This is an automated email from the ASF dual-hosted git repository.
zhangduo 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 6aebeac55f7 HBASE-29610 Add and use String constants for Junit 5 @Tag
annotations (#7323)
6aebeac55f7 is described below
commit 6aebeac55f7f5ef3cd7ce3bc6884d2a27953a2ae
Author: Istvan Toth <st...@apache.org>
AuthorDate: Thu Sep 18 10:39:08 2025 +0200
HBASE-29610 Add and use String constants for Junit 5 @Tag annotations
(#7323)
Signed-off-by: Duo Zhang <zhang...@apache.org>
(cherry picked from commit 35faadbbef21c2d6c8b46a0685cd8c1b93b0498a)
---
.../org/apache/hadoop/hbase/testclassification/ClientTests.java | 1 +
.../apache/hadoop/hbase/testclassification/CoprocessorTests.java | 1 +
.../org/apache/hadoop/hbase/testclassification/FilterTests.java | 1 +
.../org/apache/hadoop/hbase/testclassification/FlakeyTests.java | 1 +
.../java/org/apache/hadoop/hbase/testclassification/IOTests.java | 1 +
.../apache/hadoop/hbase/testclassification/IntegrationTests.java | 1 +
.../java/org/apache/hadoop/hbase/testclassification/LargeTests.java | 1 +
.../org/apache/hadoop/hbase/testclassification/MapReduceTests.java | 1 +
.../org/apache/hadoop/hbase/testclassification/MasterTests.java | 1 +
.../org/apache/hadoop/hbase/testclassification/MediumTests.java | 1 +
.../org/apache/hadoop/hbase/testclassification/MetricsTests.java | 1 +
.../java/org/apache/hadoop/hbase/testclassification/MiscTests.java | 1 +
.../java/org/apache/hadoop/hbase/testclassification/RPCTests.java | 1 +
.../apache/hadoop/hbase/testclassification/RegionServerTests.java | 1 +
.../apache/hadoop/hbase/testclassification/ReplicationTests.java | 1 +
.../java/org/apache/hadoop/hbase/testclassification/RestTests.java | 1 +
.../org/apache/hadoop/hbase/testclassification/SecurityTests.java | 1 +
.../java/org/apache/hadoop/hbase/testclassification/SmallTests.java | 1 +
.../hadoop/hbase/testclassification/VerySlowMapReduceTests.java | 2 ++
.../hadoop/hbase/testclassification/VerySlowRegionServerTests.java | 2 ++
.../java/org/apache/hadoop/hbase/testclassification/ZKTests.java | 1 +
.../test/java/org/apache/hadoop/hbase/http/TestLdapAdminACL.java | 6 ++++--
.../test/java/org/apache/hadoop/hbase/http/TestLdapHttpServer.java | 6 ++++--
23 files changed, 31 insertions(+), 4 deletions(-)
diff --git
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/ClientTests.java
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/ClientTests.java
index d9bae849063..b0e259e1f9e 100644
---
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/ClientTests.java
+++
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/ClientTests.java
@@ -36,4 +36,5 @@ package org.apache.hadoop.hbase.testclassification;
* @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
*/
public interface ClientTests {
+ public static final String TAG =
"org.apache.hadoop.hbase.testclassification.ClientTests";
}
diff --git
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/CoprocessorTests.java
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/CoprocessorTests.java
index a168adec08a..2dc143e944a 100644
---
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/CoprocessorTests.java
+++
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/CoprocessorTests.java
@@ -35,4 +35,5 @@ package org.apache.hadoop.hbase.testclassification;
* @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
*/
public interface CoprocessorTests {
+ public static final String TAG =
"org.apache.hadoop.hbase.testclassification.CoprocessorTests";
}
diff --git
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/FilterTests.java
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/FilterTests.java
index 84f346baaea..1b45b583c18 100644
---
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/FilterTests.java
+++
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/FilterTests.java
@@ -35,4 +35,5 @@ package org.apache.hadoop.hbase.testclassification;
* @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
*/
public interface FilterTests {
+ public static final String TAG =
"org.apache.hadoop.hbase.testclassification.FilterTests";
}
diff --git
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/FlakeyTests.java
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/FlakeyTests.java
index c23bfa298b3..0cb861979e0 100644
---
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/FlakeyTests.java
+++
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/FlakeyTests.java
@@ -35,4 +35,5 @@ package org.apache.hadoop.hbase.testclassification;
* @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
*/
public interface FlakeyTests {
+ public static final String TAG =
"org.apache.hadoop.hbase.testclassification.FlakeyTests";
}
diff --git
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/IOTests.java
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/IOTests.java
index 8eee0e6ae4b..be55b3829e5 100644
---
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/IOTests.java
+++
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/IOTests.java
@@ -36,4 +36,5 @@ package org.apache.hadoop.hbase.testclassification;
* @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
*/
public interface IOTests {
+ public static final String TAG =
"org.apache.hadoop.hbase.testclassification.IOTests";
}
diff --git
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/IntegrationTests.java
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/IntegrationTests.java
index 4e555b73fed..0003cd1db51 100644
---
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/IntegrationTests.java
+++
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/IntegrationTests.java
@@ -34,4 +34,5 @@ package org.apache.hadoop.hbase.testclassification;
* @see LargeTests
*/
public interface IntegrationTests {
+ public static final String TAG =
"org.apache.hadoop.hbase.testclassification.IntegrationTests";
}
diff --git
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/LargeTests.java
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/LargeTests.java
index b47e5bab9a4..3a24764e706 100644
---
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/LargeTests.java
+++
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/LargeTests.java
@@ -33,4 +33,5 @@ package org.apache.hadoop.hbase.testclassification;
* @see IntegrationTests
*/
public interface LargeTests {
+ public static final String TAG =
"org.apache.hadoop.hbase.testclassification.LargeTests";
}
diff --git
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MapReduceTests.java
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MapReduceTests.java
index 0e68ab3c034..ac5b05e3070 100644
---
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MapReduceTests.java
+++
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MapReduceTests.java
@@ -35,4 +35,5 @@ package org.apache.hadoop.hbase.testclassification;
* @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
*/
public interface MapReduceTests {
+ public static final String TAG =
"org.apache.hadoop.hbase.testclassification.MapReduceTests";
}
diff --git
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MasterTests.java
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MasterTests.java
index 5dcf51b27e5..0ad843493ec 100644
---
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MasterTests.java
+++
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MasterTests.java
@@ -35,4 +35,5 @@ package org.apache.hadoop.hbase.testclassification;
* @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
*/
public interface MasterTests {
+ public static final String TAG =
"org.apache.hadoop.hbase.testclassification.MasterTests";
}
diff --git
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MediumTests.java
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MediumTests.java
index d1f836ec004..548f655c774 100644
---
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MediumTests.java
+++
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MediumTests.java
@@ -32,4 +32,5 @@ package org.apache.hadoop.hbase.testclassification;
* @see IntegrationTests
*/
public interface MediumTests {
+ public static final String TAG =
"org.apache.hadoop.hbase.testclassification.MediumTests";
}
diff --git
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MetricsTests.java
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MetricsTests.java
index 27beaacf963..c6985d6b95c 100644
---
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MetricsTests.java
+++
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MetricsTests.java
@@ -21,4 +21,5 @@ package org.apache.hadoop.hbase.testclassification;
* Tag a test that covers our metrics handling.
*/
public interface MetricsTests {
+ public static final String TAG =
"org.apache.hadoop.hbase.testclassification.MetricsTests";
}
diff --git
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MiscTests.java
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MiscTests.java
index 695042e801b..b7b7ad4c3f6 100644
---
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MiscTests.java
+++
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MiscTests.java
@@ -35,4 +35,5 @@ package org.apache.hadoop.hbase.testclassification;
* @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
*/
public interface MiscTests {
+ public static final String TAG =
"org.apache.hadoop.hbase.testclassification.MiscTests";
}
diff --git
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/RPCTests.java
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/RPCTests.java
index 929bd6487ed..71a24d5d5dd 100644
---
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/RPCTests.java
+++
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/RPCTests.java
@@ -35,4 +35,5 @@ package org.apache.hadoop.hbase.testclassification;
* @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
*/
public interface RPCTests {
+ public static final String TAG =
"org.apache.hadoop.hbase.testclassification.RPCTests";
}
diff --git
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/RegionServerTests.java
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/RegionServerTests.java
index 3439afa76eb..d79691d6fac 100644
---
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/RegionServerTests.java
+++
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/RegionServerTests.java
@@ -35,4 +35,5 @@ package org.apache.hadoop.hbase.testclassification;
* @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
*/
public interface RegionServerTests {
+ public static final String TAG =
"org.apache.hadoop.hbase.testclassification.RegionServerTests";
}
diff --git
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/ReplicationTests.java
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/ReplicationTests.java
index df606c960c2..74c65a57982 100644
---
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/ReplicationTests.java
+++
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/ReplicationTests.java
@@ -35,4 +35,5 @@ package org.apache.hadoop.hbase.testclassification;
* @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
*/
public interface ReplicationTests {
+ public static final String TAG =
"org.apache.hadoop.hbase.testclassification.ReplicationTests";
}
diff --git
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/RestTests.java
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/RestTests.java
index a648b4c39e0..9a73fde57e2 100644
---
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/RestTests.java
+++
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/RestTests.java
@@ -35,4 +35,5 @@ package org.apache.hadoop.hbase.testclassification;
* @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
*/
public interface RestTests {
+ public static final String TAG =
"org.apache.hadoop.hbase.testclassification.RestTests";
}
diff --git
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/SecurityTests.java
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/SecurityTests.java
index a4e55ad3aba..939c25c05ff 100644
---
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/SecurityTests.java
+++
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/SecurityTests.java
@@ -35,4 +35,5 @@ package org.apache.hadoop.hbase.testclassification;
* @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
*/
public interface SecurityTests {
+ public static final String TAG =
"org.apache.hadoop.hbase.testclassification.SecurityTests";
}
diff --git
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/SmallTests.java
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/SmallTests.java
index 64d2bce381b..54e16d7ad1a 100644
---
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/SmallTests.java
+++
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/SmallTests.java
@@ -30,4 +30,5 @@ package org.apache.hadoop.hbase.testclassification;
* @see IntegrationTests
*/
public interface SmallTests {
+ public static final String TAG =
"org.apache.hadoop.hbase.testclassification.SmallTests";
}
diff --git
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowMapReduceTests.java
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowMapReduceTests.java
index d1f433b9719..dac933ec78e 100644
---
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowMapReduceTests.java
+++
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowMapReduceTests.java
@@ -36,4 +36,6 @@ package org.apache.hadoop.hbase.testclassification;
* @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
*/
public interface VerySlowMapReduceTests {
+ public static final String TAG =
+ "org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests";
}
diff --git
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowRegionServerTests.java
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowRegionServerTests.java
index f556979e5b6..1583de103e3 100644
---
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowRegionServerTests.java
+++
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowRegionServerTests.java
@@ -36,4 +36,6 @@ package org.apache.hadoop.hbase.testclassification;
* @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
*/
public interface VerySlowRegionServerTests {
+ public static final String TAG =
+ "org.apache.hadoop.hbase.testclassification.VerySlowRegionServerTests";
}
diff --git
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/ZKTests.java
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/ZKTests.java
index 9fa0579ed47..a318b388ef7 100644
---
a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/ZKTests.java
+++
b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/ZKTests.java
@@ -22,4 +22,5 @@ package org.apache.hadoop.hbase.testclassification;
* {@code RecoverableZooKeeper}, not for tests which depend on ZooKeeper.
*/
public interface ZKTests {
+ public static final String TAG =
"org.apache.hadoop.hbase.testclassification.ZKTests";
}
diff --git
a/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestLdapAdminACL.java
b/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestLdapAdminACL.java
index 900c1fef07b..c4fd208fa7c 100644
---
a/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestLdapAdminACL.java
+++
b/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestLdapAdminACL.java
@@ -31,6 +31,8 @@ import
org.apache.directory.server.core.annotations.CreatePartition;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.CommonConfigurationKeys;
import org.apache.hadoop.hbase.http.resource.JerseyResource;
+import org.apache.hadoop.hbase.testclassification.MiscTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
@@ -41,8 +43,8 @@ import org.slf4j.LoggerFactory;
/**
* Test class for admin ACLs with LDAP authentication on the HttpServer.
*/
-@Tag("org.apache.hadoop.hbase.testclassification.MiscTests")
-@Tag("org.apache.hadoop.hbase.testclassification.SmallTests")
+@Tag(MiscTests.TAG)
+@Tag(SmallTests.TAG)
@CreateLdapServer(
transports = { @CreateTransport(protocol = "LDAP", address =
LdapConstants.LDAP_SERVER_ADDR), })
@CreateDS(name = "TestLdapAdminACL", allowAnonAccess = true,
diff --git
a/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestLdapHttpServer.java
b/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestLdapHttpServer.java
index 66b3b2924ee..9faa8dc49fb 100644
---
a/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestLdapHttpServer.java
+++
b/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestLdapHttpServer.java
@@ -28,6 +28,8 @@ import
org.apache.directory.server.core.annotations.ApplyLdifs;
import org.apache.directory.server.core.annotations.ContextEntry;
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.annotations.CreatePartition;
+import org.apache.hadoop.hbase.testclassification.MiscTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
@@ -35,8 +37,8 @@ import org.junit.jupiter.api.Timeout;
/**
* Test class for LDAP authentication on the HttpServer.
*/
-@Tag("org.apache.hadoop.hbase.testclassification.MiscTests")
-@Tag("org.apache.hadoop.hbase.testclassification.SmallTests")
+@Tag(MiscTests.TAG)
+@Tag(SmallTests.TAG)
@CreateLdapServer(
transports = { @CreateTransport(protocol = "LDAP", address =
LdapConstants.LDAP_SERVER_ADDR), })
@CreateDS(name = "TestLdapHttpServer", allowAnonAccess = true,
