Author: fortino Date: Fri May 22 11:00:21 2020 New Revision: 1878026 URL: http://svn.apache.org/viewvc?rev=1878026&view=rev Log: OAK-9087|oak-search-elastic: class / package names refactoring
Added: jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/ - copied from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticConnection.java - copied, changed from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchConnection.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexDefinition.java - copied, changed from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchIndexDefinition.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexProviderService.java - copied, changed from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchIndexProviderService.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticDocument.java - copied, changed from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/index/ElasticsearchDocument.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticDocumentMaker.java - copied, changed from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/index/ElasticsearchDocumentMaker.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticIndexEditor.java - copied, changed from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/index/ElasticsearchIndexEditor.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticIndexEditorContext.java - copied, changed from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/index/ElasticsearchIndexEditorContext.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticIndexEditorProvider.java - copied, changed from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/index/ElasticsearchIndexEditorProvider.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticIndexHelper.java - copied, changed from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/index/ElasticsearchIndexHelper.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticIndexWriter.java - copied, changed from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/index/ElasticsearchIndexWriter.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticIndexWriterFactory.java - copied, changed from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/index/ElasticsearchIndexWriterFactory.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/ElasticIndex.java - copied, changed from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/query/ElasticsearchIndex.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/ElasticIndexNode.java - copied, changed from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/query/ElasticsearchIndexNode.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/ElasticIndexProvider.java - copied, changed from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/query/ElasticsearchIndexProvider.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/ElasticIndexStatistics.java - copied, changed from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/query/ElasticsearchIndexStatistics.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/ElasticResultRowIterator.java - copied, changed from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/query/ElasticsearchResultRowIterator.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/ElasticSearcher.java - copied, changed from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/query/ElasticsearchSearcher.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/ElasticSearcherModel.java - copied, changed from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/query/ElasticsearchSearcherModel.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/facets/ - copied from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/facets/ jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/facets/ElasticAggregationData.java - copied, changed from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/facets/ElasticsearchAggregationData.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/facets/ElasticFacets.java - copied, changed from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/facets/ElasticsearchFacets.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/facets/InsecureElasticFacets.java - copied, changed from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/facets/InsecureElasticSearchFacets.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/facets/SecureElasticFacets.java - copied, changed from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/facets/SecureElasticSearchFacets.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/facets/StatisticalElasticFacets.java - copied, changed from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/facets/StatisticalElasticSearchFacets.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/util/ElasticAggregationBuilderUtil.java - copied, changed from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/util/ElasticsearchAggregationBuilderUtil.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/util/ElasticConstants.java - copied, changed from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/util/ElasticsearchConstants.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/util/ElasticIndexDefinitionBuilder.java - copied, changed from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/util/ElasticsearchIndexDefinitionBuilder.java jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ - copied from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticAbstractQueryTest.java - copied, changed from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchAbstractQueryTest.java jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticConnectionRule.java - copied, changed from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchConnectionRule.java jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticConnectionTest.java - copied, changed from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchConnectionTest.java jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticContentTest.java - copied, changed from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchContentTest.java jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticFacetTest.java - copied, changed from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchFacetTest.java jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticFullTextAsyncTest.java - copied, changed from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchFullTextAsyncTest.java jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexProviderServiceTest.java - copied, changed from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchIndexProviderServiceTest.java jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticPropertyIndexTest.java - copied, changed from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchPropertyIndexTest.java jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticTestUtils.java - copied, changed from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchTestUtils.java jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticIndexHelperTest.java - copied, changed from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/index/ElasticsearchIndexHelperTest.java jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticIndexWriterTest.java - copied, changed from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/index/ElasticsearchIndexWriterTest.java jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/ElasticIndexStatisticsTest.java - copied, changed from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/query/ElasticsearchIndexStatisticsTest.java jackrabbit/oak/trunk/oak-search-elastic/src/test/resources/org/apache/jackrabbit/oak/plugins/index/elastic/ - copied from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/test/resources/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ Removed: jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticsearchConnection.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticsearchIndexDefinition.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticsearchIndexProviderService.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/facets/ jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticsearchDocument.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticsearchDocumentMaker.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticsearchIndexEditor.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticsearchIndexEditorContext.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticsearchIndexEditorProvider.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticsearchIndexHelper.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticsearchIndexWriter.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticsearchIndexWriterFactory.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/ElasticsearchIndex.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/ElasticsearchIndexNode.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/ElasticsearchIndexProvider.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/ElasticsearchIndexStatistics.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/ElasticsearchResultRowIterator.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/ElasticsearchSearcher.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/ElasticsearchSearcherModel.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/facets/ElasticsearchAggregationData.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/facets/ElasticsearchFacets.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/facets/InsecureElasticSearchFacets.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/facets/SecureElasticSearchFacets.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/facets/StatisticalElasticSearchFacets.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/util/ElasticsearchAggregationBuilderUtil.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/util/ElasticsearchConstants.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/util/ElasticsearchIndexDefinitionBuilder.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticsearchAbstractQueryTest.java jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticsearchConnectionRule.java jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticsearchConnectionTest.java jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticsearchContentTest.java jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticsearchFacetTest.java jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticsearchFullTextAsyncTest.java jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticsearchIndexProviderServiceTest.java jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticsearchPropertyIndexTest.java jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticsearchTestUtils.java jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticsearchIndexHelperTest.java jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticsearchIndexWriterTest.java jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/ElasticsearchIndexStatisticsTest.java jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ jackrabbit/oak/trunk/oak-search-elastic/src/test/resources/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ Modified: jackrabbit/oak/trunk/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticBenchmarkRunner.java jackrabbit/oak/trunk/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticFullTextWithGlobalIndexSearchTest.java jackrabbit/oak/trunk/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticFullTextWithoutGlobalIndexSearchTest.java jackrabbit/oak/trunk/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticPropertyFTIndexedContentAvailability.java jackrabbit/oak/trunk/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticPropertyFTSeparatedIndexedContentAvailability.java jackrabbit/oak/trunk/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticPropertyTextSearchTest.java jackrabbit/oak/trunk/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/util/ElasticGlobalInitializer.java jackrabbit/oak/trunk/oak-search-elastic/pom.xml jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/facets/ElasticFacetHelper.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/util/SearchSourceBuilderUtil.java jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/util/TermQueryBuilderFactory.java jackrabbit/oak/trunk/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexAggregationNtFileTest.java Modified: jackrabbit/oak/trunk/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticBenchmarkRunner.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticBenchmarkRunner.java?rev=1878026&r1=1878025&r2=1878026&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticBenchmarkRunner.java (original) +++ jackrabbit/oak/trunk/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticBenchmarkRunner.java Fri May 22 11:00:21 2020 @@ -17,14 +17,14 @@ package org.apache.jackrabbit.oak.benchmark; -import org.apache.jackrabbit.oak.plugins.index.elasticsearch.ElasticsearchConnection; +import org.apache.jackrabbit.oak.plugins.index.elastic.ElasticConnection; import org.apache.jackrabbit.oak.stats.StatisticsProvider; import java.util.Arrays; public class ElasticBenchmarkRunner extends BenchmarkRunner { - private static ElasticsearchConnection connection; + private static ElasticConnection connection; public static void main(String[] args) throws Exception { initOptionSet(args); @@ -36,7 +36,7 @@ public class ElasticBenchmarkRunner exte // we have orphaned HttpClient's I/O disp threads that don't let the process exit. try { - connection = ElasticsearchConnection.newBuilder() + connection = ElasticConnection.newBuilder() .withIndexPrefix("benchmark") .withConnectionParameters( benchmarkOptions.getElasticScheme().value(options), Modified: jackrabbit/oak/trunk/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticFullTextWithGlobalIndexSearchTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticFullTextWithGlobalIndexSearchTest.java?rev=1878026&r1=1878025&r2=1878026&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticFullTextWithGlobalIndexSearchTest.java (original) +++ jackrabbit/oak/trunk/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticFullTextWithGlobalIndexSearchTest.java Fri May 22 11:00:21 2020 @@ -28,9 +28,9 @@ import org.apache.jackrabbit.oak.fixture import org.apache.jackrabbit.oak.fixture.OakRepositoryFixture; import org.apache.jackrabbit.oak.fixture.RepositoryFixture; import org.apache.jackrabbit.oak.jcr.Jcr; -import org.apache.jackrabbit.oak.plugins.index.elasticsearch.ElasticsearchConnection; -import org.apache.jackrabbit.oak.plugins.index.elasticsearch.index.ElasticsearchIndexEditorProvider; -import org.apache.jackrabbit.oak.plugins.index.elasticsearch.query.ElasticsearchIndexProvider; +import org.apache.jackrabbit.oak.plugins.index.elastic.ElasticConnection; +import org.apache.jackrabbit.oak.plugins.index.elastic.index.ElasticIndexEditorProvider; +import org.apache.jackrabbit.oak.plugins.index.elastic.query.ElasticIndexProvider; import org.apache.jackrabbit.oak.plugins.index.nodetype.NodeTypeIndexProvider; import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexEditorProvider; import org.apache.jackrabbit.oak.plugins.index.search.ExtractedTextCache; @@ -40,10 +40,10 @@ import java.io.File; public class ElasticFullTextWithGlobalIndexSearchTest extends SearchTest { - private ElasticsearchConnection coordinate; + private ElasticConnection coordinate; private String ELASTIC_GLOBAL_INDEX; - ElasticFullTextWithGlobalIndexSearchTest(File dump, boolean flat, boolean doReport, Boolean storageEnabled, ElasticsearchConnection coordinate) { + ElasticFullTextWithGlobalIndexSearchTest(File dump, boolean flat, boolean doReport, Boolean storageEnabled, ElasticConnection coordinate) { super(dump, flat, doReport, storageEnabled); this.coordinate = coordinate; } @@ -55,9 +55,9 @@ public class ElasticFullTextWithGlobalIn return ((OakRepositoryFixture) fixture).setUpCluster(1, new JcrCreator() { @Override public Jcr customize(Oak oak) { - ElasticsearchIndexEditorProvider editorProvider = new ElasticsearchIndexEditorProvider(coordinate, + ElasticIndexEditorProvider editorProvider = new ElasticIndexEditorProvider(coordinate, new ExtractedTextCache(10 * FileUtils.ONE_MB, 100)); - ElasticsearchIndexProvider indexProvider = new ElasticsearchIndexProvider(coordinate); + ElasticIndexProvider indexProvider = new ElasticIndexProvider(coordinate); oak.with(editorProvider) .with(indexProvider) .with(new PropertyIndexEditorProvider()) Modified: jackrabbit/oak/trunk/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticFullTextWithoutGlobalIndexSearchTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticFullTextWithoutGlobalIndexSearchTest.java?rev=1878026&r1=1878025&r2=1878026&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticFullTextWithoutGlobalIndexSearchTest.java (original) +++ jackrabbit/oak/trunk/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticFullTextWithoutGlobalIndexSearchTest.java Fri May 22 11:00:21 2020 @@ -26,10 +26,10 @@ import org.apache.jackrabbit.oak.fixture import org.apache.jackrabbit.oak.fixture.OakRepositoryFixture; import org.apache.jackrabbit.oak.fixture.RepositoryFixture; import org.apache.jackrabbit.oak.jcr.Jcr; -import org.apache.jackrabbit.oak.plugins.index.elasticsearch.ElasticsearchConnection; -import org.apache.jackrabbit.oak.plugins.index.elasticsearch.ElasticsearchIndexDefinition; -import org.apache.jackrabbit.oak.plugins.index.elasticsearch.index.ElasticsearchIndexEditorProvider; -import org.apache.jackrabbit.oak.plugins.index.elasticsearch.query.ElasticsearchIndexProvider; +import org.apache.jackrabbit.oak.plugins.index.elastic.ElasticConnection; +import org.apache.jackrabbit.oak.plugins.index.elastic.ElasticIndexDefinition; +import org.apache.jackrabbit.oak.plugins.index.elastic.index.ElasticIndexEditorProvider; +import org.apache.jackrabbit.oak.plugins.index.elastic.query.ElasticIndexProvider; import org.apache.jackrabbit.oak.plugins.index.nodetype.NodeTypeIndexProvider; import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexEditorProvider; import org.apache.jackrabbit.oak.plugins.index.search.ExtractedTextCache; @@ -41,9 +41,9 @@ import static com.google.common.collect. public class ElasticFullTextWithoutGlobalIndexSearchTest extends SearchTest { - private ElasticsearchConnection coordinate; + private ElasticConnection coordinate; - ElasticFullTextWithoutGlobalIndexSearchTest(File dump, boolean flat, boolean doReport, Boolean storageEnabled, ElasticsearchConnection coordinate) { + ElasticFullTextWithoutGlobalIndexSearchTest(File dump, boolean flat, boolean doReport, Boolean storageEnabled, ElasticConnection coordinate) { super(dump, flat, doReport, storageEnabled); this.coordinate = coordinate; } @@ -54,15 +54,15 @@ public class ElasticFullTextWithoutGloba return ((OakRepositoryFixture) fixture).setUpCluster(1, new JcrCreator() { @Override public Jcr customize(Oak oak) { - ElasticsearchIndexEditorProvider editorProvider = new ElasticsearchIndexEditorProvider(coordinate, + ElasticIndexEditorProvider editorProvider = new ElasticIndexEditorProvider(coordinate, new ExtractedTextCache(10 * FileUtils.ONE_MB, 100)); - ElasticsearchIndexProvider indexProvider = new ElasticsearchIndexProvider(coordinate); + ElasticIndexProvider indexProvider = new ElasticIndexProvider(coordinate); oak.with(editorProvider) .with(indexProvider) .with(new PropertyIndexEditorProvider()) .with(new NodeTypeIndexProvider()) .with(new PropertyFullTextTest.FullTextPropertyInitialiser(TestHelper.getUniqueIndexName("elasticText"), of("text"), - ElasticsearchIndexDefinition.TYPE_ELASTICSEARCH).nodeScope().analyzed()); + ElasticIndexDefinition.TYPE_ELASTICSEARCH).nodeScope().analyzed()); return new Jcr(oak); } }); Modified: jackrabbit/oak/trunk/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticPropertyFTIndexedContentAvailability.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticPropertyFTIndexedContentAvailability.java?rev=1878026&r1=1878025&r2=1878026&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticPropertyFTIndexedContentAvailability.java (original) +++ jackrabbit/oak/trunk/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticPropertyFTIndexedContentAvailability.java Fri May 22 11:00:21 2020 @@ -26,10 +26,10 @@ import org.apache.jackrabbit.oak.fixture import org.apache.jackrabbit.oak.fixture.OakRepositoryFixture; import org.apache.jackrabbit.oak.fixture.RepositoryFixture; import org.apache.jackrabbit.oak.jcr.Jcr; -import org.apache.jackrabbit.oak.plugins.index.elasticsearch.ElasticsearchConnection; -import org.apache.jackrabbit.oak.plugins.index.elasticsearch.ElasticsearchIndexDefinition; -import org.apache.jackrabbit.oak.plugins.index.elasticsearch.index.ElasticsearchIndexEditorProvider; -import org.apache.jackrabbit.oak.plugins.index.elasticsearch.query.ElasticsearchIndexProvider; +import org.apache.jackrabbit.oak.plugins.index.elastic.ElasticConnection; +import org.apache.jackrabbit.oak.plugins.index.elastic.ElasticIndexDefinition; +import org.apache.jackrabbit.oak.plugins.index.elastic.index.ElasticIndexEditorProvider; +import org.apache.jackrabbit.oak.plugins.index.elastic.query.ElasticIndexProvider; import org.apache.jackrabbit.oak.plugins.index.search.ExtractedTextCache; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -66,7 +66,7 @@ public class ElasticPropertyFTIndexedCon private static final Logger LOG = LoggerFactory.getLogger(ElasticPropertyFTIndexedContentAvailability.class); private String currentFixtureName; - private ElasticsearchConnection coordinate; + private ElasticConnection coordinate; private String ELASTIC_GLOBAL_INDEX; @Override @@ -83,7 +83,7 @@ public class ElasticPropertyFTIndexedCon ElasticPropertyFTIndexedContentAvailability(final File dump, final boolean flat, final boolean doReport, - final Boolean storageEnabled, ElasticsearchConnection coordinate) { + final Boolean storageEnabled, ElasticConnection coordinate) { super(dump, flat, doReport, storageEnabled); this.coordinate = coordinate; } @@ -96,15 +96,15 @@ public class ElasticPropertyFTIndexedCon return ((OakRepositoryFixture) fixture).setUpCluster(1, new JcrCreator() { @Override public Jcr customize(Oak oak) { - ElasticsearchIndexEditorProvider editorProvider = new ElasticsearchIndexEditorProvider(coordinate, + ElasticIndexEditorProvider editorProvider = new ElasticIndexEditorProvider(coordinate, new ExtractedTextCache(10 * FileUtils.ONE_MB, 100)); - ElasticsearchIndexProvider indexProvider = new ElasticsearchIndexProvider(coordinate); + ElasticIndexProvider indexProvider = new ElasticIndexProvider(coordinate); oak.with(editorProvider) .with(indexProvider) .with((new ElasticGlobalInitializer(ELASTIC_GLOBAL_INDEX, storageEnabled)).async()) // the WikipediaImporter set a property `title` .with(new FullTextPropertyInitialiser(TestHelper.getUniqueIndexName("elasticTitle"), of("title"), - ElasticsearchIndexDefinition.TYPE_ELASTICSEARCH).async()) + ElasticIndexDefinition.TYPE_ELASTICSEARCH).async()) .withAsyncIndexing("async", 5); return new Jcr(oak); } Modified: jackrabbit/oak/trunk/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticPropertyFTSeparatedIndexedContentAvailability.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticPropertyFTSeparatedIndexedContentAvailability.java?rev=1878026&r1=1878025&r2=1878026&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticPropertyFTSeparatedIndexedContentAvailability.java (original) +++ jackrabbit/oak/trunk/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticPropertyFTSeparatedIndexedContentAvailability.java Fri May 22 11:00:21 2020 @@ -27,10 +27,10 @@ import org.apache.jackrabbit.oak.fixture import org.apache.jackrabbit.oak.fixture.OakRepositoryFixture; import org.apache.jackrabbit.oak.fixture.RepositoryFixture; import org.apache.jackrabbit.oak.jcr.Jcr; -import org.apache.jackrabbit.oak.plugins.index.elasticsearch.ElasticsearchConnection; -import org.apache.jackrabbit.oak.plugins.index.elasticsearch.ElasticsearchIndexDefinition; -import org.apache.jackrabbit.oak.plugins.index.elasticsearch.index.ElasticsearchIndexEditorProvider; -import org.apache.jackrabbit.oak.plugins.index.elasticsearch.query.ElasticsearchIndexProvider; +import org.apache.jackrabbit.oak.plugins.index.elastic.ElasticConnection; +import org.apache.jackrabbit.oak.plugins.index.elastic.ElasticIndexDefinition; +import org.apache.jackrabbit.oak.plugins.index.elastic.index.ElasticIndexEditorProvider; +import org.apache.jackrabbit.oak.plugins.index.elastic.query.ElasticIndexProvider; import org.apache.jackrabbit.oak.plugins.index.search.ExtractedTextCache; import javax.jcr.Repository; @@ -45,13 +45,13 @@ import static com.google.common.collect. public class ElasticPropertyFTSeparatedIndexedContentAvailability extends PropertyFullTextTest { private String currentFixtureName; - private ElasticsearchConnection coordinate; + private ElasticConnection coordinate; private String ELASTIC_GLOBAL_INDEX; ElasticPropertyFTSeparatedIndexedContentAvailability(final File dump, final boolean flat, final boolean doReport, - final Boolean storageEnabled, ElasticsearchConnection coordinate) { + final Boolean storageEnabled, ElasticConnection coordinate) { super(dump, flat, doReport, storageEnabled); this.coordinate = coordinate; } @@ -74,15 +74,15 @@ public class ElasticPropertyFTSeparatedI return ((OakRepositoryFixture) fixture).setUpCluster(1, new JcrCreator() { @Override public Jcr customize(Oak oak) { - ElasticsearchIndexEditorProvider editorProvider = new ElasticsearchIndexEditorProvider(coordinate, + ElasticIndexEditorProvider editorProvider = new ElasticIndexEditorProvider(coordinate, new ExtractedTextCache(10 * FileUtils.ONE_MB, 100)); - ElasticsearchIndexProvider indexProvider = new ElasticsearchIndexProvider(coordinate); + ElasticIndexProvider indexProvider = new ElasticIndexProvider(coordinate); oak.with(editorProvider) .with(indexProvider) .with((new ElasticGlobalInitializer(ELASTIC_GLOBAL_INDEX, storageEnabled)).async("fulltext-async")) // the WikipediaImporter set a property `title` .with(new FullTextPropertyInitialiser(TestHelper.getUniqueIndexName("elasticTitle"), of("title"), - ElasticsearchIndexDefinition.TYPE_ELASTICSEARCH).async()) + ElasticIndexDefinition.TYPE_ELASTICSEARCH).async()) .withAsyncIndexing("async", 5) .withAsyncIndexing("fulltext-async", 5); return new Jcr(oak); Modified: jackrabbit/oak/trunk/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticPropertyTextSearchTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticPropertyTextSearchTest.java?rev=1878026&r1=1878025&r2=1878026&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticPropertyTextSearchTest.java (original) +++ jackrabbit/oak/trunk/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticPropertyTextSearchTest.java Fri May 22 11:00:21 2020 @@ -26,10 +26,10 @@ import org.apache.jackrabbit.oak.fixture import org.apache.jackrabbit.oak.fixture.OakRepositoryFixture; import org.apache.jackrabbit.oak.fixture.RepositoryFixture; import org.apache.jackrabbit.oak.jcr.Jcr; -import org.apache.jackrabbit.oak.plugins.index.elasticsearch.ElasticsearchConnection; -import org.apache.jackrabbit.oak.plugins.index.elasticsearch.ElasticsearchIndexDefinition; -import org.apache.jackrabbit.oak.plugins.index.elasticsearch.index.ElasticsearchIndexEditorProvider; -import org.apache.jackrabbit.oak.plugins.index.elasticsearch.query.ElasticsearchIndexProvider; +import org.apache.jackrabbit.oak.plugins.index.elastic.ElasticConnection; +import org.apache.jackrabbit.oak.plugins.index.elastic.ElasticIndexDefinition; +import org.apache.jackrabbit.oak.plugins.index.elastic.index.ElasticIndexEditorProvider; +import org.apache.jackrabbit.oak.plugins.index.elastic.query.ElasticIndexProvider; import org.apache.jackrabbit.oak.plugins.index.nodetype.NodeTypeIndexProvider; import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexEditorProvider; import org.apache.jackrabbit.oak.plugins.index.search.ExtractedTextCache; @@ -42,9 +42,9 @@ import static com.google.common.collect. public class ElasticPropertyTextSearchTest extends SearchTest { - private ElasticsearchConnection coordinate; + private ElasticConnection coordinate; - ElasticPropertyTextSearchTest(File dump, boolean flat, boolean doReport, Boolean storageEnabled, ElasticsearchConnection coordinate) { + ElasticPropertyTextSearchTest(File dump, boolean flat, boolean doReport, Boolean storageEnabled, ElasticConnection coordinate) { super(dump, flat, doReport, storageEnabled); this.coordinate = coordinate; } @@ -70,15 +70,15 @@ public class ElasticPropertyTextSearchTe return ((OakRepositoryFixture) fixture).setUpCluster(1, new JcrCreator() { @Override public Jcr customize(Oak oak) { - ElasticsearchIndexEditorProvider editorProvider = new ElasticsearchIndexEditorProvider(coordinate, + ElasticIndexEditorProvider editorProvider = new ElasticIndexEditorProvider(coordinate, new ExtractedTextCache(10 * FileUtils.ONE_MB, 100)); - ElasticsearchIndexProvider indexProvider = new ElasticsearchIndexProvider(coordinate); + ElasticIndexProvider indexProvider = new ElasticIndexProvider(coordinate); oak.with(editorProvider) .with(indexProvider) .with(new PropertyIndexEditorProvider()) .with(new NodeTypeIndexProvider()) .with(new PropertyFullTextTest.FullTextPropertyInitialiser(TestHelper.getUniqueIndexName("elasticTitle"), of("title"), - ElasticsearchIndexDefinition.TYPE_ELASTICSEARCH)); + ElasticIndexDefinition.TYPE_ELASTICSEARCH)); return new Jcr(oak); } }); Modified: jackrabbit/oak/trunk/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/util/ElasticGlobalInitializer.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/util/ElasticGlobalInitializer.java?rev=1878026&r1=1878025&r2=1878026&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/util/ElasticGlobalInitializer.java (original) +++ jackrabbit/oak/trunk/oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/util/ElasticGlobalInitializer.java Fri May 22 11:00:21 2020 @@ -20,7 +20,7 @@ package org.apache.jackrabbit.oak.benchm import org.apache.jackrabbit.oak.plugins.index.IndexUtils; -import org.apache.jackrabbit.oak.plugins.index.elasticsearch.ElasticsearchIndexDefinition; +import org.apache.jackrabbit.oak.plugins.index.elastic.ElasticIndexDefinition; import org.apache.jackrabbit.oak.plugins.index.search.util.IndexHelper; import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; @@ -105,7 +105,7 @@ public class ElasticGlobalInitializer im // do nothing } else { IndexHelper.newFTIndexDefinition(IndexUtils.getOrCreateOakIndex(builder), - this.name, ElasticsearchIndexDefinition.TYPE_ELASTICSEARCH, + this.name, ElasticIndexDefinition.TYPE_ELASTICSEARCH, propertyTypes, excludes, async, storageEnabled); } } Modified: jackrabbit/oak/trunk/oak-search-elastic/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-elastic/pom.xml?rev=1878026&r1=1878025&r2=1878026&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-search-elastic/pom.xml (original) +++ jackrabbit/oak/trunk/oak-search-elastic/pom.xml Fri May 22 11:00:21 2020 @@ -45,7 +45,7 @@ <configuration> <instructions> <_exportcontents> - org.apache.jackrabbit.oak.plugins.index.elasticsearch.ElasticsearchIndexProviderService + org.apache.jackrabbit.oak.plugins.index.elastic.ElasticIndexProviderService </_exportcontents> <Import-Package> !com.carrotsearch.randomizedtesting.*, Copied: jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticConnection.java (from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchConnection.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticConnection.java?p2=jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticConnection.java&p1=jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchConnection.java&r1=1878025&r2=1878026&rev=1878026&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchConnection.java (original) +++ jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticConnection.java Fri May 22 11:00:21 2020 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.oak.plugins.index.elasticsearch; +package org.apache.jackrabbit.oak.plugins.index.elastic; import org.apache.http.Header; import org.apache.http.HttpHost; @@ -40,7 +40,7 @@ import java.util.concurrent.atomic.Atomi * The getClient() initializes the rest client on the first call. * Once close() is invoked this instance cannot be used anymore. */ -public class ElasticsearchConnection implements Closeable { +public class ElasticConnection implements Closeable { protected static final String SCHEME_PROP = "elasticsearch.scheme"; protected static final String DEFAULT_SCHEME = "http"; @@ -80,8 +80,8 @@ public class ElasticsearchConnection imp * Elasticsearch Security API Keys * </a> */ - private ElasticsearchConnection(@NotNull String indexPrefix, @NotNull String scheme, @NotNull String host, - @NotNull Integer port, String apiKeyId, String apiKeySecret) { + private ElasticConnection(@NotNull String indexPrefix, @NotNull String scheme, @NotNull String host, + @NotNull Integer port, String apiKeyId, String apiKeySecret) { this.indexPrefix = indexPrefix; this.scheme = scheme; this.host = host; @@ -131,7 +131,7 @@ public class ElasticsearchConnection imp public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - ElasticsearchConnection that = (ElasticsearchConnection) o; + ElasticConnection that = (ElasticConnection) o; return port == that.port && Objects.equals(scheme, that.scheme) && Objects.equals(host, that.host); @@ -149,7 +149,7 @@ public class ElasticsearchConnection imp /** * Returns a new {@code Builder.IndexPrefixStep} instance to allow a step by step construction of a - * {@link ElasticsearchConnection} object. + * {@link ElasticConnection} object. */ public static Builder.IndexPrefixStep newBuilder() { return new Builder.Steps(); @@ -190,13 +190,13 @@ public class ElasticsearchConnection imp } /** - * This is the final step in charge of building the {@link ElasticsearchConnection}. + * This is the final step in charge of building the {@link ElasticConnection}. * Validation should be here. * * It adds support for {@link OptionalSteps}. */ public interface BuildStep extends OptionalSteps { - ElasticsearchConnection build(); + ElasticConnection build(); } private static class Steps implements IndexPrefixStep, BasicConnectionStep, OptionalSteps, BuildStep { @@ -226,7 +226,7 @@ public class ElasticsearchConnection imp @Override public BuildStep withDefaultConnectionParameters() { - return withConnectionParameters(ElasticsearchConnection.DEFAULT_SCHEME, ElasticsearchConnection.DEFAULT_HOST, ElasticsearchConnection.DEFAULT_PORT); + return withConnectionParameters(ElasticConnection.DEFAULT_SCHEME, ElasticConnection.DEFAULT_HOST, ElasticConnection.DEFAULT_PORT); } @Override @@ -237,8 +237,8 @@ public class ElasticsearchConnection imp } @Override - public ElasticsearchConnection build() { - return new ElasticsearchConnection( + public ElasticConnection build() { + return new ElasticConnection( Objects.requireNonNull(indexPrefix, "indexPrefix must be not null"), Objects.requireNonNull(scheme, "scheme must be not null"), Objects.requireNonNull(host, "host must be not null"), Copied: jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexDefinition.java (from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchIndexDefinition.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexDefinition.java?p2=jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexDefinition.java&p1=jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchIndexDefinition.java&r1=1878025&r2=1878026&rev=1878026&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchIndexDefinition.java (original) +++ jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexDefinition.java Fri May 22 11:00:21 2020 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.jackrabbit.oak.plugins.index.elasticsearch; +package org.apache.jackrabbit.oak.plugins.index.elastic; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.commons.PathUtils; @@ -36,7 +36,7 @@ import java.util.stream.StreamSupport; import static org.apache.jackrabbit.oak.plugins.index.search.util.ConfigUtil.getOptionalValue; import static org.elasticsearch.common.Strings.INVALID_FILENAME_CHARS; -public class ElasticsearchIndexDefinition extends IndexDefinition { +public class ElasticIndexDefinition extends IndexDefinition { public static final String TYPE_ELASTICSEARCH = "elasticsearch"; @@ -84,13 +84,13 @@ public class ElasticsearchIndexDefinitio private final Map<String, List<PropertyDefinition>> propertiesByName; - public ElasticsearchIndexDefinition(NodeState root, NodeState defn, String indexPath, String indexPrefix) { + public ElasticIndexDefinition(NodeState root, NodeState defn, String indexPath, String indexPrefix) { super(root, getIndexDefinitionState(defn), determineIndexFormatVersion(defn), determineUniqueId(defn), indexPath); boolean isReindex = defn.getBoolean(IndexConstants.REINDEX_PROPERTY_NAME); String indexSuffix = "-" + (getReindexCount() + (isReindex ? 1 : 0)); this.indexPrefix = indexPrefix != null ? indexPrefix : ""; this.remoteAlias = setupAlias(); - this.remoteIndexName = getESSafeIndexName(this.remoteAlias + indexSuffix); + this.remoteIndexName = getElasticSafeIndexName(this.remoteAlias + indexSuffix); this.bulkActions = getOptionalValue(defn, BULK_ACTIONS, BULK_ACTIONS_DEFAULT); this.bulkSizeBytes = getOptionalValue(defn, BULK_SIZE_BYTES, BULK_SIZE_BYTES_DEFAULT); this.bulkFlushIntervalMs = getOptionalValue(defn, BULK_FLUSH_INTERVAL_MS, BULK_FLUSH_INTERVAL_MS_DEFAULT); @@ -131,12 +131,12 @@ public class ElasticsearchIndexDefinitio * Returns the keyword field name mapped in Elasticsearch for the specified property name. * @param propertyName the property name in the index rules * @return the field name identifier in Elasticsearch - * @throws IllegalArgumentException if the specified name is not part of this {@code ElasticsearchIndexDefinition} + * @throws IllegalArgumentException if the specified name is not part of this {@code ElasticIndexDefinition} */ public String getElasticKeyword(String propertyName) { List<PropertyDefinition> propertyDefinitions = propertiesByName.get(propertyName); if (propertyDefinitions == null) { - throw new IllegalArgumentException(propertyName + " is not part of this ElasticsearchIndexDefinition"); + throw new IllegalArgumentException(propertyName + " is not part of this ElasticIndexDefinition"); } String field = propertyName; @@ -154,7 +154,7 @@ public class ElasticsearchIndexDefinitio private String setupAlias() { // TODO: implement advanced remote index name strategy that takes into account multiple tenants and re-index process - return getESSafeIndexName(indexPrefix + "." + getIndexPath()); + return getElasticSafeIndexName(indexPrefix + "." + getIndexPath()); } /** @@ -166,12 +166,12 @@ public class ElasticsearchIndexDefinitio * <p> * The resulting file name would be truncated to MAX_NAME_LENGTH */ - private static String getESSafeIndexName(String indexPath) { + private static String getElasticSafeIndexName(String indexPath) { String name = StreamSupport .stream(PathUtils.elements(indexPath).spliterator(), false) .limit(3) //Max 3 nodeNames including oak:index which is the immediate parent for any indexPath .filter(p -> !"oak:index".equals(p)) - .map(ElasticsearchIndexDefinition::getESSafeName) + .map(ElasticIndexDefinition::getElasticSafeName) .collect(Collectors.joining("_")); if (name.length() > MAX_NAME_LENGTH) { @@ -184,12 +184,12 @@ public class ElasticsearchIndexDefinitio * Convert {@code e} to Elasticsearch safe index name. * Ref: https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-create-index.html */ - private static String getESSafeName(String suggestedIndexName) { + private static String getElasticSafeName(String suggestedIndexName) { return suggestedIndexName.replaceAll(INVALID_CHARS_REGEX, "").toLowerCase(); } /** - * Class to help with {@link ElasticsearchIndexDefinition} creation. + * Class to help with {@link ElasticIndexDefinition} creation. * The built object represents the index definition only without the node structure. */ public static class Builder extends IndexDefinition.Builder { @@ -201,19 +201,19 @@ public class ElasticsearchIndexDefinitio } @Override - public ElasticsearchIndexDefinition build() { - return (ElasticsearchIndexDefinition) super.build(); + public ElasticIndexDefinition build() { + return (ElasticIndexDefinition) super.build(); } @Override - public ElasticsearchIndexDefinition.Builder reindex() { + public ElasticIndexDefinition.Builder reindex() { super.reindex(); return this; } @Override protected IndexDefinition createInstance(NodeState indexDefnStateToUse) { - return new ElasticsearchIndexDefinition(root, indexDefnStateToUse, indexPath, indexPrefix); + return new ElasticIndexDefinition(root, indexDefnStateToUse, indexPath, indexPrefix); } } } Copied: jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexProviderService.java (from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchIndexProviderService.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexProviderService.java?p2=jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexProviderService.java&p1=jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchIndexProviderService.java&r1=1878025&r2=1878026&rev=1878026&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/ElasticsearchIndexProviderService.java (original) +++ jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexProviderService.java Fri May 22 11:00:21 2020 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.oak.plugins.index.elasticsearch; +package org.apache.jackrabbit.oak.plugins.index.elastic; import org.apache.commons.io.FilenameUtils; import org.apache.felix.scr.annotations.Activate; @@ -31,8 +31,8 @@ import org.apache.jackrabbit.oak.commons import org.apache.jackrabbit.oak.commons.PropertiesUtil; import org.apache.jackrabbit.oak.osgi.OsgiWhiteboard; import org.apache.jackrabbit.oak.plugins.index.IndexEditorProvider; -import org.apache.jackrabbit.oak.plugins.index.elasticsearch.index.ElasticsearchIndexEditorProvider; -import org.apache.jackrabbit.oak.plugins.index.elasticsearch.query.ElasticsearchIndexProvider; +import org.apache.jackrabbit.oak.plugins.index.elastic.index.ElasticIndexEditorProvider; +import org.apache.jackrabbit.oak.plugins.index.elastic.query.ElasticIndexProvider; import org.apache.jackrabbit.oak.plugins.index.fulltext.PreExtractedTextProvider; import org.apache.jackrabbit.oak.plugins.index.search.ExtractedTextCache; import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider; @@ -54,10 +54,10 @@ import java.util.Map; import static org.apache.commons.io.FileUtils.ONE_MB; import static org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils.registerMBean; -@Component(metatype = true, label = "Apache Jackrabbit Oak ElasticsearchIndexProvider") -public class ElasticsearchIndexProviderService { +@Component(metatype = true, label = "Apache Jackrabbit Oak ElasticIndexProvider") +public class ElasticIndexProviderService { - private static final Logger LOG = LoggerFactory.getLogger(ElasticsearchIndexProviderService.class); + private static final Logger LOG = LoggerFactory.getLogger(ElasticIndexProviderService.class); private static final String REPOSITORY_HOME = "repository.home"; @@ -96,34 +96,34 @@ public class ElasticsearchIndexProviderS static final String PROP_INDEX_PREFIX = "indexPrefix"; @Property( - value = ElasticsearchConnection.DEFAULT_SCHEME, + value = ElasticConnection.DEFAULT_SCHEME, label = "Elasticsearch connection scheme" ) - private static final String PROP_ELASTICSEARCH_SCHEME = ElasticsearchConnection.SCHEME_PROP; + private static final String PROP_ELASTIC_SCHEME = ElasticConnection.SCHEME_PROP; @Property( - value = ElasticsearchConnection.DEFAULT_HOST, + value = ElasticConnection.DEFAULT_HOST, label = "Elasticsearch connection host" ) - private static final String PROP_ELASTICSEARCH_HOST = ElasticsearchConnection.HOST_PROP; + private static final String PROP_ELASTIC_HOST = ElasticConnection.HOST_PROP; @Property( - intValue = ElasticsearchConnection.DEFAULT_PORT, + intValue = ElasticConnection.DEFAULT_PORT, label = "Elasticsearch connection port" ) - private static final String PROP_ELASTICSEARCH_PORT = ElasticsearchConnection.PORT_PROP; + private static final String PROP_ELASTIC_PORT = ElasticConnection.PORT_PROP; @Property( label = "Elasticsearch API key ID", - value = ElasticsearchConnection.DEFAULT_API_KEY_ID + value = ElasticConnection.DEFAULT_API_KEY_ID ) - private static final String PROP_ELASTICSEARCH_API_KEY_ID = ElasticsearchConnection.API_KEY_ID_PROP; + private static final String PROP_ELASTIC_API_KEY_ID = ElasticConnection.API_KEY_ID_PROP; @Property( label = "Elasticsearch API key secret", - passwordValue = ElasticsearchConnection.DEFAULT_API_KEY_SECRET + passwordValue = ElasticConnection.DEFAULT_API_KEY_SECRET ) - private static final String PROP_ELASTICSEARCH_API_KEY_SECRET = ElasticsearchConnection.API_KEY_SECRET_PROP; + private static final String PROP_ELASTIC_API_KEY_SECRET = ElasticConnection.API_KEY_SECRET_PROP; @Property( label = "Local text extraction cache path", @@ -148,7 +148,7 @@ public class ElasticsearchIndexProviderS private Whiteboard whiteboard; private File textExtractionDir; - private ElasticsearchConnection elasticsearchConnection; + private ElasticConnection elasticConnection; @Activate private void activate(BundleContext bundleContext, Map<String, Object> config) { @@ -157,9 +157,9 @@ public class ElasticsearchIndexProviderS //initializeTextExtractionDir(bundleContext, config); //initializeExtractedTextCache(config, statisticsProvider); - elasticsearchConnection = getElasticsearchConnection(config); + elasticConnection = getElasticConnection(config); - LOG.info("Registering Index and Editor providers with connection {}", elasticsearchConnection); + LOG.info("Registering Index and Editor providers with connection {}", elasticConnection); registerIndexProvider(bundleContext); registerIndexEditor(bundleContext); @@ -175,7 +175,7 @@ public class ElasticsearchIndexProviderS reg.unregister(); } - IOUtils.closeQuietly(elasticsearchConnection); + IOUtils.closeQuietly(elasticConnection); if (extractedTextCache != null) { extractedTextCache.close(); @@ -183,18 +183,18 @@ public class ElasticsearchIndexProviderS } private void registerIndexProvider(BundleContext bundleContext) { - ElasticsearchIndexProvider indexProvider = new ElasticsearchIndexProvider(elasticsearchConnection); + ElasticIndexProvider indexProvider = new ElasticIndexProvider(elasticConnection); Dictionary<String, Object> props = new Hashtable<>(); - props.put("type", ElasticsearchIndexDefinition.TYPE_ELASTICSEARCH); + props.put("type", ElasticIndexDefinition.TYPE_ELASTICSEARCH); regs.add(bundleContext.registerService(QueryIndexProvider.class.getName(), indexProvider, props)); } private void registerIndexEditor(BundleContext bundleContext) { - ElasticsearchIndexEditorProvider editorProvider = new ElasticsearchIndexEditorProvider(elasticsearchConnection, extractedTextCache); + ElasticIndexEditorProvider editorProvider = new ElasticIndexEditorProvider(elasticConnection, extractedTextCache); Dictionary<String, Object> props = new Hashtable<>(); - props.put("type", ElasticsearchIndexDefinition.TYPE_ELASTICSEARCH); + props.put("type", ElasticIndexDefinition.TYPE_ELASTICSEARCH); regs.add(bundleContext.registerService(IndexEditorProvider.class.getName(), editorProvider, props)); // oakRegs.add(registerMBean(whiteboard, // TextExtractionStatsMBean.class, @@ -261,24 +261,24 @@ public class ElasticsearchIndexProviderS } } - private ElasticsearchConnection getElasticsearchConnection(Map<String, Object> contextConfig) { + private ElasticConnection getElasticConnection(Map<String, Object> contextConfig) { // system properties have priority, get mandatory params first final String indexPrefix = System.getProperty(PROP_INDEX_PREFIX, (String) contextConfig.getOrDefault(PROP_INDEX_PREFIX, "oak-elastic")); - final String scheme = System.getProperty(PROP_ELASTICSEARCH_SCHEME, - (String) contextConfig.getOrDefault(PROP_ELASTICSEARCH_SCHEME, ElasticsearchConnection.DEFAULT_SCHEME)); - final String host = System.getProperty(PROP_ELASTICSEARCH_HOST, - (String) contextConfig.getOrDefault(PROP_ELASTICSEARCH_HOST, ElasticsearchConnection.DEFAULT_HOST)); - final int port = Integer.getInteger(PROP_ELASTICSEARCH_PORT, - (int) contextConfig.getOrDefault(PROP_ELASTICSEARCH_PORT, ElasticsearchConnection.DEFAULT_PORT)); + final String scheme = System.getProperty(PROP_ELASTIC_SCHEME, + (String) contextConfig.getOrDefault(PROP_ELASTIC_SCHEME, ElasticConnection.DEFAULT_SCHEME)); + final String host = System.getProperty(PROP_ELASTIC_HOST, + (String) contextConfig.getOrDefault(PROP_ELASTIC_HOST, ElasticConnection.DEFAULT_HOST)); + final int port = Integer.getInteger(PROP_ELASTIC_PORT, + (int) contextConfig.getOrDefault(PROP_ELASTIC_PORT, ElasticConnection.DEFAULT_PORT)); // optional params - final String apiKeyId = System.getProperty(PROP_ELASTICSEARCH_API_KEY_ID, - (String) contextConfig.get(PROP_ELASTICSEARCH_API_KEY_ID)); - final String apiSecretId = System.getProperty(PROP_ELASTICSEARCH_API_KEY_SECRET, - (String) contextConfig.get(PROP_ELASTICSEARCH_API_KEY_SECRET)); + final String apiKeyId = System.getProperty(PROP_ELASTIC_API_KEY_ID, + (String) contextConfig.get(PROP_ELASTIC_API_KEY_ID)); + final String apiSecretId = System.getProperty(PROP_ELASTIC_API_KEY_SECRET, + (String) contextConfig.get(PROP_ELASTIC_API_KEY_SECRET)); - return ElasticsearchConnection.newBuilder() + return ElasticConnection.newBuilder() .withIndexPrefix(indexPrefix) .withConnectionParameters(scheme, host, port) .withApiKeys(apiKeyId, apiSecretId) Copied: jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticDocument.java (from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/index/ElasticsearchDocument.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticDocument.java?p2=jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticDocument.java&p1=jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/index/ElasticsearchDocument.java&r1=1878025&r2=1878026&rev=1878026&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/index/ElasticsearchDocument.java (original) +++ jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticDocument.java Fri May 22 11:00:21 2020 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.oak.plugins.index.elasticsearch.index; +package org.apache.jackrabbit.oak.plugins.index.elastic.index; import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.plugins.index.search.FieldNames; @@ -30,8 +30,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -class ElasticsearchDocument { - private static final Logger LOG = LoggerFactory.getLogger(ElasticsearchDocument.class); +class ElasticDocument { + private static final Logger LOG = LoggerFactory.getLogger(ElasticDocument.class); private final String path; private final List<String> fulltext; @@ -40,7 +40,7 @@ class ElasticsearchDocument { private final List<String> nullProps; private final Map<String, Object> properties; - ElasticsearchDocument(String path) { + ElasticDocument(String path) { this.path = path; this.fulltext = new ArrayList<>(); this.suggest = new ArrayList<>(); Copied: jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticDocumentMaker.java (from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/index/ElasticsearchDocumentMaker.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticDocumentMaker.java?p2=jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticDocumentMaker.java&p1=jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/index/ElasticsearchDocumentMaker.java&r1=1878025&r2=1878026&rev=1878026&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/index/ElasticsearchDocumentMaker.java (original) +++ jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticDocumentMaker.java Fri May 22 11:00:21 2020 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.jackrabbit.oak.plugins.index.elasticsearch.index; +package org.apache.jackrabbit.oak.plugins.index.elastic.index; import org.apache.jackrabbit.oak.api.Blob; import org.apache.jackrabbit.oak.api.PropertyState; @@ -34,21 +34,21 @@ import org.jetbrains.annotations.Nullabl import java.io.IOException; import java.util.List; -class ElasticsearchDocumentMaker extends FulltextDocumentMaker<ElasticsearchDocument> { +class ElasticDocumentMaker extends FulltextDocumentMaker<ElasticDocument> { - ElasticsearchDocumentMaker(@Nullable FulltextBinaryTextExtractor textExtractor, - @NotNull IndexDefinition definition, - IndexDefinition.IndexingRule indexingRule, @NotNull String path) { + ElasticDocumentMaker(@Nullable FulltextBinaryTextExtractor textExtractor, + @NotNull IndexDefinition definition, + IndexDefinition.IndexingRule indexingRule, @NotNull String path) { super(textExtractor, definition, indexingRule, path); } @Override - protected ElasticsearchDocument initDoc() { - return new ElasticsearchDocument(path); + protected ElasticDocument initDoc() { + return new ElasticDocument(path); } @Override - protected ElasticsearchDocument finalizeDoc(ElasticsearchDocument doc, boolean dirty, boolean facet) { + protected ElasticDocument finalizeDoc(ElasticDocument doc, boolean dirty, boolean facet) { // evaluate path restrictions is enabled by default in elastic. Always index ancestors doc.indexAncestors(path); return doc; @@ -61,14 +61,14 @@ class ElasticsearchDocumentMaker extends } @Override - protected boolean indexTypeOrderedFields(ElasticsearchDocument doc, String pname, int tag, PropertyState property, PropertyDefinition pd) { + protected boolean indexTypeOrderedFields(ElasticDocument doc, String pname, int tag, PropertyState property, PropertyDefinition pd) { // TODO: check the conjecture below // ES doesn't seem to require special mapping to sort so we don't need to add anything return false; } @Override - protected boolean addBinary(ElasticsearchDocument doc, String path, List<String> binaryValues) { + protected boolean addBinary(ElasticDocument doc, String path, List<String> binaryValues) { boolean added = false; for (String binaryValue : binaryValues) { if (path != null) { @@ -84,7 +84,7 @@ class ElasticsearchDocumentMaker extends } @Override - protected boolean indexFacetProperty(ElasticsearchDocument doc, int tag, PropertyState property, String pname) { + protected boolean indexFacetProperty(ElasticDocument doc, int tag, PropertyState property, String pname) { // faceting on ES works automatically for keyword (propertyIndex) and subsequently query params. // We we don't need to add anything. // https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-terms-aggregation.html @@ -92,29 +92,29 @@ class ElasticsearchDocumentMaker extends } @Override - protected void indexAnalyzedProperty(ElasticsearchDocument doc, String pname, String value, PropertyDefinition pd) { + protected void indexAnalyzedProperty(ElasticDocument doc, String pname, String value, PropertyDefinition pd) { doc.addProperty(FieldNames.createAnalyzedFieldName(pname), value); } @Override - protected void indexSuggestValue(ElasticsearchDocument doc, String value) { + protected void indexSuggestValue(ElasticDocument doc, String value) { doc.addSuggest(value); } @Override - protected void indexSpellcheckValue(ElasticsearchDocument doc, String value) { + protected void indexSpellcheckValue(ElasticDocument doc, String value) { // TODO: Figure out how to do spellcheck with ES (interwebs seems to say that it should be simple // and don't need anything extra in indexed document } @Override - protected void indexFulltextValue(ElasticsearchDocument doc, String value) { + protected void indexFulltextValue(ElasticDocument doc, String value) { // Note: diversion from lucene impl - here we are storing even these cases and not just binary doc.addFulltext(value); } @Override - protected void indexTypedProperty(ElasticsearchDocument doc, PropertyState property, String pname, PropertyDefinition pd, int i) { + protected void indexTypedProperty(ElasticDocument doc, PropertyState property, String pname, PropertyDefinition pd, int i) { int tag = property.getType().tag(); Object f; @@ -136,23 +136,23 @@ class ElasticsearchDocumentMaker extends /** * Empty method implementation. Ancestors are always indexed * - * @see ElasticsearchDocumentMaker#finalizeDoc + * @see ElasticDocumentMaker#finalizeDoc */ @Override - protected void indexAncestors(ElasticsearchDocument doc, String path) { /* empty */ } + protected void indexAncestors(ElasticDocument doc, String path) { /* empty */ } @Override - protected void indexNotNullProperty(ElasticsearchDocument doc, PropertyDefinition pd) { + protected void indexNotNullProperty(ElasticDocument doc, PropertyDefinition pd) { doc.notNullProp(pd.name); } @Override - protected void indexNullProperty(ElasticsearchDocument doc, PropertyDefinition pd) { + protected void indexNullProperty(ElasticDocument doc, PropertyDefinition pd) { doc.nullProp(pd.name); } @Override - protected void indexAggregateValue(ElasticsearchDocument doc, Aggregate.NodeIncludeResult result, String value, PropertyDefinition pd) { + protected void indexAggregateValue(ElasticDocument doc, Aggregate.NodeIncludeResult result, String value, PropertyDefinition pd) { if (result.isRelativeNode()) { doc.addFulltextRelative(result.rootIncludePath, value); } else { @@ -161,37 +161,37 @@ class ElasticsearchDocumentMaker extends } @Override - protected void indexNodeName(ElasticsearchDocument doc, String value) { + protected void indexNodeName(ElasticDocument doc, String value) { doc.addProperty(FieldNames.NODE_NAME, value); } @Override - protected boolean indexSimilarityTag(ElasticsearchDocument doc, PropertyState property) { + protected boolean indexSimilarityTag(ElasticDocument doc, PropertyState property) { // TODO : not implemented return false; } @Override - protected void indexSimilarityBinaries(ElasticsearchDocument doc, PropertyDefinition pd, Blob blob) throws IOException { + protected void indexSimilarityBinaries(ElasticDocument doc, PropertyDefinition pd, Blob blob) throws IOException { // TODO : not implemented // see https://www.elastic.co/blog/text-similarity-search-with-vectors-in-elasticsearch // see https://www.elastic.co/guide/en/elasticsearch/reference/current/dense-vector.html } @Override - protected void indexSimilarityStrings(ElasticsearchDocument doc, PropertyDefinition pd, String value) throws IOException { + protected void indexSimilarityStrings(ElasticDocument doc, PropertyDefinition pd, String value) throws IOException { // TODO : not implemented } @Override - protected boolean augmentCustomFields(String path, ElasticsearchDocument doc, NodeState document) { + protected boolean augmentCustomFields(String path, ElasticDocument doc, NodeState document) { // TODO : not implemented return false; } @Override - protected boolean indexDynamicBoost(ElasticsearchDocument doc, PropertyDefinition pd, NodeState nodeState, - String propertyName) { + protected boolean indexDynamicBoost(ElasticDocument doc, PropertyDefinition pd, NodeState nodeState, + String propertyName) { // TODO : not implemented return false; } Copied: jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticIndexEditor.java (from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/index/ElasticsearchIndexEditor.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticIndexEditor.java?p2=jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticIndexEditor.java&p1=jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/index/ElasticsearchIndexEditor.java&r1=1878025&r2=1878026&rev=1878026&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/index/ElasticsearchIndexEditor.java (original) +++ jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticIndexEditor.java Fri May 22 11:00:21 2020 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.oak.plugins.index.elasticsearch.index; +package org.apache.jackrabbit.oak.plugins.index.elastic.index; import org.apache.jackrabbit.oak.plugins.index.IndexEditor; import org.apache.jackrabbit.oak.plugins.index.search.spi.editor.FulltextIndexEditor; @@ -24,8 +24,8 @@ import org.apache.jackrabbit.oak.plugins * {@link IndexEditor} implementation that is responsible for keeping the * corresponding Elasticsearch index up to date */ -class ElasticsearchIndexEditor extends FulltextIndexEditor<ElasticsearchDocument> { - ElasticsearchIndexEditor(FulltextIndexEditorContext<ElasticsearchDocument> context) { +class ElasticIndexEditor extends FulltextIndexEditor<ElasticDocument> { + ElasticIndexEditor(FulltextIndexEditorContext<ElasticDocument> context) { super(context); } } Copied: jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticIndexEditorContext.java (from r1878025, jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/index/ElasticsearchIndexEditorContext.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticIndexEditorContext.java?p2=jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticIndexEditorContext.java&p1=jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/index/ElasticsearchIndexEditorContext.java&r1=1878025&r2=1878026&rev=1878026&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elasticsearch/index/ElasticsearchIndexEditorContext.java (original) +++ jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticIndexEditorContext.java Fri May 22 11:00:21 2020 @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.oak.plugins.index.elasticsearch.index; +package org.apache.jackrabbit.oak.plugins.index.elastic.index; import org.apache.jackrabbit.oak.plugins.index.IndexUpdateCallback; import org.apache.jackrabbit.oak.plugins.index.IndexingContext; -import org.apache.jackrabbit.oak.plugins.index.elasticsearch.ElasticsearchIndexDefinition; +import org.apache.jackrabbit.oak.plugins.index.elastic.ElasticIndexDefinition; import org.apache.jackrabbit.oak.plugins.index.search.ExtractedTextCache; import org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition; import org.apache.jackrabbit.oak.plugins.index.search.spi.editor.DocumentMaker; @@ -29,29 +29,29 @@ import org.jetbrains.annotations.Nullabl import java.io.IOException; -class ElasticsearchIndexEditorContext extends FulltextIndexEditorContext<ElasticsearchDocument> { +class ElasticIndexEditorContext extends FulltextIndexEditorContext<ElasticDocument> { private String indexPrefix; - ElasticsearchIndexEditorContext(NodeState root, - NodeBuilder definition, @Nullable IndexDefinition indexDefinition, - IndexUpdateCallback updateCallback, - ElasticsearchIndexWriterFactory indexWriterFactory, - ExtractedTextCache extractedTextCache, - IndexingContext indexingContext, - boolean asyncIndexing, String indexPrefix) { + ElasticIndexEditorContext(NodeState root, + NodeBuilder definition, @Nullable IndexDefinition indexDefinition, + IndexUpdateCallback updateCallback, + ElasticIndexWriterFactory indexWriterFactory, + ExtractedTextCache extractedTextCache, + IndexingContext indexingContext, + boolean asyncIndexing, String indexPrefix) { super(root, definition, indexDefinition, updateCallback, indexWriterFactory, extractedTextCache, indexingContext, asyncIndexing); this.indexPrefix = indexPrefix; } @Override public IndexDefinition.Builder newDefinitionBuilder() { - return new ElasticsearchIndexDefinition.Builder(indexPrefix); + return new ElasticIndexDefinition.Builder(indexPrefix); } @Override - public DocumentMaker<ElasticsearchDocument> newDocumentMaker(IndexDefinition.IndexingRule rule, String path) { - return new ElasticsearchDocumentMaker(getTextExtractor(), getDefinition(), rule, path); + public DocumentMaker<ElasticDocument> newDocumentMaker(IndexDefinition.IndexingRule rule, String path) { + return new ElasticDocumentMaker(getTextExtractor(), getDefinition(), rule, path); } @Override @@ -68,7 +68,7 @@ class ElasticsearchIndexEditorContext ex } @Override - public ElasticsearchIndexWriter getWriter() { - return (ElasticsearchIndexWriter) super.getWriter(); + public ElasticIndexWriter getWriter() { + return (ElasticIndexWriter) super.getWriter(); } }