Backport: ensure indexes and caps at startup only

seedstack · Jul 1, 2021 · 57d3450 · 57d3450
1 parent c1490a8
commit 57d3450
Show file tree

Hide file tree

Showing 65 changed files with 256 additions and 132 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,11 +10,14 @@ cache:
   directories:
     - "$HOME/.m2/repository"
 
+before_install:
+  - gpg --fast-import gpg.asc
+
 install:
-  - echo "<settings><servers><server><id>bintray</id><username>\${env.BINTRAY_USER}</username><password>\${env.BINTRAY_KEY}</password></server></servers></settings>" > ~/.m2/settings.xml
+  - echo "<settings><servers><server><id>ossrh</id><username>\${env.SONATYPE_USER}</username><password>\${env.SONATYPE_PASSWORD}</password></server></servers></settings>" > ~/.m2/settings.xml
   - if [[ $TRAVIS_PULL_REQUEST = false ]] && [[ $TRAVIS_BRANCH = master || $TRAVIS_BRANCH = dev-* ]] || [[ $TRAVIS_TAG = v* ]]; then GOAL=deploy; else GOAL=install; fi
-  - if [[ $TRAVIS_TAG = v* ]]; then ADDITIONAL_PROFILES=release; mvn -q -U org.seedstack:seedstack-maven-plugin:release; else ADDITIONAL_PROFILES=snapshots; fi
+  - if [[ $TRAVIS_TAG = v* ]]; then ADDITIONAL_PROFILES=release; mvn -q -U org.seedstack:seedstack-maven-plugin:release; fi
 
-script: mvn -U -Pbuild-number,compatibility,bintray,quality,javadoc,$ADDITIONAL_PROFILES $GOAL jacoco:report
+script: mvn -U -Pbuild-number,compatibility,javadoc,quality,$ADDITIONAL_PROFILES $GOAL
 
 after_success: mvn -q coveralls:report -DrepoToken=$COVERALLS_TOKEN
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# Version 3.0.3 (2021-07-02)
+
+* [fix] Avoid calling `ensureIndexes()` and `ensureCaps()` for each datastore instantiation which adds a considerable
+  overhead in some circumstances. It is now done at application startup and can be controlled with
+  `mongoDb.morphia.ensureCapsAtStartup` and `mongoDb.morphia.ensureIndexesAtStartup` config options.
+
 # Version 3.0.2 (2019-01-10)
 
 * [fix] Fix issue #11: an exception occurred at startup because the way of accessing the ValidationFactory changed. 

diff --git a/checkstyle.xml b/checkstyle.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-    Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
+    Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
 
     This Source Code Form is subject to the terms of the Mozilla Public
     License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -23,6 +23,11 @@
         <property name="eachLine" value="true"/>
     </module>
 
+    <module name="LineLength">
+        <property name="max" value="120"/>
+        <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+    </module>
+
     <module name="TreeWalker">
         <module name="OuterTypeFilename"/>
         <module name="IllegalTokenText">
@@ -37,10 +42,6 @@
             <property name="allowByTailComment" value="true"/>
             <property name="allowNonPrintableEscapes" value="true"/>
         </module>
-        <module name="LineLength">
-            <property name="max" value="120"/>
-            <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
-        </module>
         <module name="AvoidStarImport"/>
         <module name="OneTopLevelClass"/>
         <module name="NoLineWrap"/>
@@ -205,24 +206,22 @@
         </module>
         <module name="NonEmptyAtclauseDescription"/>
         <module name="JavadocTagContinuationIndentation"/>
-        <!--<module name="SummaryJavadoc">-->
-            <!--<property name="forbiddenSummaryFragments"-->
-                      <!--value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>-->
-        <!--</module>-->
+        <module name="SummaryJavadoc">
+            <property name="forbiddenSummaryFragments"
+                      value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
+        </module>
         <module name="JavadocParagraph"/>
         <module name="AtclauseOrder">
             <property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
             <property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
         </module>
-        <module name="JavadocMethod">
-            <property name="scope" value="public"/>
-            <property name="allowMissingParamTags" value="true"/>
-            <property name="allowMissingThrowsTags" value="true"/>
-            <property name="allowMissingReturnTag" value="true"/>
+        <module name="MissingJavadocMethodCheck">
             <property name="allowMissingPropertyJavadoc" value="true"/>
             <property name="minLineCount" value="2"/>
+        </module>
+        <module name="JavadocMethod">
+            <property name="scope" value="public"/>
             <property name="allowedAnnotations" value="Override, Test"/>
-            <property name="allowThrowsTagsForSubclasses" value="true"/>
         </module>
         <module name="MethodName">
             <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>

diff --git a/core/pom.xml b/core/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
+    Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
 
     This Source Code Form is subject to the terms of the Mozilla Public
     License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.addons.mongodb</groupId>
         <artifactId>mongodb</artifactId>
-        <version>3.0.2-SNAPSHOT</version>
+        <version>3.0.3-SNAPSHOT</version>
     </parent>
 
 	<artifactId>mongodb-core</artifactId>

