From 0ace9fe008ae66ca0899827556f1d45fdfeb18c5 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Fri, 12 Jun 2015 14:14:28 +0200 Subject: [PATCH] Fix quality flaws --- .../step/PersistSnapshotsStep.java | 6 ++-- .../server/debt/DebtModelXMLExporter.java | 2 +- .../server/debt/DebtRulesXMLImporter.java | 2 +- .../ws/DuplicationsJsonWriter.java | 2 +- .../org/sonar/server/issue/ws/IssuesWs.java | 2 +- .../server/permission/PermissionFinder.java | 2 +- .../server/source/HtmlTextDecorator.java | 2 +- .../server/user/GroupMembershipService.java | 2 +- .../sonar/server/user/index/UserIndexer.java | 2 +- .../sonar/server/user/ws/CreateAction.java | 2 +- .../component/ComponentImplTest.java | 30 ++++++++++++++++--- .../CountUnresolvedIssuesDecorator.java | 2 +- .../org/sonar/batch/debt/DebtDecorator.java | 2 +- 13 files changed, 39 insertions(+), 19 deletions(-) diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistSnapshotsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistSnapshotsStep.java index b2c46bb56b9..8738e4463b7 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistSnapshotsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistSnapshotsStep.java @@ -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; } diff --git a/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelXMLExporter.java b/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelXMLExporter.java index be554876a30..989f3bf8337 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelXMLExporter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelXMLExporter.java @@ -109,7 +109,7 @@ public class DebtModelXMLExporter { xml.append(""); } - 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())); diff --git a/server/sonar-server/src/main/java/org/sonar/server/debt/DebtRulesXMLImporter.java b/server/sonar-server/src/main/java/org/sonar/server/debt/DebtRulesXMLImporter.java index 2f119bc0e13..edf8fb88e50 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/debt/DebtRulesXMLImporter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/debt/DebtRulesXMLImporter.java @@ -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) { diff --git a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsJsonWriter.java b/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsJsonWriter.java index e5ddea9269b..cd2c21efced 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsJsonWriter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsJsonWriter.java @@ -53,7 +53,7 @@ public class DuplicationsJsonWriter { json.endObject(); } - private void writeDuplications(List blocks, Map refByComponentKey, JsonWriter json) { + private static void writeDuplications(List blocks, Map refByComponentKey, JsonWriter json) { for (DuplicationsParser.Block block : blocks) { json.beginObject().name("blocks").beginArray(); for (DuplicationsParser.Duplication duplication : block.duplications()) { diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssuesWs.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssuesWs.java index 8727dde142c..9089029b21a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssuesWs.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssuesWs.java @@ -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); diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionFinder.java b/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionFinder.java index 0f380a30dbe..f20442c764c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionFinder.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionFinder.java @@ -85,7 +85,7 @@ public class PermissionFinder { return toGroupQueryResult(permissionTemplateDao.selectGroups(query, permissionTemplateId), query); } - private UserWithPermissionQueryResult toUserQueryResult(List dtos, int limit) { + private static UserWithPermissionQueryResult toUserQueryResult(List dtos, int limit) { boolean hasMoreResults = false; if (dtos.size() == limit) { hasMoreResults = true; diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/HtmlTextDecorator.java b/server/sonar-server/src/main/java/org/sonar/server/source/HtmlTextDecorator.java index c55cbf8f5f3..a3408a8b2a3 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/source/HtmlTextDecorator.java +++ b/server/sonar-server/src/main/java/org/sonar/server/source/HtmlTextDecorator.java @@ -119,7 +119,7 @@ class HtmlTextDecorator { } } - private void addLine(List decoratedHtmlLines, String line, int currentLine, @Nullable Integer from, @Nullable Integer to) { + private static void addLine(List decoratedHtmlLines, String line, int currentLine, @Nullable Integer from, @Nullable Integer to) { if (canAddLine(currentLine, from) && !shouldStop(currentLine, to)) { decoratedHtmlLines.add(line); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/GroupMembershipService.java b/server/sonar-server/src/main/java/org/sonar/server/user/GroupMembershipService.java index 067a659dc5e..e50a71ba1c2 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/GroupMembershipService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/GroupMembershipService.java @@ -44,7 +44,7 @@ public class GroupMembershipService { return finder.find(parseQuery(params)); } - private GroupMembershipQuery parseQuery(Map params) { + private static GroupMembershipQuery parseQuery(Map params) { GroupMembershipQuery.Builder builder = GroupMembershipQuery.builder(); builder.membership(membership(params)); builder.groupSearch((String) params.get("query")); diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/index/UserIndexer.java b/server/sonar-server/src/main/java/org/sonar/server/user/index/UserIndexer.java index 44532f11e2e..473af26e653 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/index/UserIndexer.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/index/UserIndexer.java @@ -58,7 +58,7 @@ public class UserIndexer extends BaseIndexer { } } - private long doIndex(BulkIndexer bulk, Iterator users) { + private static long doIndex(BulkIndexer bulk, Iterator users) { long maxUpdatedAt = 0L; bulk.start(); while (users.hasNext()) { diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/CreateAction.java b/server/sonar-server/src/main/java/org/sonar/server/user/ws/CreateAction.java index 143ca191130..ac9381c4cb1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/CreateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/ws/CreateAction.java @@ -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()) diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ComponentImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/component/ComponentImplTest.java index 19d9856dcdf..50e04bb3178 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/component/ComponentImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/component/ComponentImplTest.java @@ -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.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.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.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.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.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.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.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.emptyList()); + assertThat(component.isUnitTest()).isTrue(); } @Test diff --git a/sonar-batch/src/main/java/org/sonar/batch/compute/CountUnresolvedIssuesDecorator.java b/sonar-batch/src/main/java/org/sonar/batch/compute/CountUnresolvedIssuesDecorator.java index 53dd6a49d51..dee397d05d4 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/compute/CountUnresolvedIssuesDecorator.java +++ b/sonar-batch/src/main/java/org/sonar/batch/compute/CountUnresolvedIssuesDecorator.java @@ -178,7 +178,7 @@ public class CountUnresolvedIssuesDecorator implements Decorator { } } - private void saveIssuesPerRules(DecoratorContext context, RulePriority severity, Map> rulesPerSeverity) { + private static void saveIssuesPerRules(DecoratorContext context, RulePriority severity, Map> rulesPerSeverity) { Metric metric = SeverityUtils.severityToIssueMetric(severity); Collection children = context.getChildrenMeasures(MeasuresFilters.rules(metric)); diff --git a/sonar-batch/src/main/java/org/sonar/batch/debt/DebtDecorator.java b/sonar-batch/src/main/java/org/sonar/batch/debt/DebtDecorator.java index 237f27bae67..5ddb7e45949 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/debt/DebtDecorator.java +++ b/sonar-batch/src/main/java/org/sonar/batch/debt/DebtDecorator.java @@ -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; } -- 2.39.5