Skip to content

Commit 2107ff0

Browse files
StevenLuMTBewareMyPower
authored andcommitted
[improve][build] replace org.apache.commons.lang to org.apache.commons.lang3 (#24473)
### Background import change: org.apache.commons.lang to org.apache.commons.lang3 ### Modifications 1. import change: org.apache.commons.lang to org.apache.commons.lang3 2. add check style rules that prevent using commons-lang for new code. (cherry picked from commit 671994f)
1 parent 5a9912b commit 2107ff0

File tree

46 files changed

+55
-48
lines changed

Some content is hidden

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

46 files changed

+55
-48
lines changed

buildtools/src/main/resources/pulsar/checkstyle.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,13 @@ page at http://checkstyle.sourceforge.net/config.html -->
156156
value="{0}; Use org.jspecify.annotations.Nullable and org.jspecify.annotations.NonNull for nullness information. Check Jakarta Bean Validation API if you are looking for user input validation with annotations."/>
157157
</module>
158158

159+
<module name="IllegalImport">
160+
<property name="illegalPkgs"
161+
value="org.apache.commons.lang" />
162+
<message key="import.illegal"
163+
value="{0}; Please replace org.apache.commons.lang. to org.apache.commons.lang3. "/>
164+
</module>
165+
159166
<module name="RedundantModifier">
160167
<!-- Checks for redundant modifiers on various symbol definitions.
161168
See: http://checkstyle.sourceforge.net/config_modifier.html#RedundantModifier

managed-ledger/src/main/java/org/apache/bookkeeper/mledger/MetadataCompressionConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import lombok.Data;
2323
import lombok.ToString;
2424
import org.apache.bookkeeper.mledger.proto.MLDataFormats;
25-
import org.apache.commons.lang.StringUtils;
25+
import org.apache.commons.lang3.StringUtils;
2626

2727
@Data
2828
@AllArgsConstructor

pulsar-broker-auth-oidc/src/main/java/org/apache/pulsar/broker/authentication/oidc/AuthenticationProviderOpenID.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
import javax.naming.AuthenticationException;
5454
import javax.net.ssl.SSLSession;
5555
import okhttp3.OkHttpClient;
56-
import org.apache.commons.lang.StringUtils;
56+
import org.apache.commons.lang3.StringUtils;
5757
import org.apache.pulsar.broker.ServiceConfiguration;
5858
import org.apache.pulsar.broker.authentication.AuthenticationDataSource;
5959
import org.apache.pulsar.broker.authentication.AuthenticationProvider;

pulsar-broker-common/src/main/java/org/apache/pulsar/common/configuration/PulsarConfigurationLoader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import java.util.Arrays;
3030
import java.util.Map;
3131
import java.util.Properties;
32-
import org.apache.commons.lang.StringUtils;
32+
import org.apache.commons.lang3.StringUtils;
3333
import org.apache.pulsar.broker.ServiceConfiguration;
3434
import org.slf4j.Logger;
3535
import org.slf4j.LoggerFactory;

pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/BrokersBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import javax.ws.rs.container.Suspended;
4444
import javax.ws.rs.core.Response;
4545
import javax.ws.rs.core.Response.Status;
46-
import org.apache.commons.lang.StringUtils;
46+
import org.apache.commons.lang3.StringUtils;
4747
import org.apache.pulsar.PulsarVersion;
4848
import org.apache.pulsar.broker.PulsarService.State;
4949
import org.apache.pulsar.broker.ServiceConfiguration;

pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
import org.apache.bookkeeper.mledger.LedgerOffloader;
5353
import org.apache.commons.collections4.CollectionUtils;
5454
import org.apache.commons.collections4.ListUtils;
55-
import org.apache.commons.lang.mutable.MutableObject;
5655
import org.apache.commons.lang3.StringUtils;
56+
import org.apache.commons.lang3.mutable.MutableObject;
5757
import org.apache.pulsar.broker.PulsarServerException;
5858
import org.apache.pulsar.broker.admin.AdminResource;
5959
import org.apache.pulsar.broker.loadbalance.LeaderBroker;

pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/SchemasResourceBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
package org.apache.pulsar.broker.admin.impl;
2020

2121
import static java.util.Objects.isNull;
22-
import static org.apache.commons.lang.StringUtils.defaultIfEmpty;
22+
import static org.apache.commons.lang3.StringUtils.defaultIfEmpty;
2323
import com.google.common.annotations.VisibleForTesting;
2424
import java.io.IOException;
2525
import java.nio.ByteBuffer;

pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/metrics/PrometheusMetricsProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import org.apache.bookkeeper.stats.StatsLogger;
3333
import org.apache.bookkeeper.stats.StatsProvider;
3434
import org.apache.commons.configuration.Configuration;
35-
import org.apache.commons.lang.StringUtils;
35+
import org.apache.commons.lang3.StringUtils;
3636
import org.apache.pulsar.client.util.ExecutorProvider;
3737

3838
/**

pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTlsAuthTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import javax.ws.rs.core.MediaType;
3838
import lombok.Cleanup;
3939
import lombok.extern.slf4j.Slf4j;
40-
import org.apache.commons.lang.mutable.MutableBoolean;
40+
import org.apache.commons.lang3.mutable.MutableBoolean;
4141
import org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest;
4242
import org.apache.pulsar.client.admin.PulsarAdmin;
4343
import org.apache.pulsar.client.admin.PulsarAdminException;

pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/AntiAffinityNamespaceGroupTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import java.util.Set;
3636
import java.util.UUID;
3737
import lombok.Cleanup;
38-
import org.apache.commons.lang.reflect.FieldUtils;
38+
import org.apache.commons.lang3.reflect.FieldUtils;
3939
import org.apache.pulsar.broker.PulsarService;
4040
import org.apache.pulsar.broker.ServiceConfiguration;
4141
import org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest;

0 commit comments

Comments
 (0)