Skip to content

Replaced deprecated StringUtils methods with suggested ones from Strings.CS #2721

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Replaced deprecated StringUtils methods with suggested ones from Strings.CS #2721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion plugin/src/main/java/io/jenkins/plugins/casc/ConfigurationAsCode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package io.jenkins.plugins.casc;

import static io.jenkins.plugins.casc.SchemaGeneration.writeJSONSchema;
import static java.lang.String.format;
import static java.util.stream.Collectors.toList;
import static org.yaml.snakeyaml.DumperOptions.FlowStyle.BLOCK;
import static org.yaml.snakeyaml.DumperOptions.ScalarStyle.DOUBLE_QUOTED;
Expand Down
3 changes: 2 additions & 1 deletion ...in/src/main/java/io/jenkins/plugins/casc/core/HudsonPrivateSecurityRealmConfigurator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import java.util.Set;
import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Strings;
import org.kohsuke.accmod.Restricted;
import org.kohsuke.accmod.restrictions.NoExternalUse;
import org.kohsuke.stapler.DataBoundConstructor;
Expand Down Expand Up @@ -96,7 +97,7 @@ private static void setter(HudsonPrivateSecurityRealm target, Collection<UserWit
private static User createAccount(HudsonPrivateSecurityRealm target, UserWithPassword user) throws IOException {
User updatedUser;
if (StringUtils.isNotBlank(user.password)) {
if (StringUtils.startsWith(user.password, HASHED_PASSWORD_PREFIX)) {
if (Strings.CS.startsWith(user.password, HASHED_PASSWORD_PREFIX)) {
updatedUser = target.createAccountWithHashedPassword(user.id, user.password);
} else {
updatedUser = target.createAccount(user.id, user.password);
Expand Down
8 changes: 4 additions & 4 deletions ...a/io/jenkins/plugins/casc/impl/configurators/GlobalConfigurationCategoryConfigurator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import java.util.stream.Collectors;
import jenkins.model.GlobalConfigurationCategory;
import jenkins.model.Jenkins;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Strings;
import org.jenkinsci.Symbol;
import org.kohsuke.accmod.Restricted;
import org.kohsuke.accmod.restrictions.NoExternalUse;
Expand Down Expand Up @@ -59,9 +59,9 @@ public List<String> getNames() {
}

String name = c.getSimpleName();
name = StringUtils.remove(name, "Global");
name = StringUtils.remove(name, "Configuration");
name = StringUtils.remove(name, "Category");
name = Strings.CS.remove(name, "Global");
name = Strings.CS.remove(name, "Configuration");
name = Strings.CS.remove(name, "Category");
return singletonList(name.toLowerCase());
}

Expand Down
Loading