From 78b46b089bc3575a843beddf44b8afe893cb2ebd Mon Sep 17 00:00:00 2001 From: Fabio Massimo Ercoli Date: Mon, 22 Feb 2021 20:55:32 +0100 Subject: [PATCH] HSEARCH-4142 Change the scope of ToDocumentIdentifierValueConverter So that it may be used also to convert back the document identifiers --- ...asticsearchIndexSchemaRootNodeBuilder.java | 10 +++---- .../model/impl/ElasticsearchIndexModel.java | 8 +++--- .../elasticsearch/logging/impl/Log.java | 6 ++--- ...lasticsearchScopeSearchIndexesContext.java | 14 +++++----- .../impl/ElasticsearchSearchIndexContext.java | 4 +-- .../ElasticsearchSearchIndexesContext.java | 4 +-- .../impl/ElasticsearchMatchIdPredicate.java | 6 ++--- .../impl/ElasticsearchSearchQueryImpl.java | 6 ++--- .../LuceneIndexSchemaRootNodeBuilder.java | 10 +++---- .../document/model/impl/LuceneIndexModel.java | 8 +++--- .../index/impl/LuceneIndexManagerImpl.java | 4 +-- .../backend/lucene/logging/impl/Log.java | 6 ++--- .../impl/LuceneScopeSearchIndexesContext.java | 14 +++++----- .../search/impl/LuceneSearchIndexContext.java | 4 +-- .../impl/LuceneSearchIndexesContext.java | 4 +-- .../impl/LuceneMatchIdPredicate.java | 6 ++--- .../query/impl/LuceneSearchQueryImpl.java | 6 ++--- .../dsl/spi/IndexSchemaRootNodeBuilder.java | 4 +-- ... => DocumentIdentifierValueConverter.java} | 15 ++++++----- ...ringDocumentIdentifierValueConverter.java} | 8 +++--- .../impl/IndexedEntityBindingContextImpl.java | 4 +-- .../spi/IndexedEntityBindingContext.java | 4 +-- .../MatchIdPredicateConverterIT.java | 10 +++---- .../MatchIdPredicateSpecificsIT.java | 8 +++--- .../DocumentIdDefaultBridgeBaseIT.java | 26 +++++++++---------- .../DocumentIdDefaultBridgeOverridingIT.java | 10 +++---- .../impl/DefaultIdentifierBindingContext.java | 4 +-- ...idgeDocumentIdentifierValueConverter.java} | 18 ++++++------- .../document/model/StubIndexSchemaNode.java | 10 +++---- .../impl/StubIndexSchemaRootNodeBuilder.java | 4 +-- 30 files changed, 123 insertions(+), 122 deletions(-) rename engine/src/main/java/org/hibernate/search/engine/backend/types/converter/spi/{ToDocumentIdentifierValueConverter.java => DocumentIdentifierValueConverter.java} (74%) rename engine/src/main/java/org/hibernate/search/engine/backend/types/converter/spi/{StringToDocumentIdentifierValueConverter.java => StringDocumentIdentifierValueConverter.java} (58%) rename mapper/pojo-base/src/main/java/org/hibernate/search/mapper/pojo/bridge/runtime/impl/{PojoIdentifierBridgeToDocumentIdentifierValueConverter.java => PojoIdentifierBridgeDocumentIdentifierValueConverter.java} (74%) diff --git a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/document/model/dsl/impl/ElasticsearchIndexSchemaRootNodeBuilder.java b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/document/model/dsl/impl/ElasticsearchIndexSchemaRootNodeBuilder.java index 3dda42eb828..1fb45360bdc 100644 --- a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/document/model/dsl/impl/ElasticsearchIndexSchemaRootNodeBuilder.java +++ b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/document/model/dsl/impl/ElasticsearchIndexSchemaRootNodeBuilder.java @@ -33,8 +33,8 @@ import org.hibernate.search.backend.elasticsearch.lowlevel.index.settings.impl.IndexSettings; import org.hibernate.search.backend.elasticsearch.types.dsl.ElasticsearchIndexFieldTypeFactory; import org.hibernate.search.backend.elasticsearch.types.dsl.provider.impl.ElasticsearchIndexFieldTypeFactoryProvider; -import org.hibernate.search.engine.backend.types.converter.spi.ToDocumentIdentifierValueConverter; -import org.hibernate.search.engine.backend.types.converter.spi.StringToDocumentIdentifierValueConverter; +import org.hibernate.search.engine.backend.types.converter.spi.DocumentIdentifierValueConverter; +import org.hibernate.search.engine.backend.types.converter.spi.StringDocumentIdentifierValueConverter; import org.hibernate.search.engine.backend.document.model.dsl.spi.IndexSchemaRootNodeBuilder; import org.hibernate.search.engine.mapper.mapping.building.spi.IndexFieldTypeDefaultsProvider; import org.hibernate.search.engine.reporting.spi.EventContexts; @@ -54,7 +54,7 @@ public class ElasticsearchIndexSchemaRootNodeBuilder extends AbstractElasticsear private final DynamicType defaultDynamicType; private RoutingType routing = null; - private ToDocumentIdentifierValueConverter idDslConverter; + private DocumentIdentifierValueConverter idDslConverter; public ElasticsearchIndexSchemaRootNodeBuilder(ElasticsearchIndexFieldTypeFactoryProvider typeFactoryProvider, EventContext indexEventContext, @@ -87,7 +87,7 @@ public void explicitRouting() { } @Override - public void idDslConverter(ToDocumentIdentifierValueConverter idDslConverter) { + public void idDslConverter(DocumentIdentifierValueConverter idDslConverter) { this.idDslConverter = idDslConverter; } @@ -152,7 +152,7 @@ public void collect(String absoluteNamedPredicatePath, ElasticsearchIndexSchemaN mappedTypeName, analysisDefinitionRegistry, customIndexSettings, mapping, - idDslConverter == null ? new StringToDocumentIdentifierValueConverter() : idDslConverter, + idDslConverter == null ? new StringDocumentIdentifierValueConverter() : idDslConverter, rootNode, staticFields, fieldTemplates, namedPredicateNodes ); } diff --git a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/document/model/impl/ElasticsearchIndexModel.java b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/document/model/impl/ElasticsearchIndexModel.java index 4e8c5216fa1..03b2e8dd86b 100644 --- a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/document/model/impl/ElasticsearchIndexModel.java +++ b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/document/model/impl/ElasticsearchIndexModel.java @@ -24,7 +24,7 @@ import org.hibernate.search.engine.backend.document.model.spi.IndexFieldInclusion; import org.hibernate.search.engine.backend.metamodel.IndexDescriptor; import org.hibernate.search.engine.backend.metamodel.IndexFieldDescriptor; -import org.hibernate.search.engine.backend.types.converter.spi.ToDocumentIdentifierValueConverter; +import org.hibernate.search.engine.backend.types.converter.spi.DocumentIdentifierValueConverter; import org.hibernate.search.engine.reporting.spi.EventContexts; import org.hibernate.search.util.common.impl.CollectionHelper; import org.hibernate.search.util.common.reporting.EventContext; @@ -39,7 +39,7 @@ public class ElasticsearchIndexModel implements IndexDescriptor, ElasticsearchSe private final IndexSettings customIndexSettings; private final RootTypeMapping mapping; - private final ToDocumentIdentifierValueConverter idDslConverter; + private final DocumentIdentifierValueConverter idDslConverter; private final ElasticsearchIndexSchemaObjectNode rootNode; private final Map staticFields; private final List includedStaticFields; @@ -50,7 +50,7 @@ public class ElasticsearchIndexModel implements IndexDescriptor, ElasticsearchSe public ElasticsearchIndexModel(IndexNames names, String mappedTypeName, ElasticsearchAnalysisDefinitionRegistry analysisDefinitionRegistry, IndexSettings customIndexSettings, - RootTypeMapping mapping, ToDocumentIdentifierValueConverter idDslConverter, + RootTypeMapping mapping, DocumentIdentifierValueConverter idDslConverter, ElasticsearchIndexSchemaObjectNode rootNode, Map staticFields, List> fieldTemplates, @@ -87,7 +87,7 @@ public String mappedTypeName() { } @Override - public ToDocumentIdentifierValueConverter idDslConverter() { + public DocumentIdentifierValueConverter idDslConverter() { return idDslConverter; } diff --git a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/logging/impl/Log.java b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/logging/impl/Log.java index 481317fbd79..26d66828f78 100644 --- a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/logging/impl/Log.java +++ b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/logging/impl/Log.java @@ -19,7 +19,7 @@ import org.hibernate.search.backend.elasticsearch.index.ElasticsearchIndexManager; import org.hibernate.search.backend.elasticsearch.util.spi.URLEncodedString; import org.hibernate.search.engine.backend.scope.spi.IndexScopeBuilder; -import org.hibernate.search.engine.backend.types.converter.spi.ToDocumentIdentifierValueConverter; +import org.hibernate.search.engine.backend.types.converter.spi.DocumentIdentifierValueConverter; import org.hibernate.search.engine.logging.spi.AggregationKeyFormatter; import org.hibernate.search.engine.search.aggregation.AggregationKey; import org.hibernate.search.engine.search.aggregation.SearchAggregation; @@ -367,8 +367,8 @@ SearchException inconsistentConfigurationForFieldForSearch(String absoluteFieldP @Message(id = ID_OFFSET + 49, value = "Inconsistent configuration for the identifier in a search query across multiple indexes: converter differs: '%1$s' vs. '%2$s'.") - SearchException inconsistentConfigurationForIdentifierForSearch(ToDocumentIdentifierValueConverter component1, - ToDocumentIdentifierValueConverter component2, @Param EventContext context); + SearchException inconsistentConfigurationForIdentifierForSearch(DocumentIdentifierValueConverter component1, + DocumentIdentifierValueConverter component2, @Param EventContext context); @Message(id = ID_OFFSET + 53, value = "Full-text features (analysis, fuzziness) are not supported for fields of this type.") diff --git a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/scope/model/impl/ElasticsearchScopeSearchIndexesContext.java b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/scope/model/impl/ElasticsearchScopeSearchIndexesContext.java index 79c7871e1bd..05b15824d6a 100644 --- a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/scope/model/impl/ElasticsearchScopeSearchIndexesContext.java +++ b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/scope/model/impl/ElasticsearchScopeSearchIndexesContext.java @@ -24,8 +24,8 @@ import org.hibernate.search.backend.elasticsearch.search.impl.ElasticsearchSearchFieldContext; import org.hibernate.search.backend.elasticsearch.search.impl.ElasticsearchSearchIndexContext; import org.hibernate.search.backend.elasticsearch.search.impl.ElasticsearchSearchIndexesContext; -import org.hibernate.search.engine.backend.types.converter.spi.StringToDocumentIdentifierValueConverter; -import org.hibernate.search.engine.backend.types.converter.spi.ToDocumentIdentifierValueConverter; +import org.hibernate.search.engine.backend.types.converter.spi.DocumentIdentifierValueConverter; +import org.hibernate.search.engine.backend.types.converter.spi.StringDocumentIdentifierValueConverter; import org.hibernate.search.engine.reporting.spi.EventContexts; import org.hibernate.search.engine.search.common.ValueConvert; import org.hibernate.search.util.common.SearchException; @@ -36,8 +36,8 @@ public class ElasticsearchScopeSearchIndexesContext implements ElasticsearchSear private static final Log log = LoggerFactory.make( Log.class, MethodHandles.lookup() ); - private static final StringToDocumentIdentifierValueConverter RAW_ID_CONVERTER = - new StringToDocumentIdentifierValueConverter(); + private static final StringDocumentIdentifierValueConverter RAW_ID_CONVERTER = + new StringDocumentIdentifierValueConverter(); private final Set indexModels; private final Set hibernateSearchIndexNames; @@ -70,13 +70,13 @@ public Map mappedTypeNameToIndex() { } @Override - public ToDocumentIdentifierValueConverter idDslConverter(ValueConvert valueConvert) { + public DocumentIdentifierValueConverter idDslConverter(ValueConvert valueConvert) { if ( ValueConvert.NO.equals( valueConvert ) ) { return RAW_ID_CONVERTER; } - ToDocumentIdentifierValueConverter converter = null; + DocumentIdentifierValueConverter converter = null; for ( ElasticsearchIndexModel indexModel : indexModels ) { - ToDocumentIdentifierValueConverter converterForIndex = indexModel.idDslConverter(); + DocumentIdentifierValueConverter converterForIndex = indexModel.idDslConverter(); if ( converter == null ) { converter = converterForIndex; } diff --git a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/impl/ElasticsearchSearchIndexContext.java b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/impl/ElasticsearchSearchIndexContext.java index 987e35f1dcc..5d4ea2f1b5e 100644 --- a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/impl/ElasticsearchSearchIndexContext.java +++ b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/impl/ElasticsearchSearchIndexContext.java @@ -7,7 +7,7 @@ package org.hibernate.search.backend.elasticsearch.search.impl; import org.hibernate.search.backend.elasticsearch.index.layout.impl.IndexNames; -import org.hibernate.search.engine.backend.types.converter.spi.ToDocumentIdentifierValueConverter; +import org.hibernate.search.engine.backend.types.converter.spi.DocumentIdentifierValueConverter; /** * Information about an index targeted by search, @@ -19,5 +19,5 @@ public interface ElasticsearchSearchIndexContext { String mappedTypeName(); - ToDocumentIdentifierValueConverter idDslConverter(); + DocumentIdentifierValueConverter idDslConverter(); } diff --git a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/impl/ElasticsearchSearchIndexesContext.java b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/impl/ElasticsearchSearchIndexesContext.java index 76008545106..4b6f57a1fc0 100644 --- a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/impl/ElasticsearchSearchIndexesContext.java +++ b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/impl/ElasticsearchSearchIndexesContext.java @@ -11,7 +11,7 @@ import java.util.Set; import org.hibernate.search.backend.elasticsearch.document.model.impl.ElasticsearchIndexSchemaNamedPredicateNode; -import org.hibernate.search.engine.backend.types.converter.spi.ToDocumentIdentifierValueConverter; +import org.hibernate.search.engine.backend.types.converter.spi.DocumentIdentifierValueConverter; import org.hibernate.search.engine.search.common.ValueConvert; /** @@ -26,7 +26,7 @@ public interface ElasticsearchSearchIndexesContext { Map mappedTypeNameToIndex(); - ToDocumentIdentifierValueConverter idDslConverter(ValueConvert valueConvert); + DocumentIdentifierValueConverter idDslConverter(ValueConvert valueConvert); ElasticsearchSearchFieldContext field(String absoluteFieldPath); diff --git a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/predicate/impl/ElasticsearchMatchIdPredicate.java b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/predicate/impl/ElasticsearchMatchIdPredicate.java index cf68f3fcc0f..784ec5a5ee7 100644 --- a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/predicate/impl/ElasticsearchMatchIdPredicate.java +++ b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/predicate/impl/ElasticsearchMatchIdPredicate.java @@ -14,7 +14,7 @@ import org.hibernate.search.backend.elasticsearch.gson.impl.JsonObjectAccessor; import org.hibernate.search.backend.elasticsearch.search.impl.ElasticsearchSearchContext; import org.hibernate.search.engine.backend.types.converter.runtime.spi.ToDocumentIdentifierValueConvertContext; -import org.hibernate.search.engine.backend.types.converter.spi.ToDocumentIdentifierValueConverter; +import org.hibernate.search.engine.backend.types.converter.spi.DocumentIdentifierValueConverter; import org.hibernate.search.engine.search.common.ValueConvert; import org.hibernate.search.engine.search.predicate.SearchPredicate; import org.hibernate.search.engine.search.predicate.spi.MatchIdPredicateBuilder; @@ -92,11 +92,11 @@ static class Builder extends AbstractElasticsearchPredicate.AbstractBuilder impl @Override public void value(Object value, ValueConvert valueConvert) { - ToDocumentIdentifierValueConverter dslToDocumentIdConverter = + DocumentIdentifierValueConverter dslToDocumentIdConverter = searchContext.indexes().idDslConverter( valueConvert ); ToDocumentIdentifierValueConvertContext toDocumentIdentifierValueConvertContext = searchContext.toDocumentIdentifierValueConvertContext(); - values.add( dslToDocumentIdConverter.convertUnknown( value, toDocumentIdentifierValueConvertContext ) ); + values.add( dslToDocumentIdConverter.convertToDocumentUnknown( value, toDocumentIdentifierValueConvertContext ) ); } @Override diff --git a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/impl/ElasticsearchSearchQueryImpl.java b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/impl/ElasticsearchSearchQueryImpl.java index c0e1904383a..20089a49579 100644 --- a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/impl/ElasticsearchSearchQueryImpl.java +++ b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/impl/ElasticsearchSearchQueryImpl.java @@ -31,7 +31,7 @@ import org.hibernate.search.backend.elasticsearch.work.result.impl.ExplainResult; import org.hibernate.search.engine.backend.session.spi.BackendSessionContext; import org.hibernate.search.engine.backend.types.converter.runtime.spi.ToDocumentIdentifierValueConvertContext; -import org.hibernate.search.engine.backend.types.converter.spi.ToDocumentIdentifierValueConverter; +import org.hibernate.search.engine.backend.types.converter.spi.DocumentIdentifierValueConverter; import org.hibernate.search.engine.common.dsl.spi.DslExtensionState; import org.hibernate.search.engine.search.loading.spi.SearchLoadingContext; import org.hibernate.search.engine.search.query.SearchQueryExtension; @@ -275,10 +275,10 @@ private JsonObject doExplain(ElasticsearchSearchIndexContext index, Object id) { } private URLEncodedString toElasticsearchId(ElasticsearchSearchIndexContext index, Object id) { - ToDocumentIdentifierValueConverter converter = index.idDslConverter(); + DocumentIdentifierValueConverter converter = index.idDslConverter(); ToDocumentIdentifierValueConvertContext convertContext = searchContext.toDocumentIdentifierValueConvertContext(); - String documentId = converter.convertUnknown( id, convertContext ); + String documentId = converter.convertToDocumentUnknown( id, convertContext ); return URLEncodedString.fromString( searchContext.documentIdHelper() .toElasticsearchId( sessionContext.tenantIdentifier(), documentId ) ); } diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/document/model/dsl/impl/LuceneIndexSchemaRootNodeBuilder.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/document/model/dsl/impl/LuceneIndexSchemaRootNodeBuilder.java index 5856abf52ea..01958e70374 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/document/model/dsl/impl/LuceneIndexSchemaRootNodeBuilder.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/document/model/dsl/impl/LuceneIndexSchemaRootNodeBuilder.java @@ -28,8 +28,8 @@ import org.hibernate.search.backend.lucene.types.dsl.impl.LuceneIndexFieldTypeFactoryImpl; import org.hibernate.search.engine.backend.document.model.dsl.spi.IndexSchemaBuildContext; import org.hibernate.search.engine.backend.types.ObjectStructure; -import org.hibernate.search.engine.backend.types.converter.spi.ToDocumentIdentifierValueConverter; -import org.hibernate.search.engine.backend.types.converter.spi.StringToDocumentIdentifierValueConverter; +import org.hibernate.search.engine.backend.types.converter.spi.DocumentIdentifierValueConverter; +import org.hibernate.search.engine.backend.types.converter.spi.StringDocumentIdentifierValueConverter; import org.hibernate.search.engine.backend.document.model.dsl.spi.IndexSchemaRootNodeBuilder; import org.hibernate.search.engine.mapper.mapping.building.spi.IndexFieldTypeDefaultsProvider; import org.hibernate.search.engine.reporting.spi.EventContexts; @@ -42,7 +42,7 @@ public class LuceneIndexSchemaRootNodeBuilder extends AbstractLuceneIndexSchemaO private final String mappedTypeName; private final LuceneAnalysisDefinitionRegistry analysisDefinitionRegistry; - private ToDocumentIdentifierValueConverter idDslConverter; + private DocumentIdentifierValueConverter idDslConverter; public LuceneIndexSchemaRootNodeBuilder(EventContext indexEventContext, String mappedTypeName, LuceneAnalysisDefinitionRegistry analysisDefinitionRegistry) { @@ -67,7 +67,7 @@ public void explicitRouting() { } @Override - public void idDslConverter(ToDocumentIdentifierValueConverter idDslConverter) { + public void idDslConverter(DocumentIdentifierValueConverter idDslConverter) { this.idDslConverter = idDslConverter; } @@ -124,7 +124,7 @@ public void collect(LuceneIndexSchemaValueFieldTemplate template) { return new LuceneIndexModel( indexName, mappedTypeName, - idDslConverter == null ? new StringToDocumentIdentifierValueConverter() : idDslConverter, + idDslConverter == null ? new StringDocumentIdentifierValueConverter() : idDslConverter, rootNode, staticFields, fieldTemplates, namedPredicateNodes, hasNestedDocument[0] ); } diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/document/model/impl/LuceneIndexModel.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/document/model/impl/LuceneIndexModel.java index ce87a8c4eda..58c5117709a 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/document/model/impl/LuceneIndexModel.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/document/model/impl/LuceneIndexModel.java @@ -19,7 +19,7 @@ import org.hibernate.search.engine.backend.document.model.spi.IndexFieldInclusion; import org.hibernate.search.engine.backend.metamodel.IndexDescriptor; import org.hibernate.search.engine.backend.metamodel.IndexFieldDescriptor; -import org.hibernate.search.engine.backend.types.converter.spi.ToDocumentIdentifierValueConverter; +import org.hibernate.search.engine.backend.types.converter.spi.DocumentIdentifierValueConverter; import org.hibernate.search.engine.reporting.spi.EventContexts; import org.hibernate.search.util.common.impl.CollectionHelper; import org.hibernate.search.util.common.reporting.EventContext; @@ -34,7 +34,7 @@ public class LuceneIndexModel implements AutoCloseable, IndexDescriptor { private final String mappedTypeName; - private final ToDocumentIdentifierValueConverter idDslConverter; + private final DocumentIdentifierValueConverter idDslConverter; private final LuceneIndexSchemaObjectNode rootNode; private final Map staticFields; @@ -49,7 +49,7 @@ public class LuceneIndexModel implements AutoCloseable, IndexDescriptor { public LuceneIndexModel(String indexName, String mappedTypeName, - ToDocumentIdentifierValueConverter idDslConverter, + DocumentIdentifierValueConverter idDslConverter, LuceneIndexSchemaObjectNode rootNode, Map staticFields, List> fieldTemplates, @@ -112,7 +112,7 @@ public EventContext getEventContext() { return EventContexts.fromIndexName( indexName ); } - public ToDocumentIdentifierValueConverter idDslConverter() { + public DocumentIdentifierValueConverter idDslConverter() { return idDslConverter; } diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/index/impl/LuceneIndexManagerImpl.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/index/impl/LuceneIndexManagerImpl.java index 1298f5e978a..4635d39b271 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/index/impl/LuceneIndexManagerImpl.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/index/impl/LuceneIndexManagerImpl.java @@ -20,7 +20,7 @@ import org.hibernate.search.backend.lucene.scope.model.impl.LuceneScopeIndexManagerContext; import org.hibernate.search.engine.backend.metamodel.IndexDescriptor; import org.hibernate.search.engine.backend.schema.management.spi.IndexSchemaManager; -import org.hibernate.search.engine.backend.types.converter.spi.ToDocumentIdentifierValueConverter; +import org.hibernate.search.engine.backend.types.converter.spi.DocumentIdentifierValueConverter; import org.hibernate.search.engine.backend.work.execution.DocumentCommitStrategy; import org.hibernate.search.engine.backend.index.IndexManager; import org.hibernate.search.engine.backend.index.spi.IndexManagerStartContext; @@ -156,7 +156,7 @@ public LuceneIndexModel model() { } @Override - public ToDocumentIdentifierValueConverter idDslConverter() { + public DocumentIdentifierValueConverter idDslConverter() { return model.idDslConverter(); } diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/logging/impl/Log.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/logging/impl/Log.java index aac0a4b546e..7c6d34717c7 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/logging/impl/Log.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/logging/impl/Log.java @@ -22,7 +22,7 @@ import org.hibernate.search.backend.lucene.index.LuceneIndexManager; import org.hibernate.search.engine.backend.scope.spi.IndexScopeBuilder; -import org.hibernate.search.engine.backend.types.converter.spi.ToDocumentIdentifierValueConverter; +import org.hibernate.search.engine.backend.types.converter.spi.DocumentIdentifierValueConverter; import org.hibernate.search.engine.logging.spi.AggregationKeyFormatter; import org.hibernate.search.engine.search.common.SortMode; import org.hibernate.search.engine.search.predicate.SearchPredicate; @@ -331,8 +331,8 @@ SearchException unableToDeleteAllEntriesFromIndex(Query query, String causeMessa @Message(id = ID_OFFSET + 68, value = "Inconsistent configuration for the identifier in a search query across multiple indexes: converter differs: '%1$s' vs. '%2$s'.") - SearchException inconsistentConfigurationForIdentifierForSearch(ToDocumentIdentifierValueConverter component1, - ToDocumentIdentifierValueConverter component2, @Param EventContext context); + SearchException inconsistentConfigurationForIdentifierForSearch(DocumentIdentifierValueConverter component1, + DocumentIdentifierValueConverter component2, @Param EventContext context); @Message(id = ID_OFFSET + 69, value = "Unable to explain search query: %1$s") diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/scope/model/impl/LuceneScopeSearchIndexesContext.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/scope/model/impl/LuceneScopeSearchIndexesContext.java index b39d2cd0bfe..975f6286555 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/scope/model/impl/LuceneScopeSearchIndexesContext.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/scope/model/impl/LuceneScopeSearchIndexesContext.java @@ -24,8 +24,8 @@ import org.hibernate.search.backend.lucene.search.impl.LuceneSearchFieldContext; import org.hibernate.search.backend.lucene.search.impl.LuceneSearchIndexContext; import org.hibernate.search.backend.lucene.search.impl.LuceneSearchIndexesContext; -import org.hibernate.search.engine.backend.types.converter.spi.StringToDocumentIdentifierValueConverter; -import org.hibernate.search.engine.backend.types.converter.spi.ToDocumentIdentifierValueConverter; +import org.hibernate.search.engine.backend.types.converter.spi.DocumentIdentifierValueConverter; +import org.hibernate.search.engine.backend.types.converter.spi.StringDocumentIdentifierValueConverter; import org.hibernate.search.engine.reporting.spi.EventContexts; import org.hibernate.search.engine.search.common.ValueConvert; import org.hibernate.search.util.common.SearchException; @@ -36,8 +36,8 @@ public class LuceneScopeSearchIndexesContext implements LuceneSearchIndexesConte private static final Log log = LoggerFactory.make( Log.class, MethodHandles.lookup() ); - private static final StringToDocumentIdentifierValueConverter RAW_ID_CONVERTER = - new StringToDocumentIdentifierValueConverter(); + private static final StringDocumentIdentifierValueConverter RAW_ID_CONVERTER = + new StringDocumentIdentifierValueConverter(); private final Map mappedTypeNameToIndex; private final Set indexNames; @@ -68,13 +68,13 @@ public Set indexNames() { } @Override - public ToDocumentIdentifierValueConverter idDslConverter(ValueConvert valueConvert) { + public DocumentIdentifierValueConverter idDslConverter(ValueConvert valueConvert) { if ( ValueConvert.NO.equals( valueConvert ) ) { return RAW_ID_CONVERTER; } - ToDocumentIdentifierValueConverter converter = null; + DocumentIdentifierValueConverter converter = null; for ( LuceneScopeIndexManagerContext index : elements() ) { - ToDocumentIdentifierValueConverter converterForIndex = index.model().idDslConverter(); + DocumentIdentifierValueConverter converterForIndex = index.model().idDslConverter(); if ( converter == null ) { converter = converterForIndex; } diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/impl/LuceneSearchIndexContext.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/impl/LuceneSearchIndexContext.java index a669d56062c..790018dc197 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/impl/LuceneSearchIndexContext.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/impl/LuceneSearchIndexContext.java @@ -7,10 +7,10 @@ package org.hibernate.search.backend.lucene.search.impl; import org.hibernate.search.backend.lucene.lowlevel.reader.impl.ReadIndexManagerContext; -import org.hibernate.search.engine.backend.types.converter.spi.ToDocumentIdentifierValueConverter; +import org.hibernate.search.engine.backend.types.converter.spi.DocumentIdentifierValueConverter; public interface LuceneSearchIndexContext extends ReadIndexManagerContext { - ToDocumentIdentifierValueConverter idDslConverter(); + DocumentIdentifierValueConverter idDslConverter(); } diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/impl/LuceneSearchIndexesContext.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/impl/LuceneSearchIndexesContext.java index 016ca1ac8a7..9256909bf22 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/impl/LuceneSearchIndexesContext.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/impl/LuceneSearchIndexesContext.java @@ -11,7 +11,7 @@ import java.util.Set; import org.hibernate.search.backend.lucene.document.model.impl.LuceneIndexSchemaNamedPredicateNode; -import org.hibernate.search.engine.backend.types.converter.spi.ToDocumentIdentifierValueConverter; +import org.hibernate.search.engine.backend.types.converter.spi.DocumentIdentifierValueConverter; import org.hibernate.search.engine.search.common.ValueConvert; public interface LuceneSearchIndexesContext { @@ -22,7 +22,7 @@ public interface LuceneSearchIndexesContext { Set indexNames(); - ToDocumentIdentifierValueConverter idDslConverter(ValueConvert valueConvert); + DocumentIdentifierValueConverter idDslConverter(ValueConvert valueConvert); LuceneSearchFieldContext field(String absoluteFieldPath); diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/predicate/impl/LuceneMatchIdPredicate.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/predicate/impl/LuceneMatchIdPredicate.java index d2f5e6dff6d..d125b615e2c 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/predicate/impl/LuceneMatchIdPredicate.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/predicate/impl/LuceneMatchIdPredicate.java @@ -12,7 +12,7 @@ import org.hibernate.search.backend.lucene.lowlevel.common.impl.MetadataFields; import org.hibernate.search.backend.lucene.search.impl.LuceneSearchContext; import org.hibernate.search.engine.backend.types.converter.runtime.spi.ToDocumentIdentifierValueConvertContext; -import org.hibernate.search.engine.backend.types.converter.spi.ToDocumentIdentifierValueConverter; +import org.hibernate.search.engine.backend.types.converter.spi.DocumentIdentifierValueConverter; import org.hibernate.search.engine.search.common.ValueConvert; import org.hibernate.search.engine.search.predicate.SearchPredicate; import org.hibernate.search.engine.search.predicate.spi.MatchIdPredicateBuilder; @@ -61,11 +61,11 @@ static class Builder extends AbstractBuilder implements MatchIdPredicateBuilder @Override public void value(Object value, ValueConvert valueConvert) { - ToDocumentIdentifierValueConverter dslToDocumentIdConverter = + DocumentIdentifierValueConverter dslToDocumentIdConverter = searchContext.indexes().idDslConverter( valueConvert ); ToDocumentIdentifierValueConvertContext toDocumentIdentifierValueConvertContext = searchContext.toDocumentIdentifierValueConvertContext(); - values.add( dslToDocumentIdConverter.convertUnknown( value, toDocumentIdentifierValueConvertContext ) ); + values.add( dslToDocumentIdConverter.convertToDocumentUnknown( value, toDocumentIdentifierValueConvertContext ) ); } @Override diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/query/impl/LuceneSearchQueryImpl.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/query/impl/LuceneSearchQueryImpl.java index 4d53471847e..bf639506f43 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/query/impl/LuceneSearchQueryImpl.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/query/impl/LuceneSearchQueryImpl.java @@ -23,7 +23,7 @@ import org.hibernate.search.backend.lucene.work.impl.LuceneSearcher; import org.hibernate.search.backend.lucene.work.impl.LuceneWorkFactory; import org.hibernate.search.engine.backend.types.converter.runtime.spi.ToDocumentIdentifierValueConvertContext; -import org.hibernate.search.engine.backend.types.converter.spi.ToDocumentIdentifierValueConverter; +import org.hibernate.search.engine.backend.types.converter.spi.DocumentIdentifierValueConverter; import org.hibernate.search.backend.lucene.work.impl.ReadWork; import org.hibernate.search.engine.backend.session.spi.BackendSessionContext; import org.hibernate.search.engine.common.dsl.spi.DslExtensionState; @@ -221,9 +221,9 @@ private int totalHitCountThreshold(boolean trackTotalHitCount) { } private String toDocumentId(LuceneSearchIndexContext index, Object id) { - ToDocumentIdentifierValueConverter converter = index.idDslConverter(); + DocumentIdentifierValueConverter converter = index.idDslConverter(); ToDocumentIdentifierValueConvertContext convertContext = searchContext.toDocumentIdentifierValueConvertContext(); - return converter.convertUnknown( id, convertContext ); + return converter.convertToDocumentUnknown( id, convertContext ); } } diff --git a/engine/src/main/java/org/hibernate/search/engine/backend/document/model/dsl/spi/IndexSchemaRootNodeBuilder.java b/engine/src/main/java/org/hibernate/search/engine/backend/document/model/dsl/spi/IndexSchemaRootNodeBuilder.java index 360d00cd965..697814b7052 100644 --- a/engine/src/main/java/org/hibernate/search/engine/backend/document/model/dsl/spi/IndexSchemaRootNodeBuilder.java +++ b/engine/src/main/java/org/hibernate/search/engine/backend/document/model/dsl/spi/IndexSchemaRootNodeBuilder.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.engine.backend.document.model.dsl.spi; -import org.hibernate.search.engine.backend.types.converter.spi.ToDocumentIdentifierValueConverter; +import org.hibernate.search.engine.backend.types.converter.spi.DocumentIdentifierValueConverter; import org.hibernate.search.engine.backend.types.dsl.IndexFieldTypeFactory; import org.hibernate.search.engine.mapper.mapping.building.spi.IndexFieldTypeDefaultsProvider; @@ -21,5 +21,5 @@ public interface IndexSchemaRootNodeBuilder extends IndexSchemaObjectNodeBuilder */ void explicitRouting(); - void idDslConverter(ToDocumentIdentifierValueConverter idConverter); + void idDslConverter(DocumentIdentifierValueConverter idConverter); } diff --git a/engine/src/main/java/org/hibernate/search/engine/backend/types/converter/spi/ToDocumentIdentifierValueConverter.java b/engine/src/main/java/org/hibernate/search/engine/backend/types/converter/spi/DocumentIdentifierValueConverter.java similarity index 74% rename from engine/src/main/java/org/hibernate/search/engine/backend/types/converter/spi/ToDocumentIdentifierValueConverter.java rename to engine/src/main/java/org/hibernate/search/engine/backend/types/converter/spi/DocumentIdentifierValueConverter.java index 0a7e2353855..096053a2198 100644 --- a/engine/src/main/java/org/hibernate/search/engine/backend/types/converter/spi/ToDocumentIdentifierValueConverter.java +++ b/engine/src/main/java/org/hibernate/search/engine/backend/types/converter/spi/DocumentIdentifierValueConverter.java @@ -10,11 +10,12 @@ import org.hibernate.search.engine.backend.types.converter.runtime.spi.ToDocumentIdentifierValueConvertContextExtension; /** - * A converter from a source identifier value to a target value that should be used as a document identifier. + * A converter from a source identifier value to a target value that should be used as a document identifier + * and back to the source identifier from the document identifier. * * @param The type of source identifier values. */ -public interface ToDocumentIdentifierValueConverter { +public interface DocumentIdentifierValueConverter { /** * @param value The source value to convert. @@ -23,7 +24,7 @@ public interface ToDocumentIdentifierValueConverter { * to a more useful type, giving access to such things as a Hibernate ORM SessionFactory (if using the Hibernate ORM mapper). * @return The converted index field value. */ - String convert(I value, ToDocumentIdentifierValueConvertContext context); + String convertToDocument(I value, ToDocumentIdentifierValueConvertContext context); /** * Convert an input value of unknown type that may not have the required type {@code I}. @@ -36,15 +37,15 @@ public interface ToDocumentIdentifierValueConverter { * to a more useful type, giving access to such things as a Hibernate ORM SessionFactory (if using the Hibernate ORM mapper). * @return The converted index field value. */ - String convertUnknown(Object value, ToDocumentIdentifierValueConvertContext context); + String convertToDocumentUnknown(Object value, ToDocumentIdentifierValueConvertContext context); /** - * @param other Another {@link ToDocumentIdentifierValueConverter}, never {@code null}. + * @param other Another {@link DocumentIdentifierValueConverter}, never {@code null}. * @return {@code true} if the given object behaves exactly the same as this object, i.e. its - * {@link #convertUnknown(Object, ToDocumentIdentifierValueConvertContext)} method is guaranteed to always return the + * {@link #convertToDocumentUnknown(Object, ToDocumentIdentifierValueConvertContext)} method is guaranteed to always return the * same value as this object's when given the same input. {@code false} otherwise, or when in doubt. */ - default boolean isCompatibleWith(ToDocumentIdentifierValueConverter other) { + default boolean isCompatibleWith(DocumentIdentifierValueConverter other) { return equals( other ); } diff --git a/engine/src/main/java/org/hibernate/search/engine/backend/types/converter/spi/StringToDocumentIdentifierValueConverter.java b/engine/src/main/java/org/hibernate/search/engine/backend/types/converter/spi/StringDocumentIdentifierValueConverter.java similarity index 58% rename from engine/src/main/java/org/hibernate/search/engine/backend/types/converter/spi/StringToDocumentIdentifierValueConverter.java rename to engine/src/main/java/org/hibernate/search/engine/backend/types/converter/spi/StringDocumentIdentifierValueConverter.java index 94596828135..a6a16e02762 100644 --- a/engine/src/main/java/org/hibernate/search/engine/backend/types/converter/spi/StringToDocumentIdentifierValueConverter.java +++ b/engine/src/main/java/org/hibernate/search/engine/backend/types/converter/spi/StringDocumentIdentifierValueConverter.java @@ -8,20 +8,20 @@ import org.hibernate.search.engine.backend.types.converter.runtime.spi.ToDocumentIdentifierValueConvertContext; -public final class StringToDocumentIdentifierValueConverter implements ToDocumentIdentifierValueConverter { +public final class StringDocumentIdentifierValueConverter implements DocumentIdentifierValueConverter { @Override - public String convert(String value, ToDocumentIdentifierValueConvertContext context) { + public String convertToDocument(String value, ToDocumentIdentifierValueConvertContext context) { return value; } @Override - public String convertUnknown(Object value, ToDocumentIdentifierValueConvertContext context) { + public String convertToDocumentUnknown(Object value, ToDocumentIdentifierValueConvertContext context) { return (String) value; } @Override - public boolean isCompatibleWith(ToDocumentIdentifierValueConverter other) { + public boolean isCompatibleWith(DocumentIdentifierValueConverter other) { return getClass().equals( other.getClass() ); } } diff --git a/engine/src/main/java/org/hibernate/search/engine/mapper/mapping/building/impl/IndexedEntityBindingContextImpl.java b/engine/src/main/java/org/hibernate/search/engine/mapper/mapping/building/impl/IndexedEntityBindingContextImpl.java index aefc03f98b1..8a8711acd29 100644 --- a/engine/src/main/java/org/hibernate/search/engine/mapper/mapping/building/impl/IndexedEntityBindingContextImpl.java +++ b/engine/src/main/java/org/hibernate/search/engine/mapper/mapping/building/impl/IndexedEntityBindingContextImpl.java @@ -7,7 +7,7 @@ package org.hibernate.search.engine.mapper.mapping.building.impl; import org.hibernate.search.engine.backend.document.model.dsl.spi.IndexSchemaRootNodeBuilder; -import org.hibernate.search.engine.backend.types.converter.spi.ToDocumentIdentifierValueConverter; +import org.hibernate.search.engine.backend.types.converter.spi.DocumentIdentifierValueConverter; import org.hibernate.search.engine.mapper.mapping.building.spi.IndexedEntityBindingContext; import org.hibernate.search.engine.mapper.mapping.building.spi.IndexedEntityBindingMapperContext; @@ -25,7 +25,7 @@ public void explicitRouting() { } @Override - public void idDslConverter(ToDocumentIdentifierValueConverter idConverter) { + public void idDslConverter(DocumentIdentifierValueConverter idConverter) { indexSchemaObjectNodeBuilder.idDslConverter( idConverter ); } diff --git a/engine/src/main/java/org/hibernate/search/engine/mapper/mapping/building/spi/IndexedEntityBindingContext.java b/engine/src/main/java/org/hibernate/search/engine/mapper/mapping/building/spi/IndexedEntityBindingContext.java index 0609040e616..b0e3b334b83 100644 --- a/engine/src/main/java/org/hibernate/search/engine/mapper/mapping/building/spi/IndexedEntityBindingContext.java +++ b/engine/src/main/java/org/hibernate/search/engine/mapper/mapping/building/spi/IndexedEntityBindingContext.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.engine.mapper.mapping.building.spi; -import org.hibernate.search.engine.backend.types.converter.spi.ToDocumentIdentifierValueConverter; +import org.hibernate.search.engine.backend.types.converter.spi.DocumentIdentifierValueConverter; /** * The binding context associated to the root node in the entity tree. @@ -27,6 +27,6 @@ public interface IndexedEntityBindingContext extends IndexBindingContext { * * @param idConverter The ID converter to use in the predicate DSL. */ - void idDslConverter(ToDocumentIdentifierValueConverter idConverter); + void idDslConverter(DocumentIdentifierValueConverter idConverter); } diff --git a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/MatchIdPredicateConverterIT.java b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/MatchIdPredicateConverterIT.java index 2aca5ebf72d..b402d5800bc 100644 --- a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/MatchIdPredicateConverterIT.java +++ b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/MatchIdPredicateConverterIT.java @@ -10,7 +10,7 @@ import java.util.Arrays; -import org.hibernate.search.engine.backend.types.converter.spi.ToDocumentIdentifierValueConverter; +import org.hibernate.search.engine.backend.types.converter.spi.DocumentIdentifierValueConverter; import org.hibernate.search.engine.backend.types.converter.runtime.spi.ToDocumentIdentifierValueConvertContext; import org.hibernate.search.integrationtest.backend.tck.testsupport.util.rule.SearchSetupHelper; import org.hibernate.search.util.impl.integrationtest.mapper.stub.StubMappedIndex; @@ -31,15 +31,15 @@ public class MatchIdPredicateConverterIT { private static final String DOCUMENT_2 = "document2"; private static final String DOCUMENT_3 = "document3"; - private static final ToDocumentIdentifierValueConverter ID_CONVERTER = new ToDocumentIdentifierValueConverter() { + private static final DocumentIdentifierValueConverter ID_CONVERTER = new DocumentIdentifierValueConverter() { @Override - public String convert(Integer value, ToDocumentIdentifierValueConvertContext context) { + public String convertToDocument(Integer value, ToDocumentIdentifierValueConvertContext context) { return "document" + value; } @Override - public String convertUnknown(Object value, ToDocumentIdentifierValueConvertContext context) { - return convert( (Integer) value, context ); + public String convertToDocumentUnknown(Object value, ToDocumentIdentifierValueConvertContext context) { + return convertToDocument( (Integer) value, context ); } }; diff --git a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/MatchIdPredicateSpecificsIT.java b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/MatchIdPredicateSpecificsIT.java index 81fd3df6729..9aa4d40a2e9 100644 --- a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/MatchIdPredicateSpecificsIT.java +++ b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/MatchIdPredicateSpecificsIT.java @@ -12,7 +12,7 @@ import java.util.Arrays; import org.hibernate.search.engine.backend.types.converter.runtime.spi.ToDocumentIdentifierValueConvertContext; -import org.hibernate.search.engine.backend.types.converter.spi.ToDocumentIdentifierValueConverter; +import org.hibernate.search.engine.backend.types.converter.spi.DocumentIdentifierValueConverter; import org.hibernate.search.engine.reporting.spi.EventContexts; import org.hibernate.search.engine.search.common.ValueConvert; import org.hibernate.search.engine.search.predicate.dsl.SearchPredicateFactory; @@ -146,14 +146,14 @@ private static void initData() { mainIndexer.join( compatibleIdConverterIndexer, incompatibleIdConverterIndexer ); } - private static class IncompatibleIdConverter implements ToDocumentIdentifierValueConverter { + private static class IncompatibleIdConverter implements DocumentIdentifierValueConverter { @Override - public String convert(String value, ToDocumentIdentifierValueConvertContext context) { + public String convertToDocument(String value, ToDocumentIdentifierValueConvertContext context) { throw new UnsupportedOperationException( "Should not be called" ); } @Override - public String convertUnknown(Object value, ToDocumentIdentifierValueConvertContext context) { + public String convertToDocumentUnknown(Object value, ToDocumentIdentifierValueConvertContext context) { throw new UnsupportedOperationException( "Should not be called" ); } } diff --git a/integrationtest/mapper/pojo-base/src/test/java/org/hibernate/search/integrationtest/mapper/pojo/mapping/definition/DocumentIdDefaultBridgeBaseIT.java b/integrationtest/mapper/pojo-base/src/test/java/org/hibernate/search/integrationtest/mapper/pojo/mapping/definition/DocumentIdDefaultBridgeBaseIT.java index 167f904164b..15902a4bd83 100644 --- a/integrationtest/mapper/pojo-base/src/test/java/org/hibernate/search/integrationtest/mapper/pojo/mapping/definition/DocumentIdDefaultBridgeBaseIT.java +++ b/integrationtest/mapper/pojo-base/src/test/java/org/hibernate/search/integrationtest/mapper/pojo/mapping/definition/DocumentIdDefaultBridgeBaseIT.java @@ -17,7 +17,7 @@ import org.hibernate.search.engine.backend.types.converter.runtime.spi.ToDocumentIdentifierValueConvertContext; import org.hibernate.search.engine.backend.types.converter.runtime.spi.ToDocumentIdentifierValueConvertContextImpl; -import org.hibernate.search.engine.backend.types.converter.spi.ToDocumentIdentifierValueConverter; +import org.hibernate.search.engine.backend.types.converter.spi.DocumentIdentifierValueConverter; import org.hibernate.search.engine.search.query.SearchQuery; import org.hibernate.search.integrationtest.mapper.pojo.testsupport.types.PropertyTypeDescriptor; import org.hibernate.search.integrationtest.mapper.pojo.testsupport.types.expectations.DefaultIdentifierBridgeExpectations; @@ -151,9 +151,9 @@ public void projection() { public void dslToIndexConverter() { // This cast may be unsafe, but only if something is deeply wrong, and then an exception will be thrown below @SuppressWarnings("unchecked") - ToDocumentIdentifierValueConverter dslToIndexConverter = - (ToDocumentIdentifierValueConverter) index1RootSchemaNode.getIdDslConverter(); - ToDocumentIdentifierValueConverter compatibleDslToIndexConverter = + DocumentIdentifierValueConverter dslToIndexConverter = + (DocumentIdentifierValueConverter) index1RootSchemaNode.getIdDslConverter(); + DocumentIdentifierValueConverter compatibleDslToIndexConverter = index2RootSchemaNode.getIdDslConverter(); ToDocumentIdentifierValueConvertContextImpl convertContext = new ToDocumentIdentifierValueConvertContextImpl( BridgeTestUtils.toBackendMappingContext( mapping ) ); @@ -161,7 +161,7 @@ public void dslToIndexConverter() { // isCompatibleWith must return true when appropriate assertThat( dslToIndexConverter.isCompatibleWith( dslToIndexConverter ) ).isTrue(); assertThat( dslToIndexConverter.isCompatibleWith( compatibleDslToIndexConverter ) ).isTrue(); - assertThat( dslToIndexConverter.isCompatibleWith( new IncompatibleToDocumentIdentifierValueConverter() ) ) + assertThat( dslToIndexConverter.isCompatibleWith( new IncompatibleDocumentIdentifierValueConverter() ) ) .isFalse(); // convert and convertUnknown must behave appropriately on valid input @@ -169,37 +169,37 @@ public void dslToIndexConverter() { for ( I entityIdentifierValue : expectations.getEntityIdentifierValues() ) { String documentIdentifierValue = documentIdentifierIterator.next(); assertThat( - dslToIndexConverter.convert( entityIdentifierValue, convertContext ) + dslToIndexConverter.convertToDocument( entityIdentifierValue, convertContext ) ) .isEqualTo( documentIdentifierValue ); assertThat( - dslToIndexConverter.convertUnknown( entityIdentifierValue, convertContext ) + dslToIndexConverter.convertToDocumentUnknown( entityIdentifierValue, convertContext ) ) .isEqualTo( documentIdentifierValue ); } // convertUnknown must throw a runtime exception on invalid input assertThatThrownBy( - () -> dslToIndexConverter.convertUnknown( new Object(), convertContext ), + () -> dslToIndexConverter.convertToDocumentUnknown( new Object(), convertContext ), "convertUnknown on invalid input" ) .isInstanceOf( RuntimeException.class ); } - private static class IncompatibleToDocumentIdentifierValueConverter - implements ToDocumentIdentifierValueConverter { + private static class IncompatibleDocumentIdentifierValueConverter + implements DocumentIdentifierValueConverter { @Override - public String convert(Object value, ToDocumentIdentifierValueConvertContext context) { + public String convertToDocument(Object value, ToDocumentIdentifierValueConvertContext context) { throw new UnsupportedOperationException(); } @Override - public String convertUnknown(Object value, ToDocumentIdentifierValueConvertContext context) { + public String convertToDocumentUnknown(Object value, ToDocumentIdentifierValueConvertContext context) { throw new UnsupportedOperationException(); } @Override - public boolean isCompatibleWith(ToDocumentIdentifierValueConverter other) { + public boolean isCompatibleWith(DocumentIdentifierValueConverter other) { throw new UnsupportedOperationException(); } } diff --git a/integrationtest/mapper/pojo-base/src/test/java/org/hibernate/search/integrationtest/mapper/pojo/mapping/definition/DocumentIdDefaultBridgeOverridingIT.java b/integrationtest/mapper/pojo-base/src/test/java/org/hibernate/search/integrationtest/mapper/pojo/mapping/definition/DocumentIdDefaultBridgeOverridingIT.java index ae62a13d6e5..6d6df17cdd1 100644 --- a/integrationtest/mapper/pojo-base/src/test/java/org/hibernate/search/integrationtest/mapper/pojo/mapping/definition/DocumentIdDefaultBridgeOverridingIT.java +++ b/integrationtest/mapper/pojo-base/src/test/java/org/hibernate/search/integrationtest/mapper/pojo/mapping/definition/DocumentIdDefaultBridgeOverridingIT.java @@ -14,7 +14,7 @@ import java.util.Optional; import org.hibernate.search.engine.backend.types.converter.runtime.spi.ToDocumentIdentifierValueConvertContextImpl; -import org.hibernate.search.engine.backend.types.converter.spi.ToDocumentIdentifierValueConverter; +import org.hibernate.search.engine.backend.types.converter.spi.DocumentIdentifierValueConverter; import org.hibernate.search.engine.search.query.SearchQuery; import org.hibernate.search.integrationtest.mapper.pojo.testsupport.types.PropertyTypeDescriptor; import org.hibernate.search.integrationtest.mapper.pojo.testsupport.types.expectations.DefaultIdentifierBridgeExpectations; @@ -138,15 +138,15 @@ public void projection() { public void dslToIndexConverter() { // This cast may be unsafe, but only if something is deeply wrong, and then an exception will be thrown below @SuppressWarnings("unchecked") - ToDocumentIdentifierValueConverter dslToIndexConverter = - (ToDocumentIdentifierValueConverter) rootSchemaNode.getIdDslConverter(); + DocumentIdentifierValueConverter dslToIndexConverter = + (DocumentIdentifierValueConverter) rootSchemaNode.getIdDslConverter(); ToDocumentIdentifierValueConvertContextImpl convertContext = new ToDocumentIdentifierValueConvertContextImpl( BridgeTestUtils.toBackendMappingContext( mapping ) ); // The overriden default bridge must be used by the DSL converter - assertThat( dslToIndexConverter.convert( getEntityIdentifierValue(), convertContext ) ) + assertThat( dslToIndexConverter.convertToDocument( getEntityIdentifierValue(), convertContext ) ) .isEqualTo( getDocumentIdentifierValue() ); - assertThat( dslToIndexConverter.convertUnknown( getEntityIdentifierValue(), convertContext ) ) + assertThat( dslToIndexConverter.convertToDocumentUnknown( getEntityIdentifierValue(), convertContext ) ) .isEqualTo( getDocumentIdentifierValue() ); } diff --git a/mapper/pojo-base/src/main/java/org/hibernate/search/mapper/pojo/bridge/binding/impl/DefaultIdentifierBindingContext.java b/mapper/pojo-base/src/main/java/org/hibernate/search/mapper/pojo/bridge/binding/impl/DefaultIdentifierBindingContext.java index 850789161ed..9aa1a2c0e43 100644 --- a/mapper/pojo-base/src/main/java/org/hibernate/search/mapper/pojo/bridge/binding/impl/DefaultIdentifierBindingContext.java +++ b/mapper/pojo-base/src/main/java/org/hibernate/search/mapper/pojo/bridge/binding/impl/DefaultIdentifierBindingContext.java @@ -14,7 +14,7 @@ import org.hibernate.search.mapper.pojo.bridge.IdentifierBridge; import org.hibernate.search.mapper.pojo.bridge.binding.IdentifierBindingContext; import org.hibernate.search.mapper.pojo.bridge.mapping.programmatic.IdentifierBinder; -import org.hibernate.search.mapper.pojo.bridge.runtime.impl.PojoIdentifierBridgeToDocumentIdentifierValueConverter; +import org.hibernate.search.mapper.pojo.bridge.runtime.impl.PojoIdentifierBridgeDocumentIdentifierValueConverter; import org.hibernate.search.mapper.pojo.logging.impl.Log; import org.hibernate.search.mapper.pojo.model.PojoModelValue; import org.hibernate.search.mapper.pojo.model.impl.PojoModelValueElement; @@ -123,7 +123,7 @@ void abort(AbstractCloser closer) { BoundIdentifierBridge complete(IndexedEntityBindingContext indexedEntityBindingContext) { indexedEntityBindingContext.idDslConverter( - new PojoIdentifierBridgeToDocumentIdentifierValueConverter<>( + new PojoIdentifierBridgeDocumentIdentifierValueConverter<>( bridgeHolder.get(), expectedValueType ) ); diff --git a/mapper/pojo-base/src/main/java/org/hibernate/search/mapper/pojo/bridge/runtime/impl/PojoIdentifierBridgeToDocumentIdentifierValueConverter.java b/mapper/pojo-base/src/main/java/org/hibernate/search/mapper/pojo/bridge/runtime/impl/PojoIdentifierBridgeDocumentIdentifierValueConverter.java similarity index 74% rename from mapper/pojo-base/src/main/java/org/hibernate/search/mapper/pojo/bridge/runtime/impl/PojoIdentifierBridgeToDocumentIdentifierValueConverter.java rename to mapper/pojo-base/src/main/java/org/hibernate/search/mapper/pojo/bridge/runtime/impl/PojoIdentifierBridgeDocumentIdentifierValueConverter.java index 6fe3a4bc627..2f137ea4a6b 100644 --- a/mapper/pojo-base/src/main/java/org/hibernate/search/mapper/pojo/bridge/runtime/impl/PojoIdentifierBridgeToDocumentIdentifierValueConverter.java +++ b/mapper/pojo-base/src/main/java/org/hibernate/search/mapper/pojo/bridge/runtime/impl/PojoIdentifierBridgeDocumentIdentifierValueConverter.java @@ -8,7 +8,7 @@ import java.util.Optional; -import org.hibernate.search.engine.backend.types.converter.spi.ToDocumentIdentifierValueConverter; +import org.hibernate.search.engine.backend.types.converter.spi.DocumentIdentifierValueConverter; import org.hibernate.search.engine.backend.types.converter.runtime.spi.ToDocumentIdentifierValueConvertContext; import org.hibernate.search.engine.backend.types.converter.runtime.spi.ToDocumentIdentifierValueConvertContextExtension; import org.hibernate.search.engine.backend.mapping.spi.BackendMappingContext; @@ -16,12 +16,12 @@ import org.hibernate.search.mapper.pojo.bridge.runtime.IdentifierBridgeToDocumentIdentifierContext; import org.hibernate.search.mapper.pojo.bridge.runtime.spi.BridgeMappingContext; -public final class PojoIdentifierBridgeToDocumentIdentifierValueConverter implements ToDocumentIdentifierValueConverter { +public final class PojoIdentifierBridgeDocumentIdentifierValueConverter implements DocumentIdentifierValueConverter { private final IdentifierBridge bridge; private final Class expectedValueType; - public PojoIdentifierBridgeToDocumentIdentifierValueConverter(IdentifierBridge bridge, Class expectedValueType) { + public PojoIdentifierBridgeDocumentIdentifierValueConverter(IdentifierBridge bridge, Class expectedValueType) { this.bridge = bridge; this.expectedValueType = expectedValueType; } @@ -32,23 +32,23 @@ public String toString() { } @Override - public String convert(I value, ToDocumentIdentifierValueConvertContext context) { + public String convertToDocument(I value, ToDocumentIdentifierValueConvertContext context) { IdentifierBridgeToDocumentIdentifierContext extension = context.extension( PojoIdentifierBridgeContextExtension.INSTANCE ); return bridge.toDocumentIdentifier( value, extension ); } @Override - public String convertUnknown(Object value, ToDocumentIdentifierValueConvertContext context) { - return convert( expectedValueType.cast( value ), context ); + public String convertToDocumentUnknown(Object value, ToDocumentIdentifierValueConvertContext context) { + return convertToDocument( expectedValueType.cast( value ), context ); } @Override - public boolean isCompatibleWith(ToDocumentIdentifierValueConverter other) { + public boolean isCompatibleWith(DocumentIdentifierValueConverter other) { if ( other == null || !getClass().equals( other.getClass() ) ) { return false; } - PojoIdentifierBridgeToDocumentIdentifierValueConverter castedOther = - (PojoIdentifierBridgeToDocumentIdentifierValueConverter) other; + PojoIdentifierBridgeDocumentIdentifierValueConverter castedOther = + (PojoIdentifierBridgeDocumentIdentifierValueConverter) other; return expectedValueType.equals( castedOther.expectedValueType ) && bridge.isCompatibleWith( castedOther.bridge ); } diff --git a/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/document/model/StubIndexSchemaNode.java b/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/document/model/StubIndexSchemaNode.java index 6d1e1472c53..a86c1f29f16 100644 --- a/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/document/model/StubIndexSchemaNode.java +++ b/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/document/model/StubIndexSchemaNode.java @@ -12,7 +12,7 @@ import org.hibernate.search.engine.backend.types.Searchable; import org.hibernate.search.engine.backend.types.Norms; import org.hibernate.search.engine.backend.types.TermVector; -import org.hibernate.search.engine.backend.types.converter.spi.ToDocumentIdentifierValueConverter; +import org.hibernate.search.engine.backend.types.converter.spi.DocumentIdentifierValueConverter; import org.hibernate.search.engine.backend.types.ObjectStructure; import org.hibernate.search.engine.backend.types.Sortable; import org.hibernate.search.engine.backend.types.Projectable; @@ -65,7 +65,7 @@ public static Builder namedPredicate(Builder parent, String relativeNamedPredica * to make it easier to define nodes that should be matched. */ private final StubFieldConverter converter; - private final ToDocumentIdentifierValueConverter idDslConverter; + private final DocumentIdentifierValueConverter idDslConverter; private StubIndexSchemaNode(Builder builder) { super( builder ); @@ -73,7 +73,7 @@ private StubIndexSchemaNode(Builder builder) { this.idDslConverter = builder.idDslConverter; } - public ToDocumentIdentifierValueConverter getIdDslConverter() { + public DocumentIdentifierValueConverter getIdDslConverter() { return idDslConverter; } @@ -83,7 +83,7 @@ public StubFieldConverter getConverter() { public static class Builder extends AbstractBuilder implements IndexSchemaBuildContext { private StubFieldConverter converter; - private ToDocumentIdentifierValueConverter idDslConverter; + private DocumentIdentifierValueConverter idDslConverter; private Builder(Builder parent, String relativeFieldName, Type type) { super( parent, relativeFieldName ); @@ -155,7 +155,7 @@ public Builder explicitRouting() { return this; } - public Builder idDslConverter(ToDocumentIdentifierValueConverter idDslConverter) { + public Builder idDslConverter(DocumentIdentifierValueConverter idDslConverter) { this.idDslConverter = idDslConverter; return this; } diff --git a/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/document/model/impl/StubIndexSchemaRootNodeBuilder.java b/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/document/model/impl/StubIndexSchemaRootNodeBuilder.java index bb0f44ac636..c89fc1645b2 100644 --- a/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/document/model/impl/StubIndexSchemaRootNodeBuilder.java +++ b/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/document/model/impl/StubIndexSchemaRootNodeBuilder.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.util.impl.integrationtest.common.stub.backend.document.model.impl; -import org.hibernate.search.engine.backend.types.converter.spi.ToDocumentIdentifierValueConverter; +import org.hibernate.search.engine.backend.types.converter.spi.DocumentIdentifierValueConverter; import org.hibernate.search.engine.backend.document.model.dsl.spi.IndexSchemaRootNodeBuilder; import org.hibernate.search.engine.backend.types.dsl.IndexFieldTypeFactory; import org.hibernate.search.engine.mapper.mapping.building.spi.IndexFieldTypeDefaultsProvider; @@ -44,7 +44,7 @@ public void explicitRouting() { } @Override - public void idDslConverter(ToDocumentIdentifierValueConverter idConverter) { + public void idDslConverter(DocumentIdentifierValueConverter idConverter) { builder.idDslConverter( idConverter ); }