StashBuildTrigger: Use correct getter names for config.jelly fields

Getter names for fields referenced in config.jelly should start with
"get" followed by the capitalized property name. "is" is not supported.

Author: proski

src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/StashBuildTrigger.java

@@ -115,7 +115,7 @@ public String getCron() {
   }
 
   // Needed for Jelly Config
-  public String getcredentialsId() {
+  public String getCredentialsId() {
     return this.credentialsId;
   }
 
@@ -157,7 +157,7 @@ public boolean getCheckDestinationCommit() {
     return checkDestinationCommit;
   }
 
-  public boolean isIgnoreSsl() {
+  public boolean getIgnoreSsl() {
     return ignoreSsl;
   }
 
@@ -173,7 +173,7 @@ public boolean getMergeOnSuccess() {
     return mergeOnSuccess;
   }
 
-  public boolean isCancelOutdatedJobsEnabled() {
+  public boolean getCancelOutdatedJobsEnabled() {
     return cancelOutdatedJobsEnabled;
   }
 
@@ -215,19 +215,19 @@ public void stop() {
     super.stop();
   }
 
-  public boolean isCheckMergeable() {
+  public boolean getCheckMergeable() {
     return checkMergeable;
   }
 
-  public boolean isCheckNotConflicted() {
+  public boolean getCheckNotConflicted() {
     return checkNotConflicted;
   }
 
-  public boolean isCheckProbeMergeStatus() {
+  public boolean getCheckProbeMergeStatus() {
     return checkProbeMergeStatus;
   }
 
-  public boolean isOnlyBuildOnComment() {
+  public boolean getOnlyBuildOnComment() {
     return onlyBuildOnComment;
   }
 

src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/StashRepository.java

@@ -86,7 +86,7 @@ public void init() {
             trigger.getPassword(),
             trigger.getProjectCode(),
             trigger.getRepositoryName(),
-            trigger.isIgnoreSsl());
+            trigger.getIgnoreSsl());
   }
 
   public Collection<StashPullRequestResponseValue> getTargetPullRequests() {
@@ -256,7 +256,7 @@ private List<ParameterValue> getParameters(StashCause cause) {
   public Queue.Item startJob(StashCause cause) {
     List<ParameterValue> values = getParameters(cause);
 
-    if (trigger.isCancelOutdatedJobsEnabled()) {
+    if (trigger.getCancelOutdatedJobsEnabled()) {
       cancelPreviousJobsInQueueThatMatch(cause);
       abortRunningJobsThatMatch(cause);
     }
@@ -363,9 +363,9 @@ public boolean mergePullRequest(String pullRequestId, String version) {
   }
 
   private boolean isPullRequestMergeable(StashPullRequestResponseValue pullRequest) {
-    if (trigger.isCheckMergeable()
-        || trigger.isCheckNotConflicted()
-        || trigger.isCheckProbeMergeStatus()) {
+    if (trigger.getCheckMergeable()
+        || trigger.getCheckNotConflicted()
+        || trigger.getCheckProbeMergeStatus()) {
       /* Request PR status from Stash, and consult our configuration
        * toggles on whether we care about certain verdicts in that
        * JSON answer, parsed into fields of the "response" object.
@@ -374,11 +374,11 @@ private boolean isPullRequestMergeable(StashPullRequestResponseValue pullRequest
       StashPullRequestMergeableResponse mergeable =
           client.getPullRequestMergeStatus(pullRequest.getId());
       boolean res = true;
-      if (trigger.isCheckMergeable()) {
+      if (trigger.getCheckMergeable()) {
         res &= mergeable.getCanMerge();
       }
 
-      if (trigger.isCheckNotConflicted()) {
+      if (trigger.getCheckNotConflicted()) {
         res &= !mergeable.getConflicted();
       }
 
@@ -455,7 +455,7 @@ private boolean isBuildTarget(StashPullRequestResponseValue pullRequest) {
       return false;
     }
 
-    boolean isOnlyBuildOnComment = trigger.isOnlyBuildOnComment();
+    boolean isOnlyBuildOnComment = trigger.getOnlyBuildOnComment();
 
     if (isOnlyBuildOnComment) {
       shouldBuild = false;

src/test/java/stashpullrequestbuilder/stashpullrequestbuilder/StashBuildTriggerTest.java

@@ -0,0 +1,57 @@
+package stashpullrequestbuilder.stashpullrequestbuilder;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
+
+import hudson.model.Descriptor.PropertyType;
+import java.util.Arrays;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.jvnet.hudson.test.JenkinsRule;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.MockitoRule;
+import org.mockito.quality.Strictness;
+import stashpullrequestbuilder.stashpullrequestbuilder.StashBuildTrigger.StashBuildTriggerDescriptor;
+
+@RunWith(MockitoJUnitRunner.class)
+public class StashBuildTriggerTest {
+
+  @Rule public JenkinsRule jenkinsRule = new JenkinsRule();
+  @Rule public MockitoRule rule = MockitoJUnit.rule().strictness(Strictness.STRICT_STUBS);
+
+  @Test
+  public void check_getters() throws Exception {
+    StashBuildTriggerDescriptor descriptor = StashBuildTrigger.descriptor;
+
+    // Field names from config.jelly
+    Iterable<String> properties =
+        Arrays.asList(
+            "cron",
+            "stashHost",
+            "credentialsId",
+            "projectCode",
+            "repositoryName",
+            "ignoreSsl",
+            "targetBranchesToBuild",
+            "checkDestinationCommit",
+            "checkNotConflicted",
+            "checkMergeable",
+            "checkProbeMergeStatus",
+            "mergeOnSuccess",
+            "deletePreviousBuildFinishComments",
+            "cancelOutdatedJobsEnabled",
+            "ciSkipPhrases",
+            "onlyBuildOnComment",
+            "ciBuildPhrases");
+
+    for (String property : properties) {
+      System.out.println(property);
+      PropertyType propertyType = descriptor.getPropertyType(property);
+      assertThat(propertyType, is(notNullValue()));
+    }
+  }
+}