HSEARCH-4152 Remove the indexing term in DYNAMIC_MAPPING property

hibernate · Feb 10, 2021 · f2758a3 · f2758a3
1 parent 0401550
commit f2758a3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/.../main/java/org/hibernate/search/backend/elasticsearch/cfg/ElasticsearchIndexSettings.java b/.../main/java/org/hibernate/search/backend/elasticsearch/cfg/ElasticsearchIndexSettings.java
@@ -64,6 +64,18 @@ private ElasticsearchIndexSettings() {
 	 */
 	public static final String SCHEMA_MANAGEMENT_SETTINGS_FILE = "schema_management.settings_file";
 
+	/**
+	 * Specify the default behavior to handle dynamically-mapped fields in the Elasticsearch mapping.
+	 * <p>
+	 * Defaults to {@link Defaults#DYNAMIC_MAPPING}.
+	 * <p>
+	 * In case of dynamic fields with field templates, the value will be ignored,
+	 * since this feature requires a {@link DynamicMapping#TRUE} to operate.
+	 *
+	 * @see DynamicMapping
+	 */
+	public static final String DYNAMIC_MAPPING = "dynamic_mapping";
+
 	/**
 	 * The prefix for indexing-related property keys.
 	 */
@@ -108,18 +120,6 @@ private ElasticsearchIndexSettings() {
 	 */
 	public static final String INDEXING_MAX_BULK_SIZE = INDEXING_PREFIX + IndexingRadicals.MAX_BULK_SIZE;
 
-	/**
-	 * Specify the default behavior to handle dynamically-mapped fields in the Elasticsearch mapping.
-	 * <p>
-	 * Defaults to {@link Defaults#DYNAMIC_MAPPING}.
-	 * <p>
-	 * In case of dynamic fields with field templates, the value will be ignored,
-	 * since this feature requires a {@link DynamicMapping#TRUE} to operate.
-	 *
-	 * @see DynamicMapping
-	 */
-	public static final String DYNAMIC_MAPPING = INDEXING_PREFIX + IndexingRadicals.DYNAMIC_MAPPING;
-
 	/**
 	 * Configuration property keys for indexing, without the {@link #INDEXING_PREFIX prefix}.
 	 */
@@ -131,7 +131,6 @@ private IndexingRadicals() {
 		public static final String QUEUE_COUNT = "queue_count";
 		public static final String QUEUE_SIZE = "queue_size";
 		public static final String MAX_BULK_SIZE = "max_bulk_size";
-		public static final String DYNAMIC_MAPPING = "dynamic_mapping";
 	}
 
 	/**

diff --git a/...kend/elasticsearch/schema/management/ElasticsearchIndexSchemaManagerDynamicMappingIT.java b/...kend/elasticsearch/schema/management/ElasticsearchIndexSchemaManagerDynamicMappingIT.java
@@ -107,7 +107,7 @@ public void dynamicMapping_invalid() {
 		)
 				.isInstanceOf( SearchException.class )
 				.hasMessageContaining(
-						"Invalid value for configuration property 'hibernate.search.backend.indexes.indexName.indexing.dynamic_mapping': 'invalid'"
+						"Invalid value for configuration property 'hibernate.search.backend.indexes.indexName.dynamic_mapping': 'invalid'"
 				)
 				.hasMessageContaining( "Valid values are: [true, false, strict]" );
 	}