You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2017/01/09 11:59:26 UTC
[2/4] camel git commit: CAMEL-10679
CAMEL-10679
changes to match the checkstyle
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1c4d173a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1c4d173a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1c4d173a
Branch: refs/heads/master
Commit: 1c4d173aa82b5e9c68bd5797a6a90c293764bc76
Parents: f20d4a6
Author: marcusmesserkewill <ma...@kewill.com>
Authored: Mon Jan 9 11:56:49 2017 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon Jan 9 12:55:41 2017 +0100
----------------------------------------------------------------------
.../ws/SpringWebserviceConfiguration.java | 13 +++------
.../spring/ws/SpringWebserviceProducer.java | 28 +++++++++++---------
.../spring/ws/SoapResponseAttachmentTest.java | 6 ++---
3 files changed, 22 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/1c4d173a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConfiguration.java b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConfiguration.java
index eef87b0..2b47720 100644
--- a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConfiguration.java
+++ b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConfiguration.java
@@ -385,9 +385,6 @@ public class SpringWebserviceConfiguration {
this.messageIdStrategy = messageIdStrategy;
}
- /**
- * @return boolean - true, will override header with spring-ws response message header
- */
public boolean isAllowResponseHeaderOverride() {
return allowResponseHeaderOverride;
}
@@ -397,15 +394,12 @@ public class SpringWebserviceConfiguration {
* If the invoked service appends or rewrites the soap header this option when set to true, allows the modified
* soap header to be overwritten in in/out message headers
*
- * @param allowResponseHeaderOverride
- * - true, will override header with spring-ws response message header
+ * @param allowResponseHeaderOverride - true, will override header with spring-ws response message header
*/
public void setAllowResponseHeaderOverride(boolean allowResponseHeaderOverride) {
this.allowResponseHeaderOverride = allowResponseHeaderOverride;
}
- /**
- * @return boolean - true, will override attachments with spring-ws response message attachments
- */
+
public boolean isAllowResponseAttachmentOverride() {
return allowResponseAttachmentOverride;
}
@@ -415,8 +409,7 @@ public class SpringWebserviceConfiguration {
* If the invoked service appends or rewrites the soap attachments this option when set to true, allows the modified
* soap attachments to be overwritten in in/out message attachments
*
- * @param allowResponseAttachmentOverride
- * - true, will override attachments with spring-ws response message attachments
+ * @param allowResponseAttachmentOverride - true, will override attachments with spring-ws response message attachments
*/
public void setAllowResponseAttachmentOverride(boolean allowResponseAttachmentOverride) {
this.allowResponseAttachmentOverride = allowResponseAttachmentOverride;
http://git-wip-us.apache.org/repos/asf/camel/blob/1c4d173a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java
index b0a5853..106b700 100644
--- a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java
+++ b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java
@@ -109,18 +109,22 @@ public class SpringWebserviceProducer extends DefaultProducer {
}
});
}
+
/**
* Populates soap message headers and attachments from soap response
- * @param inOrOut {@link Message}
- * @param soapMessage {@link SoapMessage}
+ *
+ * @param inOrOut
+ * {@link Message}
+ * @param soapMessage
+ * {@link SoapMessage}
*/
private void populateHeaderAndAttachmentsFromResponse(Message inOrOut, SoapMessage soapMessage) {
- if (soapMessage.getSoapHeader() != null && getEndpoint().getConfiguration().isAllowResponseHeaderOverride()) {
- populateMessageHeaderFromResponse(inOrOut, soapMessage.getSoapHeader());
- }
- if (soapMessage.getAttachments() != null && getEndpoint().getConfiguration().isAllowResponseAttachmentOverride()) {
- populateMessageAttachmentsFromResponse(inOrOut, soapMessage.getAttachments());
- }
+ if (soapMessage.getSoapHeader() != null && getEndpoint().getConfiguration().isAllowResponseHeaderOverride()) {
+ populateMessageHeaderFromResponse(inOrOut, soapMessage.getSoapHeader());
+ }
+ if (soapMessage.getAttachments() != null && getEndpoint().getConfiguration().isAllowResponseAttachmentOverride()) {
+ populateMessageAttachmentsFromResponse(inOrOut, soapMessage.getAttachments());
+ }
}
/**
@@ -155,10 +159,10 @@ public class SpringWebserviceProducer extends DefaultProducer {
* @param soapMessage {@link SoapMessage}
*/
private void populateMessageAttachmentsFromResponse(Message inOrOut, Iterator<Attachment> attachments) {
- while (attachments.hasNext()) {
- Attachment attachment = attachments.next();
- inOrOut.getAttachments().put(attachment.getContentId(), attachment.getDataHandler());
- }
+ while (attachments.hasNext()) {
+ Attachment attachment = attachments.next();
+ inOrOut.getAttachments().put(attachment.getContentId(), attachment.getDataHandler());
+ }
}
private void prepareMessageSenders(SpringWebserviceConfiguration configuration) {
http://git-wip-us.apache.org/repos/asf/camel/blob/1c4d173a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapResponseAttachmentTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapResponseAttachmentTest.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapResponseAttachmentTest.java
index 6ec1ca8..9d84085 100644
--- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapResponseAttachmentTest.java
+++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapResponseAttachmentTest.java
@@ -15,19 +15,19 @@
* limitations under the License.
*/
package org.apache.camel.component.spring.ws;
-
-import static org.junit.Assert.assertNotNull;
-
import javax.activation.DataHandler;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
+
import org.junit.Test;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
+import static org.junit.Assert.assertNotNull;
+
@ContextConfiguration
public class SoapResponseAttachmentTest extends AbstractJUnit4SpringContextTests {