Skip to content

Commit 578dcd5

Browse files
authored
Remove dependency on commons-lang3-api plugin (#185)
Co-authored-by: Daniel Beck <daniel-beck@users.noreply.github.com>
1 parent d9ec65d commit 578dcd5

File tree

3 files changed

+16
-13
lines changed

3 files changed

+16
-13
lines changed

pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,6 @@
6161
<artifactId>configuration-as-code</artifactId>
6262
<optional>true</optional>
6363
</dependency>
64-
<dependency>
65-
<groupId>io.jenkins.plugins</groupId>
66-
<artifactId>commons-lang3-api</artifactId>
67-
</dependency>
6864
<dependency>
6965
<groupId>io.jenkins.plugins</groupId>
7066
<artifactId>ionicons-api</artifactId>

src/main/java/org/jenkinsci/plugins/matrixauth/AuthorizationContainerDescriptor.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import java.util.List;
1919
import java.util.stream.Collectors;
2020
import jenkins.model.Jenkins;
21-
import org.apache.commons.lang3.StringUtils;
2221
import org.kohsuke.accmod.Restricted;
2322
import org.kohsuke.accmod.restrictions.DoNotUse;
2423
import org.kohsuke.accmod.restrictions.NoExternalUse;
@@ -93,7 +92,7 @@ default String impliedByList(Permission p) {
9392
p = p.impliedBy;
9493
impliedBys.add(p);
9594
}
96-
return StringUtils.join(impliedBys.stream().map(Permission::getId).collect(Collectors.toList()), " ");
95+
return impliedBys.stream().map(Permission::getId).collect(Collectors.joining(" "));
9796
}
9897

9998
@Restricted(DoNotUse.class) // Called from Jelly view

src/main/java/org/jenkinsci/plugins/matrixauth/ValidationUtil.java

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import hudson.security.SecurityRealm;
3636
import hudson.security.UserMayOrMayNotExistException2;
3737
import hudson.util.FormValidation;
38-
import org.apache.commons.lang3.StringUtils;
3938
import org.jenkins.ui.symbol.Symbol;
4039
import org.jenkins.ui.symbol.SymbolRequest;
4140
import org.kohsuke.accmod.Restricted;
@@ -137,17 +136,15 @@ static FormValidation validateGroup(String groupName, SecurityRealm sr, boolean
137136
FormValidation.Kind.WARNING,
138137
formatUserGroupValidationResponse(
139138
GROUP,
140-
Util.escape(StringUtils.abbreviate(groupDetails.getDisplayName(), 50)),
139+
Util.escape(abbreviate(groupDetails.getDisplayName())),
141140
"Group " + escapedSid
142141
+ " found; but permissions would also be granted to a user of this name",
143142
true));
144143
} else {
145144
return FormValidation.respond(
146145
FormValidation.Kind.OK,
147146
formatUserGroupValidationResponse(
148-
GROUP,
149-
Util.escape(StringUtils.abbreviate(groupDetails.getDisplayName(), 50)),
150-
"Group " + escapedSid));
147+
GROUP, Util.escape(abbreviate(groupDetails.getDisplayName())), "Group " + escapedSid));
151148
}
152149
} catch (UserMayOrMayNotExistException2 e) {
153150
// undecidable, meaning the group may exist
@@ -196,15 +193,15 @@ static FormValidation validateUser(String userName, SecurityRealm sr, boolean am
196193
FormValidation.Kind.WARNING,
197194
formatUserGroupValidationResponse(
198195
USER,
199-
Util.escape(StringUtils.abbreviate(u.getFullName(), 50)),
196+
Util.escape(abbreviate(u.getFullName())),
200197
"User " + escapedSid
201198
+ " found; but permissions would also be granted to a group of this name",
202199
true));
203200
} else {
204201
return FormValidation.respond(
205202
FormValidation.Kind.OK,
206203
formatUserGroupValidationResponse(
207-
USER, Util.escape(StringUtils.abbreviate(u.getFullName(), 50)), "User " + escapedSid));
204+
USER, Util.escape(abbreviate(u.getFullName())), "User " + escapedSid));
208205
}
209206
} catch (UserMayOrMayNotExistException2 e) {
210207
// undecidable, meaning the user may exist
@@ -227,4 +224,15 @@ static FormValidation validateUser(String userName, SecurityRealm sr, boolean am
227224
}
228225
return null;
229226
}
227+
228+
private static String abbreviate(String str) {
229+
if (str == null) {
230+
return null;
231+
}
232+
final int length = str.length();
233+
if (length <= 50) {
234+
return str;
235+
}
236+
return str.substring(0, 47) + "...";
237+
}
230238
}

0 commit comments

Comments
 (0)