From 2b9cae20b80916c03d949e75ed095392391b8d8a Mon Sep 17 00:00:00 2001 From: fangjian0423 Date: Tue, 12 Mar 2019 16:02:07 +0800 Subject: [PATCH] sync binder to 1.x --- spring-cloud-alibaba-dependencies/pom.xml | 2 +- .../cloud/examples/TransactionListenerImpl.java | 6 +----- .../stream/binder/rocketmq/RocketMQBinderUtils.java | 2 +- .../binder/rocketmq/RocketMQMessageChannelBinder.java | 11 +---------- .../consuming/RocketMQListenerBindingContainer.java | 2 -- 5 files changed, 4 insertions(+), 19 deletions(-) diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml index c8afb18f..88f9eb01 100644 --- a/spring-cloud-alibaba-dependencies/pom.xml +++ b/spring-cloud-alibaba-dependencies/pom.xml @@ -25,7 +25,7 @@ 4.0.1 1.0.5 2.16.0 - 2.0.2-SNAPSHOT + 2.0.2 2.1.6 1.1.0 1.1.8 diff --git a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/TransactionListenerImpl.java b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/TransactionListenerImpl.java index 3e28c826..00b02a48 100644 --- a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/TransactionListenerImpl.java +++ b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/TransactionListenerImpl.java @@ -16,12 +16,9 @@ package org.springframework.cloud.alibaba.cloud.examples; -import java.util.HashMap; - import org.apache.rocketmq.spring.annotation.RocketMQTransactionListener; import org.apache.rocketmq.spring.core.RocketMQLocalTransactionListener; import org.apache.rocketmq.spring.core.RocketMQLocalTransactionState; -import org.apache.rocketmq.spring.support.RocketMQHeaders; import org.springframework.messaging.Message; /** @@ -32,8 +29,7 @@ public class TransactionListenerImpl implements RocketMQLocalTransactionListener @Override public RocketMQLocalTransactionState executeLocalTransaction(Message msg, Object arg) { - Object num = ((HashMap) msg.getHeaders().get(RocketMQHeaders.PROPERTIES)) - .get("USERS_test"); + Object num = msg.getHeaders().get("test"); if ("1".equals(num)) { System.out.println( diff --git a/spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/RocketMQBinderUtils.java b/spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/RocketMQBinderUtils.java index 7c24012a..b50e799d 100644 --- a/spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/RocketMQBinderUtils.java +++ b/spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/RocketMQBinderUtils.java @@ -25,7 +25,7 @@ import org.springframework.util.StringUtils; */ public class RocketMQBinderUtils { - public static RocketMQBinderConfigurationProperties mergeProducerProperties( + public static RocketMQBinderConfigurationProperties mergeProperties( RocketMQBinderConfigurationProperties rocketBinderConfigurationProperties, RocketMQProperties rocketMQProperties) { RocketMQBinderConfigurationProperties result = new RocketMQBinderConfigurationProperties(); diff --git a/spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/RocketMQMessageChannelBinder.java b/spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/RocketMQMessageChannelBinder.java index 04f318ed..b2ab0b00 100644 --- a/spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/RocketMQMessageChannelBinder.java +++ b/spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/RocketMQMessageChannelBinder.java @@ -17,9 +17,7 @@ package org.springframework.cloud.stream.binder.rocketmq; import java.util.HashMap; -import java.util.HashSet; import java.util.Map; -import java.util.Set; import org.apache.rocketmq.acl.common.AclClientRPCHook; import org.apache.rocketmq.acl.common.SessionCredentials; @@ -63,7 +61,6 @@ public class RocketMQMessageChannelBinder extends private final RocketMQProperties rocketMQProperties; private final InstrumentationManager instrumentationManager; - private Set clientConfigId = new HashSet<>(); private Map topicInUse = new HashMap<>(); public RocketMQMessageChannelBinder( @@ -86,7 +83,7 @@ public class RocketMQMessageChannelBinder extends if (producerProperties.getExtension().getEnabled()) { RocketMQBinderConfigurationProperties mergedProperties = RocketMQBinderUtils - .mergeProducerProperties(rocketBinderConfigurationProperties, + .mergeProperties(rocketBinderConfigurationProperties, rocketMQProperties); RocketMQTemplate rocketMQTemplate; @@ -102,7 +99,6 @@ public class RocketMQMessageChannelBinder extends "there is more than 1 RocketMQTemplates in Spring BeanFactory"); } rocketMQTemplate = rocketMQTemplates.values().iterator().next(); - clientConfigId.add(rocketMQTemplate.getProducer().buildMQClientId()); } else { rocketMQTemplate = new RocketMQTemplate(); @@ -142,7 +138,6 @@ public class RocketMQMessageChannelBinder extends producer.setMaxMessageSize( producerProperties.getExtension().getMaxMessageSize()); rocketMQTemplate.setProducer(producer); - clientConfigId.add(producer.buildMQClientId()); } RocketMQMessageHandler messageHandler = new RocketMQMessageHandler( @@ -217,10 +212,6 @@ public class RocketMQMessageChannelBinder extends return extendedBindingProperties.getExtendedProducerProperties(channelName); } - public Set getClientConfigId() { - return clientConfigId; - } - public Map getTopicInUse() { return topicInUse; } diff --git a/spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/consuming/RocketMQListenerBindingContainer.java b/spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/consuming/RocketMQListenerBindingContainer.java index 7b824600..714a3e92 100644 --- a/spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/consuming/RocketMQListenerBindingContainer.java +++ b/spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/consuming/RocketMQListenerBindingContainer.java @@ -258,8 +258,6 @@ public class RocketMQListenerBindingContainer .prepareStart(consumer); } - rocketMQMessageChannelBinder.getClientConfigId().add(consumer.buildMQClientId()); - } @Override