From daab6d4adb07ffa04e211c75617b7d8097dbfba5 Mon Sep 17 00:00:00 2001 From: Hongxu Xu Date: Tue, 12 Aug 2025 01:17:52 +0000 Subject: [PATCH 1/2] refactor: reduce dependencies --- auth/BUILD.bazel | 1 - controller/BUILD.bazel | 2 -- filter/BUILD.bazel | 2 -- srvutil/BUILD.bazel | 2 -- test/BUILD.bazel | 5 ----- 5 files changed, 12 deletions(-) diff --git a/auth/BUILD.bazel b/auth/BUILD.bazel index bc15ca3c9e0..942a0e93d7a 100644 --- a/auth/BUILD.bazel +++ b/auth/BUILD.bazel @@ -23,7 +23,6 @@ java_library( deps = [ "//common", "//remoting", - "//srvutil", "//client", "@maven//:commons_codec_commons_codec", "@maven//:org_apache_commons_commons_lang3", diff --git a/controller/BUILD.bazel b/controller/BUILD.bazel index 73c2cf3395c..e1dc61c5003 100644 --- a/controller/BUILD.bazel +++ b/controller/BUILD.bazel @@ -23,7 +23,6 @@ java_library( deps = [ "//common", "//remoting", - "//client", "//srvutil", "@maven//:io_openmessaging_storage_dledger", "@maven//:org_apache_commons_commons_lang3", @@ -65,7 +64,6 @@ java_library( ":controller", "//common", "//remoting", - "//client", "//srvutil", "@maven//:io_openmessaging_storage_dledger", "//:test_deps", diff --git a/filter/BUILD.bazel b/filter/BUILD.bazel index 048c3bdb623..c0d59ba6f43 100644 --- a/filter/BUILD.bazel +++ b/filter/BUILD.bazel @@ -22,8 +22,6 @@ java_library( visibility = ["//visibility:public"], deps = [ "//common", - "//remoting", - "//srvutil", "@maven//:org_apache_commons_commons_lang3", "@maven//:commons_validator_commons_validator", "@maven//:com_github_luben_zstd_jni", diff --git a/srvutil/BUILD.bazel b/srvutil/BUILD.bazel index a47a60cb160..699d78bcd91 100644 --- a/srvutil/BUILD.bazel +++ b/srvutil/BUILD.bazel @@ -22,7 +22,6 @@ java_library( visibility = ["//visibility:public"], deps = [ "//common", - "//remoting", "@maven//:org_apache_commons_commons_lang3", "@maven//:commons_validator_commons_validator", "@maven//:com_github_luben_zstd_jni", @@ -44,7 +43,6 @@ java_library( deps = [ ":srvutil", "//common", - "//remoting", "//:test_deps", "@maven//:org_apache_commons_commons_lang3", "@maven//:io_netty_netty_all", diff --git a/test/BUILD.bazel b/test/BUILD.bazel index 80bd06539e8..a8a7a9d8bb3 100644 --- a/test/BUILD.bazel +++ b/test/BUILD.bazel @@ -21,13 +21,8 @@ java_library( srcs = glob(["src/main/java/**/*.java"]), visibility = ["//visibility:public"], deps = [ - "//broker", "//client", "//common", - "//container", - "//controller", - "//namesrv", - "//proxy", "//remoting", "//srvutil", "//tools", From 71d472f5439d2a8d7812b31d517509e4fa4f71d5 Mon Sep 17 00:00:00 2001 From: Hongxu Xu Date: Thu, 14 Aug 2025 18:56:03 +0000 Subject: [PATCH 2/2] fix: bazel ci suppress DoubleBraceInitialization --- .bazelrc | 6 ++-- .bazelversion | 2 +- BUILD.bazel | 14 -------- WORKSPACE | 32 +++++++++++++++---- bazel/GenTestRules.bzl | 2 +- .../broker/metrics/BrokerMetricsManager.java | 1 + .../offset/ConsumerOffsetManagerTest.java | 1 + .../RocksDBConsumerOffsetManagerTest.java | 1 + client/BUILD.bazel | 1 + .../rocketmq/acl/common/AclUtilsTest.java | 3 ++ proxy/BUILD.bazel | 2 ++ .../grpc/interceptor/RequestMapping.java | 1 + .../activity/AbstractRemotingActivity.java | 1 + .../remoting/common/RemotingHelper.java | 1 + store/BUILD.bazel | 2 ++ .../store/queue/CombineConsumeQueueStore.java | 4 +-- .../rocketmq/store/timer/TimerMetrics.java | 1 + .../store/MessageStoreStateMachineTest.java | 24 +++++++------- .../store/ha/autoswitch/AutoSwitchHATest.java | 1 + .../store/timer/TimerMetricsTest.java | 1 + .../util/MessageStoreUtilTest.java | 1 + .../tools/admin/DefaultMQAdminExtTest.java | 1 + 22 files changed, 63 insertions(+), 40 deletions(-) diff --git a/.bazelrc b/.bazelrc index 6ebc08d0dc3..375ac76525d 100644 --- a/.bazelrc +++ b/.bazelrc @@ -47,10 +47,8 @@ build:remote --platforms=@buildbuddy_toolchain//:platform build:remote --extra_execution_platforms=@buildbuddy_toolchain//:platform build:remote --crosstool_top=@buildbuddy_toolchain//:toolchain build:remote --extra_toolchains=@buildbuddy_toolchain//:cc_toolchain -build:remote --javabase=@buildbuddy_toolchain//:javabase_jdk8 -build:remote --host_javabase=@buildbuddy_toolchain//:javabase_jdk8 -build:remote --java_toolchain=@buildbuddy_toolchain//:toolchain_jdk8 -build:remote --host_java_toolchain=@buildbuddy_toolchain//:toolchain_jdk8 +build:remote --java_language_version=8 +build:remote --java_runtime_version=8 build:remote --define=EXECUTOR=remote # Enable remote execution so actions are performed on the remote systems. diff --git a/.bazelversion b/.bazelversion index 7cbea073bea..4be2c727ad9 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -5.2.0 \ No newline at end of file +6.5.0 \ No newline at end of file diff --git a/BUILD.bazel b/BUILD.bazel index ba33a9e6123..71700859c1d 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -14,20 +14,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # -load("@bazel_toolchains//rules/exec_properties:exec_properties.bzl", "create_rbe_exec_properties_dict") - -platform( - name = "custom_platform", - # Inherit from the platform target generated by 'rbe_configs_gen' assuming the generated configs - # were imported as a Bazel external repository named 'rbe_default'. If you extracted the - # generated configs elsewhere in your source repository, replace the following with the label - # to the 'platform' target in the generated configs. - parents = ["@rbe_default//config:platform"], - # Example custom execution property instructing RBE to use e2-standard-2 GCE VMs. - exec_properties = create_rbe_exec_properties_dict( - container_image = "ubuntu:latest", - ), -) java_library( name = "test_deps", diff --git a/WORKSPACE b/WORKSPACE index 9125a67f88b..da58ae67634 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -64,7 +64,7 @@ maven_install( "org.awaitility:awaitility:4.1.0", "commons-cli:commons-cli:1.5.0", "com.google.guava:guava:31.0.1-jre", - "org.yaml:snakeyaml:1.30", + "org.yaml:snakeyaml:2.0", "commons-codec:commons-codec:1.13", "commons-io:commons-io:2.7", "com.google.truth:truth:0.30", @@ -134,11 +134,31 @@ load("@io_buildbuddy_buildbuddy_toolchain//:rules.bzl", "buildbuddy") buildbuddy(name = "buildbuddy_toolchain") http_archive( - name = "bazel_toolchains", - sha256 = "1adf5db506a7e3c465a26988514cfc3971af6d5b3c2218925cd6e71ee443fc3f", - strip_prefix = "bazel-toolchains-4.0.0", + name = "bazel_skylib", + sha256 = "51b5105a760b353773f904d2bbc5e664d0987fbaf22265164de65d43e910d8ac", urls = [ - "https://github.com/bazelbuild/bazel-toolchains/releases/download/4.0.0/bazel-toolchains-4.0.0.tar.gz", - "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/4.0.0/bazel-toolchains-4.0.0.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.8.1/bazel-skylib-1.8.1.tar.gz", + "https://github.com/bazelbuild/bazel-skylib/releases/download/1.8.1/bazel-skylib-1.8.1.tar.gz", ], ) + +load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") +bazel_skylib_workspace() + +http_archive( + name = "rules_java", + urls = [ + "https://github.com/bazelbuild/rules_java/releases/download/7.12.5/rules_java-7.12.5.tar.gz", + ], + sha256 = "17b18cb4f92ab7b94aa343ce78531b73960b1bed2ba166e5b02c9fdf0b0ac270", +) +load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains") +rules_java_dependencies() +rules_java_toolchains() + +load("@rules_java//toolchains:local_java_repository.bzl", "local_java_repository") +local_java_repository( + name = "jdk8", + version = "8", + java_home = "/usr/lib/jvm/java-8-openjdk-amd64", +) diff --git a/bazel/GenTestRules.bzl b/bazel/GenTestRules.bzl index fb9b6991de0..4687107ac12 100644 --- a/bazel/GenTestRules.bzl +++ b/bazel/GenTestRules.bzl @@ -66,7 +66,7 @@ def GenTestRules( runtime_deps = deps, resources = resources, size = test_size, - jvm_flags = jvm_flags, + jvm_flags = jvm_flags + ["-Dbuild.bazel=true"], args = args, flaky = flaky, tags = tags, diff --git a/broker/src/main/java/org/apache/rocketmq/broker/metrics/BrokerMetricsManager.java b/broker/src/main/java/org/apache/rocketmq/broker/metrics/BrokerMetricsManager.java index d8d94f8e69a..840b02e8c3c 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/metrics/BrokerMetricsManager.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/metrics/BrokerMetricsManager.java @@ -162,6 +162,7 @@ public class BrokerMetricsManager { public static LongCounter rollBackMessagesTotal = new NopLongCounter(); public static LongHistogram transactionFinishLatency = new NopLongHistogram(); + @SuppressWarnings("DoubleBraceInitialization") public static final List SYSTEM_GROUP_PREFIX_LIST = new ArrayList() { { add(MixAll.CID_RMQ_SYS_PREFIX.toLowerCase()); diff --git a/broker/src/test/java/org/apache/rocketmq/broker/offset/ConsumerOffsetManagerTest.java b/broker/src/test/java/org/apache/rocketmq/broker/offset/ConsumerOffsetManagerTest.java index d980090a23f..3ddd369c7fb 100644 --- a/broker/src/test/java/org/apache/rocketmq/broker/offset/ConsumerOffsetManagerTest.java +++ b/broker/src/test/java/org/apache/rocketmq/broker/offset/ConsumerOffsetManagerTest.java @@ -40,6 +40,7 @@ public class ConsumerOffsetManagerTest { private ConsumerOffsetManager consumerOffsetManager; @Before + @SuppressWarnings("DoubleBraceInitialization") public void init() { brokerController = Mockito.mock(BrokerController.class); consumerOffsetManager = new ConsumerOffsetManager(brokerController); diff --git a/broker/src/test/java/org/apache/rocketmq/broker/offset/RocksDBConsumerOffsetManagerTest.java b/broker/src/test/java/org/apache/rocketmq/broker/offset/RocksDBConsumerOffsetManagerTest.java index 5a7a2c38acb..191850f114b 100644 --- a/broker/src/test/java/org/apache/rocketmq/broker/offset/RocksDBConsumerOffsetManagerTest.java +++ b/broker/src/test/java/org/apache/rocketmq/broker/offset/RocksDBConsumerOffsetManagerTest.java @@ -41,6 +41,7 @@ public class RocksDBConsumerOffsetManagerTest { private ConsumerOffsetManager consumerOffsetManager; @Before + @SuppressWarnings("DoubleBraceInitialization") public void init() { if (notToBeExecuted()) { return; diff --git a/client/BUILD.bazel b/client/BUILD.bazel index e6edebe6bec..31681f10299 100644 --- a/client/BUILD.bazel +++ b/client/BUILD.bazel @@ -68,5 +68,6 @@ GenTestRules( ], exclude_tests = [ "src/test/java/org/apache/rocketmq/client/consumer/DefaultLitePullConsumerTest", + "src/test/java/org/apache/rocketmq/client/impl/mqclient/MQClientAPITest", ], ) diff --git a/client/src/test/java/org/apache/rocketmq/acl/common/AclUtilsTest.java b/client/src/test/java/org/apache/rocketmq/acl/common/AclUtilsTest.java index 2169144c88d..1f99a4ce2fa 100644 --- a/client/src/test/java/org/apache/rocketmq/acl/common/AclUtilsTest.java +++ b/client/src/test/java/org/apache/rocketmq/acl/common/AclUtilsTest.java @@ -20,6 +20,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.rocketmq.remoting.RPCHook; import org.junit.Assert; +import org.junit.Assume; import org.junit.Test; import java.io.File; @@ -230,6 +231,8 @@ public void getAclRPCHookTest() throws IOException { @Test public void testGetAclRPCHookByFileName() { + // Skip this test if running in Bazel, as the resource path is a path inside the JAR. + Assume.assumeTrue(System.getProperty("build.bazel") == null); RPCHook actual = AclUtils.getAclRPCHook(Objects.requireNonNull(AclUtilsTest.class.getResource("/acl_hook/plain_acl.yml")).getPath()); assertNotNull(actual); assertTrue(actual instanceof AclClientRPCHook); diff --git a/proxy/BUILD.bazel b/proxy/BUILD.bazel index b996e8b39c5..8b7915ba741 100644 --- a/proxy/BUILD.bazel +++ b/proxy/BUILD.bazel @@ -85,6 +85,7 @@ java_library( "//broker", "//client", "//common", + "//srvutil", "//remoting", "@maven//:ch_qos_logback_logback_core", "@maven//:com_alibaba_fastjson", @@ -118,6 +119,7 @@ GenTestRules( name = "GeneratedTestRules", exclude_tests = [ "src/test/java/org/apache/rocketmq/proxy/config/InitConfigTest", + "src/test/java/org/apache/rocketmq/proxy/service/cert/TlsCertificateManagerTest", ], test_files = glob(["src/test/java/**/*Test.java"]), deps = [ diff --git a/proxy/src/main/java/org/apache/rocketmq/proxy/grpc/interceptor/RequestMapping.java b/proxy/src/main/java/org/apache/rocketmq/proxy/grpc/interceptor/RequestMapping.java index f5edc03ba4a..ca9edb4a87d 100644 --- a/proxy/src/main/java/org/apache/rocketmq/proxy/grpc/interceptor/RequestMapping.java +++ b/proxy/src/main/java/org/apache/rocketmq/proxy/grpc/interceptor/RequestMapping.java @@ -33,6 +33,7 @@ import org.apache.rocketmq.remoting.protocol.RequestCode; public class RequestMapping { + @SuppressWarnings("DoubleBraceInitialization") private final static Map REQUEST_MAP = new HashMap() { { // v2 diff --git a/proxy/src/main/java/org/apache/rocketmq/proxy/remoting/activity/AbstractRemotingActivity.java b/proxy/src/main/java/org/apache/rocketmq/proxy/remoting/activity/AbstractRemotingActivity.java index f3d8fb6e314..230a37f4c19 100644 --- a/proxy/src/main/java/org/apache/rocketmq/proxy/remoting/activity/AbstractRemotingActivity.java +++ b/proxy/src/main/java/org/apache/rocketmq/proxy/remoting/activity/AbstractRemotingActivity.java @@ -45,6 +45,7 @@ public abstract class AbstractRemotingActivity implements NettyRequestProcessor protected final MessagingProcessor messagingProcessor; protected static final String BROKER_NAME_FIELD = "bname"; protected static final String BROKER_NAME_FIELD_FOR_SEND_MESSAGE_V2 = "n"; + @SuppressWarnings("DoubleBraceInitialization") private static final Map PROXY_EXCEPTION_RESPONSE_CODE_MAP = new HashMap() { { put(ProxyExceptionCode.FORBIDDEN, ResponseCode.NO_PERMISSION); diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/common/RemotingHelper.java b/remoting/src/main/java/org/apache/rocketmq/remoting/common/RemotingHelper.java index d94efe71e49..52f7561d719 100644 --- a/remoting/src/main/java/org/apache/rocketmq/remoting/common/RemotingHelper.java +++ b/remoting/src/main/java/org/apache/rocketmq/remoting/common/RemotingHelper.java @@ -45,6 +45,7 @@ import org.apache.rocketmq.remoting.protocol.RequestCode; import org.apache.rocketmq.remoting.protocol.ResponseCode; +@SuppressWarnings("DoubleBraceInitialization") public class RemotingHelper { public static final String DEFAULT_CHARSET = "UTF-8"; public static final String DEFAULT_CIDR_ALL = "0.0.0.0/0"; diff --git a/store/BUILD.bazel b/store/BUILD.bazel index 269ff2d9b34..de98657b220 100644 --- a/store/BUILD.bazel +++ b/store/BUILD.bazel @@ -76,6 +76,7 @@ GenTestRules( # These tests are extremely slow and flaky, exclude them before they are properly fixed. "src/test/java/org/apache/rocketmq/store/ha/autoswitch/AutoSwitchHATest", "src/test/java/org/apache/rocketmq/store/dledger/DLedgerCommitlogTest", + "src/test/java/org/apache/rocketmq/store/dledger/DLedgerMultiPathTest", ], medium_tests = [ "src/test/java/org/apache/rocketmq/store/DefaultMessageStoreTest", @@ -85,6 +86,7 @@ GenTestRules( "src/test/java/org/apache/rocketmq/store/queue/BatchConsumeMessageTest", "src/test/java/org/apache/rocketmq/store/dledger/MixCommitlogTest", "src/test/java/org/apache/rocketmq/store/RocksDBMessageStoreTest", + "src/test/java/org/apache/rocketmq/store/timer/TimerMessageStoreTest", ], test_files = glob(["src/test/java/**/*Test.java"]), deps = [ diff --git a/store/src/main/java/org/apache/rocketmq/store/queue/CombineConsumeQueueStore.java b/store/src/main/java/org/apache/rocketmq/store/queue/CombineConsumeQueueStore.java index b63379cb21f..c8c3202a785 100644 --- a/store/src/main/java/org/apache/rocketmq/store/queue/CombineConsumeQueueStore.java +++ b/store/src/main/java/org/apache/rocketmq/store/queue/CombineConsumeQueueStore.java @@ -28,6 +28,8 @@ import org.apache.commons.lang3.StringUtils; import org.apache.rocketmq.common.BoundaryType; import org.apache.rocketmq.common.CheckRocksdbCqWriteResult; +import org.apache.rocketmq.logging.org.slf4j.Logger; +import org.apache.rocketmq.logging.org.slf4j.LoggerFactory; import org.apache.rocketmq.common.Pair; import org.apache.rocketmq.common.constant.LoggerName; import org.apache.rocketmq.common.message.MessageExtBrokerInner; @@ -38,8 +40,6 @@ import org.apache.rocketmq.store.exception.ConsumeQueueException; import org.apache.rocketmq.store.exception.StoreException; import org.rocksdb.RocksDBException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class CombineConsumeQueueStore implements ConsumeQueueStoreInterface { private static final Logger log = LoggerFactory.getLogger(LoggerName.STORE_LOGGER_NAME); diff --git a/store/src/main/java/org/apache/rocketmq/store/timer/TimerMetrics.java b/store/src/main/java/org/apache/rocketmq/store/timer/TimerMetrics.java index 03bcc6e8b95..d676b3f4d73 100644 --- a/store/src/main/java/org/apache/rocketmq/store/timer/TimerMetrics.java +++ b/store/src/main/java/org/apache/rocketmq/store/timer/TimerMetrics.java @@ -62,6 +62,7 @@ public class TimerMetrics extends ConfigManager { private final ConcurrentMap timingDistribution = new ConcurrentHashMap<>(1024); + @SuppressWarnings("DoubleBraceInitialization") public List timerDist = new ArrayList() {{ add(5); add(60); diff --git a/store/src/test/java/org/apache/rocketmq/store/MessageStoreStateMachineTest.java b/store/src/test/java/org/apache/rocketmq/store/MessageStoreStateMachineTest.java index b6f424147d2..d00074dbcbc 100644 --- a/store/src/test/java/org/apache/rocketmq/store/MessageStoreStateMachineTest.java +++ b/store/src/test/java/org/apache/rocketmq/store/MessageStoreStateMachineTest.java @@ -27,17 +27,17 @@ import org.apache.rocketmq.logging.org.slf4j.Logger; import org.apache.rocketmq.store.MessageStoreStateMachine.MessageStoreState; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; +import org.junit.Test; +import org.junit.Before; import org.mockito.Mockito; -class MessageStoreStateMachineTest { +public class MessageStoreStateMachineTest { private Logger mockLogger; private MessageStoreStateMachine stateMachine; - @BeforeEach - void setUp() { + @Before + public void setUp() { // Mock Logger mockLogger = Mockito.mock(Logger.class); @@ -49,7 +49,7 @@ void setUp() { * Test the constructor of MessageStoreStateMachine. */ @Test - void testConstructor() { + public void testConstructor() { // Verify initial state assertEquals(MessageStoreState.INIT, stateMachine.getCurrentState()); @@ -61,7 +61,7 @@ void testConstructor() { * Test valid state transition in transitTo method. */ @Test - void testValidStateTransition() { + public void testValidStateTransition() { // Perform a valid state transition stateMachine.transitTo(MessageStoreState.LOAD_COMMITLOG_OK); @@ -77,7 +77,7 @@ void testValidStateTransition() { * Test fail state transition in transitTo method. */ @Test - void testValidFailStateTransition() { + public void testValidFailStateTransition() { stateMachine.transitTo(MessageStoreState.LOAD_COMMITLOG_OK, false); assertEquals(MessageStoreState.INIT, stateMachine.getCurrentState()); verify(mockLogger).warn(anyString(), eq(MessageStoreState.INIT), eq(MessageStoreState.LOAD_COMMITLOG_OK), @@ -88,7 +88,7 @@ void testValidFailStateTransition() { * Test invalid state transition in transitTo method. */ @Test - void testInvalidStateTransition() { + public void testInvalidStateTransition() { // Perform an invalid state transition Exception exception = assertThrows(IllegalStateException.class, () -> { stateMachine.transitTo(MessageStoreState.INIT); @@ -103,7 +103,7 @@ void testInvalidStateTransition() { * Test getCurrentState method. */ @Test - void testGetCurrentState() { + public void testGetCurrentState() { // Verify the current state assertEquals(MessageStoreState.INIT, stateMachine.getCurrentState()); } @@ -112,7 +112,7 @@ void testGetCurrentState() { * Test getTotalRunningTimeMs method. */ @Test - void testGetTotalRunningTimeMs() { + public void testGetTotalRunningTimeMs() { // Sleep for a short duration to simulate elapsed time try { Thread.sleep(100); @@ -129,7 +129,7 @@ void testGetTotalRunningTimeMs() { * Test getCurrentStateRunningTimeMs method. */ @Test - void testGetCurrentStateRunningTimeMs() { + public void testGetCurrentStateRunningTimeMs() { // Perform a state transition stateMachine.transitTo(MessageStoreState.LOAD_COMMITLOG_OK); diff --git a/store/src/test/java/org/apache/rocketmq/store/ha/autoswitch/AutoSwitchHATest.java b/store/src/test/java/org/apache/rocketmq/store/ha/autoswitch/AutoSwitchHATest.java index 7d659d2f6ae..86371ea9006 100644 --- a/store/src/test/java/org/apache/rocketmq/store/ha/autoswitch/AutoSwitchHATest.java +++ b/store/src/test/java/org/apache/rocketmq/store/ha/autoswitch/AutoSwitchHATest.java @@ -454,6 +454,7 @@ public void testAddBrokerAndSyncFromLastFile() throws Exception { } @Test + @SuppressWarnings("DoubleBraceInitialization") public void testCheckSynchronizingSyncStateSetFlag() throws Exception { // Step1: broker1 as leader, broker2 as follower init(defaultMappedFileSize); diff --git a/store/src/test/java/org/apache/rocketmq/store/timer/TimerMetricsTest.java b/store/src/test/java/org/apache/rocketmq/store/timer/TimerMetricsTest.java index 3c7b9b67fba..f664e677cda 100644 --- a/store/src/test/java/org/apache/rocketmq/store/timer/TimerMetricsTest.java +++ b/store/src/test/java/org/apache/rocketmq/store/timer/TimerMetricsTest.java @@ -57,6 +57,7 @@ public void testTimingCount() { } @Test + @SuppressWarnings("DoubleBraceInitialization") public void testTimingDistribution() { String baseDir = StoreTestUtils.createBaseDir(); TimerMetrics first = new TimerMetrics(baseDir); diff --git a/tieredstore/src/test/java/org/apache/rocketmq/tieredstore/util/MessageStoreUtilTest.java b/tieredstore/src/test/java/org/apache/rocketmq/tieredstore/util/MessageStoreUtilTest.java index cadaef8708f..6baf8f4ccea 100644 --- a/tieredstore/src/test/java/org/apache/rocketmq/tieredstore/util/MessageStoreUtilTest.java +++ b/tieredstore/src/test/java/org/apache/rocketmq/tieredstore/util/MessageStoreUtilTest.java @@ -48,6 +48,7 @@ public static void deleteStoreDirectory(String storePath) { } @Test + @SuppressWarnings("DoubleBraceInitialization") public void toHumanReadableTest() { Map capacityTable = new HashMap() { { diff --git a/tools/src/test/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtTest.java b/tools/src/test/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtTest.java index 884764f853d..33106461dd6 100644 --- a/tools/src/test/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtTest.java +++ b/tools/src/test/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtTest.java @@ -109,6 +109,7 @@ public class DefaultMQAdminExtTest { private static ClusterInfo clusterInfo = new ClusterInfo(); @BeforeClass + @SuppressWarnings("DoubleBraceInitialization") public static void init() throws Exception { mQClientAPIImpl = mock(MQClientAPIImpl.class); defaultMQAdminExt = new DefaultMQAdminExt();