Changeset 4224

Timestamp:

01/07/14 13:41:30 (10 years ago)

Author:

twagoo

Message:

No longer 'recycling' document attribute list iterator

File:

• vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/DocumentAttributesDataProvider.java (modified) (5 diffs)

vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/DocumentAttributesDataProvider.java

@@ -4 +4 @@
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Set;
 
 import org.apache.solr.common.SolrDocument;
@@ -15 +13 @@
 
 import eu.clarin.cmdi.vlo.FacetConstants;
+import java.util.Arrays;
+import java.util.HashSet;
 
-public class DocumentAttributesDataProvider extends SortableDataProvider<DocumentAttribute,String>{
-    
-    private static final Set<String> IGNORE_FACETS = new HashSet<String>();
-    static {
-        IGNORE_FACETS.add(FacetConstants.FIELD_FORMAT);
-    }
+public class DocumentAttributesDataProvider extends SortableDataProvider<DocumentAttribute, String> {
+
+    private static final Map<String, Collection<Object>> NOT_FOUND_MAP = Collections.singletonMap("Document not found", (Collection<Object>) null);
+    private static final Collection<String> IGNORE_FACETS = new HashSet<String>(Arrays.asList(FacetConstants.FIELD_FORMAT));
 
     private static final long serialVersionUID = 1L;
-    
-    private transient DocumentAttributeList attributeList;
+
+    private final Map<String, Collection<Object>> fieldMap;
 
     public DocumentAttributesDataProvider(SolrDocument solrDocument) {
         if (solrDocument != null) {
-            Map<String, Collection<Object>> fieldMap = new HashMap<String, Collection<Object>>();
+            fieldMap = new HashMap<String, Collection<Object>>();
             Map<String, Collection<Object>> fieldValuesMap = solrDocument.getFieldValuesMap();
             for (String entry : fieldValuesMap.keySet()) {
@@ -36 +34 @@
                 }
             }
-            attributeList = new DocumentAttributeList(fieldMap);
+
         } else {
-            attributeList = new DocumentAttributeList(Collections.singletonMap("Document not found", (Collection<Object>) null));
+            fieldMap = null;
         }
     }
-    
+
     private boolean ignoreEntry(String entry) {
 //        if(entry.equals(FacetConstants.FIELD_COMPLETE_METADATA)){
@@ -51 +49 @@
     @Override
     public Iterator<? extends DocumentAttribute> iterator(long first, long count) {
-        return attributeList;
+        if (fieldMap != null) {
+            return new DocumentAttributeList(fieldMap);
+        } else {
+            return new DocumentAttributeList(NOT_FOUND_MAP);
+        }
     }
 
@@ -61 +63 @@
     @Override
     public long size() {
-        return attributeList.size();
+        if (fieldMap != null) {
+            return fieldMap.size();
+        } else {
+            return NOT_FOUND_MAP.size();
+        }
     }