-Refactoring PC plugin due to new dependency to "com.microfocus.adm.p…

…erformancecenter" -https://issues.jenkins-ci.org/browse/JENKINS-49509
jenkinsci · Feb 13, 2018 · 07139a0 · 07139a0
1 parent 5c3db55
commit 07139a0
Show file tree

Hide file tree

Showing 54 changed files with 44 additions and 2,924 deletions.
diff --git a/pom.xml b/pom.xml
@@ -618,6 +618,12 @@
 			<artifactId>jersey-media-sse</artifactId>
 			<version>2.9</version>
 		</dependency>
+		<!-- https://mvnrepository.com/artifact/com.microfocus.adm.performancecenter/plugins-common -->
+		<dependency>
+			<groupId>com.microfocus.adm.performancecenter</groupId>
+			<artifactId>plugins-common</artifactId>
+			<version>1.0.1</version>
+		</dependency>
 
 	</dependencies>
 

diff --git a/src/main/java/com/hpe/application/automation/tools/common/PcException.java b/src/main/java/com/hpe/application/automation/tools/common/PcException.java
diff --git a/src/main/java/com/hpe/application/automation/tools/model/PcModel.java b/src/main/java/com/hpe/application/automation/tools/model/PcModel.java
@@ -41,6 +41,8 @@
 
 import org.kohsuke.stapler.DataBoundConstructor;
 
+import com.microfocus.adm.performancecenter.plugins.common.pcEntities.*;
+
 public class PcModel {
 
     public static final String    COLLATE         = "Collate Results";

diff --git a/src/main/java/com/hpe/application/automation/tools/model/PostRunAction.java b/src/main/java/com/hpe/application/automation/tools/model/PostRunAction.java
diff --git a/src/main/java/com/hpe/application/automation/tools/model/TimeslotDuration.java b/src/main/java/com/hpe/application/automation/tools/model/TimeslotDuration.java
diff --git a/src/main/java/com/hpe/application/automation/tools/pc/PcClient.java b/src/main/java/com/hpe/application/automation/tools/pc/PcClient.java
@@ -53,7 +53,8 @@
 import org.apache.commons.io.IOUtils;
 import org.apache.http.client.ClientProtocolException;
 
-import com.hpe.application.automation.tools.common.PcException;
+import com.microfocus.adm.performancecenter.plugins.common.pcEntities.*;
+import com.microfocus.adm.performancecenter.plugins.common.rest.PcRestProxy;
 import com.hpe.application.automation.tools.model.PcModel;
 import com.hpe.application.automation.tools.run.PcBuilder;
 
@@ -71,7 +72,7 @@ public PcClient(PcModel pcModel, PrintStream logger) {
             if(model.getProxyOutURL(true) != null && !model.getProxyOutURL(true).isEmpty()){
                 logger.println("Using proxy: " + model.getProxyOutURL(true));
             }
-            restProxy = new PcRestProxy(model.isHTTPSProtocol(),model.getPcServerName(true), model.getAlmDomain(true), model.getAlmProject(true),logger, model.getProxyOutURL(true),model.getProxyOutUser(true),model.getProxyOutPassword(true));
+            restProxy = new PcRestProxy(model.isHTTPSProtocol(),model.getPcServerName(true), model.getAlmDomain(true), model.getAlmProject(true), model.getProxyOutURL(true),model.getProxyOutUser(true),model.getProxyOutPassword(true));
             this.logger = logger;
         }catch (PcException e){
             logger.println(e.getMessage());
@@ -155,7 +156,7 @@ private int getCorrectTestInstanceID(int testID) throws IOException, PcException
                 PcTestSets pcTestSets = restProxy.GetAllTestSets();
                 if (pcTestSets !=null && pcTestSets.getPcTestSetsList() !=null){
                     PcTestSet pcTestSet = pcTestSets.getPcTestSetsList().get(pcTestSets.getPcTestSetsList().size()-1);
-                    int testSetID = pcTestSet.TestSetID;
+                    int testSetID = pcTestSet.getTestSetID();
                     logger.println(String.format("Creating Test Instance with testID: %s and TestSetID: %s", testID,testSetID));
                     testInstanceID = restProxy.createTestInstance(testID,testSetID);
                     logger.println(String.format("Test Instance with ID : %s has been created successfully.", testInstanceID));

diff --git a/src/main/java/com/hpe/application/automation/tools/pc/PcErrorResponse.java b/src/main/java/com/hpe/application/automation/tools/pc/PcErrorResponse.java