HSEARCH-4101 Remove some configurations that are now the default

hibernate · Nov 10, 2020 · ba7b880 · ba7b880
1 parent e8290c3
commit ba7b880
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 11 deletions.
diff --git a/documentation/src/test/resources/META-INF/persistence.xml b/documentation/src/test/resources/META-INF/persistence.xml
@@ -81,9 +81,6 @@
                       value="${test.elasticsearch.connection.aws.credentials.access_key_id}"/>
             <property name="hibernate.search.backend.aws.credentials.secret_access_key"
                       value="${test.elasticsearch.connection.aws.credentials.secret_access_key}"/>
-            <!-- Make this test work even if there is only a single node in the cluster -->
-            <property name="hibernate.search.backend.schema_management.minimal_required_status"
-                      value="yellow"/>
             <property name="hibernate.search.automatic_indexing.synchronization.strategy"
                       value="sync"/>
         </properties>
@@ -149,9 +146,6 @@
                       value="${test.elasticsearch.connection.aws.credentials.access_key_id}"/>
             <property name="hibernate.search.backend.aws.credentials.secret_access_key"
                       value="${test.elasticsearch.connection.aws.credentials.secret_access_key}"/>
-            <!-- Make this test work even if there is only a single node in the cluster -->
-            <property name="hibernate.search.backend.schema_management.minimal_required_status"
-                      value="yellow"/>
             <property name="hibernate.search.automatic_indexing.synchronization.strategy"
                       value="sync"/>
         </properties>

diff --git a/...tiontest/backend/elasticsearch/testsupport/util/ElasticsearchTckBackendSetupStrategy.java b/...tiontest/backend/elasticsearch/testsupport/util/ElasticsearchTckBackendSetupStrategy.java
@@ -27,7 +27,6 @@ class ElasticsearchTckBackendSetupStrategy implements TckBackendSetupStrategy {
 	ElasticsearchTckBackendSetupStrategy() {
 		setProperty( "log.json_pretty_printing", "true" );
 		setProperty( "analysis.configurer", DefaultITAnalysisConfigurer.class.getName() );
-		setProperty( "schema_management.minimal_required_status", "yellow" );
 		// Always add configuration options that allow to connect to Elasticsearch
 		ElasticsearchTestHostConnectionConfiguration.get().addToBackendProperties( properties );
 	}

diff --git a/integrationtest/jdk/java-modules/src/main/resources/hibernate.properties b/integrationtest/jdk/java-modules/src/main/resources/hibernate.properties
@@ -24,5 +24,4 @@ hibernate.search.backend.aws.credentials.type = ${test.elasticsearch.connection.
 hibernate.search.backend.aws.credentials.access_key_id = ${test.elasticsearch.connection.aws.credentials.access_key_id}
 hibernate.search.backend.aws.credentials.secret_access_key = ${test.elasticsearch.connection.aws.credentials.secret_access_key}
 hibernate.search.backend.log.json_pretty_printing = true
-hibernate.search.backend.schema_management.minimal_required_status = yellow
 hibernate.search.backend.analysis.configurer = org.hibernate.search.integrationtest.java.module.config.MyElasticsearchAnalysisConfigurer
diff --git a/integrationtest/mapper/orm-batch-jsr352/src/test/resources/META-INF/persistence.xml b/integrationtest/mapper/orm-batch-jsr352/src/test/resources/META-INF/persistence.xml
@@ -48,7 +48,6 @@
             <property name="hibernate.search.backend.aws.credentials.access_key_id" value="${test.elasticsearch.connection.aws.credentials.access_key_id}" />
             <property name="hibernate.search.backend.aws.credentials.secret_access_key" value="${test.elasticsearch.connection.aws.credentials.secret_access_key}" />
 
-            <property name="hibernate.search.backend.schema_management.minimal_required_status" value="yellow" />
             <property name="hibernate.search.backend.log.json_pretty_printing" value="true" />
         </properties>
     </persistence-unit>

diff --git a/integrationtest/showcase/library/src/test/resources/application-test-elasticsearch.yaml b/integrationtest/showcase/library/src/test/resources/application-test-elasticsearch.yaml
@@ -2,5 +2,4 @@ spring.jpa:
   properties:
     hibernate.search:
       backend:
-        schema_management.minimal_required_status: yellow
         log.json_pretty_printing: true
diff --git a/...ch/util/impl/integrationtest/backend/elasticsearch/ElasticsearchBackendConfiguration.java b/...ch/util/impl/integrationtest/backend/elasticsearch/ElasticsearchBackendConfiguration.java
@@ -33,7 +33,6 @@ public Optional<TestRule> testRule() {
 	protected Map<String, Object> backendProperties() {
 		Map<String, Object> properties = new LinkedHashMap<>();
 		properties.put( "log.json_pretty_printing", "true" );
-		properties.put( "schema_management.minimal_required_status", "yellow" );
 		ElasticsearchTestHostConnectionConfiguration.get().addToBackendProperties( properties );
 		return properties;
 	}