This is an automated email from the ASF dual-hosted git repository.
psomogyi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase-operator-tools.git
The following commit(s) were added to refs/heads/master by this push:
new e4f73fb HBASE-23124 Remove commons-lang3 dependency (#41)
e4f73fb is described below
commit e4f73fb8e4a640cfbda657523581d6523519fab0
Author: Peter Somogyi <[email protected]>
AuthorDate: Mon Oct 7 08:18:53 2019 +0200
HBASE-23124 Remove commons-lang3 dependency (#41)
Signed-off-by: Michael Stack <[email protected]>
---
hbase-hbck2/pom.xml | 4 ----
hbase-hbck2/src/main/java/org/apache/hbase/Version.java | 6 ++----
hbase-hbck2/src/main/java/org/apache/hbase/hbck1/HBaseFsck.java | 3 +--
.../src/main/java/org/apache/hbase/hbck1/OfflineMetaRepair.java | 4 +---
pom.xml | 6 ------
5 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/hbase-hbck2/pom.xml b/hbase-hbck2/pom.xml
index 625bed0..0c0b1ac 100644
--- a/hbase-hbck2/pom.xml
+++ b/hbase-hbck2/pom.xml
@@ -175,10 +175,6 @@
<version>${hbase-thirdparty.version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
<!--We want to use the shaded client but for testing, we need to rely on
hbase-server.
HBASE-15666 is about how shaded-client and hbase-server won't work
together.
diff --git a/hbase-hbck2/src/main/java/org/apache/hbase/Version.java
b/hbase-hbck2/src/main/java/org/apache/hbase/Version.java
index 505456a..7e5452a 100644
--- a/hbase-hbck2/src/main/java/org/apache/hbase/Version.java
+++ b/hbase-hbck2/src/main/java/org/apache/hbase/Version.java
@@ -17,8 +17,6 @@
*/
package org.apache.hbase;
-import org.apache.commons.lang3.StringUtils;
-
/**
* Check versions.
*/
@@ -94,9 +92,9 @@ public final class Version {
String[] comps = new String[strComps.length];
for (int i = 0; i < strComps.length; ++i) {
- if (StringUtils.isNumeric(strComps[i])) {
+ if (strComps[i].matches("\\d+")) {
comps[i] = strComps[i];
- } else if (StringUtils.isEmpty(strComps[i])) {
+ } else if (strComps[i] == null || strComps[i].isEmpty()) {
comps[i] = String.valueOf(VERY_LARGE_NUMBER);
} else {
if("SNAPSHOT".equals(strComps[i])) {
diff --git a/hbase-hbck2/src/main/java/org/apache/hbase/hbck1/HBaseFsck.java
b/hbase-hbck2/src/main/java/org/apache/hbase/hbck1/HBaseFsck.java
index 3e7412b..5aa18ab 100644
--- a/hbase-hbck2/src/main/java/org/apache/hbase/hbck1/HBaseFsck.java
+++ b/hbase-hbck2/src/main/java/org/apache/hbase/hbck1/HBaseFsck.java
@@ -61,7 +61,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.conf.Configured;
import org.apache.hadoop.fs.FSDataOutputStream;
@@ -5407,7 +5406,7 @@ public class HBaseFsck extends Configured implements
Closeable {
public HBaseFsck exec(ExecutorService exec, String[] args)
throws KeeperException, IOException, InterruptedException,
ReplicationException {
- errors.print("HBaseFsck command line options: " + StringUtils.join(args, "
"));
+ errors.print("HBaseFsck command line options: " + String.join(" ", args));
CommandLineData cld = new CommandLineData();
doCommandLine(args, cld);
diff --git
a/hbase-hbck2/src/main/java/org/apache/hbase/hbck1/OfflineMetaRepair.java
b/hbase-hbck2/src/main/java/org/apache/hbase/hbck1/OfflineMetaRepair.java
index 53ae846..2af2fce 100644
--- a/hbase-hbck2/src/main/java/org/apache/hbase/hbck1/OfflineMetaRepair.java
+++ b/hbase-hbck2/src/main/java/org/apache/hbase/hbck1/OfflineMetaRepair.java
@@ -19,8 +19,6 @@ package org.apache.hbase.hbck1;
import java.io.IOException;
-import org.apache.commons.lang3.StringUtils;
-
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseConfiguration;
@@ -105,7 +103,7 @@ public final class OfflineMetaRepair {
}
}
- System.out.println("OfflineMetaRepair command line options: " +
StringUtils.join(args, " "));
+ System.out.println("OfflineMetaRepair command line options: " +
String.join(" ", args));
// Fsck doesn't shutdown and and doesn't provide a way to shutdown its
// threads cleanly, so we do a System.exit.
diff --git a/pom.xml b/pom.xml
index 1ae4f9a..ab86329 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,7 +134,6 @@
<checkstyle.version>8.11</checkstyle.version>
<maven.checkstyle.version>3.0.0</maven.checkstyle.version>
<hbase.checkstyle.version>2.2.0</hbase.checkstyle.version>
- <commons-lang3.version>3.9</commons-lang3.version>
<enforcer.version>3.0.0-M2</enforcer.version>
<extra.enforcer.version>1.0-beta-9</extra.enforcer.version>
</properties>
@@ -146,11 +145,6 @@
<version>${hbase.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>${commons-lang3.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.hbase.operator.tools</groupId>
<artifactId>hbase-hbck2</artifactId>
<version>${project.version}</version>
