From 8995079a58095c19b691571b089c5e0a2c168037 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Wed, 11 Sep 2019 09:42:50 +0200 Subject: [PATCH] HSEARCH-1347 Move aggregation DSL interfaces to a subpackage of search.aggregation So that everything related to aggregations is in one place. --- .../elasticsearch/ElasticsearchExtension.java | 10 +++++----- .../dsl}/ElasticsearchSearchAggregationFactory.java | 4 ++-- .../ElasticsearchSearchAggregationFactoryImpl.java | 10 +++++----- .../query/ElasticsearchSearchQueryOptionsStep.java | 2 +- .../ElasticsearchSearchQueryOptionsStepImpl.java | 4 ++-- .../search/backend/lucene/LuceneExtension.java | 10 +++++----- .../dsl}/LuceneSearchAggregationFactory.java | 4 ++-- .../impl/LuceneSearchAggregationFactoryImpl.java | 10 +++++----- .../dsl/query/LuceneSearchQueryOptionsStep.java | 2 +- .../query/impl/LuceneSearchQueryOptionsStepImpl.java | 4 ++-- .../engine/common/impl/MappedIndexScopeImpl.java | 6 +++--- .../engine/mapper/scope/spi/MappedIndexScope.java | 2 +- .../dsl}/AggregationFinalStep.java | 2 +- .../dsl}/BucketAggregationOptionsStep.java | 2 +- .../dsl}/CombinedAggregationOptionsStep.java | 2 +- .../dsl}/RangeAggregationFieldStep.java | 2 +- .../dsl}/RangeAggregationOptionsStep.java | 2 +- .../dsl}/RangeAggregationRangeMoreStep.java | 2 +- .../dsl}/RangeAggregationRangeStep.java | 2 +- .../dsl}/SearchAggregationFactory.java | 2 +- .../dsl}/SearchAggregationFactoryExtension.java | 6 +++--- .../dsl}/TermsAggregationFieldStep.java | 2 +- .../dsl}/TermsAggregationOptionsStep.java | 2 +- .../dsl}/impl/DefaultSearchAggregationFactory.java | 12 ++++++------ .../dsl}/impl/RangeAggregationFieldStepImpl.java | 8 ++++---- .../dsl}/impl/RangeAggregationRangeStepImpl.java | 6 +++--- .../dsl}/impl/SearchAggregationDslContextImpl.java | 4 ++-- .../dsl}/impl/TermsAggregationFieldStepImpl.java | 8 ++++---- .../dsl}/impl/TermsAggregationOptionsStepImpl.java | 4 ++-- .../dsl}/spi/DelegatingSearchAggregationFactory.java | 10 +++++----- .../dsl}/spi/SearchAggregationDslContext.java | 2 +- .../search/dsl/query/SearchQueryOptionsStep.java | 4 ++-- .../query/impl/DefaultSearchQueryOptionsStep.java | 2 +- .../spi/AbstractExtendedSearchQueryOptionsStep.java | 2 +- .../query/spi/AbstractSearchQueryOptionsStep.java | 8 ++++---- .../tck/search/aggregation/AggregationBaseIT.java | 8 ++++---- .../aggregation/SingleFieldAggregationBaseIT.java | 4 ++-- .../operations/RangeAggregationDescriptor.java | 4 ++-- .../operations/TermsAggregationDescriptor.java | 4 ++-- .../operations/expectations/AggregationScenario.java | 4 ++-- ...nsupportedSingleFieldAggregationExpectations.java | 2 +- .../search/mapper/javabean/scope/SearchScope.java | 2 +- .../mapper/javabean/scope/impl/SearchScopeImpl.java | 2 +- .../search/mapper/orm/scope/SearchScope.java | 2 +- .../mapper/orm/scope/impl/SearchScopeImpl.java | 2 +- .../pojo/scope/impl/PojoScopeDelegateImpl.java | 2 +- .../mapper/pojo/scope/spi/PojoScopeDelegate.java | 2 +- .../common/stub/mapper/GenericStubMappingScope.java | 2 +- 48 files changed, 102 insertions(+), 102 deletions(-) rename backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/{dsl/aggregation => aggregation/dsl}/ElasticsearchSearchAggregationFactory.java (71%) rename backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/{dsl/aggregation => aggregation/dsl}/impl/ElasticsearchSearchAggregationFactoryImpl.java (72%) rename backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/{dsl/aggregation => aggregation/dsl}/LuceneSearchAggregationFactory.java (72%) rename backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/{dsl/aggregation => aggregation/dsl}/impl/LuceneSearchAggregationFactoryImpl.java (71%) rename engine/src/main/java/org/hibernate/search/engine/search/{dsl/aggregation => aggregation/dsl}/AggregationFinalStep.java (92%) rename engine/src/main/java/org/hibernate/search/engine/search/{dsl/aggregation => aggregation/dsl}/BucketAggregationOptionsStep.java (93%) rename engine/src/main/java/org/hibernate/search/engine/search/{dsl/aggregation => aggregation/dsl}/CombinedAggregationOptionsStep.java (88%) rename engine/src/main/java/org/hibernate/search/engine/search/{dsl/aggregation => aggregation/dsl}/RangeAggregationFieldStep.java (95%) rename engine/src/main/java/org/hibernate/search/engine/search/{dsl/aggregation => aggregation/dsl}/RangeAggregationOptionsStep.java (89%) rename engine/src/main/java/org/hibernate/search/engine/search/{dsl/aggregation => aggregation/dsl}/RangeAggregationRangeMoreStep.java (92%) rename engine/src/main/java/org/hibernate/search/engine/search/{dsl/aggregation => aggregation/dsl}/RangeAggregationRangeStep.java (95%) rename engine/src/main/java/org/hibernate/search/engine/search/{dsl/aggregation => aggregation/dsl}/SearchAggregationFactory.java (96%) rename engine/src/main/java/org/hibernate/search/engine/search/{dsl/aggregation => aggregation/dsl}/SearchAggregationFactoryExtension.java (90%) rename engine/src/main/java/org/hibernate/search/engine/search/{dsl/aggregation => aggregation/dsl}/TermsAggregationFieldStep.java (95%) rename engine/src/main/java/org/hibernate/search/engine/search/{dsl/aggregation => aggregation/dsl}/TermsAggregationOptionsStep.java (97%) rename engine/src/main/java/org/hibernate/search/engine/search/{dsl/aggregation => aggregation/dsl}/impl/DefaultSearchAggregationFactory.java (74%) rename engine/src/main/java/org/hibernate/search/engine/search/{dsl/aggregation => aggregation/dsl}/impl/RangeAggregationFieldStepImpl.java (82%) rename engine/src/main/java/org/hibernate/search/engine/search/{dsl/aggregation => aggregation/dsl}/impl/RangeAggregationRangeStepImpl.java (87%) rename engine/src/main/java/org/hibernate/search/engine/search/{dsl/aggregation => aggregation/dsl}/impl/SearchAggregationDslContextImpl.java (87%) rename engine/src/main/java/org/hibernate/search/engine/search/{dsl/aggregation => aggregation/dsl}/impl/TermsAggregationFieldStepImpl.java (82%) rename engine/src/main/java/org/hibernate/search/engine/search/{dsl/aggregation => aggregation/dsl}/impl/TermsAggregationOptionsStepImpl.java (93%) rename engine/src/main/java/org/hibernate/search/engine/search/{dsl/aggregation => aggregation/dsl}/spi/DelegatingSearchAggregationFactory.java (77%) rename engine/src/main/java/org/hibernate/search/engine/search/{dsl/aggregation => aggregation/dsl}/spi/SearchAggregationDslContext.java (91%) diff --git a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/ElasticsearchExtension.java b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/ElasticsearchExtension.java index a1acfe34443..70ba663c1bb 100644 --- a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/ElasticsearchExtension.java +++ b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/ElasticsearchExtension.java @@ -10,8 +10,8 @@ import java.util.Optional; import org.hibernate.search.backend.elasticsearch.search.aggregation.impl.ElasticsearchSearchAggregationBuilderFactory; -import org.hibernate.search.backend.elasticsearch.search.dsl.aggregation.ElasticsearchSearchAggregationFactory; -import org.hibernate.search.backend.elasticsearch.search.dsl.aggregation.impl.ElasticsearchSearchAggregationFactoryImpl; +import org.hibernate.search.backend.elasticsearch.search.aggregation.dsl.ElasticsearchSearchAggregationFactory; +import org.hibernate.search.backend.elasticsearch.search.aggregation.dsl.impl.ElasticsearchSearchAggregationFactoryImpl; import org.hibernate.search.backend.elasticsearch.search.dsl.projection.ElasticsearchSearchProjectionFactory; import org.hibernate.search.backend.elasticsearch.search.dsl.projection.impl.ElasticsearchSearchProjectionFactoryImpl; import org.hibernate.search.backend.elasticsearch.search.dsl.query.ElasticsearchSearchQueryHitTypeStep; @@ -31,9 +31,9 @@ import org.hibernate.search.backend.elasticsearch.search.sort.impl.ElasticsearchSearchSortBuilder; import org.hibernate.search.backend.elasticsearch.search.sort.impl.ElasticsearchSearchSortBuilderFactory; import org.hibernate.search.engine.mapper.session.context.spi.SessionContextImplementor; -import org.hibernate.search.engine.search.dsl.aggregation.SearchAggregationFactory; -import org.hibernate.search.engine.search.dsl.aggregation.SearchAggregationFactoryExtension; -import org.hibernate.search.engine.search.dsl.aggregation.spi.SearchAggregationDslContext; +import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactory; +import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactoryExtension; +import org.hibernate.search.engine.search.aggregation.dsl.spi.SearchAggregationDslContext; import org.hibernate.search.engine.search.dsl.predicate.SearchPredicateFactory; import org.hibernate.search.engine.search.dsl.predicate.SearchPredicateFactoryExtension; import org.hibernate.search.engine.search.dsl.projection.SearchProjectionFactory; diff --git a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/dsl/aggregation/ElasticsearchSearchAggregationFactory.java b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/aggregation/dsl/ElasticsearchSearchAggregationFactory.java similarity index 71% rename from backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/dsl/aggregation/ElasticsearchSearchAggregationFactory.java rename to backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/aggregation/dsl/ElasticsearchSearchAggregationFactory.java index 825d50972ab..4e8aef4f0b6 100644 --- a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/dsl/aggregation/ElasticsearchSearchAggregationFactory.java +++ b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/aggregation/dsl/ElasticsearchSearchAggregationFactory.java @@ -4,9 +4,9 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.backend.elasticsearch.search.dsl.aggregation; +package org.hibernate.search.backend.elasticsearch.search.aggregation.dsl; -import org.hibernate.search.engine.search.dsl.aggregation.SearchAggregationFactory; +import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactory; public interface ElasticsearchSearchAggregationFactory extends SearchAggregationFactory { } diff --git a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/dsl/aggregation/impl/ElasticsearchSearchAggregationFactoryImpl.java b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/aggregation/dsl/impl/ElasticsearchSearchAggregationFactoryImpl.java similarity index 72% rename from backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/dsl/aggregation/impl/ElasticsearchSearchAggregationFactoryImpl.java rename to backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/aggregation/dsl/impl/ElasticsearchSearchAggregationFactoryImpl.java index 6cc4fc38812..b2e7b61cc01 100644 --- a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/dsl/aggregation/impl/ElasticsearchSearchAggregationFactoryImpl.java +++ b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/aggregation/dsl/impl/ElasticsearchSearchAggregationFactoryImpl.java @@ -4,13 +4,13 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.backend.elasticsearch.search.dsl.aggregation.impl; +package org.hibernate.search.backend.elasticsearch.search.aggregation.dsl.impl; import org.hibernate.search.backend.elasticsearch.search.aggregation.impl.ElasticsearchSearchAggregationBuilderFactory; -import org.hibernate.search.backend.elasticsearch.search.dsl.aggregation.ElasticsearchSearchAggregationFactory; -import org.hibernate.search.engine.search.dsl.aggregation.SearchAggregationFactory; -import org.hibernate.search.engine.search.dsl.aggregation.spi.DelegatingSearchAggregationFactory; -import org.hibernate.search.engine.search.dsl.aggregation.spi.SearchAggregationDslContext; +import org.hibernate.search.backend.elasticsearch.search.aggregation.dsl.ElasticsearchSearchAggregationFactory; +import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactory; +import org.hibernate.search.engine.search.aggregation.dsl.spi.DelegatingSearchAggregationFactory; +import org.hibernate.search.engine.search.aggregation.dsl.spi.SearchAggregationDslContext; public class ElasticsearchSearchAggregationFactoryImpl extends DelegatingSearchAggregationFactory diff --git a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/dsl/query/ElasticsearchSearchQueryOptionsStep.java b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/dsl/query/ElasticsearchSearchQueryOptionsStep.java index ecce996daf1..c0f815ad387 100644 --- a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/dsl/query/ElasticsearchSearchQueryOptionsStep.java +++ b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/dsl/query/ElasticsearchSearchQueryOptionsStep.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.backend.elasticsearch.search.dsl.query; -import org.hibernate.search.backend.elasticsearch.search.dsl.aggregation.ElasticsearchSearchAggregationFactory; +import org.hibernate.search.backend.elasticsearch.search.aggregation.dsl.ElasticsearchSearchAggregationFactory; import org.hibernate.search.backend.elasticsearch.search.dsl.sort.ElasticsearchSearchSortFactory; import org.hibernate.search.backend.elasticsearch.search.query.ElasticsearchSearchFetchable; import org.hibernate.search.backend.elasticsearch.search.query.ElasticsearchSearchQuery; diff --git a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/dsl/query/impl/ElasticsearchSearchQueryOptionsStepImpl.java b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/dsl/query/impl/ElasticsearchSearchQueryOptionsStepImpl.java index 88314d08104..35f27fac189 100644 --- a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/dsl/query/impl/ElasticsearchSearchQueryOptionsStepImpl.java +++ b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/dsl/query/impl/ElasticsearchSearchQueryOptionsStepImpl.java @@ -7,7 +7,7 @@ package org.hibernate.search.backend.elasticsearch.search.dsl.query.impl; import org.hibernate.search.backend.elasticsearch.ElasticsearchExtension; -import org.hibernate.search.backend.elasticsearch.search.dsl.aggregation.ElasticsearchSearchAggregationFactory; +import org.hibernate.search.backend.elasticsearch.search.aggregation.dsl.ElasticsearchSearchAggregationFactory; import org.hibernate.search.backend.elasticsearch.search.dsl.predicate.ElasticsearchSearchPredicateFactory; import org.hibernate.search.backend.elasticsearch.search.dsl.query.ElasticsearchSearchQueryOptionsStep; import org.hibernate.search.backend.elasticsearch.search.dsl.query.ElasticsearchSearchQueryPredicateStep; @@ -17,7 +17,7 @@ import org.hibernate.search.backend.elasticsearch.search.query.ElasticsearchSearchResult; import org.hibernate.search.backend.elasticsearch.scope.impl.ElasticsearchIndexScope; import org.hibernate.search.backend.elasticsearch.search.query.impl.ElasticsearchSearchQueryBuilder; -import org.hibernate.search.engine.search.dsl.aggregation.SearchAggregationFactory; +import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactory; import org.hibernate.search.engine.search.dsl.predicate.SearchPredicateFactory; import org.hibernate.search.engine.search.dsl.query.spi.AbstractExtendedSearchQueryOptionsStep; import org.hibernate.search.engine.search.dsl.sort.SearchSortFactory; diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/LuceneExtension.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/LuceneExtension.java index 5ab1e1a5984..0864daf39c5 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/LuceneExtension.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/LuceneExtension.java @@ -10,8 +10,8 @@ import java.util.Optional; import org.hibernate.search.backend.lucene.search.aggregation.impl.LuceneSearchAggregationBuilderFactory; -import org.hibernate.search.backend.lucene.search.dsl.aggregation.LuceneSearchAggregationFactory; -import org.hibernate.search.backend.lucene.search.dsl.aggregation.impl.LuceneSearchAggregationFactoryImpl; +import org.hibernate.search.backend.lucene.search.aggregation.dsl.LuceneSearchAggregationFactory; +import org.hibernate.search.backend.lucene.search.aggregation.dsl.impl.LuceneSearchAggregationFactoryImpl; import org.hibernate.search.backend.lucene.search.dsl.predicate.LuceneSearchPredicateFactory; import org.hibernate.search.backend.lucene.search.dsl.predicate.impl.LuceneSearchPredicateFactoryImpl; import org.hibernate.search.backend.lucene.search.dsl.projection.LuceneSearchProjectionFactory; @@ -31,9 +31,9 @@ import org.hibernate.search.backend.lucene.search.sort.impl.LuceneSearchSortBuilder; import org.hibernate.search.backend.lucene.search.sort.impl.LuceneSearchSortBuilderFactory; import org.hibernate.search.engine.mapper.session.context.spi.SessionContextImplementor; -import org.hibernate.search.engine.search.dsl.aggregation.SearchAggregationFactory; -import org.hibernate.search.engine.search.dsl.aggregation.SearchAggregationFactoryExtension; -import org.hibernate.search.engine.search.dsl.aggregation.spi.SearchAggregationDslContext; +import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactory; +import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactoryExtension; +import org.hibernate.search.engine.search.aggregation.dsl.spi.SearchAggregationDslContext; import org.hibernate.search.engine.search.dsl.predicate.SearchPredicateFactory; import org.hibernate.search.engine.search.dsl.predicate.SearchPredicateFactoryExtension; import org.hibernate.search.engine.search.dsl.projection.SearchProjectionFactory; diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/dsl/aggregation/LuceneSearchAggregationFactory.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/aggregation/dsl/LuceneSearchAggregationFactory.java similarity index 72% rename from backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/dsl/aggregation/LuceneSearchAggregationFactory.java rename to backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/aggregation/dsl/LuceneSearchAggregationFactory.java index 1b9e92e6d35..1972a14ee3c 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/dsl/aggregation/LuceneSearchAggregationFactory.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/aggregation/dsl/LuceneSearchAggregationFactory.java @@ -4,9 +4,9 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.backend.lucene.search.dsl.aggregation; +package org.hibernate.search.backend.lucene.search.aggregation.dsl; -import org.hibernate.search.engine.search.dsl.aggregation.SearchAggregationFactory; +import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactory; public interface LuceneSearchAggregationFactory extends SearchAggregationFactory { } diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/dsl/aggregation/impl/LuceneSearchAggregationFactoryImpl.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/aggregation/dsl/impl/LuceneSearchAggregationFactoryImpl.java similarity index 71% rename from backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/dsl/aggregation/impl/LuceneSearchAggregationFactoryImpl.java rename to backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/aggregation/dsl/impl/LuceneSearchAggregationFactoryImpl.java index a717f9a2e9a..a2dd68d1bc6 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/dsl/aggregation/impl/LuceneSearchAggregationFactoryImpl.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/aggregation/dsl/impl/LuceneSearchAggregationFactoryImpl.java @@ -4,13 +4,13 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.backend.lucene.search.dsl.aggregation.impl; +package org.hibernate.search.backend.lucene.search.aggregation.dsl.impl; import org.hibernate.search.backend.lucene.search.aggregation.impl.LuceneSearchAggregationBuilderFactory; -import org.hibernate.search.backend.lucene.search.dsl.aggregation.LuceneSearchAggregationFactory; -import org.hibernate.search.engine.search.dsl.aggregation.SearchAggregationFactory; -import org.hibernate.search.engine.search.dsl.aggregation.spi.DelegatingSearchAggregationFactory; -import org.hibernate.search.engine.search.dsl.aggregation.spi.SearchAggregationDslContext; +import org.hibernate.search.backend.lucene.search.aggregation.dsl.LuceneSearchAggregationFactory; +import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactory; +import org.hibernate.search.engine.search.aggregation.dsl.spi.DelegatingSearchAggregationFactory; +import org.hibernate.search.engine.search.aggregation.dsl.spi.SearchAggregationDslContext; public class LuceneSearchAggregationFactoryImpl extends DelegatingSearchAggregationFactory diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/dsl/query/LuceneSearchQueryOptionsStep.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/dsl/query/LuceneSearchQueryOptionsStep.java index 3533e4d4438..a2372fd0223 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/dsl/query/LuceneSearchQueryOptionsStep.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/dsl/query/LuceneSearchQueryOptionsStep.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.backend.lucene.search.dsl.query; -import org.hibernate.search.backend.lucene.search.dsl.aggregation.LuceneSearchAggregationFactory; +import org.hibernate.search.backend.lucene.search.aggregation.dsl.LuceneSearchAggregationFactory; import org.hibernate.search.backend.lucene.search.dsl.sort.LuceneSearchSortFactory; import org.hibernate.search.backend.lucene.search.query.LuceneSearchFetchable; import org.hibernate.search.backend.lucene.search.query.LuceneSearchQuery; diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/dsl/query/impl/LuceneSearchQueryOptionsStepImpl.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/dsl/query/impl/LuceneSearchQueryOptionsStepImpl.java index e7a96630dff..33fd2251e14 100644 --- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/dsl/query/impl/LuceneSearchQueryOptionsStepImpl.java +++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/dsl/query/impl/LuceneSearchQueryOptionsStepImpl.java @@ -7,7 +7,7 @@ package org.hibernate.search.backend.lucene.search.dsl.query.impl; import org.hibernate.search.backend.lucene.LuceneExtension; -import org.hibernate.search.backend.lucene.search.dsl.aggregation.LuceneSearchAggregationFactory; +import org.hibernate.search.backend.lucene.search.aggregation.dsl.LuceneSearchAggregationFactory; import org.hibernate.search.backend.lucene.search.dsl.predicate.LuceneSearchPredicateFactory; import org.hibernate.search.backend.lucene.search.dsl.query.LuceneSearchQueryOptionsStep; import org.hibernate.search.backend.lucene.search.dsl.query.LuceneSearchQueryPredicateStep; @@ -17,7 +17,7 @@ import org.hibernate.search.backend.lucene.search.query.LuceneSearchResult; import org.hibernate.search.backend.lucene.scope.impl.LuceneIndexScope; import org.hibernate.search.backend.lucene.search.query.impl.LuceneSearchQueryBuilder; -import org.hibernate.search.engine.search.dsl.aggregation.SearchAggregationFactory; +import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactory; import org.hibernate.search.engine.search.dsl.predicate.SearchPredicateFactory; import org.hibernate.search.engine.search.dsl.query.spi.AbstractExtendedSearchQueryOptionsStep; import org.hibernate.search.engine.search.dsl.sort.SearchSortFactory; diff --git a/engine/src/main/java/org/hibernate/search/engine/common/impl/MappedIndexScopeImpl.java b/engine/src/main/java/org/hibernate/search/engine/common/impl/MappedIndexScopeImpl.java index 42f4d57f7a2..0d9146a5310 100644 --- a/engine/src/main/java/org/hibernate/search/engine/common/impl/MappedIndexScopeImpl.java +++ b/engine/src/main/java/org/hibernate/search/engine/common/impl/MappedIndexScopeImpl.java @@ -8,9 +8,9 @@ import org.hibernate.search.engine.mapper.scope.spi.MappedIndexScope; import org.hibernate.search.engine.mapper.session.context.spi.SessionContextImplementor; -import org.hibernate.search.engine.search.dsl.aggregation.SearchAggregationFactory; -import org.hibernate.search.engine.search.dsl.aggregation.impl.DefaultSearchAggregationFactory; -import org.hibernate.search.engine.search.dsl.aggregation.impl.SearchAggregationDslContextImpl; +import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactory; +import org.hibernate.search.engine.search.aggregation.dsl.impl.DefaultSearchAggregationFactory; +import org.hibernate.search.engine.search.aggregation.dsl.impl.SearchAggregationDslContextImpl; import org.hibernate.search.engine.search.dsl.predicate.SearchPredicateFactory; import org.hibernate.search.engine.search.dsl.predicate.impl.DefaultSearchPredicateFactory; import org.hibernate.search.engine.search.dsl.projection.SearchProjectionFactory; diff --git a/engine/src/main/java/org/hibernate/search/engine/mapper/scope/spi/MappedIndexScope.java b/engine/src/main/java/org/hibernate/search/engine/mapper/scope/spi/MappedIndexScope.java index a6aefa52e39..953cf06650d 100644 --- a/engine/src/main/java/org/hibernate/search/engine/mapper/scope/spi/MappedIndexScope.java +++ b/engine/src/main/java/org/hibernate/search/engine/mapper/scope/spi/MappedIndexScope.java @@ -7,7 +7,7 @@ package org.hibernate.search.engine.mapper.scope.spi; import org.hibernate.search.engine.mapper.session.context.spi.SessionContextImplementor; -import org.hibernate.search.engine.search.dsl.aggregation.SearchAggregationFactory; +import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactory; import org.hibernate.search.engine.search.dsl.predicate.SearchPredicateFactory; import org.hibernate.search.engine.search.dsl.projection.SearchProjectionFactory; import org.hibernate.search.engine.search.dsl.query.SearchQueryHitTypeStep; diff --git a/engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/AggregationFinalStep.java b/engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/AggregationFinalStep.java similarity index 92% rename from engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/AggregationFinalStep.java rename to engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/AggregationFinalStep.java index 3b1f209bcac..aacae20615a 100644 --- a/engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/AggregationFinalStep.java +++ b/engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/AggregationFinalStep.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.engine.search.dsl.aggregation; +package org.hibernate.search.engine.search.aggregation.dsl; import org.hibernate.search.engine.search.aggregation.SearchAggregation; diff --git a/engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/BucketAggregationOptionsStep.java b/engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/BucketAggregationOptionsStep.java similarity index 93% rename from engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/BucketAggregationOptionsStep.java rename to engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/BucketAggregationOptionsStep.java index 6d3da1fb3a2..e9fec79e997 100644 --- a/engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/BucketAggregationOptionsStep.java +++ b/engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/BucketAggregationOptionsStep.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.engine.search.dsl.aggregation; +package org.hibernate.search.engine.search.aggregation.dsl; import java.util.Map; diff --git a/engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/CombinedAggregationOptionsStep.java b/engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/CombinedAggregationOptionsStep.java similarity index 88% rename from engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/CombinedAggregationOptionsStep.java rename to engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/CombinedAggregationOptionsStep.java index b950242ee33..24b5397505a 100644 --- a/engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/CombinedAggregationOptionsStep.java +++ b/engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/CombinedAggregationOptionsStep.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.engine.search.dsl.aggregation; +package org.hibernate.search.engine.search.aggregation.dsl; /** * The initial and final step in a combined aggregation definition, where optional parameters can be set. diff --git a/engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/RangeAggregationFieldStep.java b/engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/RangeAggregationFieldStep.java similarity index 95% rename from engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/RangeAggregationFieldStep.java rename to engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/RangeAggregationFieldStep.java index d5d3637043e..48b9c5cc17f 100644 --- a/engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/RangeAggregationFieldStep.java +++ b/engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/RangeAggregationFieldStep.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.engine.search.dsl.aggregation; +package org.hibernate.search.engine.search.aggregation.dsl; import org.hibernate.search.engine.search.common.ValueConvert; diff --git a/engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/RangeAggregationOptionsStep.java b/engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/RangeAggregationOptionsStep.java similarity index 89% rename from engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/RangeAggregationOptionsStep.java rename to engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/RangeAggregationOptionsStep.java index c4f9657f509..98337fc0fd9 100644 --- a/engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/RangeAggregationOptionsStep.java +++ b/engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/RangeAggregationOptionsStep.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.engine.search.dsl.aggregation; +package org.hibernate.search.engine.search.aggregation.dsl; /** diff --git a/engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/RangeAggregationRangeMoreStep.java b/engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/RangeAggregationRangeMoreStep.java similarity index 92% rename from engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/RangeAggregationRangeMoreStep.java rename to engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/RangeAggregationRangeMoreStep.java index 07f2e847cc6..82ab46c8bec 100644 --- a/engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/RangeAggregationRangeMoreStep.java +++ b/engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/RangeAggregationRangeMoreStep.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.engine.search.dsl.aggregation; +package org.hibernate.search.engine.search.aggregation.dsl; import java.util.Map; diff --git a/engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/RangeAggregationRangeStep.java b/engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/RangeAggregationRangeStep.java similarity index 95% rename from engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/RangeAggregationRangeStep.java rename to engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/RangeAggregationRangeStep.java index aeffb0932c9..9f0542f1c18 100644 --- a/engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/RangeAggregationRangeStep.java +++ b/engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/RangeAggregationRangeStep.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.engine.search.dsl.aggregation; +package org.hibernate.search.engine.search.aggregation.dsl; import java.util.Collection; diff --git a/engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/SearchAggregationFactory.java b/engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/SearchAggregationFactory.java similarity index 96% rename from engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/SearchAggregationFactory.java rename to engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/SearchAggregationFactory.java index a3050f3856b..8fc3212687a 100644 --- a/engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/SearchAggregationFactory.java +++ b/engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/SearchAggregationFactory.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.engine.search.dsl.aggregation; +package org.hibernate.search.engine.search.aggregation.dsl; import org.hibernate.search.util.common.SearchException; diff --git a/engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/SearchAggregationFactoryExtension.java b/engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/SearchAggregationFactoryExtension.java similarity index 90% rename from engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/SearchAggregationFactoryExtension.java rename to engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/SearchAggregationFactoryExtension.java index eb5945c5148..8151649038f 100644 --- a/engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/SearchAggregationFactoryExtension.java +++ b/engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/SearchAggregationFactoryExtension.java @@ -4,13 +4,13 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.engine.search.dsl.aggregation; +package org.hibernate.search.engine.search.aggregation.dsl; import java.util.Optional; -import org.hibernate.search.engine.search.dsl.aggregation.spi.DelegatingSearchAggregationFactory; -import org.hibernate.search.engine.search.dsl.aggregation.spi.SearchAggregationDslContext; +import org.hibernate.search.engine.search.aggregation.dsl.spi.DelegatingSearchAggregationFactory; +import org.hibernate.search.engine.search.aggregation.dsl.spi.SearchAggregationDslContext; /** * An extension to the search aggregation DSL, allowing the use of non-standard aggregations in a query. diff --git a/engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/TermsAggregationFieldStep.java b/engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/TermsAggregationFieldStep.java similarity index 95% rename from engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/TermsAggregationFieldStep.java rename to engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/TermsAggregationFieldStep.java index 07671aff311..b3bf6c0c98d 100644 --- a/engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/TermsAggregationFieldStep.java +++ b/engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/TermsAggregationFieldStep.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.engine.search.dsl.aggregation; +package org.hibernate.search.engine.search.aggregation.dsl; import java.util.Map; diff --git a/engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/TermsAggregationOptionsStep.java b/engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/TermsAggregationOptionsStep.java similarity index 97% rename from engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/TermsAggregationOptionsStep.java rename to engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/TermsAggregationOptionsStep.java index 92627eb0ae8..bbb09cfdad8 100644 --- a/engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/TermsAggregationOptionsStep.java +++ b/engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/TermsAggregationOptionsStep.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.engine.search.dsl.aggregation; +package org.hibernate.search.engine.search.aggregation.dsl; /** diff --git a/engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/impl/DefaultSearchAggregationFactory.java b/engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/impl/DefaultSearchAggregationFactory.java similarity index 74% rename from engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/impl/DefaultSearchAggregationFactory.java rename to engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/impl/DefaultSearchAggregationFactory.java index 21ed9333d0b..b83812a20db 100644 --- a/engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/impl/DefaultSearchAggregationFactory.java +++ b/engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/impl/DefaultSearchAggregationFactory.java @@ -4,14 +4,14 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.engine.search.dsl.aggregation.impl; +package org.hibernate.search.engine.search.aggregation.dsl.impl; import org.hibernate.search.engine.common.dsl.spi.DslExtensionState; -import org.hibernate.search.engine.search.dsl.aggregation.RangeAggregationFieldStep; -import org.hibernate.search.engine.search.dsl.aggregation.SearchAggregationFactory; -import org.hibernate.search.engine.search.dsl.aggregation.SearchAggregationFactoryExtension; -import org.hibernate.search.engine.search.dsl.aggregation.TermsAggregationFieldStep; -import org.hibernate.search.engine.search.dsl.aggregation.spi.SearchAggregationDslContext; +import org.hibernate.search.engine.search.aggregation.dsl.RangeAggregationFieldStep; +import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactory; +import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactoryExtension; +import org.hibernate.search.engine.search.aggregation.dsl.TermsAggregationFieldStep; +import org.hibernate.search.engine.search.aggregation.dsl.spi.SearchAggregationDslContext; public class DefaultSearchAggregationFactory implements SearchAggregationFactory { diff --git a/engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/impl/RangeAggregationFieldStepImpl.java b/engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/impl/RangeAggregationFieldStepImpl.java similarity index 82% rename from engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/impl/RangeAggregationFieldStepImpl.java rename to engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/impl/RangeAggregationFieldStepImpl.java index c3b560cc85b..011f1b7bb71 100644 --- a/engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/impl/RangeAggregationFieldStepImpl.java +++ b/engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/impl/RangeAggregationFieldStepImpl.java @@ -4,13 +4,13 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.engine.search.dsl.aggregation.impl; +package org.hibernate.search.engine.search.aggregation.dsl.impl; import org.hibernate.search.engine.search.aggregation.spi.RangeAggregationBuilder; import org.hibernate.search.engine.search.common.ValueConvert; -import org.hibernate.search.engine.search.dsl.aggregation.RangeAggregationFieldStep; -import org.hibernate.search.engine.search.dsl.aggregation.RangeAggregationRangeStep; -import org.hibernate.search.engine.search.dsl.aggregation.spi.SearchAggregationDslContext; +import org.hibernate.search.engine.search.aggregation.dsl.RangeAggregationFieldStep; +import org.hibernate.search.engine.search.aggregation.dsl.RangeAggregationRangeStep; +import org.hibernate.search.engine.search.aggregation.dsl.spi.SearchAggregationDslContext; import org.hibernate.search.util.common.impl.Contracts; class RangeAggregationFieldStepImpl implements RangeAggregationFieldStep { diff --git a/engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/impl/RangeAggregationRangeStepImpl.java b/engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/impl/RangeAggregationRangeStepImpl.java similarity index 87% rename from engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/impl/RangeAggregationRangeStepImpl.java rename to engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/impl/RangeAggregationRangeStepImpl.java index 4961419e86e..cbd60aae2c7 100644 --- a/engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/impl/RangeAggregationRangeStepImpl.java +++ b/engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/impl/RangeAggregationRangeStepImpl.java @@ -4,15 +4,15 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.engine.search.dsl.aggregation.impl; +package org.hibernate.search.engine.search.aggregation.dsl.impl; import java.util.Collection; import java.util.Map; import org.hibernate.search.engine.search.aggregation.SearchAggregation; import org.hibernate.search.engine.search.aggregation.spi.RangeAggregationBuilder; -import org.hibernate.search.engine.search.dsl.aggregation.RangeAggregationRangeMoreStep; -import org.hibernate.search.engine.search.dsl.aggregation.RangeAggregationRangeStep; +import org.hibernate.search.engine.search.aggregation.dsl.RangeAggregationRangeMoreStep; +import org.hibernate.search.engine.search.aggregation.dsl.RangeAggregationRangeStep; import org.hibernate.search.util.common.data.Range; import org.hibernate.search.util.common.impl.Contracts; diff --git a/engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/impl/SearchAggregationDslContextImpl.java b/engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/impl/SearchAggregationDslContextImpl.java similarity index 87% rename from engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/impl/SearchAggregationDslContextImpl.java rename to engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/impl/SearchAggregationDslContextImpl.java index 56e182dcd74..6efd1fa1980 100644 --- a/engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/impl/SearchAggregationDslContextImpl.java +++ b/engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/impl/SearchAggregationDslContextImpl.java @@ -4,10 +4,10 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.engine.search.dsl.aggregation.impl; +package org.hibernate.search.engine.search.aggregation.dsl.impl; import org.hibernate.search.engine.search.aggregation.spi.SearchAggregationBuilderFactory; -import org.hibernate.search.engine.search.dsl.aggregation.spi.SearchAggregationDslContext; +import org.hibernate.search.engine.search.aggregation.dsl.spi.SearchAggregationDslContext; public class SearchAggregationDslContextImpl> implements SearchAggregationDslContext { diff --git a/engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/impl/TermsAggregationFieldStepImpl.java b/engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/impl/TermsAggregationFieldStepImpl.java similarity index 82% rename from engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/impl/TermsAggregationFieldStepImpl.java rename to engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/impl/TermsAggregationFieldStepImpl.java index b42a02cb3de..e1753bd1fc0 100644 --- a/engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/impl/TermsAggregationFieldStepImpl.java +++ b/engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/impl/TermsAggregationFieldStepImpl.java @@ -4,15 +4,15 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.engine.search.dsl.aggregation.impl; +package org.hibernate.search.engine.search.aggregation.dsl.impl; import java.util.Map; import org.hibernate.search.engine.search.aggregation.spi.TermsAggregationBuilder; import org.hibernate.search.engine.search.common.ValueConvert; -import org.hibernate.search.engine.search.dsl.aggregation.TermsAggregationFieldStep; -import org.hibernate.search.engine.search.dsl.aggregation.TermsAggregationOptionsStep; -import org.hibernate.search.engine.search.dsl.aggregation.spi.SearchAggregationDslContext; +import org.hibernate.search.engine.search.aggregation.dsl.TermsAggregationFieldStep; +import org.hibernate.search.engine.search.aggregation.dsl.TermsAggregationOptionsStep; +import org.hibernate.search.engine.search.aggregation.dsl.spi.SearchAggregationDslContext; import org.hibernate.search.util.common.impl.Contracts; class TermsAggregationFieldStepImpl implements TermsAggregationFieldStep { diff --git a/engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/impl/TermsAggregationOptionsStepImpl.java b/engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/impl/TermsAggregationOptionsStepImpl.java similarity index 93% rename from engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/impl/TermsAggregationOptionsStepImpl.java rename to engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/impl/TermsAggregationOptionsStepImpl.java index 4bdab240c37..9f78d2808a6 100644 --- a/engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/impl/TermsAggregationOptionsStepImpl.java +++ b/engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/impl/TermsAggregationOptionsStepImpl.java @@ -4,13 +4,13 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.engine.search.dsl.aggregation.impl; +package org.hibernate.search.engine.search.aggregation.dsl.impl; import java.util.Map; import org.hibernate.search.engine.search.aggregation.SearchAggregation; import org.hibernate.search.engine.search.aggregation.spi.TermsAggregationBuilder; -import org.hibernate.search.engine.search.dsl.aggregation.TermsAggregationOptionsStep; +import org.hibernate.search.engine.search.aggregation.dsl.TermsAggregationOptionsStep; import org.hibernate.search.util.common.impl.Contracts; class TermsAggregationOptionsStepImpl implements TermsAggregationOptionsStep> { diff --git a/engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/spi/DelegatingSearchAggregationFactory.java b/engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/spi/DelegatingSearchAggregationFactory.java similarity index 77% rename from engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/spi/DelegatingSearchAggregationFactory.java rename to engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/spi/DelegatingSearchAggregationFactory.java index fc339ad99b0..2fdb27d2237 100644 --- a/engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/spi/DelegatingSearchAggregationFactory.java +++ b/engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/spi/DelegatingSearchAggregationFactory.java @@ -4,12 +4,12 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.engine.search.dsl.aggregation.spi; +package org.hibernate.search.engine.search.aggregation.dsl.spi; -import org.hibernate.search.engine.search.dsl.aggregation.RangeAggregationFieldStep; -import org.hibernate.search.engine.search.dsl.aggregation.SearchAggregationFactory; -import org.hibernate.search.engine.search.dsl.aggregation.SearchAggregationFactoryExtension; -import org.hibernate.search.engine.search.dsl.aggregation.TermsAggregationFieldStep; +import org.hibernate.search.engine.search.aggregation.dsl.RangeAggregationFieldStep; +import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactory; +import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactoryExtension; +import org.hibernate.search.engine.search.aggregation.dsl.TermsAggregationFieldStep; /** * A delegating {@link SearchAggregationFactory}. diff --git a/engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/spi/SearchAggregationDslContext.java b/engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/spi/SearchAggregationDslContext.java similarity index 91% rename from engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/spi/SearchAggregationDslContext.java rename to engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/spi/SearchAggregationDslContext.java index b9a6b1c8e0a..6f1697a3edb 100644 --- a/engine/src/main/java/org/hibernate/search/engine/search/dsl/aggregation/spi/SearchAggregationDslContext.java +++ b/engine/src/main/java/org/hibernate/search/engine/search/aggregation/dsl/spi/SearchAggregationDslContext.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.engine.search.dsl.aggregation.spi; +package org.hibernate.search.engine.search.aggregation.dsl.spi; import org.hibernate.search.engine.search.aggregation.spi.SearchAggregationBuilderFactory; diff --git a/engine/src/main/java/org/hibernate/search/engine/search/dsl/query/SearchQueryOptionsStep.java b/engine/src/main/java/org/hibernate/search/engine/search/dsl/query/SearchQueryOptionsStep.java index 6bd76ff16e8..19b619e467e 100644 --- a/engine/src/main/java/org/hibernate/search/engine/search/dsl/query/SearchQueryOptionsStep.java +++ b/engine/src/main/java/org/hibernate/search/engine/search/dsl/query/SearchQueryOptionsStep.java @@ -10,11 +10,11 @@ import java.util.Collection; import java.util.function.Function; -import org.hibernate.search.engine.search.dsl.aggregation.AggregationFinalStep; +import org.hibernate.search.engine.search.aggregation.dsl.AggregationFinalStep; import org.hibernate.search.engine.search.aggregation.AggregationKey; import org.hibernate.search.engine.search.aggregation.SearchAggregation; import org.hibernate.search.engine.search.SearchSort; -import org.hibernate.search.engine.search.dsl.aggregation.SearchAggregationFactory; +import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactory; import org.hibernate.search.engine.search.dsl.sort.SearchSortFactory; import org.hibernate.search.engine.search.dsl.sort.SortFinalStep; import org.hibernate.search.engine.search.query.SearchFetchable; diff --git a/engine/src/main/java/org/hibernate/search/engine/search/dsl/query/impl/DefaultSearchQueryOptionsStep.java b/engine/src/main/java/org/hibernate/search/engine/search/dsl/query/impl/DefaultSearchQueryOptionsStep.java index 4a66ede4785..054b2d6e4b1 100644 --- a/engine/src/main/java/org/hibernate/search/engine/search/dsl/query/impl/DefaultSearchQueryOptionsStep.java +++ b/engine/src/main/java/org/hibernate/search/engine/search/dsl/query/impl/DefaultSearchQueryOptionsStep.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.engine.search.dsl.query.impl; -import org.hibernate.search.engine.search.dsl.aggregation.SearchAggregationFactory; +import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactory; import org.hibernate.search.engine.search.dsl.predicate.SearchPredicateFactory; import org.hibernate.search.engine.search.dsl.query.SearchQueryOptionsStep; import org.hibernate.search.engine.search.dsl.query.SearchQueryPredicateStep; diff --git a/engine/src/main/java/org/hibernate/search/engine/search/dsl/query/spi/AbstractExtendedSearchQueryOptionsStep.java b/engine/src/main/java/org/hibernate/search/engine/search/dsl/query/spi/AbstractExtendedSearchQueryOptionsStep.java index 7aec2834d5a..7200cfbe440 100644 --- a/engine/src/main/java/org/hibernate/search/engine/search/dsl/query/spi/AbstractExtendedSearchQueryOptionsStep.java +++ b/engine/src/main/java/org/hibernate/search/engine/search/dsl/query/spi/AbstractExtendedSearchQueryOptionsStep.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.engine.search.dsl.query.spi; -import org.hibernate.search.engine.search.dsl.aggregation.SearchAggregationFactory; +import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactory; import org.hibernate.search.engine.search.dsl.predicate.SearchPredicateFactory; import org.hibernate.search.engine.search.dsl.query.SearchQueryOptionsStep; import org.hibernate.search.engine.search.dsl.sort.SearchSortFactory; diff --git a/engine/src/main/java/org/hibernate/search/engine/search/dsl/query/spi/AbstractSearchQueryOptionsStep.java b/engine/src/main/java/org/hibernate/search/engine/search/dsl/query/spi/AbstractSearchQueryOptionsStep.java index 0d877511e15..8aaa7526074 100644 --- a/engine/src/main/java/org/hibernate/search/engine/search/dsl/query/spi/AbstractSearchQueryOptionsStep.java +++ b/engine/src/main/java/org/hibernate/search/engine/search/dsl/query/spi/AbstractSearchQueryOptionsStep.java @@ -14,10 +14,10 @@ import org.hibernate.search.engine.search.SearchPredicate; import org.hibernate.search.engine.search.SearchSort; import org.hibernate.search.engine.search.aggregation.spi.SearchAggregationBuilderFactory; -import org.hibernate.search.engine.search.dsl.aggregation.AggregationFinalStep; -import org.hibernate.search.engine.search.dsl.aggregation.SearchAggregationFactory; -import org.hibernate.search.engine.search.dsl.aggregation.impl.DefaultSearchAggregationFactory; -import org.hibernate.search.engine.search.dsl.aggregation.impl.SearchAggregationDslContextImpl; +import org.hibernate.search.engine.search.aggregation.dsl.AggregationFinalStep; +import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactory; +import org.hibernate.search.engine.search.aggregation.dsl.impl.DefaultSearchAggregationFactory; +import org.hibernate.search.engine.search.aggregation.dsl.impl.SearchAggregationDslContextImpl; import org.hibernate.search.engine.search.dsl.predicate.SearchPredicateFactory; import org.hibernate.search.engine.search.dsl.predicate.PredicateFinalStep; import org.hibernate.search.engine.search.dsl.predicate.impl.DefaultSearchPredicateFactory; diff --git a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/aggregation/AggregationBaseIT.java b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/aggregation/AggregationBaseIT.java index 5e43e1a6498..c98fe2f8831 100644 --- a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/aggregation/AggregationBaseIT.java +++ b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/aggregation/AggregationBaseIT.java @@ -19,10 +19,10 @@ import org.hibernate.search.engine.backend.work.execution.spi.IndexWorkPlan; import org.hibernate.search.engine.search.DocumentReference; import org.hibernate.search.engine.search.aggregation.AggregationKey; -import org.hibernate.search.engine.search.dsl.aggregation.AggregationFinalStep; -import org.hibernate.search.engine.search.dsl.aggregation.SearchAggregationFactory; -import org.hibernate.search.engine.search.dsl.aggregation.SearchAggregationFactoryExtension; -import org.hibernate.search.engine.search.dsl.aggregation.spi.SearchAggregationDslContext; +import org.hibernate.search.engine.search.aggregation.dsl.AggregationFinalStep; +import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactory; +import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactoryExtension; +import org.hibernate.search.engine.search.aggregation.dsl.spi.SearchAggregationDslContext; import org.hibernate.search.engine.search.query.SearchQuery; import org.hibernate.search.integrationtest.backend.tck.testsupport.util.rule.SearchSetupHelper; import org.hibernate.search.util.common.SearchException; diff --git a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/aggregation/SingleFieldAggregationBaseIT.java b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/aggregation/SingleFieldAggregationBaseIT.java index c77a74e3e8a..a15408f07cd 100644 --- a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/aggregation/SingleFieldAggregationBaseIT.java +++ b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/aggregation/SingleFieldAggregationBaseIT.java @@ -33,8 +33,8 @@ import org.hibernate.search.engine.search.aggregation.AggregationKey; import org.hibernate.search.engine.search.aggregation.SearchAggregation; import org.hibernate.search.engine.search.common.ValueConvert; -import org.hibernate.search.engine.search.dsl.aggregation.AggregationFinalStep; -import org.hibernate.search.engine.search.dsl.aggregation.SearchAggregationFactory; +import org.hibernate.search.engine.search.aggregation.dsl.AggregationFinalStep; +import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactory; import org.hibernate.search.engine.search.dsl.predicate.PredicateFinalStep; import org.hibernate.search.engine.search.dsl.predicate.SearchPredicateFactory; import org.hibernate.search.integrationtest.backend.tck.testsupport.operations.AggregationDescriptor; diff --git a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/testsupport/operations/RangeAggregationDescriptor.java b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/testsupport/operations/RangeAggregationDescriptor.java index 5a208751d42..13ad0363a5e 100644 --- a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/testsupport/operations/RangeAggregationDescriptor.java +++ b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/testsupport/operations/RangeAggregationDescriptor.java @@ -15,8 +15,8 @@ import java.util.Map; import org.hibernate.search.engine.search.common.ValueConvert; -import org.hibernate.search.engine.search.dsl.aggregation.AggregationFinalStep; -import org.hibernate.search.engine.search.dsl.aggregation.SearchAggregationFactory; +import org.hibernate.search.engine.search.aggregation.dsl.AggregationFinalStep; +import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactory; import org.hibernate.search.engine.spatial.GeoPoint; import org.hibernate.search.integrationtest.backend.tck.testsupport.operations.expectations.AggregationScenario; import org.hibernate.search.integrationtest.backend.tck.testsupport.operations.expectations.SupportedSingleFieldAggregationExpectations; diff --git a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/testsupport/operations/TermsAggregationDescriptor.java b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/testsupport/operations/TermsAggregationDescriptor.java index 49e30680d77..43527fcc4da 100644 --- a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/testsupport/operations/TermsAggregationDescriptor.java +++ b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/testsupport/operations/TermsAggregationDescriptor.java @@ -16,8 +16,8 @@ import java.util.Map; import org.hibernate.search.engine.search.common.ValueConvert; -import org.hibernate.search.engine.search.dsl.aggregation.AggregationFinalStep; -import org.hibernate.search.engine.search.dsl.aggregation.SearchAggregationFactory; +import org.hibernate.search.engine.search.aggregation.dsl.AggregationFinalStep; +import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactory; import org.hibernate.search.engine.spatial.GeoPoint; import org.hibernate.search.integrationtest.backend.tck.testsupport.operations.expectations.AggregationScenario; import org.hibernate.search.integrationtest.backend.tck.testsupport.operations.expectations.SupportedSingleFieldAggregationExpectations; diff --git a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/testsupport/operations/expectations/AggregationScenario.java b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/testsupport/operations/expectations/AggregationScenario.java index 48991276f21..ac2a8a58e64 100644 --- a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/testsupport/operations/expectations/AggregationScenario.java +++ b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/testsupport/operations/expectations/AggregationScenario.java @@ -7,8 +7,8 @@ package org.hibernate.search.integrationtest.backend.tck.testsupport.operations.expectations; import org.hibernate.search.engine.search.common.ValueConvert; -import org.hibernate.search.engine.search.dsl.aggregation.AggregationFinalStep; -import org.hibernate.search.engine.search.dsl.aggregation.SearchAggregationFactory; +import org.hibernate.search.engine.search.aggregation.dsl.AggregationFinalStep; +import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactory; public interface AggregationScenario { diff --git a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/testsupport/operations/expectations/UnsupportedSingleFieldAggregationExpectations.java b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/testsupport/operations/expectations/UnsupportedSingleFieldAggregationExpectations.java index ca77e57c8f8..3dcf639c8d2 100644 --- a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/testsupport/operations/expectations/UnsupportedSingleFieldAggregationExpectations.java +++ b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/testsupport/operations/expectations/UnsupportedSingleFieldAggregationExpectations.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.integrationtest.backend.tck.testsupport.operations.expectations; -import org.hibernate.search.engine.search.dsl.aggregation.SearchAggregationFactory; +import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactory; public interface UnsupportedSingleFieldAggregationExpectations { diff --git a/mapper/javabean/src/main/java/org/hibernate/search/mapper/javabean/scope/SearchScope.java b/mapper/javabean/src/main/java/org/hibernate/search/mapper/javabean/scope/SearchScope.java index 4011f233486..f8d49d2640d 100644 --- a/mapper/javabean/src/main/java/org/hibernate/search/mapper/javabean/scope/SearchScope.java +++ b/mapper/javabean/src/main/java/org/hibernate/search/mapper/javabean/scope/SearchScope.java @@ -10,7 +10,7 @@ import org.hibernate.search.engine.search.aggregation.AggregationKey; import org.hibernate.search.engine.search.aggregation.SearchAggregation; -import org.hibernate.search.engine.search.dsl.aggregation.SearchAggregationFactory; +import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactory; import org.hibernate.search.engine.search.dsl.predicate.SearchPredicateFactory; import org.hibernate.search.engine.search.dsl.projection.SearchProjectionFactory; import org.hibernate.search.engine.search.dsl.query.SearchQueryOptionsStep; diff --git a/mapper/javabean/src/main/java/org/hibernate/search/mapper/javabean/scope/impl/SearchScopeImpl.java b/mapper/javabean/src/main/java/org/hibernate/search/mapper/javabean/scope/impl/SearchScopeImpl.java index 976d0878bcb..cf1b0cb699d 100644 --- a/mapper/javabean/src/main/java/org/hibernate/search/mapper/javabean/scope/impl/SearchScopeImpl.java +++ b/mapper/javabean/src/main/java/org/hibernate/search/mapper/javabean/scope/impl/SearchScopeImpl.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.mapper.javabean.scope.impl; -import org.hibernate.search.engine.search.dsl.aggregation.SearchAggregationFactory; +import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactory; import org.hibernate.search.engine.search.dsl.predicate.SearchPredicateFactory; import org.hibernate.search.engine.search.dsl.projection.SearchProjectionFactory; import org.hibernate.search.engine.search.dsl.query.SearchQueryHitTypeStep; diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/scope/SearchScope.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/scope/SearchScope.java index 917e796d3df..3306cac23a3 100644 --- a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/scope/SearchScope.java +++ b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/scope/SearchScope.java @@ -10,7 +10,7 @@ import org.hibernate.search.engine.search.aggregation.AggregationKey; import org.hibernate.search.engine.search.aggregation.SearchAggregation; -import org.hibernate.search.engine.search.dsl.aggregation.SearchAggregationFactory; +import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactory; import org.hibernate.search.engine.search.dsl.predicate.SearchPredicateFactory; import org.hibernate.search.engine.search.dsl.projection.SearchProjectionFactory; import org.hibernate.search.engine.search.dsl.query.SearchQueryOptionsStep; diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/scope/impl/SearchScopeImpl.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/scope/impl/SearchScopeImpl.java index 1c1e9b3ec9c..32102032d6d 100644 --- a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/scope/impl/SearchScopeImpl.java +++ b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/scope/impl/SearchScopeImpl.java @@ -6,7 +6,7 @@ */ package org.hibernate.search.mapper.orm.scope.impl; -import org.hibernate.search.engine.search.dsl.aggregation.SearchAggregationFactory; +import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactory; import org.hibernate.search.engine.search.dsl.predicate.SearchPredicateFactory; import org.hibernate.search.engine.search.dsl.projection.SearchProjectionFactory; import org.hibernate.search.engine.search.dsl.sort.SearchSortFactory; diff --git a/mapper/pojo/src/main/java/org/hibernate/search/mapper/pojo/scope/impl/PojoScopeDelegateImpl.java b/mapper/pojo/src/main/java/org/hibernate/search/mapper/pojo/scope/impl/PojoScopeDelegateImpl.java index 23c5c11846a..ed0cfa51b21 100644 --- a/mapper/pojo/src/main/java/org/hibernate/search/mapper/pojo/scope/impl/PojoScopeDelegateImpl.java +++ b/mapper/pojo/src/main/java/org/hibernate/search/mapper/pojo/scope/impl/PojoScopeDelegateImpl.java @@ -17,7 +17,7 @@ import org.hibernate.search.engine.mapper.scope.spi.MappedIndexScope; import org.hibernate.search.engine.mapper.scope.spi.MappedIndexScopeBuilder; import org.hibernate.search.engine.mapper.session.context.spi.DetachedSessionContextImplementor; -import org.hibernate.search.engine.search.dsl.aggregation.SearchAggregationFactory; +import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactory; import org.hibernate.search.engine.search.dsl.projection.SearchProjectionFactory; import org.hibernate.search.engine.search.dsl.query.SearchQueryHitTypeStep; import org.hibernate.search.engine.search.loading.context.spi.LoadingContextBuilder; diff --git a/mapper/pojo/src/main/java/org/hibernate/search/mapper/pojo/scope/spi/PojoScopeDelegate.java b/mapper/pojo/src/main/java/org/hibernate/search/mapper/pojo/scope/spi/PojoScopeDelegate.java index 1642112f523..dc7e43ee0cd 100644 --- a/mapper/pojo/src/main/java/org/hibernate/search/mapper/pojo/scope/spi/PojoScopeDelegate.java +++ b/mapper/pojo/src/main/java/org/hibernate/search/mapper/pojo/scope/spi/PojoScopeDelegate.java @@ -8,7 +8,7 @@ import java.util.Set; -import org.hibernate.search.engine.search.dsl.aggregation.SearchAggregationFactory; +import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactory; import org.hibernate.search.engine.search.dsl.predicate.SearchPredicateFactory; import org.hibernate.search.engine.search.dsl.projection.SearchProjectionFactory; import org.hibernate.search.engine.search.dsl.query.SearchQueryHitTypeStep; diff --git a/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/mapper/GenericStubMappingScope.java b/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/mapper/GenericStubMappingScope.java index 2e0e45f4bb1..26205d2aa46 100644 --- a/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/mapper/GenericStubMappingScope.java +++ b/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/mapper/GenericStubMappingScope.java @@ -7,7 +7,7 @@ package org.hibernate.search.util.impl.integrationtest.common.stub.mapper; import org.hibernate.search.engine.mapper.scope.spi.MappedIndexScope; -import org.hibernate.search.engine.search.dsl.aggregation.SearchAggregationFactory; +import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactory; import org.hibernate.search.engine.search.dsl.predicate.SearchPredicateFactory; import org.hibernate.search.engine.search.dsl.projection.SearchProjectionFactory; import org.hibernate.search.engine.search.dsl.query.SearchQueryHitTypeStep;