Merge pull request #242 from MicroFocus/octane-dev-latest

octane 5.8.2 fixes

Author: grount

pom.xml

@@ -470,7 +470,7 @@
 		<dependency>
 			<artifactId>integrations-sdk</artifactId>
 			<groupId>com.hpe.adm.octane.ciplugins</groupId>
-			<version>2.0.55</version>
+			<version>2.0.63</version>
 		</dependency>
 
 		<!--BUILDER providers integration-->

src/main/java/com/microfocus/application/automation/tools/model/TestsFramework.java

@@ -25,20 +25,17 @@ public class TestsFramework {
     private String description;
     private String name;
     private String format;
-    private String delimiter;
 
     public TestsFramework() {
         this.name = "";
         this.description = "";
         this.format = "";
-        this.delimiter = "";
     }
 
-    public TestsFramework(String name, String description, String format, String delimiter) {
+    public TestsFramework(String name, String description, String format) {
         this.name = name;
         this.description = description;
         this.format = format;
-        this.delimiter = delimiter;
     }
 
     public String getDescription() {
@@ -53,8 +50,4 @@ public String getFormat() {
         return format;
     }
 
-    public String getDelimiter() {
-        return delimiter;
-    }
-
 }

src/main/java/com/microfocus/application/automation/tools/octane/CIJenkinsServicesImpl.java

@@ -685,26 +685,21 @@ private List<ParameterValue> createParameters(Job project, CIParameters ciParame
 	private Job getJobByRefId(String jobRefId) {
 		Job result = null;
 		if (jobRefId != null) {
-			try {
-				jobRefId = URLDecoder.decode(jobRefId, StandardCharsets.UTF_8.name());
-				TopLevelItem item = getTopLevelItem(jobRefId);
-				if (item instanceof Job) {
-					result = (Job) item;
-				} else if (jobRefId.contains("/") && item == null) {
-					String newJobRefId = jobRefId.substring(0, jobRefId.indexOf("/"));
-					item = getTopLevelItem(newJobRefId);
-					if (item != null) {
-						Collection<? extends Job> allJobs = item.getAllJobs();
-						for (Job job : allJobs) {
-							if (jobRefId.endsWith(job.getName())) {
-								result = job;
-								break;
-							}
+			TopLevelItem item = getTopLevelItem(jobRefId);
+			if (item instanceof Job) {
+				result = (Job) item;
+			} else if (jobRefId.contains("/") && item == null) {
+				String parentJobRefId = jobRefId.substring(0, jobRefId.indexOf('/'));
+				item = getTopLevelItem(parentJobRefId);
+				if (item != null) {
+					Collection<? extends Job> allJobs = item.getAllJobs();
+					for (Job job : allJobs) {
+						if (jobRefId.endsWith(job.getName())) {
+							result = job;
+							break;
 						}
 					}
 				}
-			} catch (UnsupportedEncodingException uee) {
-				logger.error("failed to decode job ref ID '" + jobRefId + "'", uee);
 			}
 		}
 		return result;

src/main/java/com/microfocus/application/automation/tools/octane/configuration/ConfigurationValidator.java

@@ -21,7 +21,7 @@
 package com.microfocus.application.automation.tools.octane.configuration;
 
 import com.hp.octane.integrations.OctaneSDK;
-import com.hp.octane.integrations.dto.connectivity.OctaneResponse;
+import com.hp.octane.integrations.exceptions.OctaneConnectivityException;
 import com.microfocus.application.automation.tools.octane.CIJenkinsServicesImpl;
 import com.microfocus.application.automation.tools.octane.Messages;
 import hudson.ProxyConfiguration;
@@ -100,20 +100,14 @@ public static FormValidation checkConfigurationAndWrapWithFormValidation(String
     }
 
     public static void checkConfiguration(List<String> errorMessages, String location, String sharedSpace, String username, Secret password) {
-        OctaneResponse checkResponse;
+
         try {
-            checkResponse = OctaneSDK.testOctaneConfiguration(location, sharedSpace, username, password.getPlainText(), CIJenkinsServicesImpl.class);
-
-            if (checkResponse.getStatus() == 401) {
-                errorMessages.add(Messages.AuthenticationFailure());
-            } else if (checkResponse.getStatus() == 403) {
-                errorMessages.add(Messages.AuthorizationFailure());
-            } else if (checkResponse.getStatus() == 404) {
-                errorMessages.add(Messages.ConnectionSharedSpaceInvalid());
-            } else if (checkResponse.getStatus() != 200) {
-                errorMessages.add(Messages.UnexpectedFailure() + ": " + checkResponse.getStatus());
-            }
-        } catch (IOException ioe) {
+            OctaneSDK.testAndValidateOctaneConfiguration(location, sharedSpace, username, password.getPlainText(), CIJenkinsServicesImpl.class);
+
+        } catch (OctaneConnectivityException octaneException) {
+            errorMessages.add(octaneException.getErrorMessageVal());
+
+        }catch (IOException ioe) {
             logger.warn("Connection check failed due to communication problem", ioe);
             errorMessages.add(Messages.ConnectionFailure());
         }

src/main/java/com/microfocus/application/automation/tools/octane/events/WorkflowListenerOctaneImpl.java

@@ -116,7 +116,7 @@ private void sendPipelineStartedEvent(FlowNode flowNode) {
 			event
 					.setParentCiId(parentRun.getParent().getParent().getFullName())
 					.setMultiBranchType(MultiBranchType.MULTI_BRANCH_CHILD)
-					.setProjectDisplayName(parentRun.getParent().getFullName());
+					.setProjectDisplayName(parentRun.getParent().getFullDisplayName().replaceAll(" » ", "/"));
 		}
 
 		CIJenkinsServicesImpl.publishEventToRelevantClients(event);