Changeset 4965

Timestamp:

04/14/14 12:06:37 (10 years ago)

Author:

Twan Goosen

Message:

rewrote parameter conversion to not use multimap

Location:

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

Files:

• pojo/FacetSelection.java (modified) (2 diffs)
• service/solr/impl/QueryFacetsSelectionParametersConverter.java (modified) (4 diffs)

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

@@ -19 +19 @@
 import com.google.common.collect.Lists;
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Collection;
 
@@ -36 +37 @@
     public FacetSelection(FacetSelectionType selectionType, Collection<String> values) {
         this.selectionType = selectionType;
-        if (values instanceof Serializable) {
+        // always store as array list, which is modifiable and serialisable
+        if (values instanceof ArrayList) {
             this.values = values;
         } else {
-            // make serializable
+            // copy to new list
             this.values = Lists.newArrayList(values);
         }

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

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.service.solr.impl;
 
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.google.common.collect.Multimap;
 import eu.clarin.cmdi.vlo.pojo.FacetSelection;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
 import eu.clarin.cmdi.vlo.service.PageParametersConverter;
-import java.io.Serializable;
-import java.util.Collection;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Map.Entry;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -48 +43 @@
         // Get facet selections from params
         final List<StringValue> facetValues = params.getValues("fq");
-        // Store in a multimap to allow for multiple selections per facet
-        final Multimap<String, String> selectionMap = HashMultimap.<String, String>create(facetValues.size(), 1);
+
+        final HashMap<String, FacetSelection> selection = Maps.newHashMapWithExpectedSize(facetValues.size());
         for (StringValue facetValue : facetValues) {
             if (!facetValue.isEmpty()) {
@@ -55 +50 @@
                 if (fq.length == 2) {
                     // we have a facet - value pair
-                    selectionMap.put(fq[0], fq[1]);
+                    final String facet = fq[0];
+                    final String value = fq[1];
+                    if (selection.containsKey(facet)) {
+                        selection.get(facet).getValues().add(value);
+                    } else {
+                        selection.put(facet, new FacetSelection(Arrays.asList(value)));
+                    }
                 }
             }
         }
 
-        // Facet selection expects a mutable and serializable map, so first convert
-        // back to ordinary map, then insert serializable values
-        final HashMap<String, FacetSelection> selection = multimapToSerializableCollectionMap(selectionMap);
-
-        // Facet selection expects a mutable and serializable map, so first convert 
         return new QueryFacetsSelection(query, selection);
     }
@@ -89 +85 @@
         return params;
     }
-
-    /**
-     *
-     * @param selectionMap multimap holding the selection
-     * @return a fully serializable map with collection values
-     */
-    private HashMap<String, FacetSelection> multimapToSerializableCollectionMap(final Multimap<String, String> selectionMap) {
-
-        final HashMap<String, FacetSelection> selection = Maps.newHashMapWithExpectedSize(selectionMap.size());
-        for (Entry<String, Collection<String>> entry : selectionMap.asMap().entrySet()) {
-            final FacetSelection value = new FacetSelection(entry.getValue());
-            if (value instanceof Serializable) {
-                // keep serializable collection value
-                selection.put(entry.getKey(), value);
-            } else {
-                // copy to a serializable collection
-                selection.put(entry.getKey(), value);
-            }
-        }
-        return selection;
-    }
 }