This is an automated email from the ASF dual-hosted git repository.
vjasani pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.6 by this push:
new 8e332a27b2f HBASE-29558: Addendum to fix checkstyle warnings (#7276)
(#7277)
8e332a27b2f is described below
commit 8e332a27b2f8a03a5d47f86a71c68495f9d47b38
Author: Hari Krishna Dara <[email protected]>
AuthorDate: Sat Sep 6 03:13:56 2025 +0530
HBASE-29558: Addendum to fix checkstyle warnings (#7276) (#7277)
Signed-off-by: Viraj Jasani <[email protected]>
---
.../apache/hadoop/hbase/client/AbstractTestShell.java | 18 +++---------------
.../org/apache/hadoop/hbase/client/TestAdminShell.java | 1 +
.../apache/hadoop/hbase/client/TestRSGroupShell.java | 1 +
.../apache/hadoop/hbase/client/TestShellNoCluster.java | 2 ++
4 files changed, 7 insertions(+), 15 deletions(-)
diff --git
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/AbstractTestShell.java
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/AbstractTestShell.java
index ecd1ea6c597..e98eecc100b 100644
---
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/AbstractTestShell.java
+++
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/AbstractTestShell.java
@@ -18,9 +18,7 @@
package org.apache.hadoop.hbase.client;
import java.io.IOException;
-import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.fs.ErasureCodingUtils;
import org.jruby.embed.ScriptingContainer;
import org.junit.After;
import org.junit.Before;
@@ -30,16 +28,17 @@ public abstract class AbstractTestShell implements
RubyShellTest {
protected final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
protected final ScriptingContainer jruby = new ScriptingContainer();
- protected boolean erasureCodingSupported = false;
-
+ @Override
public HBaseTestingUtility getTEST_UTIL() {
return TEST_UTIL;
}
+ @Override
public ScriptingContainer getJRuby() {
return jruby;
}
+ @Override
public String getSuitePattern() {
return "**/*_test.rb";
}
@@ -56,17 +55,6 @@ public abstract class AbstractTestShell implements
RubyShellTest {
RubyShellTest.doTestSetup(this);
}
- protected void setupDFS() throws IOException {
- try {
-
ErasureCodingUtils.enablePolicy(FileSystem.get(TEST_UTIL.getConfiguration()),
- "XOR-2-1-1024k");
- erasureCodingSupported = true;
- } catch (UnsupportedOperationException e) {
- LOG.info(
- "Current hadoop version does not support erasure coding, only
validation tests will run.");
- }
- }
-
@After
public void tearDown() throws Exception {
TEST_UTIL.shutdownMiniCluster();
diff --git
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestAdminShell.java
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestAdminShell.java
index 2622c80ac64..8e644b348c6 100644
---
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestAdminShell.java
+++
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestAdminShell.java
@@ -44,6 +44,7 @@ public class TestAdminShell extends AbstractTestShell {
protected boolean erasureCodingSupported = false;
+ @Override
@Before
public void setUp() throws Exception {
RubyShellTest.setUpConfig(this);
diff --git
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestRSGroupShell.java
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestRSGroupShell.java
index 3f77ca5386d..38b9b2dd002 100644
---
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestRSGroupShell.java
+++
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestRSGroupShell.java
@@ -35,6 +35,7 @@ public class TestRSGroupShell extends AbstractTestShell {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestRSGroupShell.class);
+ @Override
@Before
public void setUp() throws Exception {
RubyShellTest.setUpConfig(this);
diff --git
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestShellNoCluster.java
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestShellNoCluster.java
index 5c312ec1dac..0071b24103b 100644
---
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestShellNoCluster.java
+++
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestShellNoCluster.java
@@ -31,6 +31,7 @@ public class TestShellNoCluster extends AbstractTestShell {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestShellNoCluster.class);
+ @Override
@Before
public void setUp() throws Exception {
RubyShellTest.setUpConfig(this);
@@ -42,6 +43,7 @@ public class TestShellNoCluster extends AbstractTestShell {
RubyShellTest.doTestSetup(this);
}
+ @Override
@After
public void tearDown() throws Exception {
// no cluster