diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/ws/WebServiceDemo.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/ws/WebServiceDemo.java index 5cb4dffa91..94a4c60531 100644 --- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/ws/WebServiceDemo.java +++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/ws/WebServiceDemo.java @@ -20,7 +20,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.MessageBuilder; -import org.springframework.integration.ws.AbstractWebServiceOutboundGateway; +import org.springframework.integration.ws.WebServiceHeaders; /** * Demonstrating a web service invocation through a Web Service MessageHandler. @@ -41,7 +41,7 @@ public class WebServiceDemo { // Create the Message object // In this case the service expects a SoapAction header Message message = MessageBuilder.withPayload(requestXml) - .setHeader(AbstractWebServiceOutboundGateway.SOAP_ACTION_PROPERTY_KEY, "http://tempuri.org/FahrenheitToCelsius") + .setHeader(WebServiceHeaders.SOAP_ACTION, "http://tempuri.org/FahrenheitToCelsius") .build(); // Send the Message to the handler's input channel diff --git a/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/AbstractWebServiceOutboundGateway.java b/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/AbstractWebServiceOutboundGateway.java index 76f45c98ff..b08230f9a2 100644 --- a/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/AbstractWebServiceOutboundGateway.java +++ b/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/AbstractWebServiceOutboundGateway.java @@ -40,9 +40,6 @@ import org.springframework.ws.transport.WebServiceMessageSender; */ public abstract class AbstractWebServiceOutboundGateway extends AbstractReplyProducingMessageHandler { - public static final String SOAP_ACTION_PROPERTY_KEY = "spring.integration.ws.soapAction"; - - private final WebServiceTemplate webServiceTemplate; private volatile WebServiceMessageCallback requestCallback; @@ -98,7 +95,7 @@ public abstract class AbstractWebServiceOutboundGateway extends AbstractReplyPro if (this.requestCallback != null) { return this.requestCallback; } - String soapAction = requestMessage.getHeaders().get(SOAP_ACTION_PROPERTY_KEY, String.class); + String soapAction = requestMessage.getHeaders().get(WebServiceHeaders.SOAP_ACTION, String.class); return (soapAction != null) ? new TypeCheckingSoapActionCallback(soapAction) : null; } diff --git a/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/WebServiceHeaders.java b/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/WebServiceHeaders.java new file mode 100644 index 0000000000..4896afaaeb --- /dev/null +++ b/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/WebServiceHeaders.java @@ -0,0 +1,31 @@ +/* + * Copyright 2002-2008 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.integration.ws; + +/** + * Pre-defined header names to be used when storing or retrieving + * Web Service properties to/from integration Message Headers. + * + * @author Mark Fisher + */ +public class WebServiceHeaders { + + public static final String PREFIX = "spring.integration.ws."; + + public static final String SOAP_ACTION = PREFIX + "soap-action"; + +}