HSEARCH-3607 Apply default GeoPoint bridge to any extends of GeoPoint

hibernate · Jul 16, 2019 · 87b8f7a · 87b8f7a
1 parent 4a9a6e1
commit 87b8f7a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/...entation/src/test/java/org/hibernate/search/documentation/searchdsl/predicate/Author.java b/...entation/src/test/java/org/hibernate/search/documentation/searchdsl/predicate/Author.java
@@ -13,8 +13,8 @@
 import javax.persistence.Id;
 import javax.persistence.ManyToMany;
 
-import org.hibernate.search.mapper.pojo.bridge.builtin.annotation.GeoPointBinding;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
 
 @Entity
@@ -31,7 +31,7 @@ public class Author {
 	private String lastName;
 
 	@Embedded
-	@GeoPointBinding
+	@GenericField
 	private EmbeddableGeoPoint placeOfBirth;
 
 	@ManyToMany(mappedBy = "authors")

diff --git a/...ntation/src/test/java/org/hibernate/search/documentation/searchdsl/projection/Author.java b/...ntation/src/test/java/org/hibernate/search/documentation/searchdsl/projection/Author.java
@@ -14,8 +14,8 @@
 import javax.persistence.ManyToMany;
 
 import org.hibernate.search.engine.backend.types.Projectable;
-import org.hibernate.search.mapper.pojo.bridge.builtin.annotation.GeoPointBinding;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
 
 @Entity
@@ -32,7 +32,7 @@ public class Author {
 	private String lastName;
 
 	@Embedded
-	@GeoPointBinding(projectable = Projectable.YES)
+	@GenericField(projectable = Projectable.YES)
 	private EmbeddableGeoPoint placeOfBirth;
 
 	@ManyToMany(mappedBy = "authors")

diff --git a/documentation/src/test/java/org/hibernate/search/documentation/searchdsl/sort/Author.java b/documentation/src/test/java/org/hibernate/search/documentation/searchdsl/sort/Author.java
@@ -14,8 +14,8 @@
 import javax.persistence.ManyToMany;
 
 import org.hibernate.search.engine.backend.types.Sortable;
-import org.hibernate.search.mapper.pojo.bridge.builtin.annotation.GeoPointBinding;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.KeywordField;
 
@@ -35,7 +35,7 @@ public class Author {
 	private String lastName;
 
 	@Embedded
-	@GeoPointBinding(sortable = Sortable.YES)
+	@GenericField(sortable = Sortable.YES)
 	private EmbeddableGeoPoint placeOfBirth;
 
 	@ManyToMany(mappedBy = "authors")

diff --git a/...jo/src/main/java/org/hibernate/search/mapper/pojo/bridge/mapping/impl/BridgeResolver.java b/...jo/src/main/java/org/hibernate/search/mapper/pojo/bridge/mapping/impl/BridgeResolver.java
@@ -87,6 +87,8 @@ public BridgeResolver(TypePatternMatcherFactory typePatternMatcherFactory) {
 		TypePatternMatcher concreteEnumPattern = typePatternMatcherFactory.createRawSuperTypeMatcher( Enum.class )
 				.and( typePatternMatcherFactory.createExactRawTypeMatcher( Enum.class ).negate() );
 
+		TypePatternMatcher concreteGeoPointPattern = typePatternMatcherFactory.createRawSuperTypeMatcher( GeoPoint.class );
+
 		addIdentifierBridgeForExactRawType( Integer.class, new DefaultIntegerIdentifierBridge() );
 		addIdentifierBridgeForExactRawType( Long.class, new DefaultLongIdentifierBridge() );
 		addIdentifierBinderForTypePattern( concreteEnumPattern, new DefaultEnumIdentifierBridge.Binder() );
@@ -128,7 +130,7 @@ public BridgeResolver(TypePatternMatcherFactory typePatternMatcherFactory) {
 		addValueBridgeForExactRawType( java.sql.Date.class, new DefaultJavaSqlDateValueBridge() );
 		addValueBridgeForExactRawType( Timestamp.class, new DefaultJavaSqlTimestampValueBridge() );
 		addValueBridgeForExactRawType( Time.class, new DefaultJavaSqlTimeValueBridge() );
-		addValueBinderForExactRawType( GeoPoint.class, new PassThroughValueBridge.Binder<>( GeoPoint.class, ParseUtils::parseGeoPoint ) );
+		addValueBinderForTypePattern( concreteGeoPointPattern, new PassThroughValueBridge.Binder<>( GeoPoint.class, ParseUtils::parseGeoPoint ) );
 	}
 
 	public IdentifierBinder resolveIdentifierBinderForType(PojoGenericTypeModel<?> sourceType) {