Skip to content

Commit e34f809

Browse files
marko-bekhtamarko-bekhta
committed
HSEARCH-**** Attempt to make the migration simpler
1 parent 4e3daa1 commit e34f809

File tree

376 files changed

+4455
-2672
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

376 files changed

+4455
-2672
lines changed

‎backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/ElasticsearchExtension.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,21 @@
2222
import org.hibernate.search.engine.backend.types.dsl.IndexFieldTypeFactoryExtension;
2323
import org.hibernate.search.engine.common.schema.management.SchemaExport;
2424
import org.hibernate.search.engine.common.schema.management.SchemaExportExtension;
25-
import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactory;
2625
import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactoryExtension;
26+
import org.hibernate.search.engine.search.aggregation.dsl.TypedSearchAggregationFactory;
2727
import org.hibernate.search.engine.search.loading.spi.SearchLoadingContext;
2828
import org.hibernate.search.engine.search.loading.spi.SearchLoadingContextBuilder;
29-
import org.hibernate.search.engine.search.predicate.dsl.SearchPredicateFactory;
3029
import org.hibernate.search.engine.search.predicate.dsl.SearchPredicateFactoryExtension;
31-
import org.hibernate.search.engine.search.projection.dsl.SearchProjectionFactory;
30+
import org.hibernate.search.engine.search.predicate.dsl.TypedSearchPredicateFactory;
3231
import org.hibernate.search.engine.search.projection.dsl.SearchProjectionFactoryExtension;
32+
import org.hibernate.search.engine.search.projection.dsl.TypedSearchProjectionFactory;
3333
import org.hibernate.search.engine.search.query.SearchQuery;
3434
import org.hibernate.search.engine.search.query.SearchQueryExtension;
3535
import org.hibernate.search.engine.search.query.dsl.SearchQueryDslExtension;
3636
import org.hibernate.search.engine.search.query.dsl.SearchQuerySelectStep;
3737
import org.hibernate.search.engine.search.query.spi.SearchQueryIndexScope;
38-
import org.hibernate.search.engine.search.sort.dsl.SearchSortFactory;
3938
import org.hibernate.search.engine.search.sort.dsl.SearchSortFactoryExtension;
39+
import org.hibernate.search.engine.search.sort.dsl.TypedSearchSortFactory;
4040

