Skip to content

Commit 0cd1cc0

Browse files
marko-bekhtamarko-bekhta
committed
HSEARCH-5300 More cleanups and improvements
1 parent ad80831 commit 0cd1cc0

File tree

45 files changed

+433
-393
lines changed

Some content is hidden

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

45 files changed

+433
-393
lines changed

Diff for: ‎build/jqassistant/rules/rules.xml

+2
Original file line numberDiff line numberDiff line change
@@ -472,6 +472,7 @@
472472
<requiresConcept refId="hsearch:UtilArtifacts" />
473473
<requiresConcept refId="hsearch:Main" />
474474
<requiresConcept refId="hsearch:Impl" />
475+
<requiresConcept refId="hsearch:SuppressJQAssistant" />
475476
<description>
476477
Main (non-test) types must not depend on implementation types from other modules.
477478
SPIs must be used for such dependencies.
@@ -485,6 +486,7 @@
485486
artifact1 <> artifact2
486487
// Exceptions
487488
AND NOT artifact2:Util
489+
AND NOT type1:SuppressJQAssistant
488490
RETURN
489491
artifact1, type1, artifact2, type2
490492
]]></cypher>

Diff for: ‎build/parents/build/pom.xml

+10
Original file line numberDiff line numberDiff line change
@@ -722,6 +722,16 @@
722722
<artifactId>hibernate-search-integrationtest-metamodel-standalone-lucene</artifactId>
723723
<version>${project.version}</version>
724724
</dependency>
725+
<dependency>
726+
<groupId>org.hibernate.search</groupId>
727+
<artifactId>hibernate-search-integrationtest-metamodel-standalone-elasticsearch</artifactId>
728+
<version>${project.version}</version>
729+
</dependency>
730+
<dependency>
731+
<groupId>org.hibernate.search</groupId>
732+
<artifactId>hibernate-search-integrationtest-metamodel-orm-lucene</artifactId>
733+
<version>${project.version}</version>
734+
</dependency>
725735
<dependency>
726736
<groupId>org.hibernate.search</groupId>
727737
<artifactId>hibernate-search-integrationtest-backend-lucene-next</artifactId>

Diff for: ‎build/reports/pom.xml

+8
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,14 @@
152152
<groupId>org.hibernate.search</groupId>
153153
<artifactId>hibernate-search-integrationtest-metamodel-standalone-lucene</artifactId>
154154
</dependency>
155+
<dependency>
156+
<groupId>org.hibernate.search</groupId>
157+
<artifactId>hibernate-search-integrationtest-metamodel-standalone-elasticsearch</artifactId>
158+
</dependency>
159+
<dependency>
160+
<groupId>org.hibernate.search</groupId>
161+
<artifactId>hibernate-search-integrationtest-metamodel-orm-lucene</artifactId>
162+
</dependency>
155163
<dependency>
156164
<groupId>org.hibernate.search</groupId>
157165
<artifactId>hibernate-search-documentation</artifactId>

