Skip to content

Commit 4ece5a0

Browse files
committed
[Misc] Remove use of newly deprecated commons-lang3 APIs
1 parent de99739 commit 4ece5a0

72 files changed

Lines changed: 180 additions & 135 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-api/src/main/java/org/xwiki/activeinstalls2/internal/ActiveInstallsInitializerListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ private synchronized void startPingThread()
133133
// Make sure we always have at least one ping thread.
134134
if (this.executorService == null) {
135135
// Start a thread to regularly send pings to the active installs server.
136-
BasicThreadFactory factory = new BasicThreadFactory.Builder()
136+
BasicThreadFactory factory = BasicThreadFactory.builder()
137137
.namingPattern("Active Installs 2 Ping Thread")
138138
.daemon(true)
139139
.priority(Thread.MIN_PRIORITY)

xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-pageobjects/src/main/java/org/xwiki/administration/test/po/ThemesAdministrationSectionPage.java

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

25+
import org.apache.commons.lang3.Strings;
2526
import org.openqa.selenium.By;
2627
import org.openqa.selenium.Keys;
2728
import org.openqa.selenium.TimeoutException;
@@ -113,7 +114,7 @@ public void setColorTheme(String colorThemeName)
113114
getColorThemeOptionElement(colorThemeName).click();
114115

115116
// Waiting to be sure the change is effective
116-
getDriver().waitUntilCondition(driver -> StringUtils.equals(getCurrentColorTheme(), colorThemeName));
117+
getDriver().waitUntilCondition(driver -> Strings.CS.equals(getCurrentColorTheme(), colorThemeName));
117118
}
118119

119120
private WebElement getColorThemeOptionElement(String colorThemeName)

xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-rest/src/main/java/org/xwiki/annotation/rest/internal/AbstractAnnotationsRESTResource.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import javax.ws.rs.core.Response.Status;
3030

