HSEARCH-2981 Improve the toString() of ElasticsearchAnalyzerReferences

hibernate · Jan 3, 2018 · e7b2dcd · e7b2dcd
1 parent 420158f
commit e7b2dcd
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/...org/hibernate/search/elasticsearch/analyzer/impl/NamedElasticsearchAnalyzerReference.java b/...org/hibernate/search/elasticsearch/analyzer/impl/NamedElasticsearchAnalyzerReference.java
@@ -35,6 +35,12 @@ public class NamedElasticsearchAnalyzerReference extends ElasticsearchAnalyzerRe
 
 	private static final Log LOG = LoggerFactory.make( MethodHandles.lookup() );
 
+	private static final ElasticsearchAnalysisDefinitionRegistryPopulator NOOP_DEFINITION_REGISTRY_POPULATOR = new ElasticsearchAnalysisDefinitionRegistryPopulator() {
+		@Override
+		public void populate(ElasticsearchAnalysisDefinitionRegistry registry) {
+		}
+	};
+
 	protected final String name;
 
 	private ElasticsearchAnalysisDefinitionRegistryPopulator definitionRegistryPopulator;
@@ -77,7 +83,7 @@ public void initialize(ElasticsearchAnalysisDefinitionRegistry definitionRegistr
 	protected ElasticsearchAnalysisDefinitionRegistryPopulator createRegistryPopulator(ElasticsearchAnalysisDefinitionRegistry definitionRegistry) {
 		AnalyzerDefinition analyzerDefinition = definitionRegistry.getAnalyzerDefinition( name );
 		if ( analyzerDefinition == null ) {
-			return (r) -> { }; // No-op
+			return NOOP_DEFINITION_REGISTRY_POPULATOR; // No-op
 		}
 
 		String tokenizerName = analyzerDefinition.getTokenizer();
@@ -114,8 +120,10 @@ public String toString() {
 		sb.append( getClass().getSimpleName() );
 		sb.append( "<" );
 		sb.append( name );
-		sb.append( "," );
-		sb.append( definitionRegistryPopulator );
+		if ( definitionRegistryPopulator != NOOP_DEFINITION_REGISTRY_POPULATOR ) {
+			sb.append( "," );
+			sb.append( definitionRegistryPopulator );
+		}
 		sb.append( ">" );
 		return sb.toString();
 	}

diff --git a/...rg/hibernate/search/elasticsearch/analyzer/impl/ScopedElasticsearchAnalyzerReference.java b/...rg/hibernate/search/elasticsearch/analyzer/impl/ScopedElasticsearchAnalyzerReference.java
@@ -63,6 +63,20 @@ public CopyBuilder startCopy() {
 		return new Builder( globalAnalyzerReference, scopedAnalyzerReferences );
 	}
 
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append( getClass().getSimpleName() );
+		sb.append( "<" );
+		sb.append( "global=" );
+		sb.append( globalAnalyzerReference );
+		sb.append( "," );
+		sb.append( "scoped=" );
+		sb.append( scopedAnalyzerReferences );
+		sb.append( ">" );
+		return sb.toString();
+	}
+
 	private ElasticsearchAnalyzerReference getDelegate(String fieldName) {
 		ElasticsearchAnalyzerReference analyzerReference = scopedAnalyzerReferences.get( fieldName );
 		if ( analyzerReference == null ) {