Introduce the new UserIdCause constructor, which accepts userId as an…

… argument. (#3162) * Introduce UserIdCause constructor, which accepts userId as an argument. * [JENKINS-48467] - UserIdCuase: Add issue link in the TODO comment
jenkinsci · Dec 14, 2017 · 14605fe · 14605fe
1 parent b7f42b2
commit 14605fe
Showing 1 changed file with 21 additions and 2 deletions.
diff --git a/core/src/main/java/hudson/model/Cause.java b/core/src/main/java/hudson/model/Cause.java
@@ -402,17 +402,36 @@ public int hashCode() {
      */
     public static class UserIdCause extends Cause {
 
+        @CheckForNull
         private String userId;
 
+        /**
+         * Constructor, which uses the current {@link User}.
+         */
         public UserIdCause() {
             User user = User.current();
             this.userId = (user == null) ? null : user.getId();
         }
 
+        /**
+         * Constructor.
+         * @param userId User ID. {@code null} if the user is unknown.
+         * @since TODO
+         */
+        public UserIdCause(@CheckForNull String userId) {
+            this.userId = userId;
+        }
+
         @Exported(visibility = 3)
+        @CheckForNull
         public String getUserId() {
             return userId;
         }
+
+        @Nonnull
+        private String getUserIdOrUnknown() {
+            return  userId != null ? userId : User.getUnknown().getId();
+        }
 
         @Exported(visibility = 3)
         public String getUserName() {
@@ -435,8 +454,8 @@ public String getShortDescription() {
         @Override
         public void print(TaskListener listener) {
             listener.getLogger().println(Messages.Cause_UserIdCause_ShortDescription(
-                    // TODO better to use ModelHyperlinkNote.encodeTo(User), or User.getUrl, since it handles URL escaping
-                    ModelHyperlinkNote.encodeTo("/user/"+getUserId(), getUserName())));
+                    // TODO JENKINS-48467 - better to use ModelHyperlinkNote.encodeTo(User), or User.getUrl, since it handles URL escaping
+                    ModelHyperlinkNote.encodeTo("/user/"+getUserIdOrUnknown(), getUserName())));
         }
 
         @Override