Changeset 4614

Timestamp:

03/03/14 16:10:50 (10 years ago)

Author:

Twan Goosen

Message:

separated field reading and string concatenation functionalities of SolrFieldModel?

Location:

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

Files:

• components/SearchResultItemPanel.java (modified) (3 diffs)
• model/SolrFieldModel.java (modified) (5 diffs)
• model/SolrFieldStringModel.java (copied) (copied from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/model/SolrFieldModel.java) (2 diffs)

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/SearchResultItemPanel.java

@@ -19 +19 @@
 import eu.clarin.cmdi.vlo.FacetConstants;
 import eu.clarin.cmdi.vlo.wicket.model.NullFallbackModel;
-import eu.clarin.cmdi.vlo.wicket.model.SolrFieldModel;
+import eu.clarin.cmdi.vlo.wicket.model.SolrFieldStringModel;
 import org.apache.solr.common.SolrDocument;
 import org.apache.wicket.markup.html.basic.Label;
@@ -41 +41 @@
 
         public SolrFieldLabel(String id, IModel<SolrDocument> documentModel, String fieldName) {
-            super(id, new SolrFieldModel(documentModel, fieldName));
+            super(id, new SolrFieldStringModel(documentModel, fieldName));
         }
 
@@ -47 +47 @@
             super(id,
                     new NullFallbackModel(
-                            new SolrFieldModel(documentModel, fieldName), nullFallback));
+                            new SolrFieldStringModel(documentModel, fieldName), nullFallback));
         }
 

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/model/SolrFieldModel.java

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.wicket.model;
 
+import com.google.common.base.Function;
+import com.google.common.collect.Collections2;
 import java.util.Collection;
-import java.util.Iterator;
 import org.apache.solr.common.SolrDocument;
 import org.apache.wicket.model.AbstractReadOnlyModel;
@@ -24 +25 @@
 
 /**
- * Model that provides field values as String values for a given Solr document
- * and a field name, both for singular values and multiple values (imploding the
- * latter into a single string)
+ * Model that provides field values as for a given Solr document
  *
  * @author twagoo
+ * @param <T> type of elements in the value collection in the field. Values will
+ * be cast on the fly, so specifying a non-matching type here might result in
+ * runtime errors!
  */
-public class SolrFieldModel extends AbstractReadOnlyModel<String> {
+public class SolrFieldModel<T> extends AbstractReadOnlyModel<Collection<T>> {
 
     private final IModel<SolrDocument> documentModel;
@@ -36 +38 @@
 
     /**
-     * 
+     *
      * @param documentModel model of document that holds the field values
      * @param fieldName name of the field to take value from
@@ -46 +48 @@
 
     @Override
-    public String getObject() {
+    public Collection<T> getObject() {
         final Collection<Object> fieldValues = documentModel.getObject().getFieldValues(fieldName);
-        if (fieldValues != null) {
-            return getValueString(fieldValues);
-        }
-        return null;
-    }
-
-    private String getValueString(final Collection<Object> fieldValues) {
-        final Iterator<Object> iterator = fieldValues.iterator();
-        if (iterator.hasNext()) {
-            final String firstValue = iterator.next().toString();
-            if (iterator.hasNext()) {
-                return getMultipleValuesString(firstValue, iterator);
-            } else {
-                return firstValue;
-            }
+        if (fieldValues == null) {
+            return null;
         } else {
-            return null;
+            return transformCollectionType(fieldValues);
         }
     }
 
-    protected String getMultipleValuesString(final String firstValue, final Iterator<Object> iterator) {
-        final StringBuilder valuesBuilder = new StringBuilder(firstValue);
-        while (iterator.hasNext()) {
-            valuesBuilder.append(iterator.next().toString());
-            if (iterator.hasNext()) {
-                valuesBuilder.append("; ");
+    /**
+     * Transforms object collection to a typed collection by means of an
+     * on-the-fly cast
+     *
+     * @param fieldValues
+     * @return
+     */
+    private Collection<T> transformCollectionType(final Collection<Object> fieldValues) {
+        return Collections2.transform(fieldValues, new Function<Object, T>() {
+
+            @Override
+            public T apply(Object input) {
+                return (T) input;
             }
-        }
-        return valuesBuilder.toString();
+        });
     }
 
@@ -84 +79 @@
         documentModel.detach();
     }
-    
-    
+
 }

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/model/SolrFieldStringModel.java

@@ -24 +24 @@
 
 /**
- * Model that provides field values as String values for a given Solr document
- * and a field name, both for singular values and multiple values (imploding the
+ * Model that provides field values as String values for a given field values
+ * model, both for singular values and multiple values (imploding the
  * latter into a single string)
  *
  * @author twagoo
  */
-public class SolrFieldModel extends AbstractReadOnlyModel<String> {
+public class SolrFieldStringModel extends AbstractReadOnlyModel<String> {
 
-    private final IModel<SolrDocument> documentModel;
-    private final String fieldName;
+    private final IModel<Collection<Object>> fieldModel;
 
     /**
-     * 
+     * Wraps the document model and specified field name into a
+     * {@link SolrFieldModel} to obtain field values
+     *
      * @param documentModel model of document that holds the field values
      * @param fieldName name of the field to take value from
      */
-    public SolrFieldModel(IModel<SolrDocument> documentModel, String fieldName) {
-        this.documentModel = documentModel;
-        this.fieldName = fieldName;
+    public SolrFieldStringModel(IModel<SolrDocument> documentModel, String fieldName) {
+        this(new SolrFieldModel<Object>(documentModel, fieldName));
+    }
+
+    /**
+     *
+     * @param fieldModel model that provides field values as a collection
+     */
+    public SolrFieldStringModel(IModel<Collection<Object>> fieldModel) {
+        this.fieldModel = fieldModel;
     }
 
     @Override
     public String getObject() {
-        final Collection<Object> fieldValues = documentModel.getObject().getFieldValues(fieldName);
+        final Collection<Object> fieldValues = fieldModel.getObject();
         if (fieldValues != null) {
             return getValueString(fieldValues);
@@ -82 +90 @@
     public void detach() {
         super.detach();
-        documentModel.detach();
+        fieldModel.detach();
     }
-    
-    
+
 }