You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by an...@apache.org on 2015/04/13 11:54:58 UTC
svn commit: r1673145 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak: plugins/index/property/OrderedPropertyIndexLookup.java plugins/index/property/PropertyIndexLookup.java query/index/FilterImpl.java

Author: angela
Date: Mon Apr 13 09:54:57 2015
New Revision: 1673145

URL: http://svn.apache.org/r1673145
Log:
OAK-2641 : FilterImpl violates nullability contract

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedPropertyIndexLookup.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexLookup.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedPropertyIndexLookup.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedPropertyIndexLookup.java?rev=1673145&r1=1673144&r2=1673145&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedPropertyIndexLookup.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/OrderedPropertyIndexLookup.java Mon Apr 13 09:54:57 2015
@@ -29,6 +29,8 @@ import static org.apache.jackrabbit.oak.
 import java.util.List;
 import java.util.Set;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import org.apache.jackrabbit.oak.api.PropertyState;
@@ -141,8 +143,9 @@ public class OrderedPropertyIndexLookup
         return fallback;
     }
 
-    private static Set<String> getSuperTypes(Filter filter) {
-        if (filter != null && !filter.matchesAllTypes()) {
+    @CheckForNull
+    private static Set<String> getSuperTypes(@Nonnull Filter filter) {
+        if (!filter.matchesAllTypes()) {
             return filter.getSupertypes();
         }
         return null;

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexLookup.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexLookup.java?rev=1673145&r1=1673144&r2=1673145&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexLookup.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexLookup.java Mon Apr 13 09:54:57 2015
@@ -27,6 +27,7 @@ import static org.apache.jackrabbit.oak.
 
 import java.util.Set;
 
+import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
 
 import org.apache.jackrabbit.oak.api.PropertyState;
@@ -191,6 +192,7 @@ public class PropertyIndexLookup {
         return TYPE;
     }
 
+    @CheckForNull
     private static Set<String> getSuperTypes(Filter filter) {
         if (filter != null && !filter.matchesAllTypes()) {
             return filter.getSupertypes();

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java?rev=1673145&r1=1673144&r2=1673145&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java Mon Apr 13 09:54:57 2015
@@ -20,6 +20,7 @@ package org.apache.jackrabbit.oak.query.
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map.Entry;
@@ -229,17 +230,17 @@ public class FilterImpl implements Filte
 
     @Override @Nonnull
     public Set<String> getSupertypes() {
-        return selector == null ? null : selector.getSupertypes();
+        return selector == null ? Collections.EMPTY_SET : selector.getSupertypes();
     }
 
     @Override @Nonnull
     public Set<String> getPrimaryTypes() {
-        return selector == null ? null : selector.getPrimaryTypes();
+        return selector == null ? Collections.EMPTY_SET : selector.getPrimaryTypes();
     }
 
     @Override @Nonnull
     public Set<String> getMixinTypes() {
-        return selector == null ? null : selector.getMixinTypes();
+        return selector == null ? Collections.EMPTY_SET : selector.getMixinTypes();
     }
 
     @Override