Changeset 6023

Timestamp:

02/23/15 16:23:11 (9 years ago)

Author:

Twan Goosen

Message:

Added an interface + service implementation that maps facets and facet values. Concretely, 'language' maps to 'languageCode' to preserve the validity of existing links

Location:

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo

Files:

• config/VloServicesSpringConfig.java (modified) (3 diffs)
• service/FacetParameterMapper.java (added)
• service/impl/FacetParameterMapperImpl.java (added)
• service/impl/QueryFacetsSelectionParametersConverter.java (modified) (4 diffs)

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/config/VloServicesSpringConfig.java

@@ -21 +21 @@
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
 import eu.clarin.cmdi.vlo.pojo.SearchContext;
+import eu.clarin.cmdi.vlo.service.FacetParameterMapper;
 import eu.clarin.cmdi.vlo.service.FieldFilter;
 import eu.clarin.cmdi.vlo.service.PageParametersConverter;
@@ -31 +32 @@
 import eu.clarin.cmdi.vlo.service.impl.DocumentParametersConverter;
 import eu.clarin.cmdi.vlo.service.impl.ExclusiveFieldFilter;
+import eu.clarin.cmdi.vlo.service.impl.FacetParameterMapperImpl;
 import eu.clarin.cmdi.vlo.service.impl.InclusiveFieldFilter;
 import eu.clarin.cmdi.vlo.service.impl.QueryFacetsSelectionParametersConverter;
@@ -85 +87 @@
         return new HandleRestApiClient();
     }
+    
+    @Bean
+    public FacetParameterMapper facetParameterMapper() {
+        return new FacetParameterMapperImpl(languageCodeUtils());
+    }
 
     @Bean(name = "queryParametersConverter")
     public PageParametersConverter<QueryFacetsSelection> queryParametersConverter() {
-        return new QueryFacetsSelectionParametersConverter(vloConfig);
+        return new QueryFacetsSelectionParametersConverter(vloConfig, facetParameterMapper());
     }
 

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/impl/QueryFacetsSelectionParametersConverter.java

@@ -25 +25 @@
 import eu.clarin.cmdi.vlo.pojo.FacetSelectionType;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
+import eu.clarin.cmdi.vlo.service.FacetParameterMapper;
 import eu.clarin.cmdi.vlo.service.PageParametersConverter;
 import java.util.Arrays;
@@ -53 +54 @@
 
     private final Set<String> facetsDefined;
+    private final FacetParameterMapper facetParamMapper;
 
+    /**
+     * Constructs a converter that does not do any facet (value) mapping
+     *
+     * @param config VLO configuration
+     * @see FacetParameterMapper.IdentityMapper
+     */
     public QueryFacetsSelectionParametersConverter(VloConfig config) {
-        facetsDefined = ImmutableSet.copyOf(config.getAllFacetFields());
+        this(config, new FacetParameterMapper.IdentityMapper());
+    }
+
+    /**
+     * Constructs a converter that applies the provided facet (value) mapping
+     *
+     * @param config VLO configuration
+     * @param facetParamMapper mapper to apply to facet names and values
+     */
+    public QueryFacetsSelectionParametersConverter(VloConfig config, FacetParameterMapper facetParamMapper) {
+        this.facetsDefined = ImmutableSet.copyOf(config.getAllFacetFields());
+        this.facetParamMapper = facetParamMapper;
     }
 
@@ -71 +90 @@
                 final List<String> fqType = FILTER_SPLITTER.splitToList(selectionType.toString());
                 if (fqType.size() == 2) {
-                    final String facet = fqType.get(0);
+                    final String facet = facetParamMapper.getFacet(fqType.get(0));
                     final String type = fqType.get(1).toUpperCase();
 
@@ -94 +113 @@
                 if (fq.size() == 2) {
                     // we have a facet - value pair
-                    final String facet = fq.get(0);
-                    final String value = fq.get(1);
+                    final String requestedFacet = fq.get(0);
+                    final String facet = facetParamMapper.getFacet(requestedFacet);
+                    final String value = facetParamMapper.getValue(requestedFacet, fq.get(1));
                     if (facetsDefined.contains(facet)) {
                         if (selection.containsKey(facet)) {