HSEARCH-2451 Added getters for FacetMetadata to TypeMetadata

Preliminary work for HSEARCH-2451.
hibernate · Nov 23, 2016 · 2e6f0fb · 2e6f0fb
1 parent 862bace
commit 2e6f0fb
Showing 1 changed file with 32 additions and 5 deletions.
diff --git a/engine/src/main/java/org/hibernate/search/engine/metadata/impl/TypeMetadata.java b/engine/src/main/java/org/hibernate/search/engine/metadata/impl/TypeMetadata.java
@@ -96,6 +96,11 @@ public class TypeMetadata {
 	 */
 	private final Map<String, BridgeDefinedField> bridgeDefinedFieldNameToFieldMetadata;
 
+	/**
+	 * Metadata for a facet keyed against the facet field name
+	 */
+	private final Map<String, FacetMetadata> facetFieldNameToFacetMetadata;
+
 	/**
 	 * Metadata for a Java property (field or getter) keyed against the property name.
 	 */
@@ -177,6 +182,7 @@ protected TypeMetadata(Builder builder) {
 		this.propertyGetterNameToPropertyMetadata = buildPropertyMetadataMap( builder.propertyMetadataSet );
 		this.documentFieldMetadata = collectFieldMetadata( builder.propertyMetadataSet, builder.classBridgeFields, builder.idPropertyMetadata );
 		this.documentFieldNameToFieldMetadata = buildFieldMetadataMap( documentFieldMetadata );
+		this.facetFieldNameToFacetMetadata = buildFacetMetadataMap( documentFieldMetadata );
 		this.bridgeDefinedFieldNameToFieldMetadata = buildBridgeDefinedFieldMetadataMap( documentFieldNameToFieldMetadata.values() );
 		this.classBridgeFieldNameToDocumentFieldMetadata = copyClassBridgeMetadata( builder.classBridgeFields );
 		this.classBridgeSortableFieldMetadata = Collections.unmodifiableSet( builder.classBridgeSortableFieldMetadata );
@@ -234,6 +240,20 @@ public BridgeDefinedField getBridgeDefinedFieldMetadataFor(String fieldName) {
 		return null;
 	}
 
+	public FacetMetadata getFacetMetadataFor(String facetFieldName) {
+		FacetMetadata result = facetFieldNameToFacetMetadata.get( facetFieldName );
+		if ( result != null ) {
+			return result;
+		}
+		for ( EmbeddedTypeMetadata element : embeddedTypeMetadata ) {
+			result = element.getFacetMetadataFor( facetFieldName );
+			if ( result != null ) {
+				return result;
+			}
+		}
+		return null;
+	}
+
 	/**
 	 * Return all {@link DocumentFieldMetadata}.
 	 * Instances are not duplicated in the collection. We use {@code Collection} instead of {@code Set} for
@@ -431,18 +451,25 @@ private Map<String, DocumentFieldMetadata> buildFieldMetadataMap(Set<DocumentFie
 		return Collections.unmodifiableMap( tmpMap );
 	}
 
-	private Map<String, BridgeDefinedField> buildBridgeDefinedFieldMetadataMap(Collection<DocumentFieldMetadata> documentFieldMetadataCollection) {
-		Map<String, BridgeDefinedField> tmpMap = new HashMap<String, BridgeDefinedField>();
+	private Map<String, FacetMetadata> buildFacetMetadataMap(Collection<DocumentFieldMetadata> documentFieldMetadataCollection) {
+		Map<String, FacetMetadata> tmpMap = new HashMap<String, FacetMetadata>();
 		for ( DocumentFieldMetadata documentFieldMetadata : documentFieldMetadataCollection ) {
-			for ( BridgeDefinedField bridgeDefinedField : documentFieldMetadata.getBridgeDefinedFields().values() ) {
-				tmpMap.put( bridgeDefinedField.getAbsoluteName(), bridgeDefinedField );
+			for ( FacetMetadata facetMetadata : documentFieldMetadata.getFacetMetadata() ) {
+				tmpMap.put( facetMetadata.getAbsoluteName(), facetMetadata );
 			}
 		}
-		for ( DocumentFieldMetadata documentFieldMetadata : classBridgeFields ) {
+		// Class bridge fields, etc. are already included in documentFieldMetadataCollection
+		return Collections.unmodifiableMap( tmpMap );
+	}
+
+	private Map<String, BridgeDefinedField> buildBridgeDefinedFieldMetadataMap(Collection<DocumentFieldMetadata> documentFieldMetadataCollection) {
+		Map<String, BridgeDefinedField> tmpMap = new HashMap<String, BridgeDefinedField>();
+		for ( DocumentFieldMetadata documentFieldMetadata : documentFieldMetadataCollection ) {
 			for ( BridgeDefinedField bridgeDefinedField : documentFieldMetadata.getBridgeDefinedFields().values() ) {
 				tmpMap.put( bridgeDefinedField.getAbsoluteName(), bridgeDefinedField );
 			}
 		}
+		// Class bridge fields, etc. are already included in documentFieldMetadataCollection
 		return Collections.unmodifiableMap( tmpMap );
 	}