Skip to content

Commit efac49c

Browse files
author
Yang Guo
committed
get rid off compare id and url for pr since two diff repo
1 parent b944ff5 commit efac49c

File tree

5 files changed

+0
-27
lines changed

5 files changed

+0
-27
lines changed

platform-api/src/main/java/com/flow/platform/api/git/GitEventEnvConverter.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,6 @@ public static Map<String, String> convert(GitEvent event) {
8282
info.put(GitEnvs.FLOW_GIT_COMMIT_URL.name(), pr.getUrl());
8383
}
8484

85-
// set compare id and url from PR request
86-
if (pr.getCompareId() != null && pr.getCompareUrl() != null) {
87-
info.put(GitEnvs.FLOW_GIT_COMPARE_ID.name(), pr.getCompareId());
88-
info.put(GitEnvs.FLOW_GIT_COMPARE_URL.name(), pr.getCompareUrl());
89-
}
90-
9185
info.put(GitEnvs.FLOW_GIT_CHANGELOG.name(), pr.getTitle());
9286
info.put(GitEnvs.FLOW_GIT_PR_URL.name(), pr.getUrl());
9387
return info;

platform-util-git/src/main/java/com/flow/platform/util/git/hooks/CodingEvents.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -258,11 +258,6 @@ public GitEvent convert(String json) throws GitException {
258258
event.getTarget().setProjectId(Integer.parseInt(repo.id));
259259
event.getTarget().setProjectName(repo.name);
260260

261-
// set compare id
262-
final String compareId = GitPullRequestEvent.buildCompareId(event.getSource(), event.getTarget());
263-
event.setCompareId(compareId);
264-
event.setCompareUrl(repo.url + "/git/compare/" + compareId);
265-
266261
return event;
267262
}
268263
}

platform-util-git/src/main/java/com/flow/platform/util/git/hooks/GitHubEvents.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -219,10 +219,6 @@ else if (Objects.equals(pullRequest.state, STATE_CLOSE)) {
219219
target.setBranch(pullRequest.target.ref);
220220
target.setSha(pullRequest.target.sha);
221221

222-
// set compare id
223-
final String compareId = GitPullRequestEvent.buildCompareId(source, target);
224-
event.setCompareId(compareId);
225-
event.setCompareUrl(mr.repository.url + "/compare/" + compareId);
226222
return event;
227223
}
228224
}

platform-util-git/src/test/java/com/flow/platform/util/git/test/CodingWebHooksEventTest.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,6 @@ public void should_convert_to_pr_open_event_obj() throws Throwable {
139139
Assert.assertEquals("", target.getSha());
140140
Assert.assertEquals(1243975, target.getProjectId().intValue());
141141
Assert.assertEquals("flowclibasic", target.getProjectName());
142-
143-
Assert.assertEquals("develop...master", prEvent.getCompareId());
144-
Assert.assertEquals("https://coding.net/u/benqyang2006/p/flowclibasic/git/compare/develop...master",
145-
prEvent.getCompareUrl());
146142
}
147143

148144
@Test
@@ -181,10 +177,6 @@ public void should_convert_to_pr_close_obj() throws Throwable {
181177
Assert.assertEquals("985ae638e0cc8bd4dc2cd8c7a8a6800b00b33997", target.getSha());
182178
Assert.assertEquals(1243975, target.getProjectId().intValue());
183179
Assert.assertEquals("flowclibasic", target.getProjectName());
184-
185-
Assert.assertEquals("985ae638e0cc...db2da0ba563a", prEvent.getCompareId());
186-
Assert.assertEquals("https://coding.net/u/benqyang2006/p/flowclibasic/git/compare/985ae638e0cc...db2da0ba563a",
187-
prEvent.getCompareUrl());
188180
}
189181

190182
private static String loadWebhookSampleJson(String classPath) throws IOException {

platform-util-git/src/test/java/com/flow/platform/util/git/test/GitHubHooksEventTest.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,6 @@ public void should_convert_to_pr_event_obj() throws Throwable {
145145
Assert.assertEquals(86284448, target.getProjectId().intValue());
146146
Assert.assertEquals("yang-guo-2016/Test", target.getProjectName());
147147
Assert.assertEquals("4e4e3750cd468f245bd9f0f938c4b5f76e1bc5b0", target.getSha());
148-
149-
Assert.assertEquals("4e4e3750cd46...1d1de876084e", event.getCompareId());
150-
Assert.assertEquals("https://github.com/yang-guo-2016/Test/compare/4e4e3750cd46...1d1de876084e",
151-
event.getCompareUrl());
152148
}
153149

154150
private static String loadWebhookSampleJson(String classPath) throws IOException {

0 commit comments

Comments
 (0)