Diff for: ‎integrationtest/metamodel/orm-lucene/src/test/java/org/hibernate/search/integrationtest/metamodel/standalone/lucene/EntityAsTreeSmokeIT.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ void indexAndSearch() {
6464

6565
try ( var s = sessionFactory.openSession() ) {
6666
SearchSession session = Search.session( s );
67-
SearchScope<EntityAsTreeSmokeIT_IndexedEntity__, IndexedEntity> scope = EntityAsTreeSmokeIT_IndexedEntity__.INDEX.scope( session );
67+
SearchScope<EntityAsTreeSmokeIT_IndexedEntity__, IndexedEntity> scope =
68+
EntityAsTreeSmokeIT_IndexedEntity__.INDEX.scope( session );
6869
assertThat( session.search( scope )
6970
.where( f -> f.match().field( EntityAsTreeSmokeIT_IndexedEntity__.INDEX.containedEntities.text )
7071
.matching( "entity text" ) )
@@ -80,7 +81,8 @@ void indexAndSearch() {
8081

8182
try ( var s = sessionFactory.openSession() ) {
8283
SearchSession session = Search.session( s );
83-
SearchScope<EntityAsTreeSmokeIT_IndexedEntity__, IndexedEntity> scope = EntityAsTreeSmokeIT_IndexedEntity__.INDEX.scope( session );
84+
SearchScope<EntityAsTreeSmokeIT_IndexedEntity__, IndexedEntity> scope =
85+
EntityAsTreeSmokeIT_IndexedEntity__.INDEX.scope( session );
8486
assertThat( session.search( scope )
8587
.select( f -> f.id() )
8688
.where( f -> f.match().field( EntityAsTreeSmokeIT_IndexedEntity__.INDEX.containedEntities.text )

Diff for: ‎integrationtest/metamodel/standalone-lucene/src/test/java/org/hibernate/search/integrationtest/metamodel/standalone/lucene/EntityAsTreeSmokeIT.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ void indexAndSearch() {
7575
indexed2.containedNonEntities.add( containedNonEntity2_1 );
7676

7777
try ( SearchSession session = mapping.createSession() ) {
78-
SearchScope<EntityAsTreeSmokeIT_IndexedEntity__, IndexedEntity> scope = EntityAsTreeSmokeIT_IndexedEntity__.INDEX.scope( session );
78+
SearchScope<EntityAsTreeSmokeIT_IndexedEntity__, IndexedEntity> scope =
79+
EntityAsTreeSmokeIT_IndexedEntity__.INDEX.scope( session );
7980
assertThat( session.search( scope )
8081
.where( f -> f.match().field( EntityAsTreeSmokeIT_IndexedEntity__.INDEX.containedEntities.text )
8182
.matching( "entity text" ) )
@@ -91,7 +92,8 @@ void indexAndSearch() {
9192
simulatedIndexedEntityDatastore.put( indexed2.id, indexed2 );
9293
}
9394
try ( SearchSession session = mapping.createSession() ) {
94-
SearchScope<EntityAsTreeSmokeIT_IndexedEntity__, IndexedEntity> scope = EntityAsTreeSmokeIT_IndexedEntity__.INDEX.scope( session );
95+
SearchScope<EntityAsTreeSmokeIT_IndexedEntity__, IndexedEntity> scope =
96+
EntityAsTreeSmokeIT_IndexedEntity__.INDEX.scope( session );
9597
assertThat( session.search( scope )
9698
.where( f -> f.match().field( EntityAsTreeSmokeIT_IndexedEntity__.INDEX.containedEntities.text )
9799
.matching( "entity" ) )
@@ -104,7 +106,8 @@ void indexAndSearch() {
104106
session.indexingPlan().delete( indexed1 );
105107
}
106108
try ( SearchSession session = mapping.createSession() ) {
107-
SearchScope<EntityAsTreeSmokeIT_IndexedEntity__, IndexedEntity> scope = EntityAsTreeSmokeIT_IndexedEntity__.INDEX.scope( session );
109+
SearchScope<EntityAsTreeSmokeIT_IndexedEntity__, IndexedEntity> scope =
110+
EntityAsTreeSmokeIT_IndexedEntity__.INDEX.scope( session );
108111
assertThat( session.search( scope )
109112
.where( f -> f.match().field( EntityAsTreeSmokeIT_IndexedEntity__.INDEX.containedEntities.text )
110113
.matching( "entity text" ) )

Diff for: ‎mapper/pojo-standalone/src/main/java/org/hibernate/search/mapper/pojo/standalone/scope/StandalonePojoRootReferenceScope.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@
1010
@Incubating
1111
public interface StandalonePojoRootReferenceScope<SR, T> extends RootReferenceScope<SR, T> {
1212

13-
SearchScope<SR, T> create(SearchScopeProvider scopeProvider);
13+
SearchScope<SR, T> scope(SearchScopeProvider scopeProvider);
1414
}

Diff for: ‎mapper/pojo-standalone/src/main/java/org/hibernate/search/mapper/pojo/standalone/session/impl/StandalonePojoSearchSession.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public PojoRuntimeIntrospector runtimeIntrospector() {
141141
@Override
142142
public <SR, T> SearchQuerySelectStep<SR, ?, EntityReference, T, ?, ?, ?> search(
143143
StandalonePojoRootReferenceScope<SR, T> referenceScope) {
144-
SearchScope<SR, T> scope = referenceScope.create( this );
144+
SearchScope<SR, T> scope = referenceScope.scope( this );
145145
return search( scope );
146146
}
147147

Diff for: ‎metamodel/metamodel-processor/pom.xml

+9
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,15 @@
9999
</execution>
100100
</executions>
101101
</plugin>
102+
<plugin>
103+
<groupId>org.apache.maven.plugins</groupId>
104+
<artifactId>maven-surefire-plugin</artifactId>
105+
<configuration>
106+
<systemPropertyVariables>
107+
<org.hibernate.search.integrationtest.backend.elasticsearch.version>${version.org.elasticsearch.client}</org.hibernate.search.integrationtest.backend.elasticsearch.version>
108+
</systemPropertyVariables>
109+
</configuration>
110+
</plugin>
102111
</plugins>
103112
</build>
104113
</project>

Diff for: ‎metamodel/metamodel-processor/src/main/java/org/hibernate/search/metamodel/processor/HibernateSearchMetamodelProcessor.java

+2-8
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import javax.annotation.processing.SupportedOptions;
1515
import javax.lang.model.SourceVersion;
1616
import javax.lang.model.element.TypeElement;
17-
import javax.tools.Diagnostic;
1817

1918
import org.hibernate.search.metamodel.processor.impl.HibernateSearchMetamodelProcessorContext;
2019
import org.hibernate.search.metamodel.processor.impl.IndexedEntityMetamodelAnnotationProcessor;
@@ -30,15 +29,14 @@
3029
public class HibernateSearchMetamodelProcessor extends AbstractProcessor {
3130

3231
private HibernateSearchMetamodelProcessorContext context;
33-
private HibernateSearchMetamodelProcessorSettings.Configuration configuration;
3432
private List<MetamodelAnnotationProcessor> processors;
3533

3634
@Override
3735
public synchronized void init(ProcessingEnvironment processingEnv) {
3836
super.init( processingEnv );
3937
context = new HibernateSearchMetamodelProcessorContext( processingEnv.getElementUtils(), processingEnv.getTypeUtils(),
40-
processingEnv.getMessager(), processingEnv.getFiler() );
41-
configuration = new HibernateSearchMetamodelProcessorSettings.Configuration( processingEnv.getOptions() );
38+
processingEnv.getMessager(), processingEnv.getFiler(),
39+
new HibernateSearchMetamodelProcessorSettings.Configuration( processingEnv.getOptions() ) );
4240
processors = List.of( new IndexedEntityMetamodelAnnotationProcessor( context ) );
4341
}
4442

@@ -49,13 +47,9 @@ public SourceVersion getSupportedSourceVersion() {
4947

5048
@Override
5149
public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
52-
context.messager().printMessage( Diagnostic.Kind.NOTE, "Hibernate Search Metamodel Processor started" );
5350
for ( MetamodelAnnotationProcessor processor : processors ) {
5451
processor.process( roundEnv );
5552
}
56-
if ( roundEnv.processingOver() ) {
57-
// create metamodel classes
58-
}
5953
return false;
6054
}
6155
}

Diff for: ‎metamodel/metamodel-processor/src/main/java/org/hibernate/search/metamodel/processor/HibernateSearchMetamodelProcessorSettings.java

+38-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@
44
*/
55
package org.hibernate.search.metamodel.processor;
66

7+
8+
import java.io.Serializable;
79
import java.util.Map;
10+
import java.util.Objects;
11+
12+
import javax.lang.model.util.Elements;
813

914
public final class HibernateSearchMetamodelProcessorSettings {
1015

@@ -14,13 +19,15 @@ private HibernateSearchMetamodelProcessorSettings() {
1419
private static final String PREFIX = "org.hibernate.search.metamodel.processor.";
1520

1621
public static final String ADD_GENERATED_ANNOTATION = PREFIX + Radicals.ADD_GENERATED_ANNOTATION;
22+
public static final String BACKEND_VERSION = PREFIX + Radicals.BACKEND_VERSION;
1723

1824
public static class Radicals {
1925

2026
private Radicals() {
2127
}
2228

2329
public static final String ADD_GENERATED_ANNOTATION = "add_generated_annotation";
30+
public static final String BACKEND_VERSION = "backend.version";
2431
}
2532

2633
/**
@@ -34,9 +41,38 @@ private Defaults() {
3441
}
3542
}
3643

37-
public record Configuration(boolean addGeneratedAnnotation) {
44+
public record Configuration(boolean addGeneratedAnnotation, String version) implements Serializable {
3845
public Configuration(Map<String, String> options) {
39-
this( Boolean.parseBoolean( options.getOrDefault( ADD_GENERATED_ANNOTATION, Defaults.ADD_GENERATED_ANNOTATION ) ) );
46+
this(
47+
Boolean.parseBoolean( options.getOrDefault( ADD_GENERATED_ANNOTATION, Defaults.ADD_GENERATED_ANNOTATION ) ),
48+
Objects.toString( options.get( BACKEND_VERSION ), null )
49+
);
50+
}
51+
52+
public String elasticsearchVersion() {
53+
return version == null ? "8.17.3" : version;
54+
}
55+
56+
public String luceneVersion() {
57+
return version == null ? "9.12.1" : version;
58+
}
59+
60+
public String backendVersion() {
61+
return isLuceneBackend() ? luceneVersion() : elasticsearchVersion();
62+
}
63+
64+
public boolean isOrmMapperPresent(Elements elementUtils) {
65+
return elementUtils.getTypeElement( "org.hibernate.search.mapper.orm.Search" ) != null;
66+
}
67+
68+
private boolean isLuceneBackend() {
69+
try {
70+
Class.forName( "org.hibernate.search.backend.lucene.LuceneBackend" );
71+
}
72+
catch (ClassNotFoundException e) {
73+
return false;
74+
}
75+
return true;
4076
}
4177
}
4278
}

Diff for: ‎metamodel/metamodel-processor/src/main/java/org/hibernate/search/metamodel/processor/annotation/processing/impl/AbstractProcessorAnnotationProcessor.java

+12-6
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,9 @@
2222
import org.hibernate.search.mapper.pojo.bridge.binding.PropertyBindingContext;
2323
import org.hibernate.search.mapper.pojo.extractor.mapping.annotation.ContainerExtract;
2424
import org.hibernate.search.mapper.pojo.extractor.mapping.programmatic.ContainerExtractorPath;
25-
import org.hibernate.search.metamodel.processor.logging.impl.MappingLog;
2625
import org.hibernate.search.util.common.AssertionFailure;
2726

28-
public abstract class AbstractProcessorAnnotationProcessor implements ProcessorPropertyMappingAnnotationProcessor {
27+
abstract class AbstractProcessorAnnotationProcessor implements ProcessorPropertyMappingAnnotationProcessor {
2928

3029
protected static final String[] EMPTY = new String[0];
3130

@@ -59,11 +58,13 @@ public final void process(PropertyBindingContext bindingContext, AnnotationMirro
5958
protected abstract Optional<IndexFieldTypeFinalStep<?>> configureField(PropertyBindingContext bindingContext,
6059
AnnotationMirror annotation, ProcessorAnnotationProcessorContext context, Element element, TypeMirror fieldType);
6160

62-
protected ContainerExtractorPath toContainerExtractorPath(AnnotationMirror extraction) {
63-
return toContainerExtractorPath( extraction, "DEFAULT" );
61+
protected ContainerExtractorPath toContainerExtractorPath(AnnotationMirror extraction,
62+
ProcessorAnnotationProcessorContext context) {
63+
return toContainerExtractorPath( extraction, "DEFAULT", context );
6464
}
6565

66-
protected ContainerExtractorPath toContainerExtractorPath(AnnotationMirror extraction, String defaultValue) {
66+
protected ContainerExtractorPath toContainerExtractorPath(AnnotationMirror extraction, String defaultValue,
67+
ProcessorAnnotationProcessorContext context) {
6768
if ( extraction == null ) {
6869
return ContainerExtractorPath.defaultExtractors();
6970
}
@@ -74,7 +75,12 @@ protected ContainerExtractorPath toContainerExtractorPath(AnnotationMirror extra
7475
switch ( extract ) {
7576
case NO:
7677
if ( extractors.length != 0 ) {
77-
throw MappingLog.INSTANCE.cannotReferenceExtractorsWhenExtractionDisabled();
78+
context.messager().printMessage(
79+
Diagnostic.Kind.ERROR, "Unexpected extractor references:"
80+
+ " extractors cannot be defined explicitly when extract = ContainerExtract.NO."
81+
+ " Either leave 'extract' to its default value to define extractors explicitly"
82+
+ " or leave the 'extractor' list to its default, empty value to disable extraction."
83+
);
7884
}
7985
return ContainerExtractorPath.noExtractors();
8086
case DEFAULT:

Diff for: ‎metamodel/metamodel-processor/src/main/java/org/hibernate/search/metamodel/processor/annotation/processing/impl/AbstractProcessorFieldAnnotationProcessor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ else if ( element.asType().getKind() == TypeKind.DECLARED
3737
fieldContext.valueBridge( new ProcessorEnumValueBridge( element.asType() ) );
3838
}
3939

40-
ContainerExtractorPath extractorPath = toContainerExtractorPath( getExtraction( annotation ) );
40+
ContainerExtractorPath extractorPath = toContainerExtractorPath( getExtraction( annotation ), context );
4141
fieldContext.extractors( extractorPath );
4242
}
4343

Diff for: ‎metamodel/metamodel-processor/src/main/java/org/hibernate/search/metamodel/processor/annotation/processing/impl/AbstractProcessorNonFullTextFieldAnnotationProcessor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import org.hibernate.search.mapper.pojo.mapping.definition.programmatic.PropertyMappingStandardFieldOptionsStep;
1414
import org.hibernate.search.mapper.pojo.mapping.definition.programmatic.PropertyMappingStep;
1515

16-
public abstract class AbstractProcessorNonFullTextFieldAnnotationProcessor
16+
abstract class AbstractProcessorNonFullTextFieldAnnotationProcessor
1717
extends AbstractProcessorStandardFieldAnnotationProcessor {
1818
@Override
1919
PropertyMappingStandardFieldOptionsStep<?> initStandardFieldMappingContext(PropertyMappingStep mappingContext,

Diff for: ‎metamodel/metamodel-processor/src/main/java/org/hibernate/search/metamodel/processor/annotation/processing/impl/AbstractProcessorStandardFieldAnnotationProcessor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import org.hibernate.search.mapper.pojo.mapping.definition.programmatic.PropertyMappingStandardFieldOptionsStep;
1212
import org.hibernate.search.mapper.pojo.mapping.definition.programmatic.PropertyMappingStep;
1313

14-
public abstract class AbstractProcessorStandardFieldAnnotationProcessor extends AbstractProcessorFieldAnnotationProcessor {
14+
abstract class AbstractProcessorStandardFieldAnnotationProcessor extends AbstractProcessorFieldAnnotationProcessor {
1515
@Override
1616
PropertyMappingStandardFieldOptionsStep<?> initFieldMappingContext(PropertyMappingStep mappingContext,
1717
AnnotationMirror annotation,

Diff for: ‎metamodel/metamodel-processor/src/main/java/org/hibernate/search/metamodel/processor/annotation/processing/impl/ProcessorDocumentIdProcessor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import org.hibernate.search.mapper.pojo.bridge.mapping.programmatic.IdentifierBinder;
1515
import org.hibernate.search.mapper.pojo.mapping.definition.programmatic.PropertyMappingStep;
1616

17-
public class ProcessorDocumentIdProcessor implements ProcessorPropertyMappingAnnotationProcessor {
17+
class ProcessorDocumentIdProcessor implements ProcessorPropertyMappingAnnotationProcessor {
1818
@Override
1919
public void process(PropertyMappingStep mapping, AnnotationMirror annotation, Element element,
2020
ProcessorAnnotationProcessorContext context) {

Diff for: ‎metamodel/metamodel-processor/src/main/java/org/hibernate/search/metamodel/processor/annotation/processing/impl/ProcessorFulltextFieldProcessor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.hibernate.search.mapper.pojo.mapping.definition.programmatic.PropertyMappingStandardFieldOptionsStep;
2525
import org.hibernate.search.mapper.pojo.mapping.definition.programmatic.PropertyMappingStep;
2626

27-
public class ProcessorFulltextFieldProcessor extends AbstractProcessorStandardFieldAnnotationProcessor {
27+
class ProcessorFulltextFieldProcessor extends AbstractProcessorStandardFieldAnnotationProcessor {
2828
@Override
2929
PropertyMappingStandardFieldOptionsStep<?> initStandardFieldMappingContext(PropertyMappingStep mappingContext,
3030
AnnotationMirror annotation, String fieldName) {

Diff for: ‎metamodel/metamodel-processor/src/main/java/org/hibernate/search/metamodel/processor/annotation/processing/impl/ProcessorGenericFieldProcessor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import org.hibernate.search.mapper.pojo.mapping.definition.programmatic.PropertyMappingStep;
1818
import org.hibernate.search.metamodel.processor.model.impl.BuiltInBridgeResolverTypes;
1919

20-
public class ProcessorGenericFieldProcessor extends AbstractProcessorNonFullTextFieldAnnotationProcessor {
20+
class ProcessorGenericFieldProcessor extends AbstractProcessorNonFullTextFieldAnnotationProcessor {
2121
@Override
2222
PropertyMappingNonFullTextFieldOptionsStep<?> initSortableFieldMappingContext(PropertyMappingStep mappingContext,
2323
AnnotationMirror annotation, String fieldName) {

Diff for: ‎metamodel/metamodel-processor/src/main/java/org/hibernate/search/metamodel/processor/annotation/processing/impl/ProcessorGeoPointBindingProcessor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.hibernate.search.mapper.pojo.mapping.definition.programmatic.PropertyMappingStep;
2020
import org.hibernate.search.mapper.pojo.mapping.definition.programmatic.TypeMappingStep;
2121

22-
public class ProcessorGeoPointBindingProcessor extends AbstractProcessorAnnotationProcessor
22+
class ProcessorGeoPointBindingProcessor extends AbstractProcessorAnnotationProcessor
2323
implements ProcessorTypeMappingAnnotationProcessor {
2424
@Override
2525
public void process(PropertyMappingStep mapping, AnnotationMirror annotation, Element element,

Diff for: ‎metamodel/metamodel-processor/src/main/java/org/hibernate/search/metamodel/processor/annotation/processing/impl/ProcessorIndexedEmbeddedProcessor.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.hibernate.search.mapper.pojo.mapping.definition.annotation.processing.spi.MappingAnnotationProcessorUtils;
2626
import org.hibernate.search.mapper.pojo.mapping.definition.programmatic.PropertyMappingStep;
2727

28-
public class ProcessorIndexedEmbeddedProcessor extends AbstractProcessorAnnotationProcessor {
28+
class ProcessorIndexedEmbeddedProcessor extends AbstractProcessorAnnotationProcessor {
2929

3030
@SuppressWarnings("deprecation")
3131
@Override
@@ -38,7 +38,7 @@ public void process(PropertyMappingStep mapping, AnnotationMirror annotation, El
3838
String[] includePathsArray = toStringArray( getAnnotationValue( annotation, "includePaths" ) );
3939
String[] excludePathsArray = toStringArray( getAnnotationValue( annotation, "excludePaths" ) );
4040

41-
ContainerExtractorPath extractorPath = toContainerExtractorPath( annotation );
41+
ContainerExtractorPath extractorPath = toContainerExtractorPath( annotation, context );
4242

4343
if ( getAnnotationValue( annotation, "targetType" ) != null ) {
4444
context.messager().printMessage( Diagnostic.Kind.WARNING,
@@ -69,8 +69,6 @@ public void process(PropertyMappingStep mapping, AnnotationMirror annotation, El
6969
}
7070

7171
private void collectExtraTypes(TypeMirror type, ProcessorAnnotationProcessorContext context) {
72-
// TODO: add a marker annotation to allow users to simply put some @BlaBlaBla annotation on a type
73-
// we should consider adding through programmaticMapping().type(sometype).
7472
if ( type == null || type.getKind() == TypeKind.NONE ) {
7573
return;
7674
}

Diff for: ‎metamodel/metamodel-processor/src/main/java/org/hibernate/search/metamodel/processor/annotation/processing/impl/ProcessorKeywordFieldProcessor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import org.hibernate.search.mapper.pojo.mapping.definition.programmatic.PropertyMappingNonFullTextFieldOptionsStep;
1919
import org.hibernate.search.mapper.pojo.mapping.definition.programmatic.PropertyMappingStep;
2020

21-
public class ProcessorKeywordFieldProcessor extends AbstractProcessorNonFullTextFieldAnnotationProcessor {
21+
class ProcessorKeywordFieldProcessor extends AbstractProcessorNonFullTextFieldAnnotationProcessor {
2222
@Override
2323
PropertyMappingNonFullTextFieldOptionsStep<?> initSortableFieldMappingContext(PropertyMappingStep mappingContext,
2424
AnnotationMirror annotation, String fieldName) {

Diff for: ‎metamodel/metamodel-processor/src/main/java/org/hibernate/search/metamodel/processor/annotation/processing/impl/ProcessorLatitudeProcessor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import org.hibernate.search.mapper.pojo.bridge.builtin.programmatic.GeoPointBinder;
1717
import org.hibernate.search.mapper.pojo.mapping.definition.programmatic.PropertyMappingStep;
1818

19-
public class ProcessorLatitudeProcessor extends AbstractProcessorAnnotationProcessor {
19+
class ProcessorLatitudeProcessor extends AbstractProcessorAnnotationProcessor {
2020
@Override
2121
public void process(PropertyMappingStep mapping, AnnotationMirror annotation, Element element,
2222
ProcessorAnnotationProcessorContext context) {

Diff for: ‎metamodel/metamodel-processor/src/main/java/org/hibernate/search/metamodel/processor/annotation/processing/impl/ProcessorLongitudeProcessor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import org.hibernate.search.mapper.pojo.bridge.builtin.programmatic.GeoPointBinder;
1717
import org.hibernate.search.mapper.pojo.mapping.definition.programmatic.PropertyMappingStep;
1818

19-
public class ProcessorLongitudeProcessor extends AbstractProcessorAnnotationProcessor {
19+
class ProcessorLongitudeProcessor extends AbstractProcessorAnnotationProcessor {
2020
@Override
2121
public void process(PropertyMappingStep mapping, AnnotationMirror annotation, Element element,
2222
ProcessorAnnotationProcessorContext context) {

0 commit comments

Comments
 (0)