Merge remote-tracking branch 'origin/octane-dev-latest' into octane-d…

…ev-latest # Conflicts: # src/main/java/com/microfocus/application/automation/tools/octane/model/processors/projects/AbstractProjectProcessor.java
jenkinsci · Apr 28, 2019 · d3e1c44 · d3e1c44
2 parents 0376432 + a541a4c
commit d3e1c44
Show file tree

Hide file tree

Showing 51 changed files with 1,143 additions and 758 deletions.
diff --git a/pom.xml b/pom.xml
@@ -27,7 +27,7 @@
 	</parent>
 
 	<artifactId>hp-application-automation-tools-plugin</artifactId>
-	<version>5.7.3-beta-SNAPSHOT</version>
+	<version>5.7.4-beta-SNAPSHOT</version>
 	<packaging>hpi</packaging>
 	<name>Micro Focus Application Automation Tools</name>
 	<description>The plugin integrates Jenkins with the following Micro Focus products - Service Virtualization,
@@ -470,7 +470,7 @@
 		<dependency>
 			<artifactId>integrations-sdk</artifactId>
 			<groupId>com.hpe.adm.octane.ciplugins</groupId>
-			<version>2.0.39</version>
+			<version>2.0.41</version>
 		</dependency>
 
 		<!--BUILDER providers integration-->

diff --git a/src/main/java/com/microfocus/application/automation/tools/model/SvChangeModeModel.java b/src/main/java/com/microfocus/application/automation/tools/model/SvChangeModeModel.java
@@ -20,6 +20,7 @@
 
 package com.microfocus.application.automation.tools.model;
 
+import com.microfocus.application.automation.tools.sv.model.AbstractSvRunModel;
 import com.microfocus.sv.svconfigurator.core.impl.jaxb.ServiceRuntimeConfiguration;
 import org.kohsuke.stapler.DataBoundConstructor;
 

diff --git a/src/main/java/com/microfocus/application/automation/tools/model/SvDataModelSelection.java b/src/main/java/com/microfocus/application/automation/tools/model/SvDataModelSelection.java
@@ -22,6 +22,8 @@
 
 import javax.annotation.Nonnull;
 
+import java.io.Serializable;
+
 import hudson.Extension;
 import hudson.model.AbstractDescribableImpl;
 import hudson.model.Descriptor;
@@ -31,7 +33,7 @@
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.QueryParameter;
 
