Merge pull request #6 from MicroFocus/luiza_defect_1117010_proxy_settings_improvements

defect #1117010 [Regression_Eagles_Push2] [JiraPlugin] Proxy Setting trim host and not auto-populate password field when empty

Author: luizaM02

src/main/java/com/microfocus/octane/plugins/admin/ConfigResource.java

@@ -88,14 +88,13 @@ public Response getDataForWorkspaceDialog(@QueryParam("space-conf-id") String sp
                     .map(e -> new KeyValueItem(e.getId(), e.getName()))
                     .collect(Collectors.toList());
 
-
             Collection<KeyValueItem> select2IssueTypes = ComponentAccessor.getConstantsManager().getAllIssueTypeObjects()
-                    .stream().map(e -> new KeyValueItem(e.getName(), e.getName())).sorted(Comparator.comparing(o -> o.getId())).collect(Collectors.toList());
+                    .stream().map(e -> new KeyValueItem(e.getName(), e.getName())).sorted(Comparator.comparing(KeyValueItem::getId)).collect(Collectors.toList());
 
             Collection<KeyValueItem> select2Projects = ComponentAccessor.getProjectManager().getProjectObjects()
                     .stream()
                     .filter(e -> !usedJiraProjects.contains(e.getKey()))
-                    .map(e -> new KeyValueItem(e.getKey(), e.getKey())).sorted(Comparator.comparing(o -> o.getId()))
+                    .map(e -> new KeyValueItem(e.getKey(), e.getKey())).sorted(Comparator.comparing(KeyValueItem::getId))
                     .collect(Collectors.toList());
 
             Map<String, Object> data = new HashMap<>();
@@ -234,7 +233,13 @@ public Response getProxy() {
             outgoing.setHost(config.getHost());
             outgoing.setPort(config.getPort() == null ? "" : config.getPort().toString());
             outgoing.setUsername(config.getUsername());
-            outgoing.setPassword(PluginConstants.PASSWORD_REPLACE);
+
+            if (StringUtils.isNotEmpty(config.getPassword())) {
+                outgoing.setPassword(PluginConstants.PASSWORD_REPLACE);
+            } else {
+                outgoing.setPassword("");
+            }
+
             outgoing.setNonProxyHost(config.getNonProxyHost());
         }
 
@@ -276,7 +281,7 @@ public Response getSpaceConfigurations() {
         }
 
         List<SpaceConfigurationOutgoing> outgoing = ConfigurationManager.getInstance().getSpaceConfigurations()
-                .stream().map(c -> ConfigurationUtil.convertToOutgoing(c)).collect(Collectors.toList());
+                .stream().map(ConfigurationUtil::convertToOutgoing).collect(Collectors.toList());
 
         return Response.ok(outgoing).build();
     }

src/main/java/com/microfocus/octane/plugins/configuration/ConfigurationManager.java

@@ -144,21 +144,26 @@ public void saveProxyConfiguration(ProxyConfigurationOutgoing proxyOutgoing) {
             proxy = new ProxyConfiguration();
         }
 
-        proxy.setHost(proxyOutgoing.getHost());
+        String host = proxyOutgoing.getHost();
         Integer port = null;
         if (StringUtils.isNotEmpty(proxyOutgoing.getHost()) && StringUtils.isNotEmpty(proxyOutgoing.getPort())) {
+            host = host.trim();
+
             try {
                 port = Integer.parseInt(proxyOutgoing.getPort());
             } catch (NumberFormatException e) {
                 //do nothing
             }
         }
+
+        proxy.setHost(host);
         proxy.setPort(port);
         proxy.setUsername(proxyOutgoing.getUsername());
 
         if (!proxyOutgoing.getPassword().equals(PluginConstants.PASSWORD_REPLACE)) {
             proxy.setPassword(proxyOutgoing.getPassword());
         }
+
         proxy.setNonProxyHost(proxyOutgoing.getNonProxyHost());
         getConfiguration().setProxy(proxy);
         persistConfiguration();