Skip to content

Commit

Permalink
HSEARCH-3854 Remove the unnecessary generic type parameter for Docume…
Browse files Browse the repository at this point in the history
…ntElement
  • Loading branch information
yrodiere committed Mar 4, 2020
1 parent 1c7fff1 commit 8fc3555
Show file tree
Hide file tree
Showing 131 changed files with 336 additions and 425 deletions.
Expand Up @@ -100,7 +100,7 @@ public class ElasticsearchBackendFactory implements BackendFactory {
.build();

@Override
public BackendImplementor<?> create(String name, BackendBuildContext buildContext, ConfigurationPropertySource propertySource) {
public BackendImplementor create(String name, BackendBuildContext buildContext, ConfigurationPropertySource propertySource) {
boolean logPrettyPrinting = LOG_JSON_PRETTY_PRINTING.get( propertySource );
/*
* The Elasticsearch client only converts JsonObjects to String and
Expand Down
Expand Up @@ -15,7 +15,6 @@
import org.hibernate.search.backend.elasticsearch.ElasticsearchBackend;
import org.hibernate.search.backend.elasticsearch.analysis.model.impl.ElasticsearchAnalysisDefinitionRegistry;
import org.hibernate.search.backend.elasticsearch.document.impl.DocumentMetadataContributor;
import org.hibernate.search.backend.elasticsearch.document.impl.ElasticsearchDocumentObjectBuilder;
import org.hibernate.search.backend.elasticsearch.document.model.dsl.impl.ElasticsearchIndexSchemaRootNodeBuilder;
import org.hibernate.search.backend.elasticsearch.index.layout.impl.IndexNames;
import org.hibernate.search.backend.elasticsearch.index.layout.IndexLayoutStrategy;
Expand Down Expand Up @@ -46,7 +45,7 @@



class ElasticsearchBackendImpl implements BackendImplementor<ElasticsearchDocumentObjectBuilder>,
class ElasticsearchBackendImpl implements BackendImplementor,
ElasticsearchBackend {

private static final Log log = LoggerFactory.make( Log.class, MethodHandles.lookup() );
Expand Down Expand Up @@ -167,7 +166,7 @@ public <T> T getClient(Class<T> clientClass) {
}

@Override
public IndexManagerBuilder<ElasticsearchDocumentObjectBuilder> createIndexManagerBuilder(
public IndexManagerBuilder createIndexManagerBuilder(
String hibernateSearchIndexName,
String mappedTypeName, boolean multiTenancyEnabled, BackendBuildContext buildContext,
ConfigurationPropertySource propertySource) {
Expand Down
Expand Up @@ -9,14 +9,13 @@
import java.util.List;

import org.hibernate.search.backend.elasticsearch.document.impl.DocumentMetadataContributor;
import org.hibernate.search.backend.elasticsearch.document.impl.ElasticsearchDocumentObjectBuilder;
import org.hibernate.search.backend.elasticsearch.document.model.dsl.impl.ElasticsearchIndexSchemaRootNodeBuilder;
import org.hibernate.search.backend.elasticsearch.document.model.impl.ElasticsearchIndexModel;
import org.hibernate.search.engine.backend.document.model.dsl.spi.IndexSchemaRootNodeBuilder;
import org.hibernate.search.engine.backend.index.spi.IndexManagerBuilder;


public class ElasticsearchIndexManagerBuilder implements IndexManagerBuilder<ElasticsearchDocumentObjectBuilder> {
public class ElasticsearchIndexManagerBuilder implements IndexManagerBuilder {

private final IndexManagerBackendContext backendContext;

Expand Down
Expand Up @@ -49,7 +49,7 @@
import com.google.gson.JsonObject;


class ElasticsearchIndexManagerImpl implements IndexManagerImplementor<ElasticsearchDocumentObjectBuilder>,
class ElasticsearchIndexManagerImpl implements IndexManagerImplementor,
ElasticsearchIndexManager, WorkExecutionIndexManagerContext {

private static final Log log = LoggerFactory.make( Log.class, MethodHandles.lookup() );
Expand Down Expand Up @@ -165,7 +165,7 @@ public String toElasticsearchId(String tenantId, String id) {

@Override
public JsonObject createDocument(String tenantId, String id,
DocumentContributor<ElasticsearchDocumentObjectBuilder> documentContributor) {
DocumentContributor documentContributor) {
ElasticsearchDocumentObjectBuilder builder = new ElasticsearchDocumentObjectBuilder();
documentContributor.contribute( builder );
JsonObject document = builder.build();
Expand All @@ -182,7 +182,7 @@ public ElasticsearchIndexModel getModel() {
}

@Override
public IndexIndexingPlan<ElasticsearchDocumentObjectBuilder> createIndexingPlan(BackendSessionContext sessionContext,
public IndexIndexingPlan createIndexingPlan(BackendSessionContext sessionContext,
DocumentCommitStrategy commitStrategy, DocumentRefreshStrategy refreshStrategy) {
// The commit strategy is ignored, because Elasticsearch always commits changes to its transaction log.
return backendContext.createIndexingPlan(
Expand All @@ -194,7 +194,7 @@ public IndexIndexingPlan<ElasticsearchDocumentObjectBuilder> createIndexingPlan(
}

@Override
public IndexIndexer<ElasticsearchDocumentObjectBuilder> createIndexer(
public IndexIndexer createIndexer(
BackendSessionContext sessionContext, DocumentCommitStrategy commitStrategy) {
// The commit strategy is ignored, because Elasticsearch always commits changes to its transaction log.
return backendContext.createIndexer(
Expand Down
Expand Up @@ -7,7 +7,6 @@
package org.hibernate.search.backend.elasticsearch.index.impl;

import org.hibernate.search.backend.elasticsearch.index.layout.IndexLayoutStrategy;
import org.hibernate.search.backend.elasticsearch.document.impl.ElasticsearchDocumentObjectBuilder;
import org.hibernate.search.backend.elasticsearch.document.model.impl.ElasticsearchIndexModel;
import org.hibernate.search.backend.elasticsearch.document.model.lowlevel.impl.LowLevelIndexMetadataBuilder;
import org.hibernate.search.backend.elasticsearch.index.admin.impl.ElasticsearchIndexAdministrationClient;
Expand Down Expand Up @@ -79,7 +78,7 @@ public String toString() {
}

@Override
public IndexIndexingPlan<ElasticsearchDocumentObjectBuilder> createIndexingPlan(
public IndexIndexingPlan createIndexingPlan(
ElasticsearchWorkOrchestrator orchestrator,
WorkExecutionIndexManagerContext indexManagerContext,
DocumentRefreshStrategy refreshStrategy,
Expand All @@ -95,7 +94,7 @@ public IndexIndexingPlan<ElasticsearchDocumentObjectBuilder> createIndexingPlan(
}

@Override
public IndexIndexer<ElasticsearchDocumentObjectBuilder> createIndexer(
public IndexIndexer createIndexer(
ElasticsearchWorkOrchestrator orchestrator,
WorkExecutionIndexManagerContext indexManagerContext,
BackendSessionContext sessionContext) {
Expand Down
Expand Up @@ -8,7 +8,6 @@

import java.util.concurrent.CompletableFuture;

import org.hibernate.search.backend.elasticsearch.document.impl.ElasticsearchDocumentObjectBuilder;
import org.hibernate.search.backend.elasticsearch.orchestration.impl.ElasticsearchWorkOrchestrator;
import org.hibernate.search.backend.elasticsearch.util.spi.URLEncodedString;
import org.hibernate.search.backend.elasticsearch.work.impl.ElasticsearchWork;
Expand All @@ -20,7 +19,7 @@

import com.google.gson.JsonObject;

public class ElasticsearchIndexIndexer implements IndexIndexer<ElasticsearchDocumentObjectBuilder> {
public class ElasticsearchIndexIndexer implements IndexIndexer {

private final ElasticsearchWorkBuilderFactory factory;
private final ElasticsearchWorkOrchestrator orchestrator;
Expand All @@ -39,7 +38,7 @@ public ElasticsearchIndexIndexer(ElasticsearchWorkBuilderFactory factory,

@Override
public CompletableFuture<?> add(DocumentReferenceProvider referenceProvider,
DocumentContributor<ElasticsearchDocumentObjectBuilder> documentContributor) {
DocumentContributor documentContributor) {
String id = referenceProvider.getIdentifier();
String elasticsearchId = indexManagerContext.toElasticsearchId( tenantId, id );
String routingKey = referenceProvider.getRoutingKey();
Expand Down
Expand Up @@ -11,7 +11,6 @@
import java.util.concurrent.CompletableFuture;

import org.hibernate.search.backend.elasticsearch.util.spi.URLEncodedString;
import org.hibernate.search.backend.elasticsearch.document.impl.ElasticsearchDocumentObjectBuilder;
import org.hibernate.search.backend.elasticsearch.orchestration.impl.ElasticsearchWorkOrchestrator;
import org.hibernate.search.backend.elasticsearch.work.builder.factory.impl.ElasticsearchWorkBuilderFactory;
import org.hibernate.search.backend.elasticsearch.work.impl.SingleDocumentElasticsearchWork;
Expand All @@ -26,7 +25,7 @@



public class ElasticsearchIndexIndexingPlan implements IndexIndexingPlan<ElasticsearchDocumentObjectBuilder> {
public class ElasticsearchIndexIndexingPlan implements IndexIndexingPlan {

private final ElasticsearchWorkBuilderFactory builderFactory;
private final ElasticsearchWorkOrchestrator orchestrator;
Expand All @@ -50,13 +49,13 @@ public ElasticsearchIndexIndexingPlan(ElasticsearchWorkBuilderFactory builderFac

@Override
public void add(DocumentReferenceProvider referenceProvider,
DocumentContributor<ElasticsearchDocumentObjectBuilder> documentContributor) {
DocumentContributor documentContributor) {
index( referenceProvider, documentContributor );
}

@Override
public void update(DocumentReferenceProvider referenceProvider,
DocumentContributor<ElasticsearchDocumentObjectBuilder> documentContributor) {
DocumentContributor documentContributor) {
index( referenceProvider, documentContributor );
}

Expand Down Expand Up @@ -102,7 +101,7 @@ public void discard() {
}

private void index(DocumentReferenceProvider referenceProvider,
DocumentContributor<ElasticsearchDocumentObjectBuilder> documentContributor) {
DocumentContributor documentContributor) {
String id = referenceProvider.getIdentifier();
String elasticsearchId = indexManagerContext.toElasticsearchId( tenantId, id );
String routingKey = referenceProvider.getRoutingKey();
Expand Down
Expand Up @@ -6,7 +6,6 @@
*/
package org.hibernate.search.backend.elasticsearch.work.execution.impl;

import org.hibernate.search.backend.elasticsearch.document.impl.ElasticsearchDocumentObjectBuilder;
import org.hibernate.search.backend.elasticsearch.orchestration.impl.ElasticsearchWorkOrchestrator;
import org.hibernate.search.engine.backend.work.execution.DocumentRefreshStrategy;
import org.hibernate.search.engine.backend.work.execution.spi.IndexIndexer;
Expand All @@ -28,13 +27,13 @@
*/
public interface WorkExecutionBackendContext {

IndexIndexingPlan<ElasticsearchDocumentObjectBuilder> createIndexingPlan(
IndexIndexingPlan createIndexingPlan(
ElasticsearchWorkOrchestrator orchestrator,
WorkExecutionIndexManagerContext indexManagerContext,
DocumentRefreshStrategy refreshStrategy,
BackendSessionContext sessionContext);

IndexIndexer<ElasticsearchDocumentObjectBuilder> createIndexer(
IndexIndexer createIndexer(
ElasticsearchWorkOrchestrator orchestrator,
WorkExecutionIndexManagerContext indexManagerContext,
BackendSessionContext sessionContext);
Expand Down
Expand Up @@ -6,7 +6,6 @@
*/
package org.hibernate.search.backend.elasticsearch.work.execution.impl;

import org.hibernate.search.backend.elasticsearch.document.impl.ElasticsearchDocumentObjectBuilder;
import org.hibernate.search.backend.elasticsearch.util.spi.URLEncodedString;
import org.hibernate.search.engine.backend.work.execution.spi.DocumentContributor;

Expand All @@ -32,6 +31,6 @@ public interface WorkExecutionIndexManagerContext {
String toElasticsearchId(String tenantId, String id);

JsonObject createDocument(String tenantId, String id,
DocumentContributor<ElasticsearchDocumentObjectBuilder> documentContributor);
DocumentContributor documentContributor);

}
Expand Up @@ -25,7 +25,7 @@ public LuceneIndexEntryFactory(MultiTenancyStrategy multiTenancyStrategy, String
}

public LuceneIndexEntry create(String tenantId, String id, String routingKey,
DocumentContributor<LuceneRootDocumentBuilder> documentContributor) {
DocumentContributor documentContributor) {
LuceneRootDocumentBuilder builder = new LuceneRootDocumentBuilder(
multiTenancyStrategy, indexName, facetsConfig
);
Expand Down
Expand Up @@ -64,7 +64,7 @@ public class LuceneBackendFactory implements BackendFactory {
.build();

@Override
public BackendImplementor<?> create(String name, BackendBuildContext buildContext,
public BackendImplementor create(String name, BackendBuildContext buildContext,
ConfigurationPropertySource propertySource) {
EventContext backendContext = EventContexts.fromBackendName( name );

Expand Down
Expand Up @@ -17,7 +17,6 @@
import org.hibernate.search.engine.backend.Backend;
import org.hibernate.search.engine.backend.index.spi.IndexManagerBuilder;
import org.hibernate.search.backend.lucene.LuceneBackend;
import org.hibernate.search.backend.lucene.document.impl.LuceneRootDocumentBuilder;
import org.hibernate.search.backend.lucene.index.impl.IndexManagerBackendContext;
import org.hibernate.search.backend.lucene.index.impl.LuceneIndexManagerBuilder;
import org.hibernate.search.backend.lucene.logging.impl.Log;
Expand All @@ -37,7 +36,7 @@
import org.hibernate.search.util.common.logging.impl.LoggerFactory;


public class LuceneBackendImpl implements BackendImplementor<LuceneRootDocumentBuilder>, LuceneBackend {
public class LuceneBackendImpl implements BackendImplementor, LuceneBackend {

private static final Log log = LoggerFactory.make( Log.class, MethodHandles.lookup() );

Expand Down Expand Up @@ -132,7 +131,7 @@ public Backend toAPI() {
}

@Override
public IndexManagerBuilder<LuceneRootDocumentBuilder> createIndexManagerBuilder(
public IndexManagerBuilder createIndexManagerBuilder(
String indexName, String mappedTypeName,
boolean multiTenancyEnabled,
BackendBuildContext context, ConfigurationPropertySource propertySource) {
Expand Down
Expand Up @@ -11,7 +11,6 @@
import org.hibernate.search.backend.lucene.analysis.model.impl.LuceneAnalysisDefinitionRegistry;
import org.hibernate.search.backend.lucene.cfg.LuceneIndexSettings;
import org.hibernate.search.backend.lucene.document.impl.LuceneIndexEntryFactory;
import org.hibernate.search.backend.lucene.document.impl.LuceneRootDocumentBuilder;
import org.hibernate.search.backend.lucene.document.model.impl.LuceneIndexModel;
import org.hibernate.search.backend.lucene.lowlevel.directory.spi.DirectoryProvider;
import org.hibernate.search.backend.lucene.lowlevel.index.IOStrategyName;
Expand Down Expand Up @@ -100,7 +99,7 @@ public String toString() {
}

@Override
public IndexIndexingPlan<LuceneRootDocumentBuilder> createIndexingPlan(
public IndexIndexingPlan createIndexingPlan(
WorkExecutionIndexManagerContext indexManagerContext,
LuceneIndexEntryFactory indexEntryFactory,
BackendSessionContext sessionContext,
Expand All @@ -117,7 +116,7 @@ public IndexIndexingPlan<LuceneRootDocumentBuilder> createIndexingPlan(
}

@Override
public IndexIndexer<LuceneRootDocumentBuilder> createIndexer(
public IndexIndexer createIndexer(
WorkExecutionIndexManagerContext indexManagerContext,
LuceneIndexEntryFactory indexEntryFactory,
BackendSessionContext sessionContext,
Expand Down
Expand Up @@ -9,13 +9,12 @@
import org.hibernate.search.backend.lucene.document.impl.LuceneIndexEntryFactory;
import org.hibernate.search.engine.backend.document.model.dsl.spi.IndexSchemaRootNodeBuilder;
import org.hibernate.search.engine.backend.index.spi.IndexManagerBuilder;
import org.hibernate.search.backend.lucene.document.impl.LuceneRootDocumentBuilder;
import org.hibernate.search.backend.lucene.document.model.dsl.impl.LuceneIndexSchemaRootNodeBuilder;
import org.hibernate.search.backend.lucene.document.model.impl.LuceneIndexModel;
import org.hibernate.search.util.common.impl.SuppressingCloser;


public class LuceneIndexManagerBuilder implements IndexManagerBuilder<LuceneRootDocumentBuilder> {
public class LuceneIndexManagerBuilder implements IndexManagerBuilder {

private final IndexManagerBackendContext backendContext;

Expand Down
Expand Up @@ -24,7 +24,6 @@
import org.hibernate.search.engine.backend.index.spi.IndexManagerImplementor;
import org.hibernate.search.engine.backend.work.execution.spi.IndexIndexer;
import org.hibernate.search.engine.backend.work.execution.spi.IndexIndexingPlan;
import org.hibernate.search.backend.lucene.document.impl.LuceneRootDocumentBuilder;
import org.hibernate.search.backend.lucene.document.model.impl.LuceneIndexModel;
import org.hibernate.search.backend.lucene.logging.impl.Log;
import org.hibernate.search.engine.backend.work.execution.DocumentRefreshStrategy;
Expand All @@ -37,7 +36,7 @@
import org.hibernate.search.util.common.logging.impl.LoggerFactory;

public class LuceneIndexManagerImpl
implements IndexManagerImplementor<LuceneRootDocumentBuilder>, LuceneIndexManager,
implements IndexManagerImplementor, LuceneIndexManager,
LuceneScopeIndexManagerContext {

private static final Log log = LoggerFactory.make( Log.class, MethodHandles.lookup() );
Expand Down Expand Up @@ -92,7 +91,7 @@ public void stop() {
}

@Override
public IndexIndexingPlan<LuceneRootDocumentBuilder> createIndexingPlan(BackendSessionContext sessionContext,
public IndexIndexingPlan createIndexingPlan(BackendSessionContext sessionContext,
DocumentCommitStrategy commitStrategy, DocumentRefreshStrategy refreshStrategy) {
return backendContext.createIndexingPlan(
shardHolder, indexEntryFactory,
Expand All @@ -101,7 +100,7 @@ public IndexIndexingPlan<LuceneRootDocumentBuilder> createIndexingPlan(BackendSe
}

@Override
public IndexIndexer<LuceneRootDocumentBuilder> createIndexer(
public IndexIndexer createIndexer(
BackendSessionContext sessionContext, DocumentCommitStrategy commitStrategy) {
return backendContext.createIndexer(
shardHolder, indexEntryFactory,
Expand Down
Expand Up @@ -10,7 +10,6 @@

import org.hibernate.search.backend.lucene.document.impl.LuceneIndexEntry;
import org.hibernate.search.backend.lucene.document.impl.LuceneIndexEntryFactory;
import org.hibernate.search.backend.lucene.document.impl.LuceneRootDocumentBuilder;
import org.hibernate.search.backend.lucene.orchestration.impl.LuceneWriteWorkOrchestrator;
import org.hibernate.search.backend.lucene.work.impl.LuceneWorkFactory;
import org.hibernate.search.engine.backend.work.execution.DocumentCommitStrategy;
Expand All @@ -20,7 +19,7 @@
import org.hibernate.search.engine.backend.work.execution.spi.IndexIndexer;
import org.hibernate.search.engine.backend.session.spi.BackendSessionContext;

public class LuceneIndexIndexer implements IndexIndexer<LuceneRootDocumentBuilder> {
public class LuceneIndexIndexer implements IndexIndexer {

private final LuceneWorkFactory factory;
private final LuceneIndexEntryFactory indexEntryFactory;
Expand All @@ -41,7 +40,7 @@ public LuceneIndexIndexer(LuceneWorkFactory factory,
}

@Override
public CompletableFuture<?> add(DocumentReferenceProvider referenceProvider, DocumentContributor<LuceneRootDocumentBuilder> documentContributor) {
public CompletableFuture<?> add(DocumentReferenceProvider referenceProvider, DocumentContributor documentContributor) {
String id = referenceProvider.getIdentifier();
String routingKey = referenceProvider.getRoutingKey();

Expand Down
Expand Up @@ -20,13 +20,12 @@
import org.hibernate.search.engine.backend.work.execution.spi.DocumentContributor;
import org.hibernate.search.engine.backend.work.execution.spi.DocumentReferenceProvider;
import org.hibernate.search.backend.lucene.document.impl.LuceneIndexEntry;
import org.hibernate.search.backend.lucene.document.impl.LuceneRootDocumentBuilder;
import org.hibernate.search.backend.lucene.orchestration.impl.LuceneWriteWorkOrchestrator;
import org.hibernate.search.backend.lucene.work.impl.LuceneWorkFactory;
import org.hibernate.search.engine.backend.session.spi.BackendSessionContext;
import org.hibernate.search.engine.backend.work.execution.spi.IndexIndexingPlanExecutionReport;

public class LuceneIndexIndexingPlan implements IndexIndexingPlan<LuceneRootDocumentBuilder> {
public class LuceneIndexIndexingPlan implements IndexIndexingPlan {

private final LuceneWorkFactory factory;
private final LuceneIndexEntryFactory indexEntryFactory;
Expand All @@ -52,7 +51,7 @@ public LuceneIndexIndexingPlan(LuceneWorkFactory factory,

@Override
public void add(DocumentReferenceProvider referenceProvider,
DocumentContributor<LuceneRootDocumentBuilder> documentContributor) {
DocumentContributor documentContributor) {
String id = referenceProvider.getIdentifier();
String routingKey = referenceProvider.getRoutingKey();

Expand All @@ -63,7 +62,7 @@ public void add(DocumentReferenceProvider referenceProvider,

@Override
public void update(DocumentReferenceProvider referenceProvider,
DocumentContributor<LuceneRootDocumentBuilder> documentContributor) {
DocumentContributor documentContributor) {
String id = referenceProvider.getIdentifier();
String routingKey = referenceProvider.getRoutingKey();

Expand Down

0 comments on commit 8fc3555

Please sign in to comment.