replaced deprecated Stringutils method with suggested replacement

Author: StefanSpieker

test/src/test/java/hudson/cli/DisablePluginCommandTest.java

@@ -42,6 +42,7 @@
 import java.io.IOException;
 import java.util.function.BiPredicate;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
@@ -252,8 +253,8 @@ void disablePluginsMessageAlreadyDisabled() {
         assertPluginDisabled("dependee");
         assertPluginDisabled("depender");
 
-        assertTrue(checkResultWith(result, StringUtils::contains, "depender", PluginWrapper.PluginDisableStatus.DISABLED), "An occurrence of the depender plugin in the log says it was successfully disabled");
-        assertTrue(checkResultWith(result, StringUtils::contains, "depender", PluginWrapper.PluginDisableStatus.ALREADY_DISABLED), "An occurrence of the depender plugin in the log says it was already disabled");
+        assertTrue(checkResultWith(result, Strings.CS::contains, "depender", PluginWrapper.PluginDisableStatus.DISABLED), "An occurrence of the depender plugin in the log says it was successfully disabled");
+        assertTrue(checkResultWith(result, Strings.CS::contains, "depender", PluginWrapper.PluginDisableStatus.ALREADY_DISABLED), "An occurrence of the depender plugin in the log says it was already disabled");
     }
 
     /**
@@ -314,7 +315,7 @@ void quietModeWithErrorNoSuch() {
         assertPluginDisabled("depender");
         assertPluginDisabled("mandatory-depender");
 
-        assertTrue(checkResultWith(result, StringUtils::startsWith, "badplugin", PluginWrapper.PluginDisableStatus.NO_SUCH_PLUGIN), "Only error NO_SUCH_PLUGIN in quiet mode");
+        assertTrue(checkResultWith(result, Strings.CS::startsWith, "badplugin", PluginWrapper.PluginDisableStatus.NO_SUCH_PLUGIN), "Only error NO_SUCH_PLUGIN in quiet mode");
     }
 
     /**
@@ -331,7 +332,7 @@ void quietModeWithErrorDependents() {
         assertPluginEnabled("depender");
         assertPluginEnabled("mandatory-depender");
 
-        assertTrue(checkResultWith(result, StringUtils::startsWith, "dependee", PluginWrapper.PluginDisableStatus.NOT_DISABLED_DEPENDANTS), "Only error NOT_DISABLED_DEPENDANTS in quiet mode");
+        assertTrue(checkResultWith(result, Strings.CS::startsWith, "dependee", PluginWrapper.PluginDisableStatus.NOT_DISABLED_DEPENDANTS), "Only error NOT_DISABLED_DEPENDANTS in quiet mode");
     }
 
     /**

test/src/test/java/hudson/scm/ChangeLogSetTest.java

@@ -6,6 +6,7 @@
 import hudson.Extension;
 import hudson.MarkupText;
 import hudson.model.AbstractBuild;
+import hudson.model.Run;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.jvnet.hudson.test.FakeChangeLogSCM;
@@ -27,7 +28,7 @@ void setUp(JenkinsRule rule) {
     @Issue("JENKINS-17084")
     void catchingExceptionDuringAnnotation() {
         FakeChangeLogSCM.EntryImpl change = new FakeChangeLogSCM.EntryImpl();
-        change.setParent(ChangeLogSet.createEmpty(null)); // otherwise test would actually test only NPE thrown when accessing parent.build
+        change.setParent(ChangeLogSet.createEmpty((Run<?, ?>) null)); // otherwise test would actually test only NPE thrown when accessing parent.build
         assertDoesNotThrow(() -> {
             change.getMsgAnnotated();
         });

test/src/test/java/org/kohsuke/stapler/BindTest.java

@@ -10,7 +10,7 @@
 import hudson.ExtensionList;
 import hudson.model.InvisibleAction;
 import hudson.model.RootAction;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.htmlunit.Page;
 import org.htmlunit.ScriptException;
 import org.htmlunit.html.HtmlPage;
@@ -56,7 +56,7 @@ void bindNormal() throws Exception {
                     .orElseThrow()
                     .getAttribute("src");
 
-            final Page script = wc.goTo(StringUtils.removeStart(scriptUrl, j.contextPath + "/"), "text/javascript");
+            final Page script = wc.goTo(Strings.CS.removeStart(scriptUrl, j.contextPath + "/"), "text/javascript");
             final String content = script.getWebResponse().getContentAsString();
             assertThat(content, startsWith("varname = makeStaplerProxy('" + j.contextPath + "/$stapler/bound/"));
             assertThat(content, endsWith("','test',['annotatedJsMethod1','byName1']);"));
@@ -77,7 +77,7 @@ void bindWithWellKnownURL() throws Exception {
                     .orElseThrow()
                     .getAttribute("src");
 
-            final Page script = wc.goTo(StringUtils.removeStart(scriptUrl, j.contextPath + "/"), "text/javascript");
+            final Page script = wc.goTo(Strings.CS.removeStart(scriptUrl, j.contextPath + "/"), "text/javascript");
             assertThat(script.getWebResponse().getContentAsString(), is("varname = makeStaplerProxy('" + j.contextPath + "/theWellKnownRoot','test',['annotatedJsMethod2','byName2']);"));
         }
         assertThat(root.invocations, is(1));
@@ -96,7 +96,7 @@ void bindWithWellKnownURLWithQuotes() throws Exception {
                     .orElseThrow()
                     .getAttribute("src");
 
-            final Page script = wc.goTo(StringUtils.removeStart(scriptUrl, j.contextPath + "/"), "text/javascript");
+            final Page script = wc.goTo(Strings.CS.removeStart(scriptUrl, j.contextPath + "/"), "text/javascript");
             assertThat(script.getWebResponse().getContentAsString(), is("varname = makeStaplerProxy('" + j.contextPath + "/the\\'Well\\'Known\\\\\\'Root\\'With\\'Quotes','test',['annotatedJsMethod2','byName2']);"));
         }
         assertThat(root.invocations, is(1));
@@ -114,7 +114,7 @@ void bindNull() throws Exception {
             final HtmlPage htmlPage = exception.getPage();
             final String scriptUrl = htmlPage.getElementsByTagName("script").stream().filter(it -> it.getAttribute("src").equals(j.contextPath + "/$stapler/bound/script/null?var=varname")).findFirst().orElseThrow().getAttribute("src");
 
-            final Page script = wc.goTo(StringUtils.removeStart(scriptUrl, j.contextPath + "/"), "text/javascript");
+            final Page script = wc.goTo(Strings.CS.removeStart(scriptUrl, j.contextPath + "/"), "text/javascript");
             final String content = script.getWebResponse().getContentAsString();
             assertThat(content, is("varname = null;"));
         }