]> source.dussan.org Git - sonarqube.git/commitdiff
Fix quality flaws
authorJulien Lancelot <julien.lancelot@sonarsource.com>
Fri, 12 Jun 2015 12:14:28 +0000 (14:14 +0200)
committerJulien Lancelot <julien.lancelot@sonarsource.com>
Fri, 12 Jun 2015 12:14:28 +0000 (14:14 +0200)
13 files changed:
server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistSnapshotsStep.java
server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelXMLExporter.java
server/sonar-server/src/main/java/org/sonar/server/debt/DebtRulesXMLImporter.java
server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsJsonWriter.java
server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssuesWs.java
server/sonar-server/src/main/java/org/sonar/server/permission/PermissionFinder.java
server/sonar-server/src/main/java/org/sonar/server/source/HtmlTextDecorator.java
server/sonar-server/src/main/java/org/sonar/server/user/GroupMembershipService.java
server/sonar-server/src/main/java/org/sonar/server/user/index/UserIndexer.java
server/sonar-server/src/main/java/org/sonar/server/user/ws/CreateAction.java
server/sonar-server/src/test/java/org/sonar/server/computation/component/ComponentImplTest.java
sonar-batch/src/main/java/org/sonar/batch/compute/CountUnresolvedIssuesDecorator.java
sonar-batch/src/main/java/org/sonar/batch/debt/DebtDecorator.java