-public class SvDataModelSelection extends AbstractDescribableImpl<SvDataModelSelection> {
+public class SvDataModelSelection extends AbstractDescribableImpl<SvDataModelSelection> implements Serializable {
 
     protected final SelectionType selectionType;
     protected final String dataModel;
@@ -86,15 +88,14 @@ public String toString() {
     public String getSelectedModelName() {
         switch (selectionType) {
             case BY_NAME:
-                DescriptorImpl descriptor = (DescriptorImpl) getDescriptor();
-                validateField(descriptor.doCheckDataModel(dataModel));
+                validateField(DescriptorImpl.doCheckDataModelImpl(dataModel));
                 return dataModel;
             default:
                 return null;
         }
     }
 
-    public enum SelectionType {
+    public enum SelectionType implements Serializable {
         BY_NAME,
         NONE,
         /**
@@ -113,6 +114,10 @@ public String getDisplayName() {
 
         @SuppressWarnings("unused")
         public FormValidation doCheckDataModel(@QueryParameter String dataModel) {
+            return doCheckDataModelImpl(dataModel);
+        }
+
+        private static FormValidation doCheckDataModelImpl(@QueryParameter String dataModel) {
             if (StringUtils.isBlank(dataModel)) {
                 return FormValidation.error("Data model cannot be empty if 'Specific' model is selected");
             }

diff --git a/src/main/java/com/microfocus/application/automation/tools/model/SvDeployModel.java b/src/main/java/com/microfocus/application/automation/tools/model/SvDeployModel.java
@@ -20,6 +20,7 @@
 
 package com.microfocus.application.automation.tools.model;
 
+import com.microfocus.application.automation.tools.sv.model.AbstractSvRunModel;
 import org.kohsuke.stapler.DataBoundConstructor;
 
 public class SvDeployModel extends AbstractSvRunModel {

diff --git a/src/main/java/com/microfocus/application/automation/tools/model/SvExportModel.java b/src/main/java/com/microfocus/application/automation/tools/model/SvExportModel.java
@@ -20,6 +20,7 @@
 
 package com.microfocus.application.automation.tools.model;
 
+import com.microfocus.application.automation.tools.sv.model.AbstractSvRunModel;
 import org.apache.commons.lang.StringUtils;
 import org.kohsuke.stapler.DataBoundConstructor;
 

diff --git a/...n/java/com/microfocus/application/automation/tools/model/SvPerformanceModelSelection.java b/...n/java/com/microfocus/application/automation/tools/model/SvPerformanceModelSelection.java
@@ -22,6 +22,8 @@
 
 import javax.annotation.Nonnull;
 
+import java.io.Serializable;
+
 import hudson.Extension;
 import hudson.model.AbstractDescribableImpl;
 import hudson.model.Descriptor;
@@ -30,7 +32,7 @@
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.QueryParameter;
 
-public class SvPerformanceModelSelection extends AbstractDescribableImpl<SvPerformanceModelSelection> {
+public class SvPerformanceModelSelection extends AbstractDescribableImpl<SvPerformanceModelSelection> implements Serializable {
 
     protected final SelectionType selectionType;
     protected final String performanceModel;
@@ -81,8 +83,7 @@ public String toString() {
     public String getSelectedModelName() {
         switch (selectionType) {
             case BY_NAME:
-                DescriptorImpl descriptor = (DescriptorImpl) getDescriptor();
-                SvDataModelSelection.validateField(descriptor.doCheckPerformanceModel(performanceModel));
+                SvDataModelSelection.validateField(DescriptorImpl.doCheckPerformanceModelImpl(performanceModel));
                 return performanceModel;
             case OFFLINE:
                 return "Offline";
@@ -111,6 +112,10 @@ public String getDisplayName() {
 
         @SuppressWarnings("unused")
         public FormValidation doCheckPerformanceModel(@QueryParameter String performanceModel) {
+            return doCheckPerformanceModelImpl(performanceModel);
+        }
+
+        private static FormValidation doCheckPerformanceModelImpl(@QueryParameter String performanceModel) {
             if (StringUtils.isBlank(performanceModel)) {
                 return FormValidation.error("Performance model cannot be empty if 'Specific' model is selected");
             }

diff --git a/src/main/java/com/microfocus/application/automation/tools/model/SvServerSettingsModel.java b/src/main/java/com/microfocus/application/automation/tools/model/SvServerSettingsModel.java
@@ -20,6 +20,7 @@
 
 package com.microfocus.application.automation.tools.model;
 
+import java.io.Serializable;
 import java.net.MalformedURLException;
 import java.net.URL;
 
@@ -28,7 +29,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.kohsuke.stapler.DataBoundConstructor;
 
-public class SvServerSettingsModel {
+public class SvServerSettingsModel implements Serializable{
 
     private final String name;
     private final String url;

diff --git a/src/main/java/com/microfocus/application/automation/tools/model/SvServiceSelectionModel.java b/src/main/java/com/microfocus/application/automation/tools/model/SvServiceSelectionModel.java
@@ -22,6 +22,8 @@
 
 import javax.annotation.Nonnull;
 
+import java.io.Serializable;
+
 import hudson.Extension;
 import hudson.model.AbstractDescribableImpl;
 import hudson.model.Descriptor;
@@ -32,7 +34,7 @@
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.QueryParameter;
 
-public class SvServiceSelectionModel extends AbstractDescribableImpl<SvServiceSelectionModel> {
+public class SvServiceSelectionModel extends AbstractDescribableImpl<SvServiceSelectionModel> implements Serializable {
 
     protected final SelectionType selectionType;
     protected final String service;

diff --git a/src/main/java/com/microfocus/application/automation/tools/model/SvUndeployModel.java b/src/main/java/com/microfocus/application/automation/tools/model/SvUndeployModel.java
@@ -20,6 +20,7 @@
 
 package com.microfocus.application.automation.tools.model;
 
+import com.microfocus.application.automation.tools.sv.model.AbstractSvRunModel;
 import org.kohsuke.stapler.DataBoundConstructor;
 
 public class SvUndeployModel extends AbstractSvRunModel {