Fix some quality flaws

2 files changed, 24 insertions, 24 deletions

diff --git a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilter.java b/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilter.java
index 4bed3ca31d1..3b27ec55608 100644
--- a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilter.java
+++ b/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilter.java
@@ -27,6 +27,7 @@ import org.apache.commons.lang.builder.ReflectionToStringBuilder;
 import org.sonar.api.measures.Metric;
 import org.sonar.api.resources.Qualifiers;
 
+import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
 
 import java.util.Collections;
@@ -141,20 +142,22 @@ public class MeasureFilter {
     return this;
   }
 
-  public MeasureFilter setFromDate(Date d) {
+  public MeasureFilter setFromDate(@Nullable Date d) {
     this.fromDate = d;
     return this;
   }
 
-  public MeasureFilter setToDate(Date d) {
+  public MeasureFilter setToDate(@Nullable Date d) {
     this.toDate = d;
     return this;
   }
 
+  @CheckForNull
   public Date getFromDate() {
     return fromDate;
   }
 
+  @CheckForNull
   public Date getToDate() {
     return toDate;
   }
diff --git a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterFactory.java b/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterFactory.java
index 5abbe9340ed..45e78f61190 100644
--- a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterFactory.java
+++ b/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterFactory.java
@@ -33,8 +33,11 @@ import org.sonar.api.utils.System2;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
-
-import java.util.*;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 public class MeasureFilterFactory implements ServerComponent {
 
@@ -55,15 +58,15 @@ public class MeasureFilterFactory implements ServerComponent {
     if (condition != null) {
       filter.addCondition(condition);
     }
-    String onBaseComponents = "onBaseComponents";
-    if (properties.containsKey(onBaseComponents)) {
-      filter.setOnBaseResourceChildren(Boolean.valueOf((String) properties.get(onBaseComponents)));
+    String onBaseComponents = (String) properties.get("onBaseComponents");
+    if (onBaseComponents != null) {
+      filter.setOnBaseResourceChildren(Boolean.valueOf(onBaseComponents));
     }
     filter.setResourceName((String) properties.get("nameSearch"));
     filter.setResourceKey((String) properties.get("keySearch"));
-    String onFavourites = "onFavourites";
-    if (properties.containsKey(onFavourites)) {
-      filter.setUserFavourites(Boolean.valueOf((String) properties.get(onFavourites)));
+    String onFavourites = (String) properties.get("onFavourites");
+    if (onFavourites != null) {
+      filter.setUserFavourites(Boolean.valueOf(onFavourites));
     }
     fillDateConditions(filter, properties);
     fillSorting(filter, properties);
@@ -72,23 +75,17 @@ public class MeasureFilterFactory implements ServerComponent {
   }
 
   private void fillDateConditions(MeasureFilter filter, Map<String, Object> properties) {
-    String fromDate = "fromDate";
-    if (properties.containsKey(fromDate)) {
-      filter.setFromDate(toDate((String) properties.get(fromDate)));
+    String fromDate = (String) properties.get("fromDate");
+    if (fromDate != null) {
+      filter.setFromDate(toDate(fromDate));
     } else {
-      String ageMaxDays = "ageMaxDays";
-      if (properties.containsKey(ageMaxDays)) {
-        filter.setFromDate(toDays((String) properties.get(ageMaxDays)));
-      }
+      filter.setFromDate(toDays((String) properties.get("ageMaxDays")));
     }
-    String toDate = "toDate";
-    if (properties.containsKey(toDate)) {
-      filter.setToDate(toDate((String) properties.get(toDate)));
+    String toDate = (String) properties.get("toDate");
+    if (toDate != null) {
+      filter.setToDate(toDate(toDate));
     } else {
-      String ageMinDays = "ageMinDays";
-      if (properties.containsKey(ageMinDays)) {
-        filter.setToDate(toDays((String) properties.get(ageMinDays)));
-      }
+      filter.setToDate(toDays((String) properties.get("ageMinDays")));
     }
   }