Fix case where "SecretTokenAsPlainText" is null (#324)

* Fix case where "SecretTokenAsPlainText" is null

Fixes #304

* Add missing import

* Add missing import (again)

* Apply spotless

Author: jmini

src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabHookCreator.java

@@ -86,10 +86,14 @@ public static void register(
                 return;
         }
         String hookUrl = getHookUrl(server, true);
-        String secretToken = server.getSecretTokenAsPlainText();
         if (hookUrl.equals("")) {
             return;
         }
+        String secretToken = server.getSecretTokenAsPlainText();
+        if (secretToken == null) {
+            // sending 'null' to GitLab will ignore the value, when we want to update it to be empty.
+            secretToken = "";
+        }
         if (credentials != null) {
             try {
                 GitLabApi gitLabApi = new GitLabApi(

src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabSCMNavigator.java

@@ -285,15 +285,17 @@ public void visitSources(@NonNull final SCMSourceObserver observer) throws IOExc
                 try {
                     GitLabServer server = GitLabServers.get().findServer(serverName);
                     if (webhookGitLabApi != null && webHookUrl != null) {
+                        String secretToken = server.getSecretTokenAsPlainText();
+                        if (secretToken == null) {
+                            // sending 'null' to GitLab will ignore the value, when we want to update it to be empty.
+                            secretToken = "";
+                        }
                         observer.getListener()
                                 .getLogger()
                                 .format(
                                         "Web hook %s%n",
                                         GitLabHookCreator.createWebHookWhenMissing(
-                                                webhookGitLabApi,
-                                                projectPathWithNamespace,
-                                                webHookUrl,
-                                                server.getSecretTokenAsPlainText()));
+                                                webhookGitLabApi, projectPathWithNamespace, webHookUrl, secretToken));
                     }
                 } catch (GitLabApiException e) {
                     observer.getListener().getLogger().format("Cannot set web hook: %s%n", e.getReason());

src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabSystemHookAction.java

@@ -8,6 +8,7 @@
 import io.jenkins.plugins.gitlabserverconfig.servers.GitLabServers;
 import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.servlet.FilterChain;
@@ -84,7 +85,11 @@ private boolean isValidToken(String secretToken) {
         try {
             List<GitLabServer> servers = GitLabServers.get().getServers();
             for (GitLabServer server : servers) {
-                if (server.getSecretTokenAsPlainText().equals(secretToken)) {
+                String secretTokenAsPlainText = server.getSecretTokenAsPlainText();
+                if (Objects.equals(secretToken, secretTokenAsPlainText)
+                        || (secretTokenAsPlainText != null
+                                && secretTokenAsPlainText.isEmpty()
+                                && secretToken == null)) {
                     return true;
                 }
             }

src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabWebHookAction.java

@@ -8,6 +8,7 @@
 import io.jenkins.plugins.gitlabserverconfig.servers.GitLabServers;
 import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.servlet.FilterChain;
@@ -84,8 +85,11 @@ private boolean isValidToken(String secretToken) {
         try {
             List<GitLabServer> servers = GitLabServers.get().getServers();
             for (GitLabServer server : servers) {
-                if (server.getSecretTokenAsPlainText().equals(secretToken)
-                        || (server.getSecretTokenAsPlainText().isEmpty() && secretToken == null)) {
+                String secretTokenAsPlainText = server.getSecretTokenAsPlainText();
+                if (Objects.equals(secretToken, secretTokenAsPlainText)
+                        || (secretTokenAsPlainText != null
+                                && secretTokenAsPlainText.isEmpty()
+                                && secretToken == null)) {
                     return true;
                 }
             }