4141
/**
4242
* An extension for the Elasticsearch backend, giving access to Elasticsearch-specific features.
@@ -137,7 +137,7 @@ public Optional<ElasticsearchSearchQuery<H>> extendOptional(SearchQuery<H> origi
137137
* {@inheritDoc}
138138
*/
139139
@Override
140-
public Optional<ElasticsearchSearchPredicateFactory<SR>> extendOptional(SearchPredicateFactory<SR> original) {
140+
public Optional<ElasticsearchSearchPredicateFactory<SR>> extendOptional(TypedSearchPredicateFactory<SR> original) {
141141
if ( original instanceof ElasticsearchSearchPredicateFactory ) {
142142
return Optional.of( (ElasticsearchSearchPredicateFactory<SR>) original );
143143
}
@@ -151,7 +151,7 @@ public Optional<ElasticsearchSearchPredicateFactory<SR>> extendOptional(SearchPr
151151
*/
152152
@Override
153153
public Optional<ElasticsearchSearchSortFactory<SR>> extendOptional(
154-
SearchSortFactory<SR> original) {
154+
TypedSearchSortFactory<SR> original) {
155155
if ( original instanceof ElasticsearchSearchSortFactory ) {
156156
return Optional.of( (ElasticsearchSearchSortFactory<SR>) original );
157157
}
@@ -164,7 +164,8 @@ public Optional<ElasticsearchSearchSortFactory<SR>> extendOptional(
164164
* {@inheritDoc}
165165
*/
166166
@Override
167-
public Optional<ElasticsearchSearchProjectionFactory<SR, R, E>> extendOptional(SearchProjectionFactory<SR, R, E> original) {
167+
public Optional<ElasticsearchSearchProjectionFactory<SR, R, E>> extendOptional(
168+
TypedSearchProjectionFactory<SR, R, E> original) {
168169
if ( original instanceof ElasticsearchSearchProjectionFactory ) {
169170
return Optional.of( (ElasticsearchSearchProjectionFactory<SR, R, E>) original );
170171
}
@@ -178,7 +179,7 @@ public Optional<ElasticsearchSearchProjectionFactory<SR, R, E>> extendOptional(S
178179
*/
179180
@Override
180181
public Optional<ElasticsearchSearchAggregationFactory<SR>> extendOptional(
181-
SearchAggregationFactory<SR> original) {
182+
TypedSearchAggregationFactory<SR> original) {
182183
if ( original instanceof ElasticsearchSearchAggregationFactory ) {
183184
return Optional.of( (ElasticsearchSearchAggregationFactory<SR>) original );
184185
}

‎backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/predicate/impl/ElasticsearchNamedPredicate.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import org.hibernate.search.engine.search.common.spi.SearchQueryElementFactory;
1515
import org.hibernate.search.engine.search.predicate.SearchPredicate;
1616
import org.hibernate.search.engine.search.predicate.definition.PredicateDefinition;
17-
import org.hibernate.search.engine.search.predicate.dsl.SearchPredicateFactory;
17+
import org.hibernate.search.engine.search.predicate.dsl.TypedSearchPredicateFactory;
1818
import org.hibernate.search.engine.search.predicate.spi.NamedPredicateBuilder;
1919
import org.hibernate.search.engine.search.predicate.spi.NamedValuesBasedPredicateDefinitionContext;
2020

@@ -71,7 +71,7 @@ private static class Builder extends AbstractBuilder implements NamedPredicateBu
7171
private final PredicateDefinition definition;
7272
private final String predicateName;
7373
private final ElasticsearchSearchIndexCompositeNodeContext field;
74-
private SearchPredicateFactory<?> factory;
74+
private TypedSearchPredicateFactory<?> factory;
7575
private final Map<String, Object> params = new LinkedHashMap<>();
7676

7777
Builder(PredicateDefinition definition, String predicateName,
@@ -84,7 +84,7 @@ private static class Builder extends AbstractBuilder implements NamedPredicateBu
8484
}
8585

8686
@Override
87-
public void factory(SearchPredicateFactory<?> factory) {
87+
public void factory(TypedSearchPredicateFactory<?> factory) {
8888
this.factory = factory;
8989
}
9090

‎backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/projection/dsl/ElasticsearchSearchProjectionFactory.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import org.hibernate.search.engine.search.projection.dsl.ExtendedSearchProjectionFactory;
88
import org.hibernate.search.engine.search.projection.dsl.ProjectionFinalStep;
9-
import org.hibernate.search.engine.search.projection.dsl.SearchProjectionFactory;
9+
import org.hibernate.search.engine.search.projection.dsl.TypedSearchProjectionFactory;
1010

1111
import com.google.gson.JsonObject;
1212

@@ -16,7 +16,7 @@
1616
* @param <SR> Scope root type.
1717
* @param <R> The type of entity references.
1818
* @param <E> The type of entities.
19-
* @see SearchProjectionFactory
19+
* @see TypedSearchProjectionFactory
2020
*/
2121
public interface ElasticsearchSearchProjectionFactory<SR, R, E>
2222
extends ExtendedSearchProjectionFactory<SR, ElasticsearchSearchProjectionFactory<SR, R, E>, R, E> {

‎backend/lucene/src/main/java/org/hibernate/search/backend/lucene/LuceneExtension.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,21 @@
2525
import org.hibernate.search.engine.backend.types.dsl.IndexFieldTypeFactoryExtension;
2626
import org.hibernate.search.engine.common.schema.management.SchemaExport;
2727
import org.hibernate.search.engine.common.schema.management.SchemaExportExtension;
28-
import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactory;
2928
import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactoryExtension;
29+
import org.hibernate.search.engine.search.aggregation.dsl.TypedSearchAggregationFactory;
3030
import org.hibernate.search.engine.search.loading.spi.SearchLoadingContext;
3131
import org.hibernate.search.engine.search.loading.spi.SearchLoadingContextBuilder;
32-
import org.hibernate.search.engine.search.predicate.dsl.SearchPredicateFactory;
3332
import org.hibernate.search.engine.search.predicate.dsl.SearchPredicateFactoryExtension;
34-
import org.hibernate.search.engine.search.projection.dsl.SearchProjectionFactory;
33+
import org.hibernate.search.engine.search.predicate.dsl.TypedSearchPredicateFactory;
3534
import org.hibernate.search.engine.search.projection.dsl.SearchProjectionFactoryExtension;
35+
import org.hibernate.search.engine.search.projection.dsl.TypedSearchProjectionFactory;
3636
import org.hibernate.search.engine.search.query.SearchQuery;
3737
import org.hibernate.search.engine.search.query.SearchQueryExtension;
3838
import org.hibernate.search.engine.search.query.dsl.SearchQueryDslExtension;
3939
import org.hibernate.search.engine.search.query.dsl.SearchQuerySelectStep;
4040
import org.hibernate.search.engine.search.query.spi.SearchQueryIndexScope;
41-
import org.hibernate.search.engine.search.sort.dsl.SearchSortFactory;
4241
import org.hibernate.search.engine.search.sort.dsl.SearchSortFactoryExtension;
42+
import org.hibernate.search.engine.search.sort.dsl.TypedSearchSortFactory;
4343

4444
/**
4545
* An extension for the Lucene backend, giving access to Lucene-specific features.
@@ -140,7 +140,7 @@ public Optional<LuceneSearchQuery<H>> extendOptional(SearchQuery<H> original,
140140
* {@inheritDoc}
141141
*/
142142
@Override
143-
public Optional<LuceneSearchPredicateFactory<SR>> extendOptional(SearchPredicateFactory<SR> original) {
143+
public Optional<LuceneSearchPredicateFactory<SR>> extendOptional(TypedSearchPredicateFactory<SR> original) {
144144
if ( original instanceof LuceneSearchPredicateFactory ) {
145145
return Optional.of( (LuceneSearchPredicateFactory<SR>) original );
146146
}
@@ -154,7 +154,7 @@ public Optional<LuceneSearchPredicateFactory<SR>> extendOptional(SearchPredicate
154154
*/
155155
@Override
156156
public Optional<LuceneSearchSortFactory<SR>> extendOptional(
157-
SearchSortFactory<SR> original) {
157+
TypedSearchSortFactory<SR> original) {
158158
if ( original instanceof LuceneSearchSortFactory ) {
159159
return Optional.of( (LuceneSearchSortFactory<SR>) original );
160160
}
@@ -167,7 +167,7 @@ public Optional<LuceneSearchSortFactory<SR>> extendOptional(
167167
* {@inheritDoc}
168168
*/
169169
@Override
170-
public Optional<LuceneSearchProjectionFactory<SR, R, E>> extendOptional(SearchProjectionFactory<SR, R, E> original) {
170+
public Optional<LuceneSearchProjectionFactory<SR, R, E>> extendOptional(TypedSearchProjectionFactory<SR, R, E> original) {
171171
if ( original instanceof LuceneSearchProjectionFactory ) {
172172
return Optional.of( (LuceneSearchProjectionFactory<SR, R, E>) original );
173173
}
@@ -180,7 +180,7 @@ public Optional<LuceneSearchProjectionFactory<SR, R, E>> extendOptional(SearchPr
180180
* {@inheritDoc}
181181
*/
182182
@Override
183-
public Optional<LuceneSearchAggregationFactory<SR>> extendOptional(SearchAggregationFactory<SR> original) {
183+
public Optional<LuceneSearchAggregationFactory<SR>> extendOptional(TypedSearchAggregationFactory<SR> original) {
184184
if ( original instanceof LuceneSearchAggregationFactory ) {
185185
return Optional.of( (LuceneSearchAggregationFactory<SR>) original );
186186
}

‎backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/predicate/impl/LuceneNamedPredicate.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import org.hibernate.search.engine.search.common.spi.SearchQueryElementFactory;
1515
import org.hibernate.search.engine.search.predicate.SearchPredicate;
1616
import org.hibernate.search.engine.search.predicate.definition.PredicateDefinition;
17-
import org.hibernate.search.engine.search.predicate.dsl.SearchPredicateFactory;
17+
import org.hibernate.search.engine.search.predicate.dsl.TypedSearchPredicateFactory;
1818
import org.hibernate.search.engine.search.predicate.spi.NamedPredicateBuilder;
1919
import org.hibernate.search.engine.search.predicate.spi.NamedValuesBasedPredicateDefinitionContext;
2020

@@ -70,7 +70,7 @@ private static class Builder extends AbstractBuilder implements NamedPredicateBu
7070
private final PredicateDefinition definition;
7171
private final String predicateName;
7272
private final LuceneSearchIndexCompositeNodeContext field;
73-
private SearchPredicateFactory<?> factory;
73+
private TypedSearchPredicateFactory<?> factory;
7474
private final Map<String, Object> params = new LinkedHashMap<>();
7575

7676
Builder(PredicateDefinition definition, String predicateName, LuceneSearchIndexScope<?> scope,
@@ -82,7 +82,7 @@ private static class Builder extends AbstractBuilder implements NamedPredicateBu
8282
}
8383

8484
@Override
85-
public void factory(SearchPredicateFactory<?> factory) {
85+
public void factory(TypedSearchPredicateFactory<?> factory) {
8686
this.factory = factory;
8787
}
8888

‎backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/projection/dsl/LuceneSearchProjectionFactory.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import org.hibernate.search.engine.search.projection.dsl.ExtendedSearchProjectionFactory;
88
import org.hibernate.search.engine.search.projection.dsl.ProjectionFinalStep;
9-
import org.hibernate.search.engine.search.projection.dsl.SearchProjectionFactory;
9+
import org.hibernate.search.engine.search.projection.dsl.TypedSearchProjectionFactory;
1010
import org.hibernate.search.util.common.annotation.Incubating;
1111

1212
import org.apache.lucene.document.Document;
@@ -18,7 +18,7 @@
1818
* @param <SR> Scope root type.
1919
* @param <R> The type of entity references.
2020
* @param <E> The type of entities.
21-
* @see SearchProjectionFactory
21+
* @see TypedSearchProjectionFactory
2222
*/
2323
public interface LuceneSearchProjectionFactory<SR, R, E>
2424
extends ExtendedSearchProjectionFactory<SR, LuceneSearchProjectionFactory<SR, R, E>, R, E> {

‎documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/binding/namedpredicate/SkuIdentifierBinder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import org.hibernate.search.engine.search.predicate.SearchPredicate;
1313
import org.hibernate.search.engine.search.predicate.definition.PredicateDefinition;
1414
import org.hibernate.search.engine.search.predicate.definition.PredicateDefinitionContext;
15-
import org.hibernate.search.engine.search.predicate.dsl.SearchPredicateFactory;
15+
import org.hibernate.search.engine.search.predicate.dsl.TypedSearchPredicateFactory;
1616
import org.hibernate.search.mapper.pojo.bridge.PropertyBridge;
1717
import org.hibernate.search.mapper.pojo.bridge.binding.PropertyBindingContext;
1818
import org.hibernate.search.mapper.pojo.bridge.mapping.programmatic.PropertyBinder;
@@ -89,7 +89,7 @@ public void write(DocumentElement target, String skuId, PropertyBridgeWriteConte
8989
private static class SkuIdentifierMatchPredicateDefinition implements PredicateDefinition { // <1>
9090
@Override
9191
public SearchPredicate create(PredicateDefinitionContext<?> context) {
92-
SearchPredicateFactory<?> f = context.predicate(); // <2>
92+
TypedSearchPredicateFactory<?> f = context.predicate(); // <2>
9393

9494
String pattern = context.params().get( "pattern", String.class ); // <3>
9595

‎documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/binding/projectionbinder/constructorparameter/MyFieldProjectionBinder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.hibernate.search.engine.search.projection.SearchProjection;
88
import org.hibernate.search.engine.search.projection.definition.ProjectionDefinition;
99
import org.hibernate.search.engine.search.projection.definition.ProjectionDefinitionContext;
10-
import org.hibernate.search.engine.search.projection.dsl.SearchProjectionFactory;
10+
import org.hibernate.search.engine.search.projection.dsl.TypedSearchProjectionFactory;
1111
import org.hibernate.search.mapper.pojo.search.definition.binding.ProjectionBinder;
1212
import org.hibernate.search.mapper.pojo.search.definition.binding.ProjectionBindingContext;
1313

@@ -31,7 +31,7 @@ private MyProjectionDefinition(String fieldName) {
3131
}
3232

3333
@Override
34-
public SearchProjection<String> create(SearchProjectionFactory<?, ?, ?> factory,
34+
public SearchProjection<String> create(TypedSearchProjectionFactory<?, ?, ?> factory,
3535
ProjectionDefinitionContext context) {
3636
return factory.field( fieldName, String.class ) // <3>
3737
.toProjection();

‎documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/binding/projectionbinder/multi/MyFieldProjectionBinder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import org.hibernate.search.engine.search.projection.SearchProjection;
1212
import org.hibernate.search.engine.search.projection.definition.ProjectionDefinition;
1313
import org.hibernate.search.engine.search.projection.definition.ProjectionDefinitionContext;
14-
import org.hibernate.search.engine.search.projection.dsl.SearchProjectionFactory;
14+
import org.hibernate.search.engine.search.projection.dsl.TypedSearchProjectionFactory;
1515
import org.hibernate.search.mapper.pojo.model.PojoModelValue;
1616
import org.hibernate.search.mapper.pojo.search.definition.binding.ProjectionBinder;
1717
import org.hibernate.search.mapper.pojo.search.definition.binding.ProjectionBindingContext;
@@ -32,7 +32,7 @@ public void bind(ProjectionBindingContext context) {
3232
private static class MyProjectionDefinition
3333
implements ProjectionDefinition<List<String>> { // <4>
3434
@Override
35-
public SearchProjection<List<String>> create(SearchProjectionFactory<?, ?, ?> factory,
35+
public SearchProjection<List<String>> create(TypedSearchProjectionFactory<?, ?, ?> factory,
3636
ProjectionDefinitionContext context) {
3737
return factory.field( "tags", String.class )
3838
.collector( ProjectionCollector.list() ) // <4>

‎documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/binding/projectionbinder/param/annotation/MyFieldProjectionBinder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.hibernate.search.engine.search.projection.SearchProjection;
88
import org.hibernate.search.engine.search.projection.definition.ProjectionDefinition;
99
import org.hibernate.search.engine.search.projection.definition.ProjectionDefinitionContext;
10-
import org.hibernate.search.engine.search.projection.dsl.SearchProjectionFactory;
10+
import org.hibernate.search.engine.search.projection.dsl.TypedSearchProjectionFactory;
1111
import org.hibernate.search.mapper.pojo.search.definition.binding.ProjectionBinder;
1212
import org.hibernate.search.mapper.pojo.search.definition.binding.ProjectionBindingContext;
1313

@@ -39,7 +39,7 @@ public MyProjectionDefinition(String fieldName) { // <2>
3939
}
4040

4141
@Override
42-
public SearchProjection<String> create(SearchProjectionFactory<?, ?, ?> factory,
42+
public SearchProjection<String> create(TypedSearchProjectionFactory<?, ?, ?> factory,
4343
ProjectionDefinitionContext context) {
4444
return factory.field( fieldName, String.class ) // <3>
4545
.toProjection();

‎documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/binding/projectionbinder/param/string/MyFieldProjectionBinder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.hibernate.search.engine.search.projection.SearchProjection;
88
import org.hibernate.search.engine.search.projection.definition.ProjectionDefinition;
99
import org.hibernate.search.engine.search.projection.definition.ProjectionDefinitionContext;
10-
import org.hibernate.search.engine.search.projection.dsl.SearchProjectionFactory;
10+
import org.hibernate.search.engine.search.projection.dsl.TypedSearchProjectionFactory;
1111
import org.hibernate.search.mapper.pojo.search.definition.binding.ProjectionBinder;
1212
import org.hibernate.search.mapper.pojo.search.definition.binding.ProjectionBindingContext;
1313

@@ -32,7 +32,7 @@ public MyProjectionDefinition(String fieldName) { // <2>
3232
}
3333

3434
@Override
35-
public SearchProjection<String> create(SearchProjectionFactory<?, ?, ?> factory,
35+
public SearchProjection<String> create(TypedSearchProjectionFactory<?, ?, ?> factory,
3636
ProjectionDefinitionContext context) {
3737
return factory.field( fieldName, String.class ) // <3>
3838
.toProjection();

‎documentation/src/test/java/org/hibernate/search/documentation/mapper/orm/binding/projectionbinder/simple/MyFieldProjectionBinder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.hibernate.search.engine.search.projection.SearchProjection;
88
import org.hibernate.search.engine.search.projection.definition.ProjectionDefinition;
99
import org.hibernate.search.engine.search.projection.definition.ProjectionDefinitionContext;
10-
import org.hibernate.search.engine.search.projection.dsl.SearchProjectionFactory;
10+
import org.hibernate.search.engine.search.projection.dsl.TypedSearchProjectionFactory;
1111
import org.hibernate.search.mapper.pojo.search.definition.binding.ProjectionBinder;
1212
import org.hibernate.search.mapper.pojo.search.definition.binding.ProjectionBindingContext;
1313

@@ -29,7 +29,7 @@ public void bind(ProjectionBindingContext context) { // <2>
2929
private static class MyProjectionDefinition // <1>
3030
implements ProjectionDefinition<String> { // <2>
3131
@Override
32-
public SearchProjection<String> create(SearchProjectionFactory<?, ?, ?> factory,
32+
public SearchProjection<String> create(TypedSearchProjectionFactory<?, ?, ?> factory,
3333
ProjectionDefinitionContext context) {
3434
return factory.field( "title", String.class ) // <3>
3535
.toProjection(); // <4>

0 commit comments

Comments
 (0)