Fix some quality flaws

2 files changed, 6 insertions, 4 deletions

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/resources/DefaultProjectFileSystem.java b/sonar-plugin-api/src/main/java/org/sonar/api/resources/DefaultProjectFileSystem.java
index 0c829ab7cdc..7afea1cad57 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/resources/DefaultProjectFileSystem.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/resources/DefaultProjectFileSystem.java
@@ -35,6 +35,7 @@ import org.sonar.api.utils.Logs;
 import org.sonar.api.utils.SonarException;
 import org.sonar.api.utils.WildcardPattern;
 
+import javax.annotation.Nullable;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.Charset;
@@ -51,8 +52,8 @@ import java.util.*;
 public class DefaultProjectFileSystem implements ProjectFileSystem {
 
   protected static final Predicate<File> DIRECTORY_EXISTS = new Predicate<File>() {
-    public boolean apply(File input) {
-      return input.exists() && input.isDirectory();
+    public boolean apply(@Nullable File input) {
+      return input != null && input.exists() && input.isDirectory();
     }
   };
 
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/resources/ResourceTypes.java b/sonar-plugin-api/src/main/java/org/sonar/api/resources/ResourceTypes.java
index 6fbcc46f299..306042d40d0 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/resources/ResourceTypes.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/resources/ResourceTypes.java
@@ -30,6 +30,7 @@ import com.google.common.collect.Maps;
 import org.sonar.api.BatchComponent;
 import org.sonar.api.ServerComponent;
 
+import javax.annotation.Nullable;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -42,8 +43,8 @@ import java.util.Map;
 public final class ResourceTypes implements BatchComponent, ServerComponent {
 
   public static final Predicate<ResourceType> AVAILABLE_FOR_FILTERS = new Predicate<ResourceType>() {
-    public boolean apply(ResourceType input) {
-      return Boolean.TRUE.equals(input.getBooleanProperty("availableForFilters"));
+    public boolean apply(@Nullable ResourceType input) {
+      return input != null && Boolean.TRUE.equals(input.getBooleanProperty("availableForFilters"));
     }
   };