Changeset 4518

Timestamp:

02/14/14 09:53:19 (10 years ago)

Author:

twagoo

Message:

Removed Facet pojo because it only wrapped a String

Location:

vlo/branches/vlo-3.0/vlo-web-app/src

Files:

• main/java/eu/clarin/cmdi/vlo/pojo/Facet.java (deleted)
• main/java/eu/clarin/cmdi/vlo/pojo/FacetSelection.java (modified) (1 diff)
• main/java/eu/clarin/cmdi/vlo/service/impl/SolrQueryFactoryImpl.java (modified) (1 diff)
• main/java/eu/clarin/cmdi/vlo/wicket/pages/FacetedSearchPage.java (modified) (2 diffs)
• test/java/eu/clarin/cmdi/vlo/service/impl/SolrQueryFactoryImplTest.java (modified) (4 diffs)

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/pojo/FacetSelection.java

@@ -26 +26 @@
 public class FacetSelection implements Serializable {
 
-    private final Facet facet;
+    private final String facetName;
 
     private final Collection<String> values;
 
-    public FacetSelection(Facet facet, Collection<String> values) {
-        this.facet = facet;
+    public FacetSelection(String facet, Collection<String> values) {
+        this.facetName = facet;
         this.values = values;
     }
 
-    public Facet getFacet() {
-        return facet;
+    public String getFacetName() {
+        return facetName;
     }
 

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

@@ -58 +58 @@
             final List<String> encodedQueries = new ArrayList(selections.size());
             for (FacetSelection selection : selections) {
-                final String facetName = selection.getFacet().getName();
+                final String facetName = selection.getFacetName();
                 final Collection<String> values = selection.getValue();
                 if (values != null) {

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/FacetedSearchPage.java

@@ -2 +2 @@
 
 import eu.clarin.cmdi.vlo.wicket.components.FacetsPanel;
-import eu.clarin.cmdi.vlo.pojo.Facet;
 import eu.clarin.cmdi.vlo.pojo.FacetSelection;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
@@ -18 +17 @@
         super(parameters);
 
-        final FacetSelection languageSelection = new FacetSelection(new Facet("language"), Collections.singleton("Dutch"));
+        final FacetSelection languageSelection = new FacetSelection("language", Collections.singleton("Dutch"));
 
         final QueryFacetsSelection selection = new QueryFacetsSelection(Arrays.asList(languageSelection));

vlo/branches/vlo-3.0/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/impl/SolrQueryFactoryImplTest.java

@@ -18 +18 @@
 
 import eu.clarin.cmdi.vlo.config.VloConfig;
-import eu.clarin.cmdi.vlo.pojo.Facet;
 import eu.clarin.cmdi.vlo.pojo.FacetSelection;
 import java.util.Arrays;
@@ -77 +76 @@
         List<FacetSelection> selection = Arrays.asList(
                 new FacetSelection(
-                        new Facet("facet1"),
+                        "facet1",
                         Collections.<String>emptyList()),
                 new FacetSelection(
-                        new Facet("facet2"),
+                        "facet2",
                         Collections.<String>emptyList()));
         SolrQuery query = instance.createFacetQuery(selection, null);
@@ -99 +98 @@
         List<FacetSelection> selection = Arrays.asList(
                 new FacetSelection(
-                        new Facet("facet1"),
+                        "facet1",
                         Arrays.asList("valueA")),
                 new FacetSelection(
-                        new Facet("facet2"),
+                        "facet2",
                         Arrays.asList("valueB", "valueC")),
                 new FacetSelection(
-                        new Facet("facet3"),
+                        "facet3",
                         Collections.<String>emptyList()));
         SolrQuery query = instance.createFacetQuery(selection, null);
@@ -127 +126 @@
         List<FacetSelection> selection = Arrays.asList(
                 new FacetSelection(
-                        new Facet("facet1"),
+                        "facet1",
                         Arrays.asList("valueA")));
         SolrQuery query = instance.createFacetQuery(selection, "query string");