study/Spring-Cloud-Alibaba
1
0
Fork 0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00
Code Issues Releases Wiki Activity

degrade rocketmq spring version

Browse Source
This commit is contained in:
fangjian0423
2019-06-12 19:31:02 +08:00
parent 4a1e51d839
commit c2195f73db
5 changed files with 1 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/RocketMQBinderUtils.java
View File

@@ -16,7 +16,6 @@
package org.springframework.cloud.stream.binder.rocketmq;
import org.apache.rocketmq.client.AccessChannel;
import org.apache.rocketmq.spring.autoconfigure.RocketMQProperties;
import org.springframework.cloud.stream.binder.rocketmq.properties.RocketMQBinderConfigurationProperties;
import org.springframework.util.StringUtils;
@@ -67,14 +66,6 @@ public class RocketMQBinderUtils {
result.setEnableMsgTrace(
rocketBinderConfigurationProperties.isEnableMsgTrace());
}
if (!StringUtils.isEmpty(rocketMQProperties.getAccessChannel())) {
result.setAccessChannel(
AccessChannel.valueOf(rocketMQProperties.getAccessChannel()));
}
else {
result.setAccessChannel(
rocketBinderConfigurationProperties.getAccessChannel());
}
return result;
}

5
spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/RocketMQMessageChannelBinder.java
View File

@@ -134,11 +134,6 @@ public class RocketMQMessageChannelBinder extends
producer.setVipChannelEnabled(
producerProperties.getExtension().getVipChannelEnabled());
}
if (mergedProperties.getAccessChannel() != null) {
producer.setAccessChannel(mergedProperties.getAccessChannel());
}
producer.setNamesrvAddr(mergedProperties.getNameServer());
producer.setSendMsgTimeout(
producerProperties.getExtension().getSendMessageTimeout());

5
spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/consuming/RocketMQListenerBindingContainer.java
View File

@@ -215,11 +215,6 @@ public class RocketMQListenerBindingContainer
rocketBinderConfigurationProperties.getCustomizedTraceTopic());
}
if (rocketBinderConfigurationProperties.getAccessChannel() != null) {
consumer.setAccessChannel(
rocketBinderConfigurationProperties.getAccessChannel());
}
consumer.setNamesrvAddr(nameServer);
consumer.setConsumeThreadMax(rocketMQConsumerProperties.getConcurrency());
consumer.setConsumeThreadMin(rocketMQConsumerProperties.getConcurrency());

14
spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/properties/RocketMQBinderConfigurationProperties.java
View File

@@ -16,7 +16,6 @@
package org.springframework.cloud.stream.binder.rocketmq.properties;
import org.apache.rocketmq.client.AccessChannel;
import org.apache.rocketmq.common.MixAll;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.cloud.stream.binder.rocketmq.RocketMQBinderConstants;
@@ -54,11 +53,6 @@ public class RocketMQBinderConfigurationProperties {
*/
private String customizedTraceTopic = MixAll.RMQ_SYS_TRACE_TOPIC;
/**
* Enum type for accessChannel, values: LOCAL, CLOUD.
*/
private AccessChannel accessChannel = AccessChannel.LOCAL;
public String getNameServer() {
return nameServer;
}
@@ -98,12 +92,4 @@ public class RocketMQBinderConfigurationProperties {
public void setCustomizedTraceTopic(String customizedTraceTopic) {
this.customizedTraceTopic = customizedTraceTopic;
}
public AccessChannel getAccessChannel() {
return accessChannel;
}
public void setAccessChannel(AccessChannel accessChannel) {
this.accessChannel = accessChannel;
}
}