The plugin was not saving correctly the new nexus3 property.

polopoly · Mar 24, 2021 · 926ec5b · 926ec5b
1 parent b1de763
commit 926ec5b
Showing 1 changed file with 22 additions and 13 deletions.
diff --git a/src/main/java/com/atex/confluence/plugin/nexus/config/ConfigurationServlet.java b/src/main/java/com/atex/confluence/plugin/nexus/config/ConfigurationServlet.java
@@ -1,27 +1,33 @@
 package com.atex.confluence.plugin.nexus.config;
 
-import com.atex.confluence.plugin.nexus.data.MetadataManager;
-import com.atlassian.sal.api.auth.LoginUriProvider;
-import com.atlassian.sal.api.pluginsettings.PluginSettings;
-import com.atlassian.sal.api.pluginsettings.PluginSettingsFactory;
-import com.atlassian.sal.api.transaction.TransactionCallback;
-import com.atlassian.sal.api.transaction.TransactionTemplate;
-import com.atlassian.sal.api.user.UserManager;
-import com.atlassian.templaterenderer.TemplateRenderer;
-
+import static com.atex.confluence.plugin.nexus.config.Configuration.GENERATE_LINK;
+import static com.atex.confluence.plugin.nexus.config.Configuration.GROUPID;
+import static com.atex.confluence.plugin.nexus.config.Configuration.NEXUS3;
+import static com.atex.confluence.plugin.nexus.config.Configuration.NEXUSLINKPREFIX;
+import static com.atex.confluence.plugin.nexus.config.Configuration.PASSWORD;
+import static com.atex.confluence.plugin.nexus.config.Configuration.URL;
+import static com.atex.confluence.plugin.nexus.config.Configuration.USERNAME;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import static com.atex.confluence.plugin.nexus.config.Configuration.*;
+import com.atex.confluence.plugin.nexus.data.MetadataManager;
+import com.atlassian.sal.api.auth.LoginUriProvider;
+import com.atlassian.sal.api.pluginsettings.PluginSettings;
+import com.atlassian.sal.api.pluginsettings.PluginSettingsFactory;
+import com.atlassian.sal.api.transaction.TransactionCallback;
+import com.atlassian.sal.api.transaction.TransactionTemplate;
+import com.atlassian.sal.api.user.UserManager;
+import com.atlassian.templaterenderer.TemplateRenderer;
 
 /**
  *
@@ -74,8 +80,9 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws S
         final String username = req.getParameter("username");
         final String password = req.getParameter("password");
         final String groupId = req.getParameter("groupId");
-        final Boolean generateLink = Boolean.valueOf(req.getParameter("generateLink"));
+        final boolean generateLink = Boolean.parseBoolean(req.getParameter("generateLink"));
         final String nexusLinkPrefix = req.getParameter("nexusLinkPrefix");
+        final boolean nexus3 = Boolean.parseBoolean(req.getParameter("nexus3"));
 
         Map<String, Object> models = new HashMap<String, Object>();
         if (!isValid(urlString)) {
@@ -100,7 +107,8 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws S
             configuration.setUsername(username);
             configuration.setPassword(password);
             configuration.setGroupId(groupId);
-            configuration.setGenerateLink(generateLink.booleanValue());
+            configuration.setGenerateLink(generateLink);
+            configuration.setNexus3(nexus3);
             // this is last one to set, which might throw exception
             configuration.setURL(urlString);
             configuration.setNexusLinkPrefix(nexusLinkPrefix);
@@ -126,7 +134,8 @@ public Void doInTransaction() {
                     pluginSettings.put(PASSWORD, password);
                     pluginSettings.put(GROUPID, groupId);
                     // not support Boolean object, need use toString()
-                    pluginSettings.put(GENERATE_LINK, generateLink.toString());
+                    pluginSettings.put(GENERATE_LINK, Boolean.toString(generateLink));
+                    pluginSettings.put(NEXUS3, Boolean.toString(nexus3));
                     pluginSettings.put(NEXUSLINKPREFIX, nexusLinkPrefix);
                     return null;
                 }