#574: mlUpdateIndexes disables forest creation automatically

Author: rjrudin

gradle.properties

@@ -1,3 +1,5 @@
 group=com.marklogic
 version=4.1.0-SNAPSHOT
 javadocsDir=../gh-pages-marklogic-java/javadocs
+
+snykToken=

src/main/groovy/com/marklogic/gradle/task/databases/UpdateIndexesTask.groovy

@@ -14,70 +14,81 @@ class UpdateIndexesTask extends MarkLogicTask {
 
 	@TaskAction
 	void updateIndexes() {
-		if (command != null) {
-			command.execute(getCommandContext())
-		} else {
-			getAppConfig().setIncludeProperties(
-				"database-name",
-				"stemmed-searches",
-				"word-searches",
-				"word-positions",
-				"fast-phrase-searches",
-				"fast-reverse-searches",
-				"triple-index",
-				"triple-positions",
-				"fast-case-sensitive-searches",
-				"fast-diacritic-sensitive-searches",
-				"fast-element-word-searches",
-				"element-word-positions",
-				"fast-element-phrase-searches",
-				"element-value-positions",
-				"attribute-value-positions",
-				"field-value-searches",
-				"field-value-positions",
-				"three-character-searches",
-				"three-character-word-positions",
-				"fast-element-character-searches",
-				"trailing-wildcard-searches",
-				"trailing-wildcard-word-positions",
-				"fast-element-trailing-wildcard-searches",
-				"word-lexicon",
-				"word-lexicons",
-				"two-character-searches",
-				"one-character-searches",
-				"uri-lexicon",
-				"collection-lexicon",
-				"element-word-query-through",
-				"element-word-query-throughs",
-				"phrase-through",
-				"phrase-throughs",
-				"phrase-around",
-				"phrase-arounds",
-				"range-element-index",
-				"range-element-indexes",
-				"range-element-attribute-index",
-				"range-element-attribute-indexes",
-				"range-path-index",
-				"range-path-indexes",
-				"range-field-index",
-				"range-field-indexes",
-				"field",
-				"fields",
-				"geospatial-element-index",
-				"geospatial-element-indexes",
-				"geospatial-element-child-index",
-				"geospatial-element-child-indexes",
-				"geospatial-element-pair-index",
-				"geospatial-element-pair-indexes",
-				"geospatial-element-attribute-pair-index",
-				"geospatial-element-attribute-pair-indexes",
-				"geospatial-path-index",
-				"geospatial-path-indexes",
-				"geospatial-region-path-index",
-				"geospatial-region-path-indexes"
-			)
-
-			deployWithCommandListProperty("mlDatabaseCommands")
+		final boolean originalCreateForests = getAppConfig().isCreateForests()
+		try {
+			// Ensure forests are never created by this task, as the expectation is that only index-specific database
+			// properties will be updated
+			getAppConfig().setCreateForests(false)
+			if (command != null) {
+				command.execute(getCommandContext())
+			} else {
+				configureIndexPropertiesToInclude()
+				deployWithCommandListProperty("mlDatabaseCommands")
+			}
+		} finally {
+			getAppConfig().setCreateForests(originalCreateForests)
 		}
 	}
+
+	void configureIndexPropertiesToInclude() {
+		getAppConfig().setIncludeProperties(
+			"database-name",
+			"stemmed-searches",
+			"word-searches",
+			"word-positions",
+			"fast-phrase-searches",
+			"fast-reverse-searches",
+			"triple-index",
+			"triple-positions",
+			"fast-case-sensitive-searches",
+			"fast-diacritic-sensitive-searches",
+			"fast-element-word-searches",
+			"element-word-positions",
+			"fast-element-phrase-searches",
+			"element-value-positions",
+			"attribute-value-positions",
+			"field-value-searches",
+			"field-value-positions",
+			"three-character-searches",
+			"three-character-word-positions",
+			"fast-element-character-searches",
+			"trailing-wildcard-searches",
+			"trailing-wildcard-word-positions",
+			"fast-element-trailing-wildcard-searches",
+			"word-lexicon",
+			"word-lexicons",
+			"two-character-searches",
+			"one-character-searches",
+			"uri-lexicon",
+			"collection-lexicon",
+			"element-word-query-through",
+			"element-word-query-throughs",
+			"phrase-through",
+			"phrase-throughs",
+			"phrase-around",
+			"phrase-arounds",
+			"range-element-index",
+			"range-element-indexes",
+			"range-element-attribute-index",
+			"range-element-attribute-indexes",
+			"range-path-index",
+			"range-path-indexes",
+			"range-field-index",
+			"range-field-indexes",
+			"field",
+			"fields",
+			"geospatial-element-index",
+			"geospatial-element-indexes",
+			"geospatial-element-child-index",
+			"geospatial-element-child-indexes",
+			"geospatial-element-pair-index",
+			"geospatial-element-pair-indexes",
+			"geospatial-element-attribute-pair-index",
+			"geospatial-element-attribute-pair-indexes",
+			"geospatial-path-index",
+			"geospatial-path-indexes",
+			"geospatial-region-path-index",
+			"geospatial-region-path-indexes"
+		)
+	}
 }