HSEARCH-2167 Rename enum to IndexSchemaManagementStrategy

Author: Sanne

elasticsearch/src/main/java/org/hibernate/search/elasticsearch/cfg/ElasticsearchEnvironment.java

@@ -19,7 +19,7 @@ public final class ElasticsearchEnvironment {
 public static final class Defaults {
 
 public static final String SERVER_URI = "http://localhost:9200";
-public static final IndexManagementStrategy INDEX_MANAGEMENT_STRATEGY = IndexManagementStrategy.NONE;
+public static final IndexSchemaManagementStrategy INDEX_MANAGEMENT_STRATEGY = IndexSchemaManagementStrategy.NONE;
 public static final int INDEX_MANAGEMENT_WAIT_TIMEOUT = 10_000;
 public static final String REQUIRED_INDEX_STATUS = "green";
 public static final boolean REFRESH_AFTER_WRITE = false;
@@ -44,7 +44,7 @@ public static final class Defaults {
 /**
  * Property for specifying the strategy for maintaining the Elasticsearch index.
  * <p>
- * The name of one of the {@link IndexManagementStrategy} constants is expected, e.g. MERGE.
+ * The name of one of the {@link IndexSchemaManagementStrategy} constants is expected, e.g. MERGE.
  * <p>
  * Can be given globally (e.g. {@code hibernate.search.default.elasticsearch.index_management_strategy=MERGE}) or
  * for specific indexes (e.g. {@code hibernate.search.someindex.elasticsearch.index_management_strategy=CREATE}).

…csearch/cfg/IndexManagementStrategy.java …h/cfg/IndexSchemaManagementStrategy.javaelasticsearch/src/main/java/org/hibernate/search/elasticsearch/cfg/IndexManagementStrategy.java renamed to elasticsearch/src/main/java/org/hibernate/search/elasticsearch/cfg/IndexSchemaManagementStrategy.java elasticsearch/src/main/java/org/hibernate/search/elasticsearch/cfg/IndexManagementStrategy.java renamed to elasticsearch/src/main/java/org/hibernate/search/elasticsearch/cfg/IndexSchemaManagementStrategy.java

@@ -11,7 +11,7 @@
  *
  * @author Gunnar Morling
  */
-public enum IndexManagementStrategy {
+public enum IndexSchemaManagementStrategy {
 
 /**
  * Indexes will never be created or deleted.

elasticsearch/src/main/java/org/hibernate/search/elasticsearch/impl/ElasticsearchIndexManager.java

@@ -26,7 +26,7 @@
 import org.hibernate.search.backend.OptimizeLuceneWork;
 import org.hibernate.search.cfg.Environment;
 import org.hibernate.search.elasticsearch.cfg.ElasticsearchEnvironment;
-import org.hibernate.search.elasticsearch.cfg.IndexManagementStrategy;
+import org.hibernate.search.elasticsearch.cfg.IndexSchemaManagementStrategy;
 import org.hibernate.search.elasticsearch.client.impl.BackendRequest;
 import org.hibernate.search.elasticsearch.client.impl.BackendRequestProcessor;
 import org.hibernate.search.elasticsearch.client.impl.JestClient;
@@ -78,7 +78,7 @@ public class ElasticsearchIndexManager implements IndexManager, RemoteAnalyzerPr
 private String indexName;
 private String actualIndexName;
 private boolean refreshAfterWrite;
-private IndexManagementStrategy indexManagementStrategy;
+private IndexSchemaManagementStrategy indexManagementStrategy;
 private String indexManagementWaitTimeout;
 
 /**
@@ -153,9 +153,9 @@ private static String getIndexName(String indexName, Properties properties) {
 return name != null ? name : indexName;
 }
 
-private static IndexManagementStrategy getIndexManagementStrategy(Properties properties) {
+private static IndexSchemaManagementStrategy getIndexManagementStrategy(Properties properties) {
 String strategy = properties.getProperty( ElasticsearchEnvironment.INDEX_MANAGEMENT_STRATEGY );
-return strategy != null ? IndexManagementStrategy.valueOf( strategy ) : ElasticsearchEnvironment.Defaults.INDEX_MANAGEMENT_STRATEGY;
+return strategy != null ? IndexSchemaManagementStrategy.valueOf( strategy ) : ElasticsearchEnvironment.Defaults.INDEX_MANAGEMENT_STRATEGY;
 }
 
 private static String getIndexManagementWaitTimeout(Properties properties) {
@@ -192,7 +192,7 @@ private static boolean getRefreshAfterWrite(Properties properties) {
 
 @Override
 public void destroy() {
-if ( indexManagementStrategy == IndexManagementStrategy.CREATE_DELETE ) {
+if ( indexManagementStrategy == IndexSchemaManagementStrategy.CREATE_DELETE ) {
 deleteIndexIfExisting();
 }
 
@@ -206,17 +206,17 @@ public void setSearchFactory(ExtendedSearchIntegrator boundSearchIntegrator) {
 }
 
 private void initializeIndex() {
-if ( indexManagementStrategy == IndexManagementStrategy.NONE ) {
+if ( indexManagementStrategy == IndexSchemaManagementStrategy.NONE ) {
 return;
 }
-else if ( indexManagementStrategy == IndexManagementStrategy.CREATE ||
-indexManagementStrategy == IndexManagementStrategy.CREATE_DELETE ) {
+else if ( indexManagementStrategy == IndexSchemaManagementStrategy.CREATE ||
+indexManagementStrategy == IndexSchemaManagementStrategy.CREATE_DELETE ) {
 
 deleteIndexIfExisting();
 createIndex();
 createIndexMappings();
 }
-else if ( indexManagementStrategy == IndexManagementStrategy.MERGE ) {
+else if ( indexManagementStrategy == IndexSchemaManagementStrategy.MERGE ) {
 createIndexIfNotYetExisting();
 createIndexMappings();
 }