index b2c46bb56b9bc802df6948653ab5a7846789528d..8738e4463b776c0d641ed977480f23dcbb56e225 100644 (file)
@@ -62,7 +62,7 @@ public class PersistSnapshotsStep implements ComputationStep {
     DbSession session = dbClient.openSession(false);
     try {
       Component root = treeRootHolder.getRoot();
-      ProcessPersistSnapshot processPersistSnapshot = new ProcessPersistSnapshot(session, reportReader, reportReader.readMetadata().getAnalysisDate());
+      ProcessPersistSnapshot processPersistSnapshot = new ProcessPersistSnapshot(session, reportReader.readMetadata().getAnalysisDate());
       processPersistSnapshot.process(root, null);
       session.commit();
     } finally {
@@ -72,14 +72,12 @@ public class PersistSnapshotsStep implements ComputationStep {
 
   private class ProcessPersistSnapshot {
 
-    private final BatchReportReader reportReader;
     private final DbSession dbSession;
     private final long analysisDate;
 
     private long projectId;
 
-    public ProcessPersistSnapshot(DbSession dbSession, BatchReportReader reportReader, long analysisDate) {
-      this.reportReader = reportReader;
+    public ProcessPersistSnapshot(DbSession dbSession, long analysisDate) {
       this.dbSession = dbSession;
       this.analysisDate = analysisDate;
     }
index be554876a307d8f9dd3223dbf236a2e430b8692d..989f3bf833770583fdf3b7f5d11cfba4917a8b55 100644 (file)
@@ -109,7 +109,7 @@ public class DebtModelXMLExporter {
     xml.append("</" + CHARACTERISTIC + ">");
   }
 
-  private void processRule(RuleDebt rule, StringBuilder xml) {
+  private static void processRule(RuleDebt rule, StringBuilder xml) {
     xml.append("<" + CHARACTERISTIC + ">");
     xml.append("<" + REPOSITORY_KEY + ">");
     xml.append(StringEscapeUtils.escapeXml(rule.ruleKey().repository()));
index 2f119bc0e139da204e31dd77998b9c0a45008477..edf8fb88e5066b75429d5a6627bd256f04a53bf6 100644 (file)
@@ -166,7 +166,7 @@ public class DebtRulesXMLImporter {
   }
 
   @CheckForNull
-  private RuleDebt createRule(RuleKey ruleKey, Properties properties, ValidationMessages validationMessages) {
+  private static RuleDebt createRule(RuleKey ruleKey, Properties properties, ValidationMessages validationMessages) {
     Property function = properties.function();
     if (function != null) {
 
index e5ddea9269bcc30c27779ee60ae47e4b2f0dc765..cd2c21efcedb8e3dae6d3f9c98a95aac273a6e3d 100644 (file)
@@ -53,7 +53,7 @@ public class DuplicationsJsonWriter {
     json.endObject();
   }
 
-  private void writeDuplications(List<DuplicationsParser.Block> blocks, Map<String, String> refByComponentKey, JsonWriter json) {
+  private static void writeDuplications(List<DuplicationsParser.Block> blocks, Map<String, String> refByComponentKey, JsonWriter json) {
     for (DuplicationsParser.Block block : blocks) {
       json.beginObject().name("blocks").beginArray();
       for (DuplicationsParser.Duplication duplication : block.duplications()) {
index 8727dde142c4e84df8cababd27da8e06e90a186d..9089029b21ae954aca0d96b413013d90a67fca53 100644 (file)
@@ -60,7 +60,7 @@ public class IssuesWs implements WebService {
     controller.done();
   }
 
-  private void defineRailsActions(NewController controller) {
+  private static void defineRailsActions(NewController controller) {
     defineChangelogAction(controller);
     defineAssignAction(controller);
     defineAddCommentAction(controller);
index 0f380a30dbee7c2c4b42b5fc13f5f7fbc40a5b4b..f20442c764cfc63d8567163a9d3bcbf02a209996 100644 (file)
@@ -85,7 +85,7 @@ public class PermissionFinder {
     return toGroupQueryResult(permissionTemplateDao.selectGroups(query, permissionTemplateId), query);
   }
 
-  private UserWithPermissionQueryResult toUserQueryResult(List<UserWithPermissionDto> dtos, int limit) {
+  private static UserWithPermissionQueryResult toUserQueryResult(List<UserWithPermissionDto> dtos, int limit) {
     boolean hasMoreResults = false;
     if (dtos.size() == limit) {
       hasMoreResults = true;
index c55cbf8f5f3f52642206a939deca81604ef576d1..a3408a8b2a3b6f381c622433e1bb5d8368c121b2 100644 (file)
@@ -119,7 +119,7 @@ class HtmlTextDecorator {
     }
   }
 
-  private void addLine(List<String> decoratedHtmlLines, String line, int currentLine, @Nullable Integer from, @Nullable Integer to) {
+  private static void addLine(List<String> decoratedHtmlLines, String line, int currentLine, @Nullable Integer from, @Nullable Integer to) {
     if (canAddLine(currentLine, from) && !shouldStop(currentLine, to)) {
       decoratedHtmlLines.add(line);
     }
index 067a659dc5e8e413234620ea157140f345d4f6aa..e50a71ba1c239833bb35efcfe9c0a37aa8c9fea3 100644 (file)
@@ -44,7 +44,7 @@ public class GroupMembershipService {
     return finder.find(parseQuery(params));
   }
 
-  private GroupMembershipQuery parseQuery(Map<String, Object> params) {
+  private static GroupMembershipQuery parseQuery(Map<String, Object> params) {
     GroupMembershipQuery.Builder builder = GroupMembershipQuery.builder();
     builder.membership(membership(params));
     builder.groupSearch((String) params.get("query"));
index 44532f11e2ea96b032aa118ce4374be69bd10b81..473af26e6538b49dfec4f357f6834e68e305fb87 100644 (file)
@@ -58,7 +58,7 @@ public class UserIndexer extends BaseIndexer {
     }
   }
 
-  private long doIndex(BulkIndexer bulk, Iterator<UserDoc> users) {
+  private static long doIndex(BulkIndexer bulk, Iterator<UserDoc> users) {
     long maxUpdatedAt = 0L;
     bulk.start();
     while (users.hasNext()) {
index 143ca191130b347b5caf3aed6704af74492b7eb9..ac9381c4cb1d813ab9ac606551a18e7d7d41751f 100644 (file)
@@ -115,7 +115,7 @@ public class CreateAction implements UsersWsAction {
     json.endObject().close();
   }
 
-  private void writeUser(JsonWriter json, UserDoc user) {
+  private static void writeUser(JsonWriter json, UserDoc user) {
     json.name("user").beginObject()
       .prop("login", user.login())
       .prop("name", user.name())
index 19d9856dcdfaeacfe427d0da0d68072eec40cad9..50e04bb3178169035aaf4ec679e32e117db5b2e8 100644 (file)
@@ -28,8 +28,6 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class ComponentImplTest {
 
-  private ComponentImpl component = new ComponentImpl(BatchReport.Component.newBuilder().build(), Collections.<Component>emptyList());
-
   @Test(expected = NullPointerException.class)
   public void constructor_throws_NPE_if_component_arg_is_Null() {
     new ComponentImpl(null, null);
@@ -37,24 +35,48 @@ public class ComponentImplTest {
 
   @Test(expected = UnsupportedOperationException.class)
   public void getUuid_throws_UOE_if_uuid_has_not_been_set_yet() {
+    ComponentImpl component = new ComponentImpl(BatchReport.Component.newBuilder().build(), Collections.<Component>emptyList());
     component.getUuid();
   }
 
   @Test(expected = UnsupportedOperationException.class)
   public void getKey_throws_UOE_if_uuid_has_not_been_set_yet() {
+    ComponentImpl component = new ComponentImpl(BatchReport.Component.newBuilder().build(), Collections.<Component>emptyList());
     component.getKey();
   }
 
   @Test
   public void verify_setUuid() {
     String uuid = "toto";
-    assertThat(component.setUuid(uuid).getUuid()).isEqualTo(uuid);
+    ComponentImpl component = new ComponentImpl(BatchReport.Component.newBuilder().build(), Collections.<Component>emptyList()).setUuid(uuid);
+    assertThat(component.getUuid()).isEqualTo(uuid);
   }
 
   @Test
   public void verify_setKey() {
     String key = "toto";
-    assertThat(component.setKey(key).getKey()).isEqualTo(key);
+    ComponentImpl component = new ComponentImpl(BatchReport.Component.newBuilder().build(), Collections.<Component>emptyList()).setKey(key);
+    assertThat(component.getKey()).isEqualTo(key);
+  }
+
+  @Test
+  public void get_name_from_batch_component() throws Exception {
+    String name = "project";
+    ComponentImpl component = new ComponentImpl(BatchReport.Component.newBuilder().setName(name).build(), Collections.<Component>emptyList());
+    assertThat(component.getName()).isEqualTo(name);
+  }
+
+  @Test
+  public void get_version_from_batch_component() throws Exception {
+    String version = "1.0";
+    ComponentImpl component = new ComponentImpl(BatchReport.Component.newBuilder().setVersion(version).build(), Collections.<Component>emptyList());
+    assertThat(component.getVersion()).isEqualTo(version);
+  }
+
+  @Test
+  public void get_is_unit_test_from_batch_component() throws Exception {
+    ComponentImpl component = new ComponentImpl(BatchReport.Component.newBuilder().setIsTest(true).build(), Collections.<Component>emptyList());
+    assertThat(component.isUnitTest()).isTrue();
   }
 
   @Test
index 53dd6a49d51571a3afe774fda1b24818d067d33a..dee397d05d414b92596c677cfbdba90f364604ef 100644 (file)
@@ -178,7 +178,7 @@ public class CountUnresolvedIssuesDecorator implements Decorator {
     }
   }
 
-  private void saveIssuesPerRules(DecoratorContext context, RulePriority severity, Map<RulePriority, Multiset<RuleKey>> rulesPerSeverity) {
+  private static void saveIssuesPerRules(DecoratorContext context, RulePriority severity, Map<RulePriority, Multiset<RuleKey>> rulesPerSeverity) {
     Metric metric = SeverityUtils.severityToIssueMetric(severity);
 
     Collection<Measure> children = context.getChildrenMeasures(MeasuresFilters.rules(metric));
index 237f27bae6776ae96ddde7f602db10645e7f25e9..5ddb7e459498812c369d22bcdff0754585bf373f 100644 (file)
@@ -188,7 +188,7 @@ public final class DebtDecorator implements Decorator {
     context.saveMeasure(measure);
   }
 
-  private boolean shouldSaveMeasure(DecoratorContext context) {
+  private static boolean shouldSaveMeasure(DecoratorContext context) {
     return context.getMeasure(CoreMetrics.TECHNICAL_DEBT) == null;
   }