Index: oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Filter.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Filter.java	(revision 1667561)
+++ oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Filter.java	(revision )
@@ -22,6 +22,7 @@
 import java.util.List;
 import java.util.Set;
 
+import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.jcr.PropertyType;
@@ -140,25 +141,25 @@
     /**
      * Returns the names of the filter node type and all its supertypes.
      *
-     * @return supertype name
+     * @return supertype name or null
      */
-    @Nonnull
+    @CheckForNull
     Set<String> getSupertypes();
 
     /**
      * Returns the names of all matching primary node types.
      *
-     * @return primary node type names
+     * @return primary node type names or null
      */
-    @Nonnull
+    @CheckForNull
     Set<String> getPrimaryTypes();
 
     /**
      * Returns the names of all matching mixin node types.
      *
-     * @return mixin node type names
+     * @return mixin node type names or null
      */
-    @Nonnull
+    @CheckForNull
     Set<String> getMixinTypes();
 
     /**
Index: oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java	(revision 1667561)
+++ oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java	(revision )
@@ -25,7 +25,7 @@
 import java.util.Map.Entry;
 import java.util.Set;
 
-import javax.annotation.Nonnull;
+import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
 import javax.jcr.PropertyType;
 import javax.jcr.Session;
@@ -227,17 +227,17 @@
         return matchesAllTypes;
     }
 
-    @Override @Nonnull
+    @Override @CheckForNull
     public Set<String> getSupertypes() {
         return selector == null ? null : selector.getSupertypes();
     }
 
-    @Override @Nonnull
+    @Override @CheckForNull
     public Set<String> getPrimaryTypes() {
         return selector == null ? null : selector.getPrimaryTypes();
     }
 
-    @Override @Nonnull
+    @Override @CheckForNull
     public Set<String> getMixinTypes() {
         return selector == null ? null : selector.getMixinTypes();
     }