From dde15fad40cd2885015518f1a4dabcdec33b56d1 Mon Sep 17 00:00:00 2001
From: Julien Lancelot <julien.lancelot@sonarsource.com>
Date: Thu, 22 May 2014 11:07:29 +0200
Subject: [PATCH] Fix quality flaws

---
 .../component/ws/ComponentAppAction.java      |  4 ---
 .../duplication/ws/DuplicationsWriter.java    | 26 +++++++++++--------
 .../qualityprofile/QProfileValidations.java   | 15 -----------
 3 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentAppAction.java b/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentAppAction.java
index 1eaa1bf2608..1e285762e81 100644
--- a/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentAppAction.java
+++ b/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentAppAction.java
@@ -40,18 +40,14 @@ import org.sonar.core.component.ComponentDto;
 import org.sonar.core.measure.db.MeasureDto;
 import org.sonar.core.persistence.DbSession;
 import org.sonar.core.persistence.MyBatis;
-import org.sonar.core.properties.PropertiesDao;
 import org.sonar.core.properties.PropertyDto;
 import org.sonar.core.properties.PropertyQuery;
-import org.sonar.core.resource.ResourceDao;
 import org.sonar.core.resource.SnapshotDto;
 import org.sonar.core.timemachine.Periods;
-import org.sonar.server.component.persistence.ComponentDao;
 import org.sonar.server.db.DbClient;
 import org.sonar.server.exceptions.NotFoundException;
 import org.sonar.server.issue.IssueService;
 import org.sonar.server.issue.RulesAggregation;
-import org.sonar.server.measure.persistence.MeasureDao;
 import org.sonar.server.source.SourceService;
 import org.sonar.server.user.UserSession;
 
diff --git a/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsWriter.java b/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsWriter.java
index 6f267fc05f7..28e8e633068 100644
--- a/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsWriter.java
+++ b/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsWriter.java
@@ -75,17 +75,7 @@ public class DuplicationsWriter implements ServerComponent {
           String size = bCursor.getAttrValue("l");
           String componentKey = bCursor.getAttrValue("r");
           if (from != null && size != null && componentKey != null) {
-            String ref = refByComponentKey.get(componentKey);
-            if (ref == null) {
-              ref = Integer.toString(refByComponentKey.size() + 1);
-              refByComponentKey.put(componentKey, Integer.toString(refByComponentKey.size() + 1));
-            }
-
-            json.beginObject();
-            json.prop("from", Integer.valueOf(from));
-            json.prop("size", Integer.valueOf(size));
-            json.prop("_ref", ref);
-            json.endObject();
+            writeDuplication(refByComponentKey, from, size, componentKey, json);
           }
         }
         json.endArray().endObject();
@@ -95,6 +85,20 @@ public class DuplicationsWriter implements ServerComponent {
     }
   }
 
+  private void writeDuplication(Map<String, String> refByComponentKey, String from, String size, String componentKey, JsonWriter json) {
+    String ref = refByComponentKey.get(componentKey);
+    if (ref == null) {
+      ref = Integer.toString(refByComponentKey.size() + 1);
+      refByComponentKey.put(componentKey, Integer.toString(refByComponentKey.size() + 1));
+    }
+
+    json.beginObject();
+    json.prop("from", Integer.valueOf(from));
+    json.prop("size", Integer.valueOf(size));
+    json.prop("_ref", ref);
+    json.endObject();
+  }
+
   private void writeFiles(Map<String, String> refByComponentKey, JsonWriter json, DbSession session) {
     Map<Long, ComponentDto> projectById = newHashMap();
     for (Map.Entry<String, String> entry : refByComponentKey.entrySet()) {
diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileValidations.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileValidations.java
index 8d76ca8e000..71af3a73be0 100644
--- a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileValidations.java
+++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileValidations.java
@@ -20,9 +20,7 @@
 
 package org.sonar.server.qualityprofile;
 
-import org.sonar.core.qualityprofile.db.ActiveRuleDto;
 import org.sonar.core.qualityprofile.db.QualityProfileDto;
-import org.sonar.core.rule.RuleDto;
 import org.sonar.server.exceptions.NotFoundException;
 
 import javax.annotation.Nullable;
@@ -40,17 +38,4 @@ public class QProfileValidations {
     return profile;
   }
 
-  public static RuleDto checkRuleIsNotNull(@Nullable RuleDto rule) {
-    if (rule == null) {
-      throw new NotFoundException("This rule does not exists.");
-    }
-    return rule;
-  }
-
-  public static ActiveRuleDto checkActiveRuleIsNotNull(@Nullable ActiveRuleDto activeRule) {
-    if (activeRule == null) {
-      throw new NotFoundException("This active rule does not exists.");
-    }
-    return activeRule;
-  }
 }
-- 
2.39.5