Skip to content

Commit a052757

Browse files
rbrirbri
committed
fix commons lang deprecated
1 parent b7b7947 commit a052757

10 files changed

Lines changed: 25 additions & 19 deletions

File tree

‎src/main/java/org/htmlunit/WebResponseData.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.apache.commons.io.IOUtils;
3030
import org.apache.commons.io.input.BOMInputStream;
3131
import org.apache.commons.lang3.ArrayUtils;
32-
import org.apache.commons.lang3.StringUtils;
32+
import org.apache.commons.lang3.Strings;
3333
import org.apache.commons.logging.Log;
3434
import org.apache.commons.logging.LogFactory;
3535
import org.brotli.dec.BrotliInputStream;
@@ -101,7 +101,7 @@ private InputStream getStream(final ByteOrderMark... bomHeaders) throws IOExcept
101101
final List<NameValuePair> headers = getResponseHeaders();
102102
final String encoding = getHeader(headers, "content-encoding");
103103
if (encoding != null) {
104-
boolean isGzip = StringUtils.contains(encoding, "gzip") && !"no-gzip".equals(encoding);
104+
boolean isGzip = Strings.CI.contains(encoding, "gzip") && !"no-gzip".equals(encoding);
105105
if ("gzip-only-text/html".equals(encoding)) {
106106
isGzip = MimeType.TEXT_HTML.equals(getHeader(headers, "content-type"));
107107
}
@@ -148,7 +148,7 @@ private InputStream getStream(final ByteOrderMark... bomHeaders) throws IOExcept
148148
return stream;
149149
}
150150

