Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed MessageBuilder copyHeadersFromMessage and copyHeaderFromMessageIfAbsent methods.

Browse Source
This commit is contained in:
Mark Fisher
2008-07-18 13:13:23 +00:00
parent d854a8e9d8
commit 7231e0867c
4 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
org.springframework.integration/src/main/java/org/springframework/integration/message/MessageBuilder.java
View File

@@ -81,11 +81,7 @@ public final class MessageBuilder<T> {
return this; return this;
} }
public MessageBuilder<T> copyHeadersFromMessage(Message<?> message) { public MessageBuilder<T> copyHeaders(Map<String, Object> headersToCopy) {
return this.copyHeaders(message.getHeaders());
}
public MessageBuilder<T> copyHeaders(MessageHeaders headersToCopy) {
Set<String> keys = headersToCopy.keySet(); Set<String> keys = headersToCopy.keySet();
for (String key : keys) { for (String key : keys) {
if (key.equals(MessageHeaders.TIMESTAMP)) { if (key.equals(MessageHeaders.TIMESTAMP)) {
@@ -96,19 +92,13 @@ public final class MessageBuilder<T> {
return this; return this;
} }
public MessageBuilder<T> copyHeadersFromMessageIfAbsent(Message<?> message) { public MessageBuilder<T> copyHeadersIfAbsent(Map<String, Object> headersToCopy) {
return this.copyHeadersIfAbsent(message.getHeaders());
}
public MessageBuilder<T> copyHeadersIfAbsent(MessageHeaders headersToCopy) {
Set<String> keys = headersToCopy.keySet(); Set<String> keys = headersToCopy.keySet();
for (String key : keys) { for (String key : keys) {
if (key.equals(MessageHeaders.TIMESTAMP)) { if (key.equals(MessageHeaders.TIMESTAMP)) {
continue; continue;
} }
if (this.headers.get(key) == null) { this.setHeaderIfAbsent(key, headersToCopy.get(key));
this.setHeaderIfAbsent(key, headersToCopy.get(key));
}
} }
return this; return this;
} }

2
org.springframework.integration/src/main/java/org/springframework/integration/transformer/AnnotationMethodTransformerAdapter.java
View File

@@ -98,7 +98,7 @@ public class AnnotationMethodTransformerAdapter extends AbstractMethodInvokingAd
return builder.build(); return builder.build();
} }
else { else {
return MessageBuilder.fromPayload(result).copyHeadersFromMessage(message).build(); return MessageBuilder.fromPayload(result).copyHeaders(message.getHeaders()).build();
} }
} }
catch (Exception e) { catch (Exception e) {

2
org.springframework.integration/src/main/java/org/springframework/integration/transformer/PayloadTransformerAdapter.java
View File

@@ -30,7 +30,7 @@ public class PayloadTransformerAdapter extends AbstractMethodInvokingAdapter imp
public Message<?> transform(Message<?> message) { public Message<?> transform(Message<?> message) {
try { try {
Object result = this.invokeMethod(message.getPayload()); Object result = this.invokeMethod(message.getPayload());
return MessageBuilder.fromPayload(result).copyHeadersFromMessage(message).build(); return MessageBuilder.fromPayload(result).copyHeaders(message.getHeaders()).build();
} catch (Exception e) { } catch (Exception e) {
throw new MessagingException(message, "failed to transform message payload", e); throw new MessagingException(message, "failed to transform message payload", e);
} }

2
org.springframework.integration/src/test/java/org/springframework/integration/message/MessageBuilderTests.java
View File

@@ -50,7 +50,7 @@ public class MessageBuilderTests {
.setHeader("bar", "2") .setHeader("bar", "2")
.build(); .build();
Message<String> message2 = MessageBuilder.fromPayload("test2") Message<String> message2 = MessageBuilder.fromPayload("test2")
.copyHeadersFromMessage(message1) .copyHeaders(message1.getHeaders())
.setHeader("foo", "42") .setHeader("foo", "42")
.setHeaderIfAbsent("bar", "99") .setHeaderIfAbsent("bar", "99")
.build(); .build();