From 45e0fcbc875da4d3fbfc35b5c6c698c44cbe6259 Mon Sep 17 00:00:00 2001
From: Karsten Kraus <Karsten.Kraus@web.de>
Date: Sat, 3 Mar 2018 19:54:59 +0100
Subject: [PATCH] Fixes #38. Settings are now properly saved and restored

---
 .../gitlab_branch_source/GitLabSCMSource.java     |  2 +-
 .../settings/GitLabSCMSourceSettings.java         | 12 ++++++------
 .../settings/MonitorStrategy.java                 | 15 +++++++++++++++
 .../GitLabSCMBranchMonitorStrategy/config.jelly   |  3 +--
 .../GitLabSCMForksMonitorStrategy/config.jelly    |  3 +--
 .../GitLabSCMOriginMonitorStrategy/config.jelly   |  3 +--
 .../GitLabSCMTagMonitorStrategy/config.jelly      |  6 ++----
 7 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/GitLabSCMSource.java b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/GitLabSCMSource.java
index 3205a4e..b107c45 100644
--- a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/GitLabSCMSource.java
+++ b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/GitLabSCMSource.java
@@ -86,7 +86,7 @@ public GitLabSCMSourceSettings getSourceSettings() {
 
     @Override
     public String getCredentialsId() {
-        return sourceSettings.getCredentialsId();
+        return sourceSettings.getCheckoutCredentialsId();
     }
 
     @Override
diff --git a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/settings/GitLabSCMSourceSettings.java b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/settings/GitLabSCMSourceSettings.java
index d625ba2..9ea6b3e 100644
--- a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/settings/GitLabSCMSourceSettings.java
+++ b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/settings/GitLabSCMSourceSettings.java
@@ -44,7 +44,7 @@ public final class GitLabSCMSourceSettings extends AbstractDescribableImpl<GitLa
     private final GitLabSCMOriginMonitorStrategy originMonitorStrategy;
     private final GitLabSCMForksMonitorStrategy forksMonitorStrategy;
     private final GitLabSCMTagMonitorStrategy tagMonitorStrategy;
-    private String credentialsId;
+    private String checkoutCredentialsId;
     private boolean updateBuildDescription;
     private boolean publishUnstableBuildsAsSuccess;
     private String mergeCommitMessage;
@@ -70,7 +70,7 @@ public GitLabSCMSourceSettings(String connectionName,
         this.originMonitorStrategy = originMonitorStrategy;
         this.forksMonitorStrategy = forksMonitorStrategy;
         this.tagMonitorStrategy = tagMonitorStrategy;
-        this.credentialsId = CHECKOUT_CREDENTIALS_ANONYMOUS;
+        this.checkoutCredentialsId = CHECKOUT_CREDENTIALS_ANONYMOUS;
         this.updateBuildDescription = true;
         this.publishUnstableBuildsAsSuccess = false;
         this.mergeCommitMessage = DEFAULT_MERGE_COMMIT_MESSAGE;
@@ -97,13 +97,13 @@ public GitLabSCMTagMonitorStrategy getTagMonitorStrategy() {
         return tagMonitorStrategy;
     }
 
-    public String getCredentialsId() {
-        return !CHECKOUT_CREDENTIALS_ANONYMOUS.equals(credentialsId) ? credentialsId : null;
+    public String getCheckoutCredentialsId() {
+        return !CHECKOUT_CREDENTIALS_ANONYMOUS.equals(checkoutCredentialsId) ? checkoutCredentialsId : null;
     }
 
     @DataBoundSetter
-    public void setCredentialsId(String credentialsId) {
-        this.credentialsId = credentialsId;
+    public void setCheckoutCredentialsId(String checkoutCredentialsId) {
+        this.checkoutCredentialsId = checkoutCredentialsId;
     }
 
 
diff --git a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/settings/MonitorStrategy.java b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/settings/MonitorStrategy.java
index bea04ac..473285a 100644
--- a/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/settings/MonitorStrategy.java
+++ b/src/main/java/argelbargel/jenkins/plugins/gitlab_branch_source/settings/MonitorStrategy.java
@@ -7,6 +7,7 @@
 import hudson.util.ListBoxModel;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
+import org.kohsuke.stapler.DataBoundSetter;
 
 import javax.annotation.Nonnull;
 
@@ -26,14 +27,28 @@ public final boolean getMonitored() {
         return monitor;
     }
 
+    @DataBoundSetter
+    public final void setMonitored(boolean value) {
+        monitor = value;
+    }
+
     public final boolean getBuild() {
         return build;
     }
 
+    @DataBoundSetter
+    public final void setBuild(boolean value) {
+        build = value;
+    }
+
     public final BuildStatusPublishMode getBuildStatusPublishMode() {
         return buildStatusPublishMode;
     }
 
+    @DataBoundSetter
+    public final void setBuildStatusPublishMode(BuildStatusPublishMode value) {
+        buildStatusPublishMode = value;
+    }
 
     protected static abstract class MonitorStrategyDescriptor<T extends MonitorStrategy> extends Descriptor<MonitorStrategy> {
         @Nonnull
diff --git a/src/main/resources/argelbargel/jenkins/plugins/gitlab_branch_source/settings/GitLabSCMBranchMonitorStrategy/config.jelly b/src/main/resources/argelbargel/jenkins/plugins/gitlab_branch_source/settings/GitLabSCMBranchMonitorStrategy/config.jelly
index 7118314..010b9e6 100644
--- a/src/main/resources/argelbargel/jenkins/plugins/gitlab_branch_source/settings/GitLabSCMBranchMonitorStrategy/config.jelly
+++ b/src/main/resources/argelbargel/jenkins/plugins/gitlab_branch_source/settings/GitLabSCMBranchMonitorStrategy/config.jelly
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
-    <f:optionalBlock title="${%Monitor &amp; Build Origin Branches}" field="monitored" inline="true"
-                     checked="${descriptor.defaults.monitored}">
+    <f:optionalBlock title="${%Monitor &amp; Build Origin Branches}" field="monitored" inline="true">
         <f:nested>
             <table>
                 <f:entry title="${%Include branches}" field="includes">
diff --git a/src/main/resources/argelbargel/jenkins/plugins/gitlab_branch_source/settings/GitLabSCMForksMonitorStrategy/config.jelly b/src/main/resources/argelbargel/jenkins/plugins/gitlab_branch_source/settings/GitLabSCMForksMonitorStrategy/config.jelly
index 3e9f415..65b2a79 100644
--- a/src/main/resources/argelbargel/jenkins/plugins/gitlab_branch_source/settings/GitLabSCMForksMonitorStrategy/config.jelly
+++ b/src/main/resources/argelbargel/jenkins/plugins/gitlab_branch_source/settings/GitLabSCMForksMonitorStrategy/config.jelly
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
-    <f:optionalBlock title="Monitor &amp; Build Merge Requests from Forks" field="monitored" inline="true"
-                     checked="${descriptor.defaults.monitored}">
+    <f:optionalBlock title="Monitor &amp; Build Merge Requests from Forks" field="monitored" inline="true">
         <f:nested>
             <table>
                 <f:optionalBlock title="${%Build merged with base branch}" field="build"
diff --git a/src/main/resources/argelbargel/jenkins/plugins/gitlab_branch_source/settings/GitLabSCMOriginMonitorStrategy/config.jelly b/src/main/resources/argelbargel/jenkins/plugins/gitlab_branch_source/settings/GitLabSCMOriginMonitorStrategy/config.jelly
index 4948725..e4fc5db 100644
--- a/src/main/resources/argelbargel/jenkins/plugins/gitlab_branch_source/settings/GitLabSCMOriginMonitorStrategy/config.jelly
+++ b/src/main/resources/argelbargel/jenkins/plugins/gitlab_branch_source/settings/GitLabSCMOriginMonitorStrategy/config.jelly
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
-    <f:optionalBlock title="${%Monitor &amp; Build Merge Requests from Origin}" field="monitored"
-                     checked="${descriptor.defaults.monitored}" inline="true">
+    <f:optionalBlock title="${%Monitor &amp; Build Merge Requests from Origin}" field="monitored" inline="true">
         <f:nested>
             <table>
                 <f:optionalBlock title="${%Build merged with base branch}" field="buildMerged"
diff --git a/src/main/resources/argelbargel/jenkins/plugins/gitlab_branch_source/settings/GitLabSCMTagMonitorStrategy/config.jelly b/src/main/resources/argelbargel/jenkins/plugins/gitlab_branch_source/settings/GitLabSCMTagMonitorStrategy/config.jelly
index 3d97f85..d008963 100644
--- a/src/main/resources/argelbargel/jenkins/plugins/gitlab_branch_source/settings/GitLabSCMTagMonitorStrategy/config.jelly
+++ b/src/main/resources/argelbargel/jenkins/plugins/gitlab_branch_source/settings/GitLabSCMTagMonitorStrategy/config.jelly
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
-    <f:optionalBlock title="${%Monitor Tags}" field="monitored" checked="${descriptor.defaults.monitored}"
-                     inline="true">
+    <f:optionalBlock title="${%Monitor Tags}" field="monitored" inline="true">
         <f:nested>
             <table>
-                <f:optionalBlock title="${%Build Tags}" field="buildTags" checked="${descriptor.defaults.build}"
-                                 inline="true">
+                <f:optionalBlock title="${%Build Tags}" field="build" inline="true">
                     <f:entry title="${%Publish build status}" field="buildStatusPublishMode">
                         <f:select default="${descriptor.defaults.buildStatusPublishMode}"/>
                     </f:entry>