From 29814478d54b8e74d4ed2450a01c4123333fee2d Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Mon, 31 Aug 2015 15:44:53 +0200 Subject: [PATCH] Fix quality flaws --- ...CloseIssuesOnRemovedComponentsVisitor.java | 3 ++- .../step/FeedMeasureComputers.java | 23 +++++++++++-------- .../ws/DuplicationsJsonWriter.java | 2 +- .../duplication/ws/DuplicationsParser.java | 12 +++++----- .../org/sonar/server/issue/AssignAction.java | 13 +++++------ .../org/sonar/server/issue/CommentAction.java | 6 ++--- .../server/issue/IssueBulkChangeQuery.java | 2 +- .../server/issue/IssueBulkChangeService.java | 2 +- .../org/sonar/server/issue/PlanAction.java | 11 ++++----- .../sonar/server/issue/SetSeverityAction.java | 6 ++--- .../sonar/server/issue/TransitionAction.java | 6 ++--- .../issue/filter/IssueFilterParameters.java | 2 +- .../org/sonar/server/issue/ws/ShowAction.java | 5 ---- .../org/sonar/server/platform/Platform.java | 3 --- .../step/PersistFileSourcesStepTest.java | 4 ---- .../server/debt/DebtModelXMLExporterTest.java | 17 +++++++------- .../ws/DuplicationsParserTest.java | 16 ++++++------- 17 files changed, 62 insertions(+), 71 deletions(-) diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/CloseIssuesOnRemovedComponentsVisitor.java b/server/sonar-server/src/main/java/org/sonar/server/computation/issue/CloseIssuesOnRemovedComponentsVisitor.java index 87075b4b47e..7197df5481a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/issue/CloseIssuesOnRemovedComponentsVisitor.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/issue/CloseIssuesOnRemovedComponentsVisitor.java @@ -40,7 +40,8 @@ public class CloseIssuesOnRemovedComponentsVisitor extends TypeAwareVisitorAdapt private final IssueCache issueCache; private final IssueLifecycle issueLifecycle; - public CloseIssuesOnRemovedComponentsVisitor(BaseIssuesLoader baseIssuesLoader, ComponentsWithUnprocessedIssues componentsWithUnprocessedIssues, IssueCache issueCache, IssueLifecycle issueLifecycle) { + public CloseIssuesOnRemovedComponentsVisitor(BaseIssuesLoader baseIssuesLoader, ComponentsWithUnprocessedIssues componentsWithUnprocessedIssues, IssueCache issueCache, + IssueLifecycle issueLifecycle) { super(CrawlerDepthLimit.PROJECT, POST_ORDER); this.baseIssuesLoader = baseIssuesLoader; this.componentsWithUnprocessedIssues = componentsWithUnprocessedIssues; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/FeedMeasureComputers.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/FeedMeasureComputers.java index b5623facd0c..48dc14cbf1e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/FeedMeasureComputers.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/FeedMeasureComputers.java @@ -87,14 +87,7 @@ public class FeedMeasureComputers implements ComputationStep { private static Iterable sortComputers(List computers) { Map computersByOutputMetric = new HashMap<>(); Map computersByInputMetric = new HashMap<>(); - for (MeasureComputer computer : computers) { - for (String outputMetric : computer.getOutputMetrics()) { - computersByOutputMetric.put(outputMetric, computer); - } - for (String inputMetric : computer.getInputMetrics()) { - computersByInputMetric.put(inputMetric, computer); - } - } + feedComputersByMetric(computers, computersByOutputMetric, computersByInputMetric); ToComputerByKey toComputerByOutputMetricKey = new ToComputerByKey(computersByOutputMetric); ToComputerByKey toComputerByInputMetricKey = new ToComputerByKey(computersByInputMetric); @@ -111,6 +104,18 @@ public class FeedMeasureComputers implements ComputationStep { return dag.sort(); } + private static void feedComputersByMetric(List computers, Map computersByOutputMetric, + Map computersByInputMetric) { + for (MeasureComputer computer : computers) { + for (String outputMetric : computer.getOutputMetrics()) { + computersByOutputMetric.put(outputMetric, computer); + } + for (String inputMetric : computer.getInputMetrics()) { + computersByInputMetric.put(inputMetric, computer); + } + } + } + private void validateInputMetrics(List computers) { Set pluginMetricKeys = FluentIterable.from(Arrays.asList(metricsRepositories)) .transformAndConcat(MetricsToMetricList.INSTANCE) @@ -126,7 +131,7 @@ public class FeedMeasureComputers implements ComputationStep { } } - private static Iterable getDependencies(MeasureComputer measureComputer, ToComputerByKey toComputerByOutputMetricKey) { + private static Iterable getDependencies(MeasureComputer measureComputer, ToComputerByKey toComputerByOutputMetricKey) { // Remove null computer because a computer can depend on a metric that is only generated by a sensor or on a core metrics return FluentIterable.from(measureComputer.getInputMetrics()).transform(toComputerByOutputMetricKey).filter(Predicates.notNull()); } 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 1c15677a302..7bf7d1ecad8 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 @@ -57,7 +57,7 @@ public class DuplicationsJsonWriter { 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()) { + for (DuplicationsParser.Duplication duplication : block.getDuplications()) { writeDuplication(refByComponentKey, duplication, json); } json.endArray().endObject(); diff --git a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsParser.java b/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsParser.java index c9e21ccbb40..5cb81834cce 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsParser.java +++ b/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsParser.java @@ -157,8 +157,8 @@ public class DuplicationsParser { if (b1 == null || b2 == null) { return -1; } - List duplications1 = b1.duplications(); - List duplications2 = b2.duplications(); + List duplications1 = b1.getDuplications(); + List duplications2 = b2.getDuplications(); if (duplications1.isEmpty() || duplications2.isEmpty()) { return -1; } @@ -194,14 +194,14 @@ public class DuplicationsParser { } } - public static class Block { - List duplications; + static class Block { + private final List duplications; - Block(List duplications) { + public Block(List duplications) { this.duplications = duplications; } - List duplications() { + public List getDuplications() { return duplications; } } diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/AssignAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/AssignAction.java index 41e8b91708c..e46ce835c02 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/AssignAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/AssignAction.java @@ -21,29 +21,28 @@ package org.sonar.server.issue; import com.google.common.base.Strings; -import org.sonar.api.server.ServerSide; +import java.util.Collection; +import java.util.Map; import org.sonar.api.issue.Issue; import org.sonar.api.issue.condition.IsUnResolved; -import org.sonar.core.issue.DefaultIssue; +import org.sonar.api.server.ServerSide; import org.sonar.api.user.User; import org.sonar.api.user.UserFinder; +import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.IssueUpdater; import org.sonar.server.user.UserSession; -import java.util.Collection; -import java.util.Map; - @ServerSide public class AssignAction extends Action { - public static final String KEY = "assign"; + private static final String ASSIGN_KEY = "assign"; public static final String VERIFIED_ASSIGNEE = "verifiedAssignee"; private final UserFinder userFinder; private final IssueUpdater issueUpdater; public AssignAction(UserFinder userFinder, IssueUpdater issueUpdater) { - super(KEY); + super(ASSIGN_KEY); this.userFinder = userFinder; this.issueUpdater = issueUpdater; super.setConditions(new IsUnResolved()); diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/CommentAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/CommentAction.java index d37a746aff9..8a0dda0a888 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/CommentAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/CommentAction.java @@ -24,21 +24,21 @@ import com.google.common.base.Strings; import java.util.Collection; import java.util.Map; import org.sonar.api.issue.Issue; -import org.sonar.core.issue.DefaultIssue; import org.sonar.api.server.ServerSide; +import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.IssueUpdater; import org.sonar.server.user.UserSession; @ServerSide public class CommentAction extends Action { - public static final String KEY = "comment"; + public static final String COMMENT_KEY = "comment"; public static final String COMMENT_PROPERTY = "comment"; private final IssueUpdater issueUpdater; public CommentAction(IssueUpdater issueUpdater) { - super(KEY); + super(COMMENT_KEY); this.issueUpdater = issueUpdater; } diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeQuery.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeQuery.java index 5acaa1eeb8b..3a657421245 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeQuery.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeQuery.java @@ -77,7 +77,7 @@ public class IssueBulkChangeQuery { hasComment = true; Map commentMap = newHashMap(); commentMap.put(CommentAction.COMMENT_PROPERTY, comment); - propertiesByActions.put(CommentAction.KEY, commentMap); + propertiesByActions.put(CommentAction.COMMENT_KEY, commentMap); } } diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeService.java index 3c46a956130..28b7abcb210 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeService.java @@ -103,7 +103,7 @@ public class IssueBulkChangeService { if (result.issuesChanged().contains(issue)) { // Apply comment action only on changed issues if (issueBulkChangeQuery.hasComment()) { - applyAction(getAction(CommentAction.KEY), actionContext, issueBulkChangeQuery, result); + applyAction(getAction(CommentAction.COMMENT_KEY), actionContext, issueBulkChangeQuery, result); } issueStorage.save((DefaultIssue) issue); if (issueBulkChangeQuery.sendNotifications()) { diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/PlanAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/PlanAction.java index bf2993a12e2..5862fe06597 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/PlanAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/PlanAction.java @@ -21,29 +21,28 @@ package org.sonar.server.issue; import com.google.common.base.Strings; -import org.sonar.api.server.ServerSide; +import java.util.Collection; +import java.util.Map; import org.sonar.api.issue.ActionPlan; import org.sonar.api.issue.Issue; import org.sonar.api.issue.condition.IsUnResolved; +import org.sonar.api.server.ServerSide; import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.IssueUpdater; import org.sonar.server.issue.actionplan.ActionPlanService; import org.sonar.server.user.UserSession; -import java.util.Collection; -import java.util.Map; - @ServerSide public class PlanAction extends Action { - public static final String KEY = "plan"; + public static final String PLAN_KEY = "plan"; public static final String VERIFIED_ACTION_PLAN = "verifiedActionPlan"; private final ActionPlanService actionPlanService; private final IssueUpdater issueUpdater; public PlanAction(ActionPlanService actionPlanService, IssueUpdater issueUpdater) { - super(KEY); + super(PLAN_KEY); this.actionPlanService = actionPlanService; this.issueUpdater = issueUpdater; super.setConditions(new IsUnResolved()); diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/SetSeverityAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/SetSeverityAction.java index 6c75b9c1f01..bdda3c2ff2b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/SetSeverityAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/SetSeverityAction.java @@ -26,22 +26,22 @@ import java.util.Map; import org.sonar.api.issue.Issue; import org.sonar.api.issue.condition.Condition; import org.sonar.api.issue.condition.IsUnResolved; -import org.sonar.core.issue.DefaultIssue; import org.sonar.api.server.ServerSide; import org.sonar.api.web.UserRole; +import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.IssueUpdater; import org.sonar.server.user.UserSession; @ServerSide public class SetSeverityAction extends Action { - public static final String KEY = "set_severity"; + public static final String SET_SEVERITY_KEY = "set_severity"; private final IssueUpdater issueUpdater; private final UserSession userSession; public SetSeverityAction(IssueUpdater issueUpdater, UserSession userSession) { - super(KEY); + super(SET_SEVERITY_KEY); this.issueUpdater = issueUpdater; this.userSession = userSession; super.setConditions(new IsUnResolved(), new Condition() { diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/TransitionAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/TransitionAction.java index 1f4c4b283ed..dd4e79f1419 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/TransitionAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/TransitionAction.java @@ -27,8 +27,8 @@ import java.util.Collection; import java.util.Map; import org.apache.commons.lang.StringUtils; import org.sonar.api.issue.Issue; -import org.sonar.core.issue.DefaultIssue; import org.sonar.api.server.ServerSide; +import org.sonar.core.issue.DefaultIssue; import org.sonar.core.issue.workflow.IssueWorkflow; import org.sonar.core.issue.workflow.Transition; import org.sonar.server.user.UserSession; @@ -36,13 +36,13 @@ import org.sonar.server.user.UserSession; @ServerSide public class TransitionAction extends Action { - public static final String KEY = "do_transition"; + public static final String DO_TRANSITION_KEY = "do_transition"; private final IssueWorkflow workflow; private final UserSession userSession; public TransitionAction(IssueWorkflow workflow, UserSession userSession) { - super(KEY); + super(DO_TRANSITION_KEY); this.workflow = workflow; this.userSession = userSession; } diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterParameters.java b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterParameters.java index 3f1b221d4ec..8c552eb2c88 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterParameters.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/filter/IssueFilterParameters.java @@ -79,7 +79,7 @@ public class IssueFilterParameters { ASSIGNEES, LANGUAGES, ASSIGNED, PLANNED, HIDE_RULES, CREATED_AT, CREATED_AFTER, CREATED_BEFORE, CREATED_IN_LAST, COMPONENT_UUIDS, COMPONENT_ROOT_UUIDS, FACET_MODE, PROJECTS, PROJECT_UUIDS, PROJECT_KEYS, COMPONENT_KEYS, MODULE_UUIDS, DIRECTORIES, FILE_UUIDS, AUTHORS, HIDE_COMMENTS, PAGE_SIZE, PAGE_INDEX, SORT, ASC); - public static final List ALL_WITHOUT_PAGINATION = newArrayList(Iterables.filter(ALL, new Predicate() { + static final List ALL_WITHOUT_PAGINATION = newArrayList(Iterables.filter(ALL, new Predicate() { @Override public boolean apply(String input) { return !PAGE_INDEX.equals(input) && !PAGE_SIZE.equals(input); diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/ShowAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/ShowAction.java index 5487d2ee999..520da52f097 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/ShowAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/ShowAction.java @@ -211,11 +211,6 @@ public class ShowAction implements IssuesWsAction { usersByLogin.put(userLogin, user); } } - } - - for (IssueComment comment : comments) { - String userLogin = comment.userLogin(); - User user = usersByLogin.get(userLogin); json .beginObject() .prop("key", comment.key()) diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/Platform.java b/server/sonar-server/src/main/java/org/sonar/server/platform/Platform.java index fc5f931464b..0740f9aa859 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/Platform.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/Platform.java @@ -61,9 +61,6 @@ public class Platform { private final List level4AddedComponents = Lists.newArrayList(); private final Profiler profiler = Profiler.createIfTrace(Loggers.get(Platform.class)); - public Platform() { - } - public static Platform getInstance() { return INSTANCE; } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistFileSourcesStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistFileSourcesStepTest.java index 97a54e9aa51..302cc4ed8b5 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistFileSourcesStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistFileSourcesStepTest.java @@ -26,7 +26,6 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.junit.rules.TemporaryFolder; import org.sonar.api.resources.Language; import org.sonar.api.utils.System2; import org.sonar.batch.protocol.Constants; @@ -69,9 +68,6 @@ public class PersistFileSourcesStepTest extends BaseStepTest { @Rule public BatchReportReaderRule reportReader = new BatchReportReaderRule(); - @Rule - public TemporaryFolder temp = new TemporaryFolder(); - DbClient dbClient = dbTester.getDbClient(); PersistFileSourcesStep underTest; diff --git a/server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelXMLExporterTest.java b/server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelXMLExporterTest.java index f463fce9693..177e57ff19e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelXMLExporterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelXMLExporterTest.java @@ -20,6 +20,10 @@ package org.sonar.server.debt; import com.google.common.io.Resources; +import java.nio.charset.StandardCharsets; +import java.util.Collections; +import java.util.List; +import java.util.regex.Pattern; import org.apache.commons.lang.CharUtils; import org.apache.commons.lang.SystemUtils; import org.custommonkey.xmlunit.Diff; @@ -30,11 +34,6 @@ import org.sonar.api.rule.RuleKey; import org.sonar.api.server.debt.DebtRemediationFunction; import org.sonar.api.server.debt.internal.DefaultDebtCharacteristic; -import java.nio.charset.StandardCharsets; -import java.util.Collections; -import java.util.List; -import java.util.regex.Pattern; - import static com.google.common.collect.Lists.newArrayList; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertTrue; @@ -91,12 +90,12 @@ public class DebtModelXMLExporterTest { String xml = xmlExporter.export(debtModel, Collections.emptyList()); // root characteristics are sorted by the column "characteristic_order" - Pattern regex = Pattern.compile(".*USABILITY.*PORTABILITY.*EFFICIENCY.*", Pattern.DOTALL); - assertThat(regex.matcher(xml).matches()); + assertThat(Pattern.compile(".*PORTABILITY.*USABILITY.*EFFICIENCY.*", Pattern.DOTALL).matcher(xml).matches()).isTrue(); + assertThat(Pattern.compile(".*USABILITY.*PORTABILITY.*EFFICIENCY.*", Pattern.DOTALL).matcher(xml).matches()).isFalse(); // sub characteristics are sorted by name - regex = Pattern.compile(".*CPU Efficiency.*Other Efficiency.*RAM Efficiency.*", Pattern.DOTALL); - assertThat(regex.matcher(xml).matches()); + assertThat(Pattern.compile(".*CPU Efficiency.*Other Efficiency.*RAM Efficiency.*", Pattern.DOTALL).matcher(xml).matches()).isTrue(); + assertThat(Pattern.compile(".*CPU Efficiency.*RAM Efficiency.*Other Efficiency.*", Pattern.DOTALL).matcher(xml).matches()).isFalse(); } @Test diff --git a/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsParserTest.java b/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsParserTest.java index 06cfbbf8b82..b0791d59c42 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsParserTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsParserTest.java @@ -98,7 +98,7 @@ public class DuplicationsParserTest { List blocks = parser.parse(currentFile, getData("duplication_on_same_file.xml"), session); assertThat(blocks).hasSize(1); - List duplications = blocks.get(0).duplications(); + List duplications = blocks.get(0).getDuplications(); assertThat(duplications).hasSize(2); // Smallest line comes first @@ -118,7 +118,7 @@ public class DuplicationsParserTest { List blocks = parser.parse(currentFile, getData("duplication_on_same_project.xml"), session); assertThat(blocks).hasSize(1); - List duplications = blocks.get(0).duplications(); + List duplications = blocks.get(0).getDuplications(); assertThat(duplications).hasSize(2); // Current file comes first @@ -138,7 +138,7 @@ public class DuplicationsParserTest { List blocks = parser.parse(currentFile, getData("duplications_on_different_project.xml"), session); assertThat(blocks).hasSize(1); - List duplications = blocks.get(0).duplications(); + List duplications = blocks.get(0).getDuplications(); assertThat(duplications).hasSize(3); // Current file's project comes first @@ -168,11 +168,11 @@ public class DuplicationsParserTest { // Block with smaller line should come first - assertThat(blocks.get(0).duplications().get(0).from()).isEqualTo(38); - assertThat(blocks.get(0).duplications().get(1).from()).isEqualTo(29); + assertThat(blocks.get(0).getDuplications().get(0).from()).isEqualTo(38); + assertThat(blocks.get(0).getDuplications().get(1).from()).isEqualTo(29); - assertThat(blocks.get(1).duplications().get(0).from()).isEqualTo(94); - assertThat(blocks.get(1).duplications().get(1).from()).isEqualTo(83); + assertThat(blocks.get(1).getDuplications().get(0).from()).isEqualTo(94); + assertThat(blocks.get(1).getDuplications().get(1).from()).isEqualTo(83); } @Test @@ -180,7 +180,7 @@ public class DuplicationsParserTest { List blocks = parser.parse(currentFile, getData("duplication_on_removed_file.xml"), session); assertThat(blocks).hasSize(1); - List duplications = blocks.get(0).duplications(); + List duplications = blocks.get(0).getDuplications(); assertThat(duplications).hasSize(2); // Duplications on removed file -- 2.39.5