From 3d6fdee865a14eff7d84f9be50ac8561c5590ab2 Mon Sep 17 00:00:00 2001 From: offa Date: Mon, 11 Oct 2021 09:50:16 +0200 Subject: [PATCH 1/2] Code improvements --- .../varsetter/impl/UserIdCauseDeterminant.java | 11 +++++------ .../jenkinsci/plugins/builduser/BuildUserTest.java | 3 +-- .../plugins/builduser/BuildUserVarsConfigTest.java | 8 +++----- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/builduser/varsetter/impl/UserIdCauseDeterminant.java b/src/main/java/org/jenkinsci/plugins/builduser/varsetter/impl/UserIdCauseDeterminant.java index ca9a28c..06eeed3 100644 --- a/src/main/java/org/jenkinsci/plugins/builduser/varsetter/impl/UserIdCauseDeterminant.java +++ b/src/main/java/org/jenkinsci/plugins/builduser/varsetter/impl/UserIdCauseDeterminant.java @@ -12,7 +12,6 @@ import hudson.security.ACL; import hudson.tasks.Mailer; import hudson.model.User; -import hudson.model.UserProperty; import java.util.logging.Logger; import jenkins.model.Jenkins; import org.acegisecurity.GrantedAuthority; @@ -57,8 +56,8 @@ public boolean setJenkinsUserBuildVars(UserIdCause cause, SecurityRealm realm = jenkinsInstance.getSecurityRealm(); userid = mapUserId (userid, realm); GrantedAuthority[] authorities = realm.loadUserByUsername(originalUserid).getAuthorities(); - for (int i = 0; i < authorities.length; i++) { - String authorityString = authorities[i].getAuthority(); + for (GrantedAuthority authority : authorities) { + String authorityString = authority.getAuthority(); if (authorityString != null && authorityString.length() > 0) { groupString.append(authorityString).append(","); } @@ -66,7 +65,7 @@ public boolean setJenkinsUserBuildVars(UserIdCause cause, groupString.setLength(groupString.length() == 0 ? 0 : groupString.length() - 1); } catch (Exception err) { // Error - log.warning(String.format("Failed to get groups for user: %s error: %s ", userid, err.toString())); + log.warning(String.format("Failed to get groups for user: %s error: %s ", userid, err)); } variables.put(BUILD_USER_ID, userid); variables.put(BUILD_USER_VAR_GROUPS, groupString.toString()); @@ -74,9 +73,9 @@ public boolean setJenkinsUserBuildVars(UserIdCause cause, User user=User.get(originalUserid); if(null != user) { - UserProperty prop = user.getProperty(Mailer.UserProperty.class); + Mailer.UserProperty prop = user.getProperty(Mailer.UserProperty.class); if(null != prop) { - String adrs = StringUtils.trimToEmpty(((Mailer.UserProperty)prop).getAddress()); + String adrs = StringUtils.trimToEmpty(prop.getAddress()); variables.put(BUILD_USER_EMAIL, adrs); } } diff --git a/src/test/java/org/jenkinsci/plugins/builduser/BuildUserTest.java b/src/test/java/org/jenkinsci/plugins/builduser/BuildUserTest.java index 7c91ad8..5930ff1 100644 --- a/src/test/java/org/jenkinsci/plugins/builduser/BuildUserTest.java +++ b/src/test/java/org/jenkinsci/plugins/builduser/BuildUserTest.java @@ -78,8 +78,7 @@ public void testMakeUserBuildVariablesWithoutUpstream() throws Exception { // Register non-existent build as an execution cause Build downstreamBuild = childProject.getLastBuild(); List actions = downstreamBuild.getActions(CauseAction.class); - Assert.assertTrue("CauseAction has not been created properly", - actions != null && actions.size() == 1); + Assert.assertEquals("CauseAction has not been created properly", 1, actions.size()); Cause.UpstreamCause upstreamCause = null; List causes = actions.get(0).getCauses(); for (Cause cause : causes) { diff --git a/src/test/java/org/jenkinsci/plugins/builduser/BuildUserVarsConfigTest.java b/src/test/java/org/jenkinsci/plugins/builduser/BuildUserVarsConfigTest.java index 8a90623..dd9c3bf 100644 --- a/src/test/java/org/jenkinsci/plugins/builduser/BuildUserVarsConfigTest.java +++ b/src/test/java/org/jenkinsci/plugins/builduser/BuildUserVarsConfigTest.java @@ -38,10 +38,8 @@ public void uiAndStorage() throws Throwable { BuildUserVarsConfig.get().isAllBuilds()); }); sessions.then( - r -> { - assertTrue( - "still there after restart of Jenkins", - BuildUserVarsConfig.get().isAllBuilds()); - }); + r -> assertTrue( + "still there after restart of Jenkins", + BuildUserVarsConfig.get().isAllBuilds())); } } From bf039ccff211d902701613bd99e1817a70a77c58 Mon Sep 17 00:00:00 2001 From: offa Date: Mon, 11 Oct 2021 09:53:11 +0200 Subject: [PATCH 2/2] Replace deprecated User.get() --- .../varsetter/impl/UserIdCauseDeterminant.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/builduser/varsetter/impl/UserIdCauseDeterminant.java b/src/main/java/org/jenkinsci/plugins/builduser/varsetter/impl/UserIdCauseDeterminant.java index 06eeed3..1f66972 100644 --- a/src/main/java/org/jenkinsci/plugins/builduser/varsetter/impl/UserIdCauseDeterminant.java +++ b/src/main/java/org/jenkinsci/plugins/builduser/varsetter/impl/UserIdCauseDeterminant.java @@ -71,14 +71,14 @@ public boolean setJenkinsUserBuildVars(UserIdCause cause, variables.put(BUILD_USER_VAR_GROUPS, groupString.toString()); - User user=User.get(originalUserid); - if(null != user) { - Mailer.UserProperty prop = user.getProperty(Mailer.UserProperty.class); - if(null != prop) { - String adrs = StringUtils.trimToEmpty(prop.getAddress()); - variables.put(BUILD_USER_EMAIL, adrs); - } - } + User user = User.getById(originalUserid, false); + if (null != user) { + Mailer.UserProperty prop = user.getProperty(Mailer.UserProperty.class); + if (null != prop) { + String adrs = StringUtils.trimToEmpty(prop.getAddress()); + variables.put(BUILD_USER_EMAIL, adrs); + } + } return true; } else {