diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQMessageChannelBinder.java b/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQMessageChannelBinder.java index ed0be4eb9..7e1cea97e 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQMessageChannelBinder.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQMessageChannelBinder.java @@ -39,7 +39,6 @@ import org.springframework.cloud.stream.provisioning.ConsumerDestination; import org.springframework.cloud.stream.provisioning.ProducerDestination; import org.springframework.integration.StaticMessageHeaderAccessor; import org.springframework.integration.acks.AcknowledgmentCallback; -import org.springframework.integration.acks.AcknowledgmentCallback.Status; import org.springframework.integration.channel.AbstractMessageChannel; import org.springframework.integration.core.MessageProducer; import org.springframework.integration.support.DefaultErrorMessageStrategy; @@ -47,7 +46,6 @@ import org.springframework.integration.support.ErrorMessageStrategy; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageHandler; import org.springframework.messaging.MessagingException; -import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; /** @@ -116,7 +114,7 @@ public class RocketMQMessageChannelBinder extends ExtendedConsumerProperties extendedConsumerProperties) throws Exception { // todo support anymous consumer - if (StringUtils.isEmpty(group)) { + if (!StringUtils.hasLength(group)) { throw new RuntimeException( "'group must be configured for channel " + destination.getName()); } diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/custom/RocketMQBeanContainerCache.java b/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/custom/RocketMQBeanContainerCache.java index 21c62aede..a90e1f21a 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/custom/RocketMQBeanContainerCache.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/custom/RocketMQBeanContainerCache.java @@ -62,7 +62,7 @@ public final class RocketMQBeanContainerCache { } public static T getBean(String beanName, Class clazz, T defaultObj) { - if (StringUtils.isEmpty(beanName)) { + if (!StringUtils.hasLength(beanName)) { return defaultObj; } Object obj = BEANS_CACHE.get(beanName); diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/integration/inbound/RocketMQConsumerFactory.java b/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/integration/inbound/RocketMQConsumerFactory.java index 13c2cd415..b4e5b1529 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/integration/inbound/RocketMQConsumerFactory.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/integration/inbound/RocketMQConsumerFactory.java @@ -60,8 +60,8 @@ public final class RocketMQConsumerFactory { AllocateMessageQueueStrategy.class, new AllocateMessageQueueAveragely()); RPCHook rpcHook = null; - if (!StringUtils.isEmpty(consumerProperties.getAccessKey()) - && !StringUtils.isEmpty(consumerProperties.getSecretKey())) { + if (StringUtils.hasLength(consumerProperties.getAccessKey()) + && StringUtils.hasLength(consumerProperties.getSecretKey())) { rpcHook = new AclClientRPCHook( new SessionCredentials(consumerProperties.getAccessKey(), consumerProperties.getSecretKey())); @@ -111,8 +111,8 @@ public final class RocketMQConsumerFactory { AllocateMessageQueueStrategy.class); RPCHook rpcHook = null; - if (!StringUtils.isEmpty(consumerProperties.getAccessKey()) - && !StringUtils.isEmpty(consumerProperties.getSecretKey())) { + if (StringUtils.hasLength(consumerProperties.getAccessKey()) + && StringUtils.hasLength(consumerProperties.getSecretKey())) { rpcHook = new AclClientRPCHook( new SessionCredentials(consumerProperties.getAccessKey(), consumerProperties.getSecretKey())); diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/integration/outbound/RocketMQProduceFactory.java b/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/integration/outbound/RocketMQProduceFactory.java index 509aae652..d50ddf52d 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/integration/outbound/RocketMQProduceFactory.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/integration/outbound/RocketMQProduceFactory.java @@ -65,8 +65,8 @@ public final class RocketMQProduceFactory { "Property 'nameServer' is required"); RPCHook rpcHook = null; - if (!StringUtils.isEmpty(producerProperties.getAccessKey()) - && !StringUtils.isEmpty(producerProperties.getSecretKey())) { + if (StringUtils.hasLength(producerProperties.getAccessKey()) + && StringUtils.hasLength(producerProperties.getSecretKey())) { rpcHook = new AclClientRPCHook( new SessionCredentials(producerProperties.getAccessKey(), producerProperties.getSecretKey())); diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/support/RocketMQMessageConverterSupport.java b/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/support/RocketMQMessageConverterSupport.java index 3615cd4e8..c6e0a29b1 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/support/RocketMQMessageConverterSupport.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/support/RocketMQMessageConverterSupport.java @@ -138,13 +138,13 @@ public final class RocketMQMessageConverterSupport { if (Objects.nonNull(headers) && !headers.isEmpty()) { Object tag = headers.getOrDefault(Headers.TAGS, headers.get(toRocketHeaderKey(Headers.TAGS))); - if (!StringUtils.isEmpty(tag)) { + if (StringUtils.hasLength(tag.toString())) { rocketMsg.setTags(String.valueOf(tag)); } Object keys = headers.getOrDefault(Headers.KEYS, headers.get(toRocketHeaderKey(Headers.KEYS))); - if (!StringUtils.isEmpty(keys)) { + if (StringUtils.hasLength(keys.toString())) { rocketMsg.setKeys(keys.toString()); } Object flagObj = headers.getOrDefault(Headers.FLAG, diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/utils/RocketMQUtils.java b/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/utils/RocketMQUtils.java index b431db74f..4ab1411da 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/utils/RocketMQUtils.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/utils/RocketMQUtils.java @@ -19,13 +19,13 @@ package com.alibaba.cloud.stream.binder.rocketmq.utils; import com.alibaba.cloud.stream.binder.rocketmq.constant.RocketMQConst; import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQBinderConfigurationProperties; import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQCommonProperties; +import org.apache.commons.lang3.StringUtils; import org.apache.rocketmq.acl.common.AclClientRPCHook; import org.apache.rocketmq.acl.common.SessionCredentials; import org.apache.rocketmq.client.consumer.MessageSelector; import org.apache.rocketmq.common.UtilAll; import org.apache.rocketmq.remoting.RPCHook; -import org.springframework.util.StringUtils; /** * @author Jim @@ -94,7 +94,7 @@ public final class RocketMQUtils { private static final String SQL = "sql:"; public static MessageSelector getMessageSelector(String expression) { - if (StringUtils.hasText(expression) && expression.startsWith(SQL)) { + if (StringUtils.isNotBlank(expression) && expression.startsWith(SQL)) { return MessageSelector.bySql(expression.replaceFirst(SQL, "")); } return MessageSelector.byTag(expression);