diff options
8 files changed, 2 insertions, 18 deletions
diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/AnticipatedTransitionRepositoryImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/AnticipatedTransitionRepositoryImpl.java index 9c0e943cacc..e2a115a98c2 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/AnticipatedTransitionRepositoryImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/AnticipatedTransitionRepositoryImpl.java @@ -63,7 +63,6 @@ public class AnticipatedTransitionRepositoryImpl implements AnticipatedTransitio private AnticipatedTransition getAnticipatedTransition(AnticipatedTransitionDto transitionDto) { return new AnticipatedTransition( transitionDto.getProjectUuid(), - "branch", transitionDto.getUserUuid(), RuleKey.parse(transitionDto.getRuleKey()), transitionDto.getMessage(), diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/TransitionIssuesToAnticipatedStatesVisitorTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/TransitionIssuesToAnticipatedStatesVisitorTest.java index b7b76f23a90..4cd4af882e9 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/TransitionIssuesToAnticipatedStatesVisitorTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/TransitionIssuesToAnticipatedStatesVisitorTest.java @@ -115,11 +115,11 @@ public class TransitionIssuesToAnticipatedStatesVisitorTest { } private Collection<AnticipatedTransition> getAnticipatedTransitions(String projecKey, String fileName) { - return Stream.of(new AnticipatedTransition(projecKey, null, "admin", RuleKey.parse("repo:id"), "issue message", fileName, 1, "abcdefghi", "wontfix", "doing the transition in an anticipated way")).collect(Collectors.toList()); + return Stream.of(new AnticipatedTransition(projecKey, "admin", RuleKey.parse("repo:id"), "issue message", fileName, 1, "abcdefghi", "wontfix", "doing the transition in an anticipated way")).collect(Collectors.toList()); } private Collection<AnticipatedTransition> getAnticipatedTransitionsWithEmptyComment(String projecKey, String fileName) { - return Stream.of(new AnticipatedTransition(projecKey, null, "admin", RuleKey.parse("repo:id"), "issue message", fileName, 1, "abcdefghi", "wontfix", null)).collect(Collectors.toList()); + return Stream.of(new AnticipatedTransition(projecKey, "admin", RuleKey.parse("repo:id"), "issue message", fileName, 1, "abcdefghi", "wontfix", null)).collect(Collectors.toList()); } private Component getComponent(Component.Type type) { diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/anticipatedtransition/AnticipatedTransitionParser.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/anticipatedtransition/AnticipatedTransitionParser.java index eb02da3726a..1b4cbab8bd1 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/anticipatedtransition/AnticipatedTransitionParser.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/anticipatedtransition/AnticipatedTransitionParser.java @@ -56,7 +56,6 @@ public class AnticipatedTransitionParser { return anticipatedTransitions.stream() .map(anticipatedTransition -> new AnticipatedTransition( projectKey, - "branch", userUuid, RuleKey.parse(anticipatedTransition.ruleKey()), anticipatedTransition.message(), diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/anticipatedtransition/AnticipatedTransitionHandlerTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/anticipatedtransition/AnticipatedTransitionHandlerTest.java index 6cc2bf6415c..6e6e1d4fa47 100644 --- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/anticipatedtransition/AnticipatedTransitionHandlerTest.java +++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/anticipatedtransition/AnticipatedTransitionHandlerTest.java @@ -98,7 +98,6 @@ public class AnticipatedTransitionHandlerTest { private AnticipatedTransition populateAnticipatedTransition() { return new AnticipatedTransition( PROJECT_KEY, - "branch", USER_UUID, RuleKey.of("repo", "squid:S0001"), "issueMessage1", diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/anticipatedtransition/AnticipatedTransitionParserTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/anticipatedtransition/AnticipatedTransitionParserTest.java index 02b3e5042df..c1e771124d8 100644 --- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/anticipatedtransition/AnticipatedTransitionParserTest.java +++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/anticipatedtransition/AnticipatedTransitionParserTest.java @@ -102,7 +102,6 @@ public class AnticipatedTransitionParserTest { return List.of( new AnticipatedTransition( PROJECT_KEY, - "branch", USER_UUID, RuleKey.parse("squid:S0001"), "issueMessage1", @@ -113,7 +112,6 @@ public class AnticipatedTransitionParserTest { "comment1"), new AnticipatedTransition( PROJECT_KEY, - "branch", USER_UUID, RuleKey.parse("squid:S0002"), "issueMessage2", diff --git a/sonar-core/src/main/java/org/sonar/core/issue/AnticipatedTransition.java b/sonar-core/src/main/java/org/sonar/core/issue/AnticipatedTransition.java index 5d0fe394964..bcb1c5192dc 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/AnticipatedTransition.java +++ b/sonar-core/src/main/java/org/sonar/core/issue/AnticipatedTransition.java @@ -31,7 +31,6 @@ import org.sonar.core.issue.tracking.Trackable; public class AnticipatedTransition implements Trackable { private final String projectKey; - private final String branch; private final String transition; private final String userUuid; private final String comment; @@ -43,7 +42,6 @@ public class AnticipatedTransition implements Trackable { public AnticipatedTransition( String projectKey, - @Nullable String branch, String userUuid, @Nullable RuleKey ruleKey, @Nullable String message, @@ -53,7 +51,6 @@ public class AnticipatedTransition implements Trackable { String transition, @Nullable String comment) { this.projectKey = projectKey; - this.branch = branch; this.transition = transition; this.userUuid = userUuid; this.comment = comment; @@ -68,10 +65,6 @@ public class AnticipatedTransition implements Trackable { return projectKey; } - public String getBranch() { - return branch; - } - public String getTransition() { return transition; } @@ -132,7 +125,6 @@ public class AnticipatedTransition implements Trackable { } AnticipatedTransition that = (AnticipatedTransition) o; return Objects.equals(projectKey, that.projectKey) - && Objects.equals(branch, that.branch) && Objects.equals(transition, that.transition) && Objects.equals(userUuid, that.userUuid) && Objects.equals(comment, that.comment) diff --git a/sonar-core/src/test/java/org/sonar/core/issue/AnticipatedTransitionTest.java b/sonar-core/src/test/java/org/sonar/core/issue/AnticipatedTransitionTest.java index 041753af341..4e1be63dfef 100644 --- a/sonar-core/src/test/java/org/sonar/core/issue/AnticipatedTransitionTest.java +++ b/sonar-core/src/test/java/org/sonar/core/issue/AnticipatedTransitionTest.java @@ -45,7 +45,6 @@ public class AnticipatedTransitionTest { private void assertFieldsAreTheSame(AnticipatedTransition anticipatedTransition, AnticipatedTransition anticipatedTransition2) { Assertions.assertThat(anticipatedTransition.getProjectKey()).isEqualTo(anticipatedTransition2.getProjectKey()); - Assertions.assertThat(anticipatedTransition.getBranch()).isEqualTo(anticipatedTransition2.getBranch()); Assertions.assertThat(anticipatedTransition.getUserUuid()).isEqualTo(anticipatedTransition2.getUserUuid()); Assertions.assertThat(anticipatedTransition.getTransition()).isEqualTo(anticipatedTransition2.getTransition()); Assertions.assertThat(anticipatedTransition.getComment()).isEqualTo(anticipatedTransition2.getComment()); @@ -59,7 +58,6 @@ public class AnticipatedTransitionTest { private AnticipatedTransition getAnticipatedTransition() { return new AnticipatedTransition( "projectKey", - "branch", "userUuid", RuleKey.parse("rule:key"), "message", diff --git a/sonar-core/src/test/java/org/sonar/core/issue/tracking/AnticipatedTransitionTrackerTest.java b/sonar-core/src/test/java/org/sonar/core/issue/tracking/AnticipatedTransitionTrackerTest.java index 2d88c894266..017e4b8417a 100644 --- a/sonar-core/src/test/java/org/sonar/core/issue/tracking/AnticipatedTransitionTrackerTest.java +++ b/sonar-core/src/test/java/org/sonar/core/issue/tracking/AnticipatedTransitionTrackerTest.java @@ -93,7 +93,6 @@ public class AnticipatedTransitionTrackerTest { private AnticipatedTransition getAnticipatedTransition(Integer line, String message, String hash, String ruleKey) { return new AnticipatedTransition("projectKey", - null, "userUuid", RuleKey.parse(ruleKey), message, |