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

format code

Browse Source 
Signed-off-by: caotc <250622148@qq.com>
This commit is contained in:
caotc 2019-09-03 15:49:46 +08:00
parent 8ed8cd2dba
commit d02a35b173
3 changed files with 37 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQMessageChannelBinder.java
View File

@ -85,8 +85,7 @@ public class RocketMQMessageChannelBinder extends
@Override @Override
protected MessageHandler createProducerMessageHandler(ProducerDestination destination, protected MessageHandler createProducerMessageHandler(ProducerDestination destination,
ExtendedProducerProperties<RocketMQProducerProperties> producerProperties, ExtendedProducerProperties<RocketMQProducerProperties> producerProperties,
MessageChannel channel, MessageChannel channel, MessageChannel errorChannel) throws Exception {
MessageChannel errorChannel) throws Exception {
if (producerProperties.getExtension().getEnabled()) { if (producerProperties.getExtension().getEnabled()) {
// if producerGroup is empty, using destination // if producerGroup is empty, using destination
@ -155,8 +154,6 @@ public class RocketMQMessageChannelBinder extends
} }
} }
RocketMQMessageHandler messageHandler = new RocketMQMessageHandler( RocketMQMessageHandler messageHandler = new RocketMQMessageHandler(
rocketMQTemplate, destination.getName(), producerGroup, rocketMQTemplate, destination.getName(), producerGroup,
producerProperties.getExtension().getTransactional(), producerProperties.getExtension().getTransactional(),
@ -305,10 +302,11 @@ public class RocketMQMessageChannelBinder extends
return createHeaderMapper(Collections.emptyList()); return createHeaderMapper(Collections.emptyList());
} }
private RocketMQHeaderMapper createHeaderMapper(Collection<String> trustedPackages){ private RocketMQHeaderMapper createHeaderMapper(Collection<String> trustedPackages) {
ObjectMapper objectMapper=this.getApplicationContext() ObjectMapper objectMapper = this.getApplicationContext()
.getBeansOfType(ObjectMapper.class).values().iterator().next(); .getBeansOfType(ObjectMapper.class).values().iterator().next();
JacksonRocketMQHeaderMapper headerMapper = new JacksonRocketMQHeaderMapper(objectMapper); JacksonRocketMQHeaderMapper headerMapper = new JacksonRocketMQHeaderMapper(
objectMapper);
if (!StringUtils.isEmpty(trustedPackages)) { if (!StringUtils.isEmpty(trustedPackages)) {
headerMapper.addTrustedPackages(trustedPackages); headerMapper.addTrustedPackages(trustedPackages);
} }

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

@ -451,8 +451,9 @@ public class RocketMQListenerBindingContainer
int reconsumeTimes = messageExt.getReconsumeTimes(); int reconsumeTimes = messageExt.getReconsumeTimes();
messageExt.putUserProperty(ROCKETMQ_RECONSUME_TIMES, messageExt.putUserProperty(ROCKETMQ_RECONSUME_TIMES,
String.valueOf(reconsumeTimes)); String.valueOf(reconsumeTimes));
Message message=RocketMQUtil.convertToSpringMessage(messageExt); Message message = RocketMQUtil.convertToSpringMessage(messageExt);
return MessageBuilder.fromMessage(message).copyHeaders(headerMapper.toHeaders(messageExt.getProperties())).build(); return MessageBuilder.fromMessage(message)
.copyHeaders(headerMapper.toHeaders(messageExt.getProperties())).build();
} }
} }

9
spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/integration/RocketMQMessageHandler.java
View File

@ -156,12 +156,11 @@ public class RocketMQMessageHandler extends AbstractMessageHandler implements Li
protected void handleMessageInternal(org.springframework.messaging.Message<?> message) protected void handleMessageInternal(org.springframework.messaging.Message<?> message)
throws Exception { throws Exception {
try { try {
//issue 737 fix // issue 737 fix
Map<String,String> jsonHeaders=headerMapper.fromHeaders(message.getHeaders()); Map<String, String> jsonHeaders = headerMapper
.fromHeaders(message.getHeaders());
message = org.springframework.messaging.support.MessageBuilder message = org.springframework.messaging.support.MessageBuilder
.fromMessage(message).copyHeaders(jsonHeaders) .fromMessage(message).copyHeaders(jsonHeaders).build();
.build();
final StringBuilder topicWithTags = new StringBuilder(destination); final StringBuilder topicWithTags = new StringBuilder(destination);
String tags = Optional String tags = Optional