SONAR-13742 The payload should return GitHub API's 'html_url' value rather than ...

diff --git a/server/sonar-alm-client/src/main/java/org/sonar/alm/client/github/GithubBinding.java b/server/sonar-alm-client/src/main/java/org/sonar/alm/client/github/GithubBinding.java
index ce6e207bf707afb1c2799555033eafbf1a06b2b7..fc2c2a77f718770c6c33571d08e162003f049f4c 100644 (file)
--- a/server/sonar-alm-client/src/main/java/org/sonar/alm/client/github/GithubBinding.java
+++ b/server/sonar-alm-client/src/main/java/org/sonar/alm/client/github/GithubBinding.java
@@ -138,8 +138,8 @@ public class GithubBinding {
     String fullName;
     @SerializedName("private")
     boolean isPrivate;
-    @SerializedName("url")
-    String url;
+    @SerializedName("html_url")
+    String htmlUrl;
     @SerializedName("default_branch")
     String defaultBranch;
 
@@ -151,7 +151,7 @@ public class GithubBinding {
 
     public Repository toRepository() {
       return new Repository(this.id, this.name, this.isPrivate, this.fullName,
-        this.url, this.defaultBranch);
+        this.htmlUrl, this.defaultBranch);
     }
   }
 }

diff --git a/server/sonar-alm-client/src/test/java/org/sonar/alm/client/github/GithubApplicationClientImplTest.java b/server/sonar-alm-client/src/test/java/org/sonar/alm/client/github/GithubApplicationClientImplTest.java
index 3b823daab6a10100cf394d813ea7db68b205036f..56cf7a30879595da9a2920cf9997e46979cc6a31 100644 (file)
--- a/server/sonar-alm-client/src/test/java/org/sonar/alm/client/github/GithubApplicationClientImplTest.java
+++ b/server/sonar-alm-client/src/test/java/org/sonar/alm/client/github/GithubApplicationClientImplTest.java
@@ -794,7 +794,7 @@ public class GithubApplicationClientImplTest {
       .get()
       .extracting(GithubApplicationClient.Repository::getId, GithubApplicationClient.Repository::getName, GithubApplicationClient.Repository::getFullName,
         GithubApplicationClient.Repository::getUrl, GithubApplicationClient.Repository::isPrivate, GithubApplicationClient.Repository::getDefaultBranch)
-      .containsOnly(1296269L, "Hello-World", "octocat/Hello-World", "https://github.sonarsource.com/api/v3/repos/octocat/Hello-World", false, "master");
+      .containsOnly(1296269L, "Hello-World", "octocat/Hello-World", "https://github.com/octocat/Hello-World", false, "master");
   }
 
   private AppToken mockAppToken() {