Added strategyId to @DataBoundConstructor on ProjectNamingStrategyTrait

Author: robross0606

README.md

@@ -17,7 +17,7 @@ you require the following plugins:
      * `io.jenkins.plugins.gitlabserverconfig` - Manages server configuration and web hooks management. Ideally should reside inside another plugin with name `GitLab Plugin`. In future, this package will be moved into a new plugin.
 
      * `io.jenkins.plugins.gitlabbranchsource` - Adds GitLab Branch Source for Multi-branch Pipeline Jobs (including
-     Merge Requests) and Folder organisation.
+     Merge Requests) and Folder organization.
 
 ## Getting Started
 
@@ -365,7 +365,7 @@ See handling secrets [section](https://github.com/jenkinsci/configuration-as-cod
 GitLab Branch Source Plugin allows you to create 2 type of jobs:
 
 * `Multibranch Pipeline Jobs` - For single project.
-* `Folder Organisation` - For multiple projects inside a owner (user/group/subgroup).
+* `Folder Organization` - For multiple projects inside a owner (user/group/subgroup).
 
 ### Multibranch Pipeline Jobs
 
@@ -748,7 +748,7 @@ GITLAB_CHANGES_UPDATED_AT_CURR
 
 To create a Job DSL seed job see this [tutorial](https://github.com/jenkinsci/job-dsl-plugin/wiki/Tutorial---Using-the-Jenkins-Job-DSL).
 
-Here is a sample seed job script for folder organisation job:
+Here is a sample seed job script for folder organization job:
 
 ```groovy
 organizationFolder('GitLab Organization Folder') {

pom.xml

@@ -19,7 +19,7 @@
     <jcasc.version>1.36</jcasc.version>
   </properties>
   <name>GitLab Branch Source Plugin</name>
-  <description>GitLab Provides branch source and folder organisation functionality for GitLab
+  <description>GitLab Provides branch source and folder organization functionality for GitLab
     Repositories in Jenkins Source Plugin
   </description>
   <licenses>

src/main/java/io/jenkins/plugins/gitlabbranchsource/ProjectNamingStrategyTrait.java

@@ -18,8 +18,8 @@ public class ProjectNamingStrategyTrait extends SCMNavigatorTrait {
     private int strategyId = 1;
 
     @DataBoundConstructor
-    public ProjectNamingStrategyTrait() {
-        // empty
+    public ProjectNamingStrategyTrait(int strategyId) {
+        this.strategyId = strategyId;
     }
 
     public int getStrategyId() {
@@ -38,7 +38,7 @@ public void setStrategyId(int strategyId) {
     protected void decorateContext(SCMNavigatorContext<?, ?> context) {
         if (context instanceof GitLabSCMNavigatorContext) {
             GitLabSCMNavigatorContext ctx = (GitLabSCMNavigatorContext) context;
-            ctx.withProjectNamingStrategy(strategyId);
+            ctx.withProjectNamingStrategy(getStrategyId());
         }
     }
 

src/main/java/io/jenkins/plugins/gitlabbranchsource/helpers/GitLabPipelineStatusNotifier.java

@@ -256,26 +256,23 @@ private static void sendNotifications(Run<?, ?> build, TaskListener listener) {
         status.setTargetUrl(url);
 
         if (Result.SUCCESS.equals(result)) {
-            status.setDescription(build.getParent().getFullName() + ": This commit looks good");
+            status.setDescription(build.toString() + ": This commit looks good.");
             status.setStatus("SUCCESS");
             state = Constants.CommitBuildState.SUCCESS;
         } else if (Result.UNSTABLE.equals(result)) {
-            status.setDescription(
-                build.getParent().getFullName() + ": This commit has test failures");
+            status.setDescription(build.toString() + ": This commit is unstable with partial failure.");
             status.setStatus("FAILED");
             state = Constants.CommitBuildState.FAILED;
         } else if (Result.FAILURE.equals(result)) {
-            status.setDescription(
-                build.getParent().getFullName() + ": There was a failure building this commit");
+            status.setDescription(build.toString() + ": There was a failure building this commit.");
             status.setStatus("FAILED");
             state = Constants.CommitBuildState.FAILED;
         } else if (result != null) { // ABORTED, NOT_BUILT.
-            status.setDescription(build.getParent().getFullName()
-                + ": Something is wrong with the build of this commit");
+            status.setDescription(build.toString() + ": Something is wrong with the build of this commit.");
             status.setStatus("CANCELED");
             state = Constants.CommitBuildState.CANCELED;
         } else {
-            status.setDescription(build.getParent().getFullName() + ": Build started...");
+            status.setDescription(build.toString() + ": Build started...");
             status.setStatus("RUNNING");
             state = Constants.CommitBuildState.RUNNING;
         }

src/main/resources/index.jelly

@@ -1,4 +1,4 @@
 <?jelly escape-by-default='true'?>
 <div>
-  Provides branch source and folder organisation functionality for GitLab Repositories in Jenkins
+  Provides branch source and folder organization functionality for GitLab Repositories in Jenkins
 </div>