You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by rw...@apache.org on 2012/04/25 07:04:01 UTC

svn commit: r1330103 - /incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/query/SimilarityConstraint.java

Author: rwesten
Date: Wed Apr 25 05:04:00 2012
New Revision: 1330103

URL: http://svn.apache.org/viewvc?rev=1330103&view=rev
Log:
STANBOL-589: Changed SimilarityConstraint to support parsing NULL as additional fields. Now it also filters NULL and empty values in parsed additional fields values

Modified:
    incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/query/SimilarityConstraint.java

Modified: incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/query/SimilarityConstraint.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/query/SimilarityConstraint.java?rev=1330103&r1=1330102&r2=1330103&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/query/SimilarityConstraint.java (original)
+++ incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/query/SimilarityConstraint.java Wed Apr 25 05:04:00 2012
@@ -17,6 +17,7 @@
 package org.apache.stanbol.entityhub.servicesapi.query;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -31,23 +32,38 @@ public class SimilarityConstraint extend
 
     protected final String context;
 
-    protected final List<String> additionalFields = new ArrayList<String>();
+    protected final List<String> additionalFields;
 
     public SimilarityConstraint(String context) {
-        super(ConstraintType.similarity);
-        this.context = context;
+        this(context, null);
     }
 
     public SimilarityConstraint(String context, List<String> additionalFields) {
         super(ConstraintType.similarity);
         this.context = context;
-        this.additionalFields.addAll(additionalFields);
+        if(additionalFields == null || additionalFields.isEmpty()){
+            this.additionalFields = Collections.emptyList();
+        } else {
+            List<String> fields = new ArrayList<String>(additionalFields.size());
+            for(String field : additionalFields){
+                if(field != null && !field.isEmpty()){
+                    fields.add(field);
+                }
+            }
+            this.additionalFields = Collections.unmodifiableList(fields);
+        }
     }
-
+    /**
+     * Additional fields used for similarity calculations
+     * @return
+     */
     public List<String> getAdditionalFields() {
         return additionalFields;
     }
-    
+    /**
+     * The context used for checking the similarity
+     * @return
+     */
     public String getContext() {
         return context;
     }