Merge pull request #3 from levelops/prop-2199

[PROP-2199] Fix: NoSuchMethod in JobRunParserService causing some jobs not to be reported
jenkinsci · Nov 23, 2022 · d9e29ca · d9e29ca
2 parents bb31ff7 + 4f91280
commit d9e29ca
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -82,7 +82,7 @@
     </profiles>
 
     <properties>
-        <revision>1.0.22</revision>
+        <revision>1.0.23</revision>
         <!-- <changelist>999999-SNAPSHOT</changelist> -->
         <changelist></changelist>
         <product.build.sourceEncoding>UTF-8</product.build.sourceEncoding>

diff --git a/src/main/java/io/jenkins/plugins/propelo/commons/service/JobRunParserService.java b/src/main/java/io/jenkins/plugins/propelo/commons/service/JobRunParserService.java
@@ -13,6 +13,8 @@
 import io.jenkins.plugins.propelo.commons.models.JobRunParam;
 import io.jenkins.plugins.propelo.commons.models.JobTrigger;
 import jenkins.model.Jenkins;
+
+import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
 
 import java.io.File;
@@ -236,11 +238,11 @@ private String getUserCauseUser(final Cause cause){
             case "UserIdCause":
                 Cause.UserIdCause userIdCause = (Cause.UserIdCause) cause;
                 LOGGER.finest("JobRunParserService::getUserCauseUser currentUser = " + userIdCause.getUserId());
-                return Objects.firstNonNull(userIdCause.getUserId(), ACL.ANONYMOUS_USERNAME);
+                return (String) ObjectUtils.defaultIfNull(userIdCause.getUserId(), ACL.ANONYMOUS_USERNAME);
             case "UserCause":
                 Cause.UserCause userCause = (Cause.UserCause) cause;
                 LOGGER.finest("JobRunParserService::getUserCauseUser currentUser = " + userCause.getUserName());
-                return Objects.firstNonNull(userCause.getUserName(), ACL.ANONYMOUS_USERNAME);
+                return (String) ObjectUtils.defaultIfNull(userCause.getUserName(), ACL.ANONYMOUS_USERNAME);
             default:
                 LOGGER.finest("JobRunParserService::getUserCauseUser currentUser = " + ACL.SYSTEM_USERNAME);
                 return ACL.SYSTEM_USERNAME;
@@ -310,6 +312,8 @@ private JobTrigger buildTriggerChain(final Object cause, File hudsonHome) {
             case "RemoteCause":
                 triggerId = ((Cause.RemoteCause) cause).getAddr();
                 break;
+            case "GitHubPushCause":
+                LOGGER.info("GitHubPushCause, handling it as the SCMTriggerCause");
             case "SCMTriggerCause":
                 triggerId = "SCMTrigger";
                 break;