Copilot commented on code in PR #10790:
URL: https://github.com/apache/rocketmq/pull/10790#discussion_r3702673154
##########
proxy/src/main/java/org/apache/rocketmq/proxy/remoting/activity/ConsumerManagerActivity.java:
##########
@@ -157,6 +158,7 @@ protected RemotingCommand
unlockBatchMQ(ChannelHandlerContext ctx, RemotingComma
Set<MessageQueue> mqSet = requestBody.getMqSet();
if (mqSet.isEmpty()) {
response.setBody(requestBody.encode());
+ response.setCode(ResponseCode.SYSTEM_ERROR);
response.setRemark("MessageQueue set is empty");
return response;
}
Review Comment:
`mqSet.isEmpty()` is a client/request validation failure, but the code
returns `ResponseCode.SYSTEM_ERROR` (typically interpreted as a server-side
fault). If `ResponseCode.INVALID_PARAMETER` (or an equivalent request/argument
error code in this module) is available, it would better reflect the condition
and reduce the chance clients treat it as a transient server error and retry
unnecessarily.
##########
proxy/src/main/java/org/apache/rocketmq/proxy/remoting/activity/ConsumerManagerActivity.java:
##########
@@ -136,6 +136,7 @@ protected RemotingCommand lockBatchMQ(ChannelHandlerContext
ctx, RemotingCommand
Set<MessageQueue> mqSet = requestBody.getMqSet();
if (mqSet.isEmpty()) {
response.setBody(requestBody.encode());
+ response.setCode(ResponseCode.SYSTEM_ERROR);
response.setRemark("MessageQueue set is empty");
return response;
}
Review Comment:
`mqSet.isEmpty()` is a client/request validation failure, but the code
returns `ResponseCode.SYSTEM_ERROR` (typically interpreted as a server-side
fault). If `ResponseCode.INVALID_PARAMETER` (or an equivalent request/argument
error code in this module) is available, it would better reflect the condition
and reduce the chance clients treat it as a transient server error and retry
unnecessarily.
##########
proxy/src/test/java/org/apache/rocketmq/proxy/remoting/activity/ConsumerManagerActivityTest.java:
##########
@@ -0,0 +1,78 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.rocketmq.proxy.remoting.activity;
+
+import org.apache.rocketmq.proxy.config.InitConfigTest;
+import org.apache.rocketmq.proxy.processor.MessagingProcessor;
+import org.apache.rocketmq.remoting.protocol.RemotingCommand;
+import org.apache.rocketmq.remoting.protocol.RequestCode;
+import org.apache.rocketmq.remoting.protocol.ResponseCode;
+import org.apache.rocketmq.remoting.protocol.body.LockBatchRequestBody;
+import org.apache.rocketmq.remoting.protocol.body.UnlockBatchRequestBody;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ConsumerManagerActivityTest extends InitConfigTest {
+ private static final String EMPTY_QUEUE_REMARK = "MessageQueue set is
empty";
+
+ ConsumerManagerActivity consumerManagerActivity;
+
+ @Mock
+ MessagingProcessor messagingProcessorMock;
+
+ @Before
+ public void setup() {
+ consumerManagerActivity = new ConsumerManagerActivity(null,
messagingProcessorMock);
+ }
+
+ @Test
+ public void testLockBatchMQWithEmptyQueueSetReturnsErrorCode() throws
Exception {
+ LockBatchRequestBody requestBody = new LockBatchRequestBody();
+ RemotingCommand request =
RemotingCommand.createRequestCommand(RequestCode.LOCK_BATCH_MQ, null);
+ request.setBody(requestBody.encode());
+
+ RemotingCommand response = consumerManagerActivity.lockBatchMQ(null,
request, null);
+
+ assertThat(response.getCode()).isEqualTo(ResponseCode.SYSTEM_ERROR);
+ assertThat(response.getRemark()).isEqualTo(EMPTY_QUEUE_REMARK);
Review Comment:
The remark string is duplicated between production code and the test (the
test defines its own copy). To avoid brittle coupling and future drift,
consider defining a single constant in `ConsumerManagerActivity` (e.g., `static
final String EMPTY_QUEUE_REMARK`) and referencing it from the test, or assert
on a less duplication-prone property (e.g., the response code only, or a
standardized error code/enum if available).
##########
proxy/src/test/java/org/apache/rocketmq/proxy/remoting/activity/ConsumerManagerActivityTest.java:
##########
@@ -0,0 +1,78 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.rocketmq.proxy.remoting.activity;
+
+import org.apache.rocketmq.proxy.config.InitConfigTest;
+import org.apache.rocketmq.proxy.processor.MessagingProcessor;
+import org.apache.rocketmq.remoting.protocol.RemotingCommand;
+import org.apache.rocketmq.remoting.protocol.RequestCode;
+import org.apache.rocketmq.remoting.protocol.ResponseCode;
+import org.apache.rocketmq.remoting.protocol.body.LockBatchRequestBody;
+import org.apache.rocketmq.remoting.protocol.body.UnlockBatchRequestBody;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ConsumerManagerActivityTest extends InitConfigTest {
+ private static final String EMPTY_QUEUE_REMARK = "MessageQueue set is
empty";
Review Comment:
The remark string is duplicated between production code and the test (the
test defines its own copy). To avoid brittle coupling and future drift,
consider defining a single constant in `ConsumerManagerActivity` (e.g., `static
final String EMPTY_QUEUE_REMARK`) and referencing it from the test, or assert
on a less duplication-prone property (e.g., the response code only, or a
standardized error code/enum if available).
##########
proxy/src/test/java/org/apache/rocketmq/proxy/remoting/activity/ConsumerManagerActivityTest.java:
##########
@@ -0,0 +1,78 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.rocketmq.proxy.remoting.activity;
+
+import org.apache.rocketmq.proxy.config.InitConfigTest;
+import org.apache.rocketmq.proxy.processor.MessagingProcessor;
+import org.apache.rocketmq.remoting.protocol.RemotingCommand;
+import org.apache.rocketmq.remoting.protocol.RequestCode;
+import org.apache.rocketmq.remoting.protocol.ResponseCode;
+import org.apache.rocketmq.remoting.protocol.body.LockBatchRequestBody;
+import org.apache.rocketmq.remoting.protocol.body.UnlockBatchRequestBody;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ConsumerManagerActivityTest extends InitConfigTest {
+ private static final String EMPTY_QUEUE_REMARK = "MessageQueue set is
empty";
+
+ ConsumerManagerActivity consumerManagerActivity;
+
+ @Mock
+ MessagingProcessor messagingProcessorMock;
+
+ @Before
+ public void setup() {
+ consumerManagerActivity = new ConsumerManagerActivity(null,
messagingProcessorMock);
+ }
+
+ @Test
+ public void testLockBatchMQWithEmptyQueueSetReturnsErrorCode() throws
Exception {
+ LockBatchRequestBody requestBody = new LockBatchRequestBody();
+ RemotingCommand request =
RemotingCommand.createRequestCommand(RequestCode.LOCK_BATCH_MQ, null);
+ request.setBody(requestBody.encode());
+
+ RemotingCommand response = consumerManagerActivity.lockBatchMQ(null,
request, null);
+
+ assertThat(response.getCode()).isEqualTo(ResponseCode.SYSTEM_ERROR);
+ assertThat(response.getRemark()).isEqualTo(EMPTY_QUEUE_REMARK);
+ verify(messagingProcessorMock, never()).request(any(), any(), any(),
anyLong());
+ }
+
+ @Test
+ public void testUnlockBatchMQWithEmptyQueueSetReturnsErrorCode() throws
Exception {
+ UnlockBatchRequestBody requestBody = new UnlockBatchRequestBody();
+ RemotingCommand request =
RemotingCommand.createRequestCommand(RequestCode.UNLOCK_BATCH_MQ, null);
+ request.setBody(requestBody.encode());
+
+ RemotingCommand response = consumerManagerActivity.unlockBatchMQ(null,
request, null);
+
+ assertThat(response.getCode()).isEqualTo(ResponseCode.SYSTEM_ERROR);
+ assertThat(response.getRemark()).isEqualTo(EMPTY_QUEUE_REMARK);
Review Comment:
The remark string is duplicated between production code and the test (the
test defines its own copy). To avoid brittle coupling and future drift,
consider defining a single constant in `ConsumerManagerActivity` (e.g., `static
final String EMPTY_QUEUE_REMARK`) and referencing it from the test, or assert
on a less duplication-prone property (e.g., the response code only, or a
standardized error code/enum if available).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
