Skip to content

kaiyuanke-2301210357: fix了一些warning & 对一些语句做了简化 #8237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Mrhorse99 wants to merge 6 commits into from
Closed

kaiyuanke-2301210357: fix了一些warning & 对一些语句做了简化 #8237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
12cedec
Update AclFileWatchService.java
Mrhorse99 Jun 1, 2024
cf3d329
修复一些warning 简化写法
Jun 1, 2024
9351fe8
修复一些warning 简化写法
Jun 1, 2024
0d33de9
Update AbstractOMSProducer.java
Mrhorse99 Jun 1, 2024
044ac92
Merge branch 'apache:develop' into develop
Mrhorse99 Jun 2, 2024
ee3c8cd
Merge branch 'apache:develop' into develop
Mrhorse99 Jun 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,10 +641,7 @@ private synchronized RemotingCommand updateAndCreateStaticTopic(ChannelHandlerCo
return response;
}
}
boolean force = false;
if (requestHeader.getForce() != null && requestHeader.getForce()) {
force = true;
}
boolean force = requestHeader.getForce() != null && requestHeader.getForce();

TopicConfig topicConfig = new TopicConfig(topic);
topicConfig.setReadQueueNums(requestHeader.getReadQueueNums());
Expand Down Expand Up @@ -880,7 +877,7 @@ private RemotingCommand getAllTopicConfig(ChannelHandlerContext ctx, RemotingCom
topicConfigAndMappingSerializeWrapper.setTopicQueueMappingDetailMap(this.brokerController.getTopicQueueMappingManager().getTopicQueueMappingTable());

String content = topicConfigAndMappingSerializeWrapper.toJson();
if (content != null && content.length() > 0) {
if (content != null && !content.isEmpty()) {
try {
response.setBody(content.getBytes(MixAll.DEFAULT_CHARSET));
} catch (UnsupportedEncodingException e) {
Expand Down Expand Up @@ -945,13 +942,13 @@ private synchronized RemotingCommand updateColdDataFlowCtrGroupConfig(ChannelHan
Properties properties = MixAll.string2Properties(bodyStr);
if (properties != null) {
LOGGER.info("updateColdDataFlowCtrGroupConfig new config: {}, client: {}", properties, ctx.channel().remoteAddress());
properties.entrySet().stream().forEach(i -> {
properties.forEach((key, value) -> {
try {
String consumerGroup = String.valueOf(i.getKey());
Long threshold = Long.valueOf(String.valueOf(i.getValue()));
String consumerGroup = String.valueOf(key);
Long threshold = Long.valueOf(String.valueOf(value));
this.brokerController.getColdDataCgCtrService().addOrUpdateGroupConfig(consumerGroup, threshold);
} catch (Exception e) {
LOGGER.error("updateColdDataFlowCtrGroupConfig properties on entry error, key: {}, val: {}", i.getKey(), i.getValue(), e);
LOGGER.error("updateColdDataFlowCtrGroupConfig properties on entry error, key: {}, val: {}", key, value, e);
}
});
} else {
Expand Down Expand Up @@ -1111,7 +1108,7 @@ private RemotingCommand getBrokerConfig(ChannelHandlerContext ctx, RemotingComma
final GetBrokerConfigResponseHeader responseHeader = (GetBrokerConfigResponseHeader) response.readCustomHeader();

String content = this.brokerController.getConfiguration().getAllConfigsFormatString();
if (content != null && content.length() > 0) {
if (content != null && !content.isEmpty()) {
try {
response.setBody(content.getBytes(MixAll.DEFAULT_CHARSET));
} catch (UnsupportedEncodingException e) {
Expand Down Expand Up @@ -1596,7 +1593,7 @@ private RemotingCommand getAllSubscriptionGroup(ChannelHandlerContext ctx,
RemotingCommand request) throws RemotingCommandException {
final RemotingCommand response = RemotingCommand.createResponseCommand(null);
String content = this.brokerController.getSubscriptionGroupManager().encode();
if (content != null && content.length() > 0) {
if (content != null && !content.isEmpty()) {
try {
response.setBody(content.getBytes(MixAll.DEFAULT_CHARSET));
} catch (UnsupportedEncodingException e) {
Expand Down Expand Up @@ -1886,7 +1883,7 @@ private RemotingCommand getAllConsumerOffset(ChannelHandlerContext ctx, Remoting
final RemotingCommand response = RemotingCommand.createResponseCommand(null);

String content = this.brokerController.getConsumerOffsetManager().encode();
if (content != null && content.length() > 0) {
if (content != null && !content.isEmpty()) {
try {
response.setBody(content.getBytes(MixAll.DEFAULT_CHARSET));
} catch (UnsupportedEncodingException e) {
Expand Down
16 changes: 2 additions & 14 deletions broker/src/main/java/org/apache/rocketmq/broker/slave/SlaveSynchronize.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
package org.apache.rocketmq.broker.slave;

import java.io.IOException;
import java.util.Iterator;
import java.util.Map;
import java.util.concurrent.ConcurrentMap;

import org.apache.commons.lang3.StringUtils;
Expand Down Expand Up @@ -85,12 +83,7 @@ private void syncTopicConfig() {
ConcurrentMap<String, TopicConfig> newTopicConfigTable = topicWrapper.getTopicConfigTable();
//delete
ConcurrentMap<String, TopicConfig> topicConfigTable = this.brokerController.getTopicConfigManager().getTopicConfigTable();
for (Iterator<Map.Entry<String, TopicConfig>> it = topicConfigTable.entrySet().iterator(); it.hasNext(); ) {
Map.Entry<String, TopicConfig> item = it.next();
if (!newTopicConfigTable.containsKey(item.getKey())) {
it.remove();
}
}
topicConfigTable.entrySet().removeIf(item -> !newTopicConfigTable.containsKey(item.getKey()));
//update
topicConfigTable.putAll(newTopicConfigTable);

Expand All @@ -104,12 +97,7 @@ private void syncTopicConfig() {
ConcurrentMap<String, TopicConfig> newTopicConfigTable = topicWrapper.getTopicConfigTable();
//delete
ConcurrentMap<String, TopicConfig> topicConfigTable = this.brokerController.getTopicConfigManager().getTopicConfigTable();
for (Iterator<Map.Entry<String, TopicConfig>> it = topicConfigTable.entrySet().iterator(); it.hasNext(); ) {
Map.Entry<String, TopicConfig> item = it.next();
if (!newTopicConfigTable.containsKey(item.getKey())) {
it.remove();
}
}
topicConfigTable.entrySet().removeIf(item -> !newTopicConfigTable.containsKey(item.getKey()));
//update
topicConfigTable.putAll(newTopicConfigTable);

Expand Down
2 changes: 1 addition & 1 deletion srvutil/src/main/java/org/apache/rocketmq/srvutil/AclFileWatchService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public void getAllAclFiles(String path) {
return;
}
File[] files = file.listFiles();
for (int i = 0; i < files.length; i++) {
for (int i = 0; files != null && i < files.length; i++) {
String fileName = files[i].getAbsolutePath();
File f = new File(fileName);
if (fileName.equals(aclPath + File.separator + "tools.yml")) {
Expand Down