Author: veithen
Date: Mon Jan 16 09:32:38 2017
New Revision: 1778999
URL: http://svn.apache.org/viewvc?rev=1778999&view=rev
Log:
Unify the code that computes the SOAPAction header.
Modified:
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/GetRequest.java
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/PostRequest.java
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/PutRequest.java
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/RequestBase.java
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/Request.java
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/GetRequest.java
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/PostRequest.java
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/PutRequest.java
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/RequestBase.java
Modified:
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/GetRequest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/GetRequest.java?rev=1778999&r1=1778998&r2=1778999&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/GetRequest.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/GetRequest.java
Mon Jan 16 09:32:38 2017
@@ -38,14 +38,6 @@ class GetRequest extends RequestBase<Get
@Override
public void execute() throws AxisFault {
- // Need to have this here because we can have soap action when using
the
- // soap response MEP
- String soapAction = messageFormatter
- .formatSOAPAction(msgContext, sender.getFormat(),
soapActionString);
-
- if (soapAction != null && !msgContext.isDoingREST()) {
- method.setRequestHeader(HTTPConstants.HEADER_SOAP_ACTION,
soapAction);
- }
try {
sender.executeMethod(httpClient, msgContext, url, method);
sender.handleResponse(msgContext, method);
Modified:
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/PostRequest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/PostRequest.java?rev=1778999&r1=1778998&r2=1778999&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/PostRequest.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/PostRequest.java
Mon Jan 16 09:32:38 2017
@@ -50,12 +50,6 @@ class PostRequest extends RequestBase<Po
method.setContentChunked(true);
}
- String soapAction = messageFormatter.formatSOAPAction(msgContext,
sender.getFormat(), soapActionString);
-
- if (soapAction != null && !msgContext.isDoingREST()) {
- method.setRequestHeader(HTTPConstants.HEADER_SOAP_ACTION,
soapAction);
- }
-
/*
* main excecution takes place..
*/
Modified:
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/PutRequest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/PutRequest.java?rev=1778999&r1=1778998&r2=1778999&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/PutRequest.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/PutRequest.java
Mon Jan 16 09:32:38 2017
@@ -46,11 +46,6 @@ class PutRequest extends RequestBase<Put
method.setContentChunked(true);
}
- String soapAction = messageFormatter.formatSOAPAction(msgContext,
sender.getFormat(), soapActionString);
- if (soapAction != null && !msgContext.isDoingREST()) {
- method.setRequestHeader(HTTPConstants.HEADER_SOAP_ACTION,
soapAction);
- }
-
/*
* main excecution takes place..
*/
Modified:
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/RequestBase.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/RequestBase.java?rev=1778999&r1=1778998&r2=1778999&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/RequestBase.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/RequestBase.java
Mon Jan 16 09:32:38 2017
@@ -47,4 +47,9 @@ abstract class RequestBase<T extends Htt
sender.populateCommonProperties(msgContext, url, method,
httpClient, soapActionString, messageFormatter);
}
+
+ @Override
+ public void setHeader(String name, String value) {
+ method.setRequestHeader(name, value);
+ }
}
Modified:
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java?rev=1778999&r1=1778998&r2=1778999&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
Mon Jan 16 09:32:38 2017
@@ -95,24 +95,29 @@ public abstract class HTTPSender extends
MessageFormatter messageFormatter = MessageProcessorSelector
.getMessageFormatter(msgContext);
+ Request request = null;
if ((httpMethod != null)) {
if
(Constants.Configuration.HTTP_METHOD_GET.equalsIgnoreCase(httpMethod)) {
- this.prepareGet(msgContext, url, soapActionString,
messageFormatter).execute();
-
- return;
+ request = prepareGet(msgContext, url, soapActionString,
messageFormatter);
} else if
(Constants.Configuration.HTTP_METHOD_DELETE.equalsIgnoreCase(httpMethod)) {
- this.prepareDelete(msgContext, url, soapActionString,
messageFormatter).execute();
-
- return;
+ request = prepareDelete(msgContext, url, soapActionString,
messageFormatter);
} else if
(Constants.Configuration.HTTP_METHOD_PUT.equalsIgnoreCase(httpMethod)) {
- this.preparePut(msgContext, url, soapActionString,
messageFormatter).execute();
-
- return;
+ request = preparePut(msgContext, url, soapActionString,
messageFormatter);
}
}
- this.preparePost(msgContext, url, soapActionString,
messageFormatter).execute();
+ if (request == null) {
+ request = preparePost(msgContext, url, soapActionString,
messageFormatter);
+ }
+
+ String soapAction = messageFormatter.formatSOAPAction(msgContext,
format, soapActionString);
+
+ if (soapAction != null && !msgContext.isDoingREST()) {
+ request.setHeader(HTTPConstants.HEADER_SOAP_ACTION, soapAction);
+ }
+
+ request.execute();
}
/**
Modified:
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/Request.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/Request.java?rev=1778999&r1=1778998&r2=1778999&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/Request.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/Request.java
Mon Jan 16 09:32:38 2017
@@ -24,5 +24,6 @@ import org.apache.axis2.AxisFault;
* Interface to prepare and execute an HTTP request.
*/
public interface Request {
+ void setHeader(String name, String value);
void execute() throws AxisFault;
}
Modified:
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/GetRequest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/GetRequest.java?rev=1778999&r1=1778998&r2=1778999&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/GetRequest.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/GetRequest.java
Mon Jan 16 09:32:38 2017
@@ -39,15 +39,6 @@ class GetRequest extends RequestBase<Htt
@Override
public void execute() throws AxisFault {
- // Need to have this here because we can have soap action when using
the
- // soap response MEP
- String soapAction = messageFormatter
- .formatSOAPAction(msgContext, sender.getFormat(),
soapActionString);
-
- if (soapAction != null && !msgContext.isDoingREST()) {
- method.setHeader(HTTPConstants.HEADER_SOAP_ACTION, soapAction);
- }
-
/*
* main execution takes place..
*/
Modified:
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/PostRequest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/PostRequest.java?rev=1778999&r1=1778998&r2=1778999&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/PostRequest.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/PostRequest.java
Mon Jan 16 09:32:38 2017
@@ -52,12 +52,6 @@ class PostRequest extends RequestBase<Ht
requestEntity.setChunked(sender.isChunked());
}
- String soapAction = messageFormatter.formatSOAPAction(msgContext,
sender.getFormat(), soapActionString);
-
- if (soapAction != null && !msgContext.isDoingREST()) {
- method.setHeader(HTTPConstants.HEADER_SOAP_ACTION, soapAction);
- }
-
/*
* main execution takes place..
*/
Modified:
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/PutRequest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/PutRequest.java?rev=1778999&r1=1778998&r2=1778999&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/PutRequest.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/PutRequest.java
Mon Jan 16 09:32:38 2017
@@ -49,11 +49,6 @@ class PutRequest extends RequestBase<Htt
requestEntity.setChunked(sender.isChunked());
}
- String soapAction = messageFormatter.formatSOAPAction(msgContext,
sender.getFormat(), soapActionString);
- if (soapAction != null && !msgContext.isDoingREST()) {
- method.setHeader(HTTPConstants.HEADER_SOAP_ACTION, soapAction);
- }
-
/*
* main execution takes place..
*/
Modified:
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/RequestBase.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/RequestBase.java?rev=1778999&r1=1778998&r2=1778999&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/RequestBase.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/RequestBase.java
Mon Jan 16 09:32:38 2017
@@ -47,4 +47,9 @@ abstract class RequestBase<T extends Htt
sender.populateCommonProperties(msgContext, url, method,
httpClient, soapActionString, messageFormatter);
}
+
+ @Override
+ public void setHeader(String name, String value) {
+ method.setHeader(name, value);
+ }
}
