From 4e908d5614b340cc713f3596605047a85769f884 Mon Sep 17 00:00:00 2001
From: Damien Coraboeuf <damien.coraboeuf@gmail.com>
Date: Thu, 31 Jul 2014 10:27:00 +0200
Subject: [PATCH] #16 GitHub parsing problem

---
 ...efaultGitHubClientConfiguratorFactory.java |  2 +-
 .../github/model/GitHubConfiguration.java     | 10 ++--
 .../github/service/GitHubConfigurator.java    |  2 +-
 .../github/model/GitHubConfigurationTest.java | 58 +++++++++++++++++++
 .../nemerosa/ontrack/json/ObjectBuilder.java  |  4 ++
 5 files changed, 70 insertions(+), 6 deletions(-)
 create mode 100644 ontrack-extension-github/src/test/java/net/nemerosa/ontrack/extension/github/model/GitHubConfigurationTest.java

diff --git a/ontrack-extension-github/src/main/java/net/nemerosa/ontrack/extension/github/client/DefaultGitHubClientConfiguratorFactory.java b/ontrack-extension-github/src/main/java/net/nemerosa/ontrack/extension/github/client/DefaultGitHubClientConfiguratorFactory.java
index 2a846c32828..baaa5199eb2 100644
--- a/ontrack-extension-github/src/main/java/net/nemerosa/ontrack/extension/github/client/DefaultGitHubClientConfiguratorFactory.java
+++ b/ontrack-extension-github/src/main/java/net/nemerosa/ontrack/extension/github/client/DefaultGitHubClientConfiguratorFactory.java
@@ -10,7 +10,7 @@ public class DefaultGitHubClientConfiguratorFactory implements GitHubClientConfi
     @Override
     public GitHubClientConfigurator getGitHubConfigurator(GitHubConfiguration configuration) {
         return client -> {
-            String oAuth2Token = configuration.getOAuth2Token();
+            String oAuth2Token = configuration.getOauth2Token();
             if (StringUtils.isNotBlank(oAuth2Token)) {
                 client.setOAuth2Token(oAuth2Token);
             } else {
diff --git a/ontrack-extension-github/src/main/java/net/nemerosa/ontrack/extension/github/model/GitHubConfiguration.java b/ontrack-extension-github/src/main/java/net/nemerosa/ontrack/extension/github/model/GitHubConfiguration.java
index d31266a89f1..ab0351ec862 100644
--- a/ontrack-extension-github/src/main/java/net/nemerosa/ontrack/extension/github/model/GitHubConfiguration.java
+++ b/ontrack-extension-github/src/main/java/net/nemerosa/ontrack/extension/github/model/GitHubConfiguration.java
@@ -1,6 +1,7 @@
 package net.nemerosa.ontrack.extension.github.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import net.nemerosa.ontrack.extension.github.GitHubIssueServiceExtension;
 import net.nemerosa.ontrack.extension.issues.model.IssueServiceConfiguration;
@@ -40,7 +41,7 @@ public class GitHubConfiguration implements UserPasswordConfiguration<GitHubConf
     /**
      * OAuth2 token
      */
-    private final String oAuth2Token;
+    private final String oauth2Token;
 
     /**
      * Indexation interval
@@ -67,7 +68,7 @@ public GitHubConfiguration withPassword(String password) {
                 repository,
                 user,
                 password,
-                oAuth2Token,
+                oauth2Token,
                 indexationInterval
         );
     }
@@ -94,7 +95,7 @@ public static Form form() {
                                 .optional()
                 )
                 .with(
-                        Text.of("oAuth2Token")
+                        Text.of("oauth2Token")
                                 .label("OAuth2 token")
                                 .length(50)
                                 .optional()
@@ -117,7 +118,7 @@ public Form asForm() {
                 .fill("repository", repository)
                 .fill("user", user)
                 .fill("password", "")
-                .fill("oAuth2Token", oAuth2Token)
+                .fill("oauth2Token", oauth2Token)
                 .fill("indexationInterval", indexationInterval)
                 ;
     }
@@ -138,6 +139,7 @@ public String getFileAtCommitLink() {
     }
 
     @Override
+    @JsonIgnore
     public String getServiceId() {
         return GitHubIssueServiceExtension.GITHUB_SERVICE_ID;
     }
diff --git a/ontrack-extension-github/src/main/java/net/nemerosa/ontrack/extension/github/service/GitHubConfigurator.java b/ontrack-extension-github/src/main/java/net/nemerosa/ontrack/extension/github/service/GitHubConfigurator.java
index 6a2c023f1ac..8c68b3ec3b5 100644
--- a/ontrack-extension-github/src/main/java/net/nemerosa/ontrack/extension/github/service/GitHubConfigurator.java
+++ b/ontrack-extension-github/src/main/java/net/nemerosa/ontrack/extension/github/service/GitHubConfigurator.java
@@ -37,7 +37,7 @@ public GitConfiguration configure(GitConfiguration configuration, Branch branch)
                     .withFileAtCommitLink(gitHub.getFileAtCommitLink())
                     .withIssueServiceConfigurationIdentifier(gitHub.toIdentifier().format());
             // User / password
-            String oAuth2Token = gitHub.getOAuth2Token();
+            String oAuth2Token = gitHub.getOauth2Token();
             String user = gitHub.getUser();
             if (StringUtils.isNotBlank(oAuth2Token)) {
                 gitHubConfig = gitHubConfig
diff --git a/ontrack-extension-github/src/test/java/net/nemerosa/ontrack/extension/github/model/GitHubConfigurationTest.java b/ontrack-extension-github/src/test/java/net/nemerosa/ontrack/extension/github/model/GitHubConfigurationTest.java
new file mode 100644
index 00000000000..dc41e04c794
--- /dev/null
+++ b/ontrack-extension-github/src/test/java/net/nemerosa/ontrack/extension/github/model/GitHubConfigurationTest.java
@@ -0,0 +1,58 @@
+package net.nemerosa.ontrack.extension.github.model;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import org.junit.Test;
+
+import static net.nemerosa.ontrack.json.JsonUtils.object;
+import static net.nemerosa.ontrack.test.TestUtils.assertJsonRead;
+import static net.nemerosa.ontrack.test.TestUtils.assertJsonWrite;
+
+public class GitHubConfigurationTest {
+
+    @Test
+    public void toJson() throws JsonProcessingException {
+        assertJsonWrite(
+                object()
+                        .with("name", "ontrack")
+                        .with("repository", "nemerosa/ontrack")
+                        .withNull("user")
+                        .withNull("password")
+                        .with("oauth2Token", "1234567890abcdef")
+                        .with("indexationInterval", 60)
+                        .end(),
+                new GitHubConfiguration(
+                        "ontrack",
+                        "nemerosa/ontrack",
+                        null,
+                        null,
+                        "1234567890abcdef",
+                        60
+                )
+        );
+    }
+
+    @Test
+    public void fromJson() throws JsonProcessingException {
+        assertJsonRead(
+                new GitHubConfiguration(
+                        "ontrack",
+                        "nemerosa/ontrack",
+                        null,
+                        null,
+                        "1234567890abcdef",
+                        60
+                ),
+                object()
+                        .with("name", "ontrack")
+                        .with("repository", "nemerosa/ontrack")
+                        .withNull("user")
+                        .withNull("password")
+                        .with("indexationInterval", 60)
+                        .with("oauth2Token", "1234567890abcdef")
+                        .with("serviceId", "ontrack") // This field is ignored
+                        .end(),
+                GitHubConfiguration.class
+        );
+    }
+
+}
\ No newline at end of file
diff --git a/ontrack-json/src/main/java/net/nemerosa/ontrack/json/ObjectBuilder.java b/ontrack-json/src/main/java/net/nemerosa/ontrack/json/ObjectBuilder.java
index 5e2123a2af9..5cdf4cc0ba9 100644
--- a/ontrack-json/src/main/java/net/nemerosa/ontrack/json/ObjectBuilder.java
+++ b/ontrack-json/src/main/java/net/nemerosa/ontrack/json/ObjectBuilder.java
@@ -14,6 +14,10 @@ public ObjectBuilder(JsonNodeFactory factory) {
         this.thisNode = factory.objectNode();
     }
 
+    public ObjectBuilder withNull(String field) {
+        return with(field, factory.nullNode());
+    }
+
     public ObjectBuilder with(String field, int value) {
         return with(field, factory.numberNode(value));
     }