[JENKINS-37477] - Partial fix - docs are generated now.

Snippet generator still not working, so more work to do.
jenkinsci · Aug 22, 2016 · df624fb · df624fb
1 parent 6e3d7f4
commit df624fb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowJob.java b/src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowJob.java
@@ -430,7 +430,7 @@ public PipelineTriggersJobProperty getTriggersJobProperty() {
         PipelineTriggersJobProperty triggerProp = getProperty(PipelineTriggersJobProperty.class);
 
         if (triggerProp == null) {
-            triggerProp = new PipelineTriggersJobProperty(new ArrayList<Trigger<?>>());
+            triggerProp = new PipelineTriggersJobProperty(new ArrayList<Trigger>());
         }
 
         return triggerProp;
@@ -444,7 +444,8 @@ public void setTriggers(List<Trigger<?>> inputTriggers) throws IOException {
 
             removeProperty(PipelineTriggersJobProperty.class);
 
-            PipelineTriggersJobProperty triggerProp = new PipelineTriggersJobProperty(inputTriggers);
+            PipelineTriggersJobProperty triggerProp = new PipelineTriggersJobProperty(null);
+            triggerProp.setTriggers(inputTriggers);
 
             addProperty(triggerProp);
             bc.commit();

diff --git a/src/main/java/org/jenkinsci/plugins/workflow/job/properties/PipelineTriggersJobProperty.java b/src/main/java/org/jenkinsci/plugins/workflow/job/properties/PipelineTriggersJobProperty.java
@@ -50,16 +50,19 @@
 import java.util.List;
 import java.util.Map;
 
+@SuppressWarnings("rawtypes")
 public class PipelineTriggersJobProperty extends JobProperty<WorkflowJob> {
     private List<Trigger<?>> triggers = new ArrayList<>();
 
     @DataBoundConstructor
-    public PipelineTriggersJobProperty(List<Trigger<?>> triggers) {
+    public PipelineTriggersJobProperty(List<Trigger> triggers) {
         // Defensive handling of when we get called via {@code Descriptor.newInstance} with no form data.
         if (triggers == null) {
             this.triggers = new ArrayList<>();
         } else {
-            this.triggers = triggers;
+            for (Trigger t : triggers) {
+                this.triggers.add((Trigger<?>)t);
+            }
         }
     }
 
@@ -140,7 +143,7 @@ public PipelineTriggersJobProperty reconfigure(@Nonnull StaplerRequest req, @Che
 
         this.stopTriggers();
 
-        PipelineTriggersJobProperty thisProp = new PipelineTriggersJobProperty(new ArrayList<>(trigList.toList()));
+        PipelineTriggersJobProperty thisProp = new PipelineTriggersJobProperty(new ArrayList<Trigger>(trigList.toList()));
         thisProp.setOwner(owner);
 
         thisProp.startTriggers(true);
@@ -151,7 +154,6 @@ public PipelineTriggersJobProperty reconfigure(@Nonnull StaplerRequest req, @Che
     @Extension
     @Symbol("pipelineTriggers")
     public static class DescriptorImpl extends JobPropertyDescriptor {
-
         @Override
         public String getDisplayName() {
             return "Build triggers";