Fix some quality flaws

2 files changed, 14 insertions, 12 deletions

diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/dialect/DialectUtils.java b/sonar-core/src/main/java/org/sonar/core/persistence/dialect/DialectUtils.java
index 71d07c0ac90..573b34d2c96 100644
--- a/sonar-core/src/main/java/org/sonar/core/persistence/dialect/DialectUtils.java
+++ b/sonar-core/src/main/java/org/sonar/core/persistence/dialect/DialectUtils.java
@@ -24,6 +24,7 @@ import com.google.common.collect.Iterators;
 import org.apache.commons.lang.StringUtils;
 import org.sonar.api.utils.SonarException;
 
+import javax.annotation.Nullable;
 import java.util.NoSuchElementException;
 
 public final class DialectUtils {
@@ -42,12 +43,11 @@ public final class DialectUtils {
   }
 
   private static Dialect findByJdbcUrl(final String jdbcConnectionUrl) {
-    Dialect match = findDialect(new Predicate<Dialect>() {
-      public boolean apply(Dialect dialect) {
-        return dialect.matchesJdbcURL(StringUtils.trimToEmpty(jdbcConnectionUrl));
+    return findDialect(new Predicate<Dialect>() {
+      public boolean apply(@Nullable Dialect dialect) {
+        return dialect != null && dialect.matchesJdbcURL(StringUtils.trimToEmpty(jdbcConnectionUrl));
       }
     });
-    return match;
   }
 
   private static Dialect findById(final String dialectId) {
diff --git a/sonar-core/src/main/java/org/sonar/core/review/ReviewPredicates.java b/sonar-core/src/main/java/org/sonar/core/review/ReviewPredicates.java
index 4529d0186f0..4fc6e3ff12b 100644
--- a/sonar-core/src/main/java/org/sonar/core/review/ReviewPredicates.java
+++ b/sonar-core/src/main/java/org/sonar/core/review/ReviewPredicates.java
@@ -22,6 +22,8 @@ package org.sonar.core.review;
 import com.google.common.base.Predicate;
 import org.apache.commons.lang.ArrayUtils;
 
+import javax.annotation.Nullable;
+
 /**
  * @since 2.14
  */
@@ -53,8 +55,8 @@ public final class ReviewPredicates {
       this.statuses = statuses;
     }
 
-    public boolean apply(ReviewDto review) {
-      return ArrayUtils.contains(statuses, review.getStatus());
+    public boolean apply(@Nullable ReviewDto review) {
+      return review!=null && ArrayUtils.contains(statuses, review.getStatus());
     }
   }
 
@@ -65,8 +67,8 @@ public final class ReviewPredicates {
       this.resolutions = resolutions;
     }
 
-    public boolean apply(ReviewDto review) {
-      return ArrayUtils.contains(resolutions, review.getResolution());
+    public boolean apply(@Nullable ReviewDto review) {
+      return review!=null && ArrayUtils.contains(resolutions, review.getResolution());
     }
   }
 
@@ -76,8 +78,8 @@ public final class ReviewPredicates {
     private ManualViolationPredicate() {
     }
 
-    public boolean apply(ReviewDto review) {
-      return review.isManualViolation();
+    public boolean apply(@Nullable ReviewDto review) {
+      return review!=null && review.isManualViolation();
     }
   }
 
@@ -87,8 +89,8 @@ public final class ReviewPredicates {
     private ManualSeverityPredicate() {
     }
 
-    public boolean apply(ReviewDto review) {
-      return review.isManualSeverity();
+    public boolean apply(@Nullable ReviewDto review) {
+      return review!=null && review.isManualSeverity();
     }
   }
 }