151-
if (StringUtils.contains(encoding, "deflate")) {
151+
if (Strings.CI.contains(encoding, "deflate")) {
152152
boolean zlibHeader = false;
153153
if (stream.markSupported()) { // should be always the case as the content is in a byte[] or in a file
154154
stream.mark(2);

‎src/main/java/org/htmlunit/css/CssStyleSheet.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939

4040
import org.apache.commons.io.IOUtils;
4141
import org.apache.commons.lang3.StringUtils;
42+
import org.apache.commons.lang3.Strings;
4243
import org.apache.commons.lang3.math.NumberUtils;
4344
import org.apache.commons.logging.Log;
4445
import org.apache.commons.logging.LogFactory;
@@ -563,7 +564,7 @@ static boolean selects(final BrowserVersion browserVersion,
563564
final String prefixValue = prefixAttributeCondition.getValue();
564565
if (prefixAttributeCondition.isCaseInSensitive()) {
565566
return !org.htmlunit.util.StringUtils.isEmptyString(prefixValue)
566-
&& StringUtils.startsWithIgnoreCase(
567+
&& Strings.CI.startsWith(
567568
element.getAttribute(prefixAttributeCondition.getLocalName()), prefixValue);
568569
}
569570
return !org.htmlunit.util.StringUtils.isEmptyString(prefixValue)
@@ -574,7 +575,7 @@ static boolean selects(final BrowserVersion browserVersion,
574575
final String suffixValue = suffixAttributeCondition.getValue();
575576
if (suffixAttributeCondition.isCaseInSensitive()) {
576577
return !org.htmlunit.util.StringUtils.isEmptyString(suffixValue)
577-
&& StringUtils.endsWithIgnoreCase(
578+
&& Strings.CI.endsWith(
578579
element.getAttribute(suffixAttributeCondition.getLocalName()), suffixValue);
579580
}
580581
return !org.htmlunit.util.StringUtils.isEmptyString(suffixValue)
@@ -585,7 +586,7 @@ static boolean selects(final BrowserVersion browserVersion,
585586
final String substringValue = substringAttributeCondition.getValue();
586587
if (substringAttributeCondition.isCaseInSensitive()) {
587588
return !org.htmlunit.util.StringUtils.isEmptyString(substringValue)
588-
&& StringUtils.containsIgnoreCase(
589+
&& Strings.CI.contains(
589590
element.getAttribute(substringAttributeCondition.getLocalName()), substringValue);
590591
}
591592
return !org.htmlunit.util.StringUtils.isEmptyString(substringValue)

‎src/main/java/org/htmlunit/html/HtmlAnchor.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
import org.apache.commons.lang3.ArrayUtils;
2626
import org.apache.commons.lang3.StringUtils;
27+
import org.apache.commons.lang3.Strings;
2728
import org.apache.commons.logging.Log;
2829
import org.apache.commons.logging.LogFactory;
2930
import org.htmlunit.BrowserVersion;
@@ -116,7 +117,7 @@ protected void doClickStateUpdate(final boolean shiftKey, final boolean ctrlKey,
116117
}
117118
final String downloadAttribute = getDownloadAttribute();
118119
HtmlPage page = (HtmlPage) getPage();
119-
if (StringUtils.startsWithIgnoreCase(href, JavaScriptURLConnection.JAVASCRIPT_PREFIX)) {
120+
if (Strings.CI.startsWith(href, JavaScriptURLConnection.JAVASCRIPT_PREFIX)) {
120121
final StringBuilder builder = new StringBuilder(href.length());
121122
builder.append(JavaScriptURLConnection.JAVASCRIPT_PREFIX);
122123
for (int i = JavaScriptURLConnection.JAVASCRIPT_PREFIX.length(); i < href.length(); i++) {

‎src/main/java/org/htmlunit/html/HtmlArea.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.util.Map;
2424

2525
import org.apache.commons.lang3.StringUtils;
26+
import org.apache.commons.lang3.Strings;
2627
import org.apache.commons.logging.Log;
2728
import org.apache.commons.logging.LogFactory;
2829
import org.htmlunit.SgmlPage;
@@ -80,7 +81,7 @@ protected boolean doClickStateUpdate(final boolean shiftKey, final boolean ctrlK
8081
final String href = getHrefAttribute().trim();
8182
if (!href.isEmpty()) {
8283
final HtmlPage page = (HtmlPage) getPage();
83-
if (StringUtils.startsWithIgnoreCase(href, JavaScriptURLConnection.JAVASCRIPT_PREFIX)) {
84+
if (Strings.CI.startsWith(href, JavaScriptURLConnection.JAVASCRIPT_PREFIX)) {
8485
page.executeJavaScript(
8586
href, "javascript url", getStartLineNumber());
8687
return false;

‎src/main/java/org/htmlunit/html/HtmlForm.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434

3535
import org.apache.commons.lang3.ArrayUtils;
3636
import org.apache.commons.lang3.StringUtils;
37+
import org.apache.commons.lang3.Strings;
3738
import org.apache.commons.logging.Log;
3839
import org.apache.commons.logging.LogFactory;
3940
import org.htmlunit.BrowserVersion;
@@ -158,13 +159,13 @@ && getAttributeDirect(ATTRIBUTE_NOVALIDATE) != ATTRIBUTE_NOT_DEFINED) {
158159
}
159160

160161
final String action = getActionAttribute().trim();
161-
if (StringUtils.startsWithIgnoreCase(action, JavaScriptURLConnection.JAVASCRIPT_PREFIX)) {
162+
if (Strings.CI.startsWith(action, JavaScriptURLConnection.JAVASCRIPT_PREFIX)) {
162163
htmlPage.executeJavaScript(action, "Form action", getStartLineNumber());
163164
return;
164165
}
165166
}
166167
else {
167-
if (StringUtils.startsWithIgnoreCase(getActionAttribute(), JavaScriptURLConnection.JAVASCRIPT_PREFIX)) {
168+
if (Strings.CI.startsWith(getActionAttribute(), JavaScriptURLConnection.JAVASCRIPT_PREFIX)) {
168169
// The action is JavaScript but JavaScript isn't enabled.
169170
return;
170171
}

‎src/main/java/org/htmlunit/html/ScriptElementSupport.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.nio.charset.Charset;
2020

2121
import org.apache.commons.lang3.StringUtils;
22+
import org.apache.commons.lang3.Strings;
2223
import org.apache.commons.logging.Log;
2324
import org.apache.commons.logging.LogFactory;
2425
import org.htmlunit.FailingHttpStatusCodeException;
@@ -297,7 +298,7 @@ public static boolean isJavaScript(String typeAttribute, final String languageAt
297298
}
298299

299300
if (StringUtils.isNotEmpty(languageAttribute)) {
300-
return StringUtils.startsWithIgnoreCase(languageAttribute, "javascript");
301+
return Strings.CI.startsWith(languageAttribute, "javascript");
301302
}
302303
return true;
303304
}

‎src/main/java/org/htmlunit/javascript/host/Location.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.net.URL;
2424

2525
import org.apache.commons.lang3.StringUtils;
26+
import org.apache.commons.lang3.Strings;
2627
import org.apache.commons.logging.Log;
2728
import org.apache.commons.logging.LogFactory;
2829
import org.htmlunit.BrowserVersion;
@@ -337,7 +338,7 @@ public String getSearch() {
337338
return "";
338339
}
339340

340-
if (StringUtils.startsWithIgnoreCase(url.getProtocol(), UrlUtils.ABOUT)
341+
if (Strings.CI.startsWith(url.getProtocol(), UrlUtils.ABOUT)
341342
&& window_.getWebWindow().getWebClient().getBrowserVersion()
342343
.hasFeature(JS_LOCATION_IGNORE_QUERY_FOR_ABOUT_PROTOCOL)) {
343344
return "";

‎src/main/java/org/htmlunit/javascript/host/css/CSSPageRule.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import java.util.Locale;
2020

21-
import org.apache.commons.lang3.StringUtils;
21+
import org.apache.commons.lang3.Strings;
2222
import org.htmlunit.BrowserVersion;
2323
import org.htmlunit.css.WrappedCssStyleDeclaration;
2424
import org.htmlunit.cssparser.dom.CSSPageRuleImpl;
@@ -118,7 +118,7 @@ public String getCssText() {
118118
String cssText = super.getCssText();
119119
final BrowserVersion browserVersion = getBrowserVersion();
120120
if (browserVersion.hasFeature(CSS_CSSTEXT_FF_STYLE)) {
121-
cssText = StringUtils.replace(cssText, "@page {", "@page {");
121+
cssText = Strings.CS.replace(cssText, "@page {", "@page {");
122122
}
123123

124124
return cssText;

‎src/main/java/org/htmlunit/util/HeaderUtils.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import java.util.regex.Matcher;
1818
import java.util.regex.Pattern;
1919

20-
import org.apache.commons.lang3.StringUtils;
20+
import org.apache.commons.lang3.Strings;
2121
import org.htmlunit.HttpHeader;
2222
import org.htmlunit.WebResponse;
2323

@@ -110,10 +110,10 @@ public static boolean containsMaxAge(final WebResponse response) {
110110
*/
111111
public static boolean containsMaxAgeOrSMaxage(final WebResponse response) {
112112
final String cacheControl = response.getResponseHeaderValue(HttpHeader.CACHE_CONTROL);
113-
if (StringUtils.contains(cacheControl, CACHE_CONTROL_MAX_AGE)) {
113+
if (Strings.CI.contains(cacheControl, CACHE_CONTROL_MAX_AGE)) {
114114
return true;
115115
}
116-
return StringUtils.contains(cacheControl, CACHE_CONTROL_S_MAXAGE);
116+
return Strings.CI.contains(cacheControl, CACHE_CONTROL_S_MAXAGE);
117117
}
118118

119119
/**
@@ -153,6 +153,6 @@ private static long directiveValue(final WebResponse response, final Pattern pat
153153

154154
private static boolean containsCacheControlValue(final WebResponse response, final String value) {
155155
final String cacheControl = response.getResponseHeaderValue(HttpHeader.CACHE_CONTROL);
156-
return StringUtils.contains(cacheControl, value);
156+
return Strings.CI.contains(cacheControl, value);
157157
}
158158
}

‎src/main/java/org/htmlunit/util/UrlUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ public static URL toUrlUnsafe(final String url) throws MalformedURLException {
247247
}
248248

249249
if (ABOUT.equals(protocol)) {
250-
if (org.apache.commons.lang3.StringUtils.equalsIgnoreCase(ABOUT_BLANK, url)) {
250+
if (org.apache.commons.lang3.Strings.CI.equals(ABOUT_BLANK, url)) {
251251
return URL_ABOUT_BLANK;
252252
}
253253
return new URL(null, url, ABOUT_HANDLER);

0 commit comments

Comments
 (0)