HSEARCH-3101 Use aliases for backend types and make them point to the…

… right backend factory
hibernate · Dec 4, 2018 · 8dedcb9 · 8dedcb9
1 parent f001ea4
commit 8dedcb9
Show file tree

Hide file tree

Showing 11 changed files with 54 additions and 10 deletions.
diff --git a/...ain/java/org/hibernate/search/backend/elasticsearch/impl/ElasticsearchBeanConfigurer.java b/...ain/java/org/hibernate/search/backend/elasticsearch/impl/ElasticsearchBeanConfigurer.java
@@ -0,0 +1,21 @@
+/*
+ * Hibernate Search, full-text search for your domain model
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+package org.hibernate.search.backend.elasticsearch.impl;
+
+import org.hibernate.search.engine.backend.spi.BackendFactory;
+import org.hibernate.search.engine.environment.bean.spi.BeanConfigurationContext;
+import org.hibernate.search.engine.environment.bean.spi.BeanConfigurer;
+
+public class ElasticsearchBeanConfigurer implements BeanConfigurer {
+	@Override
+	public void configure(BeanConfigurationContext context) {
+		context.define(
+				BackendFactory.class, "elasticsearch",
+				factoryCreationContext -> new ElasticsearchBackendFactory()
+		);
+	}
+}
diff --git a/...sources/META-INF/services/org.hibernate.search.engine.environment.bean.spi.BeanConfigurer b/...sources/META-INF/services/org.hibernate.search.engine.environment.bean.spi.BeanConfigurer
@@ -0,0 +1 @@
+org.hibernate.search.backend.elasticsearch.impl.ElasticsearchBeanConfigurer
diff --git a/...d/lucene/src/main/java/org/hibernate/search/backend/lucene/impl/LuceneBeanConfigurer.java b/...d/lucene/src/main/java/org/hibernate/search/backend/lucene/impl/LuceneBeanConfigurer.java
@@ -0,0 +1,21 @@
+/*
+ * Hibernate Search, full-text search for your domain model
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+package org.hibernate.search.backend.lucene.impl;
+
+import org.hibernate.search.engine.backend.spi.BackendFactory;
+import org.hibernate.search.engine.environment.bean.spi.BeanConfigurationContext;
+import org.hibernate.search.engine.environment.bean.spi.BeanConfigurer;
+
+public class LuceneBeanConfigurer implements BeanConfigurer {
+	@Override
+	public void configure(BeanConfigurationContext context) {
+		context.define(
+				BackendFactory.class, "lucene",
+				factoryCreationContext -> new LuceneBackendFactory()
+		);
+	}
+}
diff --git a/...sources/META-INF/services/org.hibernate.search.engine.environment.bean.spi.BeanConfigurer b/...sources/META-INF/services/org.hibernate.search.engine.environment.bean.spi.BeanConfigurer
@@ -0,0 +1 @@
+org.hibernate.search.backend.lucene.impl.LuceneBeanConfigurer
diff --git a/documentation/src/test/resources/META-INF/persistence.xml b/documentation/src/test/resources/META-INF/persistence.xml
@@ -21,7 +21,7 @@
         <properties>
             <!-- tag::gettingstarted-configuration-orm_lucene[] -->
             <property name="hibernate.search.backends.myBackend.type"
-                      value="org.hibernate.search.backend.lucene.impl.LuceneBackendFactory"/> <!--1-->
+                      value="lucene"/> <!--1-->
             <property name="hibernate.search.backends.myBackend.lucene.directory_provider"
                       value="local_directory"/> <!--2-->
             <!--
@@ -50,7 +50,7 @@
         <properties>
             <!-- tag::gettingstarted-configuration-orm_elasticsearch[] -->
             <property name="hibernate.search.backends.myBackend.type"
-                      value="org.hibernate.search.backend.elasticsearch.impl.ElasticsearchBackendFactory" /> <!--1-->
+                      value="elasticsearch" /> <!--1-->
             <!--
             <property name="hibernate.search.backends.myBackend.host"
                       value="https://elasticsearch.mycompany.com"/>
@@ -84,7 +84,7 @@
         <exclude-unlisted-classes />
         <properties>
             <property name="hibernate.search.backends.myBackend.type"
-                      value="org.hibernate.search.backend.lucene.impl.LuceneBackendFactory"/>
+                      value="lucene"/>
             <property name="hibernate.search.backends.myBackend.lucene.directory_provider"
                       value="local_directory"/>
             <!-- tag::gettingstarted-configuration-orm_lucene-analysis[] -->
@@ -111,7 +111,7 @@
         <exclude-unlisted-classes />
         <properties>
             <property name="hibernate.search.backends.myBackend.type"
-                      value="org.hibernate.search.backend.elasticsearch.impl.ElasticsearchBackendFactory" />
+                      value="elasticsearch" />
             <!-- tag::gettingstarted-configuration-orm_elasticsearch-analysis[] -->
             <property name="hibernate.search.backends.myBackend.analysis_configurer"
                       value="org.hibernate.search.documentation.gettingstarted.withhsearch.withanalysis.MyElasticsearchAnalysisConfigurer"/> <!--6-->

diff --git a/...ationtest/backend/elasticsearch/src/test/resources/backend-tck-analysis-custom.properties b/...ationtest/backend/elasticsearch/src/test/resources/backend-tck-analysis-custom.properties
@@ -1,4 +1,4 @@
-backend.type org.hibernate.search.backend.elasticsearch.impl.ElasticsearchBackendFactory
+backend.type elasticsearch
 backend.host ${test.elasticsearch.host.url}
 backend.username ${test.elasticsearch.host.username}
 backend.password ${test.elasticsearch.host.password}

diff --git a/...grationtest/backend/elasticsearch/src/test/resources/backend-tck-multi-tenancy.properties b/...grationtest/backend/elasticsearch/src/test/resources/backend-tck-multi-tenancy.properties
@@ -1,4 +1,4 @@
-backend.type org.hibernate.search.backend.elasticsearch.impl.ElasticsearchBackendFactory
+backend.type elasticsearch
 backend.host ${test.elasticsearch.host.url}
 backend.username ${test.elasticsearch.host.username}
 backend.password ${test.elasticsearch.host.password}

diff --git a/integrationtest/backend/elasticsearch/src/test/resources/backend-tck.properties b/integrationtest/backend/elasticsearch/src/test/resources/backend-tck.properties
@@ -1,4 +1,4 @@
-backend.type org.hibernate.search.backend.elasticsearch.impl.ElasticsearchBackendFactory
+backend.type elasticsearch
 backend.host ${test.elasticsearch.host.url}
 backend.username ${test.elasticsearch.host.username}
 backend.password ${test.elasticsearch.host.password}

diff --git a/integrationtest/backend/lucene/src/test/resources/backend-tck-analysis-custom.properties b/integrationtest/backend/lucene/src/test/resources/backend-tck-analysis-custom.properties
@@ -1,4 +1,4 @@
-backend.type org.hibernate.search.backend.lucene.impl.LuceneBackendFactory
+backend.type lucene
 backend.lucene.directory_provider local_directory
 backend.lucene.root_directory ${project.build.directory}/test-indexes/#{tck.startup.timestamp}/#{tck.test.id}/
 backend.analysis_configurer org.hibernate.search.integrationtest.backend.lucene.configuration.AnalysisCustomITAnalysisConfigurer
diff --git a/integrationtest/backend/lucene/src/test/resources/backend-tck-multi-tenancy.properties b/integrationtest/backend/lucene/src/test/resources/backend-tck-multi-tenancy.properties
@@ -1,4 +1,4 @@
-backend.type org.hibernate.search.backend.lucene.impl.LuceneBackendFactory
+backend.type lucene
 backend.lucene.directory_provider local_directory
 backend.lucene.root_directory ${project.build.directory}/test-indexes/#{tck.startup.timestamp}/#{tck.test.id}/
 backend.analysis_configurer org.hibernate.search.integrationtest.backend.lucene.configuration.DefaultITAnalysisConfigurer

diff --git a/integrationtest/backend/lucene/src/test/resources/backend-tck.properties b/integrationtest/backend/lucene/src/test/resources/backend-tck.properties
@@ -1,4 +1,4 @@
-backend.type org.hibernate.search.backend.lucene.impl.LuceneBackendFactory
+backend.type lucene
 backend.lucene.directory_provider local_directory
 backend.lucene.root_directory ${project.build.directory}/test-indexes/#{tck.startup.timestamp}/#{tck.test.id}/
 backend.analysis_configurer org.hibernate.search.integrationtest.backend.lucene.configuration.DefaultITAnalysisConfigurer