Changeset 4597

Timestamp:

02/28/14 12:37:17 (10 years ago)

Author:

Twan Goosen

Message:

Added method to vlo config to get all facets, including collection facet. using this when sanitising input in web app

Location:

vlo/branches/vlo-3.0

Files:

• vlo-commons/src/main/java/eu/clarin/cmdi/vlo/config/VloConfig.java (modified) (1 diff)
• vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/DefaultVloConfigFactoryTest.java (modified) (2 diffs)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/config/VloSpringConfig.java (modified) (1 diff)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/impl/SolrDaoImpl.java (modified) (1 diff)

vlo/branches/vlo-3.0/vlo-commons/src/main/java/eu/clarin/cmdi/vlo/config/VloConfig.java

@@ -697 +697 @@
 
     /**
+     *
+     * @return all facet fields, including collection facet (arbitrary order unspecified)
+     * @see #getFacetFields()
+     * @see #getCollectionFacet()
+     */
+    public List<String> getAllFacetFields() {
+        final ArrayList<String> allFacets = new ArrayList<String>(facetField);
+        allFacets.add(getCollectionFacet());
+        return allFacets;
+    }
+
+    /**
      * Set the value of the FacetFields parameter<br><br>
      *

vlo/branches/vlo-3.0/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/DefaultVloConfigFactoryTest.java

@@ -6 +6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
+import static org.hamcrest.CoreMatchers.hasItems;
 import static org.junit.Assert.*;
 import org.junit.Before;
@@ -698 +701 @@
     }
 
+    @Test
+    public void testGetAllFacetsField() {
+        final String[] expItems = new String[]{
+            "language",
+            "resourceClass",
+            "modality",
+            "continent",
+            "genre",
+            "country",
+            "subject",
+            "organisation",
+            "format",
+            "dataProvider",
+            "nationalProject",
+            "keywords",
+            "collection"};
+        List<String> result = config.getAllFacetFields();
+        
+        //order is not important in this case
+        assertThat(result, hasItems(expItems));
+    }
+
     /**
      * Test of setFacetFields method, of class VloConfig

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/config/VloSpringConfig.java

@@ -78 +78 @@
     @Bean
     public SolrFacetQueryFactory facetQueryFactory() {
-        final ArrayList<String> facets = Lists.newArrayList(vloConfig().getFacetFields());
-        //TODO: get collections facet from config
-        facets.add(vloConfig().getCollectionFacet());
-
-        return new SolrFacetQueryFactoryImpl(facets);
+        return new SolrFacetQueryFactoryImpl(vloConfig().getAllFacetFields());
     }
 

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/impl/SolrDaoImpl.java

@@ -55 +55 @@
             // present the facets from the config file as a list to a new set
             Set<String> facetsDefined;
-            facetsDefined = new HashSet<String>(config.getFacetFields());
+            facetsDefined = new HashSet<String>(config.getAllFacetFields());
 
             // check the filters in the query by name