diff --git a/core/src/main/java/org/seedstack/mongodb/MongoDbConfig.java b/core/src/main/java/org/seedstack/mongodb/MongoDbConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/core/src/main/java/org/seedstack/mongodb/internal/AbstractMongoDbManager.java b/core/src/main/java/org/seedstack/mongodb/internal/AbstractMongoDbManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/core/src/main/java/org/seedstack/mongodb/internal/AsyncMongoDbManager.java b/core/src/main/java/org/seedstack/mongodb/internal/AsyncMongoDbManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/core/src/main/java/org/seedstack/mongodb/internal/MongoDbErrorCode.java b/core/src/main/java/org/seedstack/mongodb/internal/MongoDbErrorCode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/core/src/main/java/org/seedstack/mongodb/internal/MongoDbManager.java b/core/src/main/java/org/seedstack/mongodb/internal/MongoDbManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/core/src/main/java/org/seedstack/mongodb/internal/MongoDbModule.java b/core/src/main/java/org/seedstack/mongodb/internal/MongoDbModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/core/src/main/java/org/seedstack/mongodb/internal/MongoDbPlugin.java b/core/src/main/java/org/seedstack/mongodb/internal/MongoDbPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/core/src/main/java/org/seedstack/mongodb/internal/SyncMongoDbManager.java b/core/src/main/java/org/seedstack/mongodb/internal/SyncMongoDbManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/core/src/main/resources/org/seedstack/mongodb/MongoDbConfig.properties b/core/src/main/resources/org/seedstack/mongodb/MongoDbConfig.properties
@@ -1,5 +1,5 @@
 #
-# Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
+# Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/core/src/main/resources/org/seedstack/mongodb/internal/MongoDbErrorCode.properties b/core/src/main/resources/org/seedstack/mongodb/internal/MongoDbErrorCode.properties
@@ -1,5 +1,5 @@
 #
-# Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
+# Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/core/src/test/java/org/seedstack/mongodb/MongoDbAsyncIT.java b/core/src/test/java/org/seedstack/mongodb/MongoDbAsyncIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/core/src/test/java/org/seedstack/mongodb/MongoDbIT.java b/core/src/test/java/org/seedstack/mongodb/MongoDbIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/core/src/test/resources/application.yaml b/core/src/test/resources/application.yaml
@@ -1,5 +1,5 @@
 #
-# Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
+# Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/gpg.asc b/gpg.asc
@@ -0,0 +1,91 @@
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+
+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
+=LXKR
+-----END PGP PRIVATE KEY BLOCK-----
diff --git a/morphia/pom.xml b/morphia/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
+    Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
 
     This Source Code Form is subject to the terms of the Mozilla Public
     License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.addons.mongodb</groupId>
         <artifactId>mongodb</artifactId>
-        <version>3.0.2-SNAPSHOT</version>
+        <version>3.0.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>mongodb-morphia</artifactId>

diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/BaseMorphiaRepository.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/BaseMorphiaRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/Morphia.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/Morphia.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/MorphiaConfig.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/MorphiaConfig.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+package org.seedstack.mongodb.morphia;
+
+import org.seedstack.coffig.Config;
+
+@Config("mongoDb.morphia")
+public class MorphiaConfig {
+    private boolean ensureCapsAtStartup = true;
+    private boolean ensureIndexesAtStartup = true;
+
+    public boolean isEnsureCapsAtStartup() {
+        return ensureCapsAtStartup;
+    }
+
+    public MorphiaConfig setEnsureCapsAtStartup(boolean ensureCapsAtStartup) {
+        this.ensureCapsAtStartup = ensureCapsAtStartup;
+        return this;
+    }
+
+    public boolean isEnsureIndexesAtStartup() {
+        return ensureIndexesAtStartup;
+    }
+
+    public MorphiaConfig setEnsureIndexesAtStartup(boolean ensureIndexesAtStartup) {
+        this.ensureIndexesAtStartup = ensureIndexesAtStartup;
+        return this;
+    }
+}
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/MorphiaDatastore.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/MorphiaDatastore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreFactory.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2019, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -34,20 +34,20 @@ public class DatastoreFactory {
     }
 
     public Datastore createDatastore(Class<?> morphiaClass) {
-        MorphiaDatastore datastoreAnnotation = createDatastoreAnnotation(application, morphiaClass);
+        return createDatastore(createDatastoreAnnotation(application, morphiaClass));
+    }
+
+    public Datastore createDatastore(MorphiaDatastore datastoreAnnotation) {
         return createDatastore(datastoreAnnotation.clientName(), datastoreAnnotation.dbName());
     }
 
     public Datastore createDatastore(String clientName, String dbName) {
-        Datastore datastore = morphia.createDatastore(
+        return morphia.createDatastore(
                 injector.getInstance(Key.get(MongoClient.class, Names.named(clientName))),
                 MorphiaUtils.resolveDatabaseAlias(
                         getMongoClientConfig(application, clientName),
                         dbName
                 )
         );
-        datastore.ensureIndexes(true);
-        datastore.ensureCaps();
-        return datastore;
     }
 }