Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
HSEARCH-2219 Make analyzer strategy an interface implemented by index…
…ing services This will allow to use implementation-specific analyzer types in Elasticsearch, giving us more space for handling analyzer definitions.
- Loading branch information
Showing
42 changed files
with
582 additions
and
375 deletions.
There are no files selected for viewing
73 changes: 73 additions & 0 deletions
73
.../java/org/hibernate/search/elasticsearch/analyzer/impl/ElasticsearchAnalyzerStrategy.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| /* | ||
| * 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.elasticsearch.analyzer.impl; | ||
|
|
||
| import java.util.Collection; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| import org.hibernate.search.analyzer.impl.LazyRemoteAnalyzer; | ||
| import org.hibernate.search.analyzer.impl.RemoteAnalyzer; | ||
| import org.hibernate.search.analyzer.impl.RemoteAnalyzerReference; | ||
| import org.hibernate.search.analyzer.spi.AnalyzerStrategy; | ||
| import org.hibernate.search.annotations.AnalyzerDef; | ||
|
|
||
|
|
||
| /** | ||
| * @author Yoann Rodiere | ||
| */ | ||
| public class ElasticsearchAnalyzerStrategy implements AnalyzerStrategy<RemoteAnalyzerReference> { | ||
|
|
||
| @Override | ||
| public RemoteAnalyzerReference createDefaultAnalyzerReference() { | ||
| return new RemoteAnalyzerReference( new RemoteAnalyzer( "default" ) ); | ||
| } | ||
|
|
||
| @Override | ||
| public RemoteAnalyzerReference createPassThroughAnalyzerReference() { | ||
| return new RemoteAnalyzerReference( new RemoteAnalyzer( "keyword" ) ); | ||
| } | ||
|
|
||
| @Override | ||
| public RemoteAnalyzerReference createAnalyzerReference(String name) { | ||
| return new RemoteAnalyzerReference( new LazyRemoteAnalyzer( name ) ); | ||
| } | ||
|
|
||
| @Override | ||
| public RemoteAnalyzerReference createAnalyzerReference(Class<?> analyzerClass) { | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public void initializeNamedAnalyzerReferences(Collection<RemoteAnalyzerReference> references, Map<String, AnalyzerDef> analyzerDefinitions) { | ||
| Map<String, RemoteAnalyzer> initializedAnalyzers = new HashMap<>(); | ||
| for ( RemoteAnalyzerReference reference : references ) { | ||
| initializeReference( initializedAnalyzers, reference, analyzerDefinitions ); | ||
| } | ||
| } | ||
|
|
||
|
|
||
| private void initializeReference(Map<String, RemoteAnalyzer> initializedAnalyzers, RemoteAnalyzerReference analyzerReference, | ||
| Map<String, AnalyzerDef> analyzerDefinitions) { | ||
| LazyRemoteAnalyzer lazyAnalyzer = (LazyRemoteAnalyzer) analyzerReference.getAnalyzer(); | ||
|
|
||
| String name = lazyAnalyzer.getName(); | ||
| RemoteAnalyzer delegate = initializedAnalyzers.get( name ); | ||
|
|
||
| if ( delegate == null ) { | ||
| // TODO HSEARCH-2219 Actually use the definition | ||
| delegate = buildAnalyzer( name ); | ||
| initializedAnalyzers.put( name, delegate ); | ||
| } | ||
|
|
||
| lazyAnalyzer.setDelegate( delegate ); | ||
| } | ||
|
|
||
| private RemoteAnalyzer buildAnalyzer(String name) { | ||
| return new RemoteAnalyzer( name ); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
153 changes: 153 additions & 0 deletions
153
engine/src/main/java/org/hibernate/search/analyzer/impl/LuceneEmbeddedAnalyzerStrategy.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,153 @@ | ||
| /* | ||
| * 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.analyzer.impl; | ||
|
|
||
| import java.io.IOException; | ||
| import java.text.ParseException; | ||
| import java.util.Collection; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| import org.apache.lucene.analysis.Analyzer; | ||
| import org.apache.lucene.analysis.standard.StandardAnalyzer; | ||
| import org.apache.lucene.util.Version; | ||
| import org.hibernate.search.analyzer.spi.AnalyzerStrategy; | ||
| import org.hibernate.search.annotations.AnalyzerDef; | ||
| import org.hibernate.search.cfg.Environment; | ||
| import org.hibernate.search.cfg.spi.SearchConfiguration; | ||
| import org.hibernate.search.util.StringHelper; | ||
| import org.hibernate.search.util.impl.ClassLoaderHelper; | ||
| import org.hibernate.search.util.impl.PassThroughAnalyzer; | ||
| import org.hibernate.search.util.logging.impl.Log; | ||
| import org.hibernate.search.util.logging.impl.LoggerFactory; | ||
| import org.hibernate.search.engine.service.spi.ServiceManager; | ||
| import org.hibernate.search.exception.SearchException; | ||
|
|
||
|
|
||
| /** | ||
| * @author Yoann Rodiere | ||
| */ | ||
| public class LuceneEmbeddedAnalyzerStrategy implements AnalyzerStrategy<LuceneAnalyzerReference> { | ||
|
|
||
| private static final Log log = LoggerFactory.make(); | ||
|
|
||
| private final ServiceManager serviceManager; | ||
|
|
||
| private final SearchConfiguration cfg; | ||
|
|
||
| private final Version luceneMatchVersion; | ||
|
|
||
| public LuceneEmbeddedAnalyzerStrategy(ServiceManager serviceManager, SearchConfiguration cfg) { | ||
| this.serviceManager = serviceManager; | ||
| this.cfg = cfg; | ||
| this.luceneMatchVersion = getLuceneMatchVersion( cfg ); | ||
| } | ||
|
|
||
| private Version getLuceneMatchVersion(SearchConfiguration cfg) { | ||
| final Version version; | ||
| String tmp = cfg.getProperty( Environment.LUCENE_MATCH_VERSION ); | ||
| if ( StringHelper.isEmpty( tmp ) ) { | ||
| log.recommendConfiguringLuceneVersion(); | ||
| version = Environment.DEFAULT_LUCENE_MATCH_VERSION; | ||
| } | ||
| else { | ||
| try { | ||
| version = Version.parseLeniently( tmp ); | ||
| if ( log.isDebugEnabled() ) { | ||
| log.debug( "Setting Lucene compatibility to Version " + version ); | ||
| } | ||
| } | ||
| catch (IllegalArgumentException e) { | ||
| throw log.illegalLuceneVersionFormat( tmp, e.getMessage() ); | ||
| } | ||
| catch (ParseException e) { | ||
| throw log.illegalLuceneVersionFormat( tmp, e.getMessage() ); | ||
| } | ||
| } | ||
| return version; | ||
| } | ||
|
|
||
| @SuppressWarnings("unchecked") | ||
| @Override | ||
| public LuceneAnalyzerReference createDefaultAnalyzerReference() { | ||
| Class<? extends Analyzer> analyzerClass; | ||
| String analyzerClassName = cfg.getProperty( Environment.ANALYZER_CLASS ); | ||
| if ( analyzerClassName != null ) { | ||
| try { | ||
| analyzerClass = ClassLoaderHelper.classForName( analyzerClassName, serviceManager ); | ||
| } | ||
| catch (Exception e) { | ||
| // Maybe the string refers to an analyzer definition instead? | ||
| return createAnalyzerReference( analyzerClassName ); | ||
| } | ||
| } | ||
| else { | ||
| analyzerClass = StandardAnalyzer.class; | ||
| } | ||
| return createAnalyzerReference( analyzerClass ); | ||
| } | ||
|
|
||
| @Override | ||
| public LuceneAnalyzerReference createPassThroughAnalyzerReference() { | ||
| return new LuceneAnalyzerReference( PassThroughAnalyzer.INSTANCE ); | ||
| } | ||
|
|
||
| @Override | ||
| public LuceneAnalyzerReference createAnalyzerReference(Class<?> analyzerClass) { | ||
| try { | ||
| Analyzer analyzer = ClassLoaderHelper.analyzerInstanceFromClass( analyzerClass, luceneMatchVersion ); | ||
| return new LuceneAnalyzerReference( analyzer ); | ||
| } | ||
| catch (ClassCastException e) { | ||
| throw new SearchException( "Lucene analyzer does not extend " + Analyzer.class.getName() + ": " + analyzerClass.getName(), e ); | ||
| } | ||
| catch (Exception e) { | ||
| throw new SearchException( "Failed to instantiate lucene analyzer with type " + analyzerClass.getName(), e ); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public LuceneAnalyzerReference createAnalyzerReference(String name) { | ||
| return new LuceneAnalyzerReference( new LazyLuceneAnalyzer( name ) ); | ||
| } | ||
|
|
||
| @Override | ||
| public void initializeNamedAnalyzerReferences(Collection<LuceneAnalyzerReference> references, Map<String, AnalyzerDef> analyzerDefinitions) { | ||
| Map<String, Analyzer> initializedAnalyzers = new HashMap<>(); | ||
| for ( LuceneAnalyzerReference reference : references ) { | ||
| initializeReference( initializedAnalyzers, reference, analyzerDefinitions ); | ||
| } | ||
| } | ||
|
|
||
| private void initializeReference(Map<String, Analyzer> initializedAnalyzers, LuceneAnalyzerReference analyzerReference, | ||
| Map<String, AnalyzerDef> analyzerDefinitions) { | ||
| LazyLuceneAnalyzer lazyAnalyzer = (LazyLuceneAnalyzer) analyzerReference.getAnalyzer(); | ||
|
|
||
| String name = lazyAnalyzer.getName(); | ||
| Analyzer delegate = initializedAnalyzers.get( name ); | ||
|
|
||
| if ( delegate == null ) { | ||
| AnalyzerDef analyzerDefinition = analyzerDefinitions.get( name ); | ||
| if ( analyzerDefinition == null ) { | ||
| throw new SearchException( "Lucene analyzer found with an unknown definition: " + name ); | ||
| } | ||
| delegate = buildAnalyzer( analyzerDefinition ); | ||
| initializedAnalyzers.put( name, delegate ); | ||
| } | ||
|
|
||
| lazyAnalyzer.setDelegate( delegate ); | ||
| } | ||
|
|
||
| private Analyzer buildAnalyzer(AnalyzerDef analyzerDefinition) { | ||
| try { | ||
| return LuceneAnalyzerBuilder.buildAnalyzer( analyzerDefinition, luceneMatchVersion, serviceManager ); | ||
| } | ||
| catch (IOException e) { | ||
| throw new SearchException( "Could not initialize Analyzer definition " + analyzerDefinition, e ); | ||
| } | ||
| } | ||
| } |
27 changes: 0 additions & 27 deletions
27
engine/src/main/java/org/hibernate/search/analyzer/impl/RemoteAnalyzerProvider.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.