user story #868008 : Jira Plugin On Prem - Support multi spaces

Author: Radislav Berkovich

pom.xml

@@ -7,7 +7,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.microfocus.octane.plugins</groupId>
     <artifactId>jira-octane-quality-insight-plugin</artifactId>
-    <version>1.0.3.7</version>
+    <version>1.0.4.0</version>
     <organization>
         <name>Micro Focus ALM Octane</name>
         <url>https://www.microfocus.com/en-us/products/alm-octane/overview</url>

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

@@ -22,8 +22,7 @@
 
 @XmlRootElement()
 @XmlAccessorType(XmlAccessType.FIELD)
-
-public class Select2ResultItem {
+public class KeyValueItem {
 
     @XmlElement(name = "id")
     private String id;
@@ -32,11 +31,15 @@ public class Select2ResultItem {
     private String text;
 
 
-    public Select2ResultItem(String id, String text) {
+    public KeyValueItem(String id, String text) {
         this.text = text;
         this.id = id;
     }
 
+    public static KeyValueItem create(String id, String text) {
+        return new KeyValueItem(id, text);
+    }
+
     public String getText() {
         return text;
     }
@@ -47,6 +50,6 @@ public String getId() {
 
     @Override
     public String toString() {
-        return id +" : " + text;
+        return id + " : " + text;
     }
 }

src/main/java/com/microfocus/octane/plugins/admin/Select2ResultItem.java renamed to src/main/java/com/microfocus/octane/plugins/admin/KeyValueItem.java

@@ -37,6 +37,8 @@ public class ProxyConfigurationOutgoing {
     @XmlElement(name = "password")
     private String password;
 
+    @XmlElement(name = "nonProxyHost")
+    private String nonProxyHost;
 
     public static ProxyConfigurationOutgoing create() {
         return new ProxyConfigurationOutgoing();
@@ -82,6 +84,15 @@ public ProxyConfigurationOutgoing setPassword(String password) {
     public String toString() {
         return "ProxyConfiguration {host=" + host + ", port=" + port + ", username=" + username + " }";
     }
+
+    public String getNonProxyHost() {
+        return nonProxyHost;
+    }
+
+    public ProxyConfigurationOutgoing setNonProxyHost(String nonProxyHost) {
+        this.nonProxyHost = nonProxyHost;
+        return this;
+    }
 }
 
 

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

@@ -36,14 +36,8 @@ public class SpaceConfigurationOutgoing {
     @XmlElement(name = "clientSecret")
     private String clientSecret;
 
-    public static SpaceConfigurationOutgoing create(String id, String location, String clientId, String clientSecret){
-        SpaceConfigurationOutgoing model = new SpaceConfigurationOutgoing();
-        model.setId(id);
-        model.setLocation(location);
-        model.setClientId(clientId);
-        model.setClientSecret(clientSecret);
-        return model;
-    }
+    @XmlElement(name = "name")
+    private String name;
 
     public String getId() {
         return id;
@@ -58,23 +52,35 @@ public String getLocation() {
         return location;
     }
 
-    public void setLocation(String location) {
+    public SpaceConfigurationOutgoing setLocation(String location) {
         this.location = location;
+        return this;
     }
 
     public String getClientId() {
         return clientId;
     }
 
-    public void  setClientId(String clientId) {
+    public SpaceConfigurationOutgoing  setClientId(String clientId) {
         this.clientId = clientId;
+        return this;
     }
 
     public String getClientSecret() {
         return clientSecret;
     }
 
-    public void  setClientSecret(String clientSecret) {
+    public SpaceConfigurationOutgoing  setClientSecret(String clientSecret) {
         this.clientSecret = clientSecret;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public SpaceConfigurationOutgoing setName(String name) {
+        this.name = name;
+        return this;
     }
 }

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

@@ -26,10 +26,16 @@
 public class WorkspaceConfigurationOutgoing {
 
     @XmlElement(name = "id")
-    private long id;
+    private String id;
+
+    @XmlElement(name = "spaceConfigId")
+    private String spaceConfigId;
+
+    @XmlElement(name = "spaceConfigName")
+    private String spaceConfigName;
 
     @XmlElement(name = "workspaceId")
-    private long workspaceId;
+    private String workspaceId;
 
     @XmlElement(name = "workspaceName")
     private String workspaceName;
@@ -46,24 +52,15 @@ public class WorkspaceConfigurationOutgoing {
     @XmlElement(name = "jiraProjects")
     private List<String> jiraProjects;
 
-    public long getId() {
+    public String getId() {
         return id;
     }
 
-    public WorkspaceConfigurationOutgoing setId(long id) {
+    public WorkspaceConfigurationOutgoing setId(String id) {
         this.id = id;
         return this;
     }
 
-    public String getWorkspaceName() {
-        return workspaceName;
-    }
-
-    public WorkspaceConfigurationOutgoing setWorkspaceName(String workspaceName) {
-        this.workspaceName = workspaceName;
-        return this;
-    }
-
     public String getOctaneUdf() {
         return octaneUdf;
     }
@@ -73,7 +70,6 @@ public WorkspaceConfigurationOutgoing setOctaneUdf(String octaneUdf) {
         return this;
     }
 
-
     public List<String> getOctaneEntityTypes() {
         return octaneEntityTypes;
     }
@@ -101,12 +97,40 @@ public WorkspaceConfigurationOutgoing setJiraProjects(List<String> jiraProjects)
         return this;
     }
 
-    public long getWorkspaceId() {
+
+    public String getSpaceConfigId() {
+        return spaceConfigId;
+    }
+
+    public WorkspaceConfigurationOutgoing setSpaceConfigId(String spaceConfigId) {
+        this.spaceConfigId = spaceConfigId;
+        return this;
+    }
+
+    public String getSpaceConfigName() {
+        return spaceConfigName;
+    }
+
+    public WorkspaceConfigurationOutgoing setSpaceConfigName(String spaceConfigName) {
+        this.spaceConfigName = spaceConfigName;
+        return this;
+    }
+
+    public String getWorkspaceId() {
         return workspaceId;
     }
 
-    public WorkspaceConfigurationOutgoing setWorkspaceId(long workspaceId) {
+    public WorkspaceConfigurationOutgoing setWorkspaceId(String workspaceId) {
         this.workspaceId = workspaceId;
         return this;
     }
+
+    public String getWorkspaceName() {
+        return workspaceName;
+    }
+
+    public WorkspaceConfigurationOutgoing setWorkspaceName(String workspaceName) {
+        this.workspaceName = workspaceName;
+        return this;
+    }
 }

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

@@ -0,0 +1,4 @@
+package com.microfocus.octane.plugins.components.api;
+
+public interface InitService {
+}

src/main/java/com/microfocus/octane/plugins/components/api/InitService.java

@@ -0,0 +1,25 @@
+package com.microfocus.octane.plugins.components.impl;
+
+import com.atlassian.plugin.spring.scanner.annotation.export.ExportAsService;
+import com.atlassian.plugin.spring.scanner.annotation.imports.ComponentImport;
+import com.atlassian.sal.api.pluginsettings.PluginSettingsFactory;
+import com.microfocus.octane.plugins.components.api.InitService;
+import com.microfocus.octane.plugins.configuration.ConfigurationManager;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
+@ExportAsService({InitService.class})
+@Named("initService")
+public class InitServiceImpl implements InitService {
+
+    @ComponentImport
+    private final PluginSettingsFactory pluginSettingsFactory;
+
+    @Inject
+    public InitServiceImpl(final PluginSettingsFactory pluginSettingsFactory) {
+        this.pluginSettingsFactory = pluginSettingsFactory;
+        ConfigurationManager.getInstance().init(pluginSettingsFactory);
+    }
+
+}

src/main/java/com/microfocus/octane/plugins/components/api/OctaneRestService.java

@@ -16,21 +16,37 @@
 
 import com.microfocus.octane.plugins.rest.ProxyConfiguration;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class ConfigurationCollection {
 
-    private List<SpaceConfiguration> spaces;
+    private List<SpaceConfiguration> spaces = new ArrayList<>();
+    private List<WorkspaceConfiguration> workspaces = new ArrayList<>();
     private ProxyConfiguration proxy;
 
     public List<SpaceConfiguration> getSpaces() {
         return spaces;
     }
 
+    public List<WorkspaceConfiguration> getWorkspaces() {
+        return workspaces;
+    }
+
     public void setSpaces(List<SpaceConfiguration> spaces) {
+        if (spaces == null) {
+            spaces = new ArrayList<>();
+        }
         this.spaces = spaces;
     }
 
+    public void setWorkspaces(List<WorkspaceConfiguration> workspaces) {
+        if (workspaces == null) {
+            workspaces = new ArrayList<>();
+        }
+        this.workspaces = workspaces;
+    }
+
     public ProxyConfiguration getProxy() {
         return proxy;
     }