Fix quality flaws

2 files changed, 11 insertions, 5 deletions

diff --git a/sonar-batch/src/main/java/org/sonar/batch/qualitygate/QualityGateProvider.java b/sonar-batch/src/main/java/org/sonar/batch/qualitygate/QualityGateProvider.java
index e2e298f2fd1..7294e4e668b 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/qualitygate/QualityGateProvider.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/qualitygate/QualityGateProvider.java
@@ -36,12 +36,15 @@ import java.net.HttpURLConnection;
 
 public class QualityGateProvider extends ProviderAdapter {
 
+
   private static final Logger LOG = LoggerFactory.getLogger(QualityGateProvider.class);
 
   private static final String PROPERTY_QUALITY_GATE = "sonar.qualitygate";
 
   private static final String SHOW_URL = "/api/qualitygates/show";
 
+  private static final String ATTRIBUTE_CONDITIONS = "conditions";
+
   private QualityGate instance;
 
   public QualityGate provide(Settings settings, ServerClient client, MetricFinder metricFinder) {
@@ -93,8 +96,8 @@ public class QualityGateProvider extends ProviderAdapter {
 
     QualityGate configuredGate = new QualityGate(root.get("name").getAsString());
 
-    if (root.has("conditions")) {
-      for (JsonElement condition: root.get("conditions").getAsJsonArray()) {
+    if (root.has(ATTRIBUTE_CONDITIONS)) {
+      for (JsonElement condition: root.get(ATTRIBUTE_CONDITIONS).getAsJsonArray()) {
         JsonObject conditionObject = condition.getAsJsonObject();
         configuredGate.add(new ResolvedCondition(conditionObject, metricFinder.findByKey(conditionObject.get("metric").getAsString())));
       }
diff --git a/sonar-batch/src/main/java/org/sonar/batch/qualitygate/ResolvedCondition.java b/sonar-batch/src/main/java/org/sonar/batch/qualitygate/ResolvedCondition.java
index 6f893419c3d..0e22e7285b3 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/qualitygate/ResolvedCondition.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/qualitygate/ResolvedCondition.java
@@ -57,15 +57,18 @@ public class ResolvedCondition {
     return json.get("op").getAsString();
   }
 
-  public @CheckForNull String warningThreshold() {
+  @CheckForNull
+  public String warningThreshold() {
     return json.has(ATTRIBUTE_WARNING) ? json.get(ATTRIBUTE_WARNING).getAsString() : null;
   }
 
-  public @CheckForNull String errorThreshold() {
+  @CheckForNull
+  public String errorThreshold() {
     return json.has(ATTRIBUTE_ERROR) ? json.get(ATTRIBUTE_ERROR).getAsString() : null;
   }
 
-  public @CheckForNull Integer period() {
+  @CheckForNull
+  public Integer period() {
     return json.has(ATTRIBUTE_PERIOD) ? json.get(ATTRIBUTE_PERIOD).getAsInt() : null;
   }
 }