3131
import org.apache.commons.lang3.StringUtils;
32+
import org.apache.commons.lang3.Strings;
3233
import org.xwiki.annotation.AnnotationServiceException;
3334
import org.xwiki.annotation.rest.model.jaxb.AnnotationAddRequest;
3435
import org.xwiki.annotation.rest.model.jaxb.AnnotationField;
@@ -76,14 +77,14 @@ protected Response getAnnotatedContent(DocumentReference documentReference)
7677
AnnotationRequest.Request requestedFields = new AnnotationRequest.Request();
7778
for (Map.Entry<String, List<String>> entry : parameters.entrySet()) {
7879
String name = entry.getKey();
79-
if (StringUtils.startsWith(name, ANNOTATION_REQUEST_FILTER_PARAMETER_PREFIX)) {
80+
if (Strings.CS.startsWith(name, ANNOTATION_REQUEST_FILTER_PARAMETER_PREFIX)) {
8081
for (String value : entry.getValue()) {
8182
AnnotationField field = new AnnotationField();
8283
field.setName(StringUtils.substringAfter(name, ANNOTATION_REQUEST_FILTER_PARAMETER_PREFIX));
8384
field.setValue(value);
8485
annotationFields.add(field);
8586
}
86-
} else if (StringUtils.equals(name, ANNOTATION_REQUEST_REQUESTED_FIELD_PARAMETER)) {
87+
} else if (Strings.CS.equals(name, ANNOTATION_REQUEST_REQUESTED_FIELD_PARAMETER)) {
8788
requestedFields.getFields().addAll(entry.getValue());
8889
}
8990
}

xwiki-platform-core/xwiki-platform-bridge/src/main/java/org/xwiki/bridge/event/AbstractActionExecutionEvent.java

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

2222
import java.io.Serializable;
2323

24-
import org.apache.commons.lang3.StringUtils;
24+
import org.apache.commons.lang3.Strings;
2525

2626
/**
2727
* Base class for all action execution related events.
@@ -80,7 +80,7 @@ public int hashCode()
8080
public boolean equals(Object object)
8181
{
8282
if (object != null && getClass().isAssignableFrom(object.getClass())) {
83-
return StringUtils.equals(getActionName(), ((ActionExecutionEvent) object).getActionName());
83+
return Strings.CS.equals(getActionName(), ((ActionExecutionEvent) object).getActionName());
8484
}
8585
return false;
8686
}

xwiki-platform-core/xwiki-platform-container/xwiki-platform-container-servlet/src/main/java/org/xwiki/container/servlet/filters/internal/SavedRequestRestorerFilter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import jakarta.servlet.http.HttpSession;
3939

4040
import org.apache.commons.lang3.StringUtils;
41+
import org.apache.commons.lang3.Strings;
4142
import org.xwiki.container.servlet.filters.SavedRequestManager;
4243
import org.xwiki.container.servlet.filters.SavedRequestManager.SavedRequest;
4344

@@ -252,7 +253,7 @@ protected SavedRequest getSavedRequest(HttpServletRequest request)
252253
SavedRequest savedRequest = savedRequests.get(savedRequestId);
253254
// Only reuse this request if the new request is for the same resource (URL)
254255
if (savedRequest != null
255-
&& StringUtils.equals(savedRequest.getRequestUrl(), request.getRequestURL().toString())) {
256+
&& Strings.CS.equals(savedRequest.getRequestUrl(), request.getRequestURL().toString())) {
256257
// Remove the saved request from the session
257258
savedRequests.remove(savedRequestId);
258259
// Return the SavedRequest

xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-macro/src/main/java/org/xwiki/rendering/internal/macro/dashboard/EditableGadgetRenderer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import javax.inject.Named;
2626
import javax.inject.Singleton;
2727

28-
import org.apache.commons.lang3.StringUtils;
28+
import org.apache.commons.lang3.Strings;
2929
import org.slf4j.Logger;
3030
import org.xwiki.component.annotation.Component;
3131
import org.xwiki.component.manager.ComponentLookupException;
@@ -92,7 +92,7 @@ protected BlockRenderer getGadgetContentRenderer()
9292

9393
// Get the annotated syntax corresponding to the current target syntax
9494
String annotatedTargetSyntax = currentTargetSyntax.toIdString();
95-
if (!StringUtils.startsWith(annotatedTargetSyntax, ANNOTATED_SYNTAXES_PREFIX)) {
95+
if (!Strings.CS.startsWith(annotatedTargetSyntax, ANNOTATED_SYNTAXES_PREFIX)) {
9696
annotatedTargetSyntax = ANNOTATED_SYNTAXES_PREFIX + annotatedTargetSyntax;
9797
}
9898

xwiki-platform-core/xwiki-platform-diff/xwiki-platform-diff-xml/src/main/java/org/xwiki/diff/xml/internal/ImageDownloader.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import org.apache.commons.io.IOUtils;
3232
import org.apache.commons.io.input.BoundedInputStream;
3333
import org.apache.commons.lang3.StringUtils;
34+
import org.apache.commons.lang3.Strings;
3435
import org.apache.hc.client5.http.classic.methods.HttpGet;
3536
import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
3637
import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
@@ -134,7 +135,7 @@ private DownloadResult handleResponse(URI uri, ClassicHttpResponse response) thr
134135
String contentType = entity.getContentType();
135136
contentType = StringUtils.substringBefore(contentType, ";");
136137

137-
if (!StringUtils.startsWith(contentType, "image/")) {
138+
if (!Strings.CS.startsWith(contentType, "image/")) {
138139
throw new IOException(String.format("The content of [%s] is not an image.", uri));
139140
}
140141

xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-default/src/main/java/org/xwiki/export/pdf/internal/DefaultRequiredSkinExtensionsRecorder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import javax.inject.Inject;
2828
import javax.inject.Provider;
2929

30-
import org.apache.commons.lang3.StringUtils;
30+
import org.apache.commons.lang3.Strings;
3131
import org.xwiki.component.annotation.Component;
3232
import org.xwiki.component.annotation.InstantiationStrategy;
3333
import org.xwiki.component.descriptor.ComponentInstantiationStrategy;
@@ -70,7 +70,7 @@ public String stop()
7070
StringBuilder requiredSkinExtensions = new StringBuilder();
7171
for (Map.Entry<String, String> entry : this.requiredSkinExtensionsMap.entrySet()) {
7272
requiredSkinExtensions
73-
.append(StringUtils.removeStart(getImportString(entry.getKey()), entry.getValue()).trim());
73+
.append(Strings.CS.removeStart(getImportString(entry.getKey()), entry.getValue()).trim());
7474
}
7575
return requiredSkinExtensions.toString();
7676
}

xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-distribution/src/main/java/org/xwiki/extension/distribution/internal/DocumentsModifiedDuringDistributionListener.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import javax.inject.Named;
2828
import javax.inject.Singleton;
2929

30-
import org.apache.commons.lang3.StringUtils;
30+
import org.apache.commons.lang3.Strings;
3131
import org.xwiki.bridge.event.DocumentCreatedEvent;
3232
import org.xwiki.bridge.event.DocumentDeletedEvent;
3333
import org.xwiki.bridge.event.DocumentUpdatedEvent;
@@ -174,7 +174,7 @@ private void checkXARHandler(Event event, XWikiDocument document)
174174
Request request = this.jobContext.getCurrentJob().getRequest();
175175

176176
// It's a job started by the Distribution Wizard
177-
if (StringUtils.equals(request.<String>getProperty("context.action"), "distribution")) {
177+
if (Strings.CS.equals(request.<String>getProperty("context.action"), "distribution")) {
178178
String distributionWiki = request.getProperty("context.wiki");
179179

180180
if (distributionWiki != null) {

xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-distribution/src/main/java/org/xwiki/extension/distribution/internal/job/DistributionJobStatus.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import java.util.concurrent.ConcurrentHashMap;
2727

2828
import org.apache.commons.lang3.ObjectUtils;
29-
import org.apache.commons.lang3.StringUtils;
29+
import org.apache.commons.lang3.Strings;
3030
import org.xwiki.extension.ExtensionId;
3131
import org.xwiki.extension.distribution.internal.DistributionManager.DistributionState;
3232
import org.xwiki.extension.distribution.internal.job.step.DistributionStep;
@@ -105,7 +105,7 @@ public List<DistributionStep> getSteps()
105105
public DistributionStep getStep(String stepId)
106106
{
107107
for (DistributionStep step : getSteps()) {
108-
if (StringUtils.equals(step.getId(), stepId)) {
108+
if (Strings.CS.equals(step.getId(), stepId)) {
109109
return step;
110110
}
111111
}

0 commit comments

Comments
 (0)