Author: veithen
Date: Mon Jan 16 10:53:59 2017
New Revision: 1779007
URL: http://svn.apache.org/viewvc?rev=1779007&view=rev
Log:
Improve encapsulation.
Modified:
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/HTTPSenderImpl.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/src/org/apache/axis2/transport/http/AxisRequestEntity.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/impl/httpclient4/HTTPSenderImpl.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
Modified:
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/HTTPSenderImpl.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/HTTPSenderImpl.java?rev=1779007&r1=1779006&r2=1779007&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/HTTPSenderImpl.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/HTTPSenderImpl.java
Mon Jan 16 10:53:59 2017
@@ -34,7 +34,6 @@ import javax.xml.namespace.QName;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMOutputFormat;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.context.ConfigurationContext;
@@ -76,18 +75,10 @@ public class HTTPSenderImpl extends HTTP
private static final Log log = LogFactory.getLog(HTTPSenderImpl.class);
- OMOutputFormat getFormat() {
- return format;
- }
-
boolean isChunked() {
return chunked;
}
- boolean isAllowedRetry() {
- return isAllowedRetry;
- }
-
String getHttpVersion() {
return httpVersion;
}
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=1779007&r1=1779006&r2=1779007&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 10:53:59 2017
@@ -24,7 +24,6 @@ import java.net.URL;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.transport.MessageFormatter;
-import org.apache.axis2.transport.http.AxisRequestEntity;
import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.commons.logging.Log;
@@ -43,8 +42,7 @@ class PostRequest extends RequestBase<Po
log.trace(Thread.currentThread() + " PostMethod " + method + " / "
+ httpClient);
}
- method.setRequestEntity(new AxisRequestEntityImpl(new
AxisRequestEntity(messageFormatter, msgContext, sender.getFormat(),
- soapActionString, sender.isChunked(),
sender.isAllowedRetry())));
+ method.setRequestEntity(new
AxisRequestEntityImpl(sender.buildRequestEntity(messageFormatter, msgContext,
soapActionString)));
if (!sender.getHttpVersion().equals(HTTPConstants.HEADER_PROTOCOL_10)
&& sender.isChunked()) {
method.setContentChunked(true);
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=1779007&r1=1779006&r2=1779007&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 10:53:59 2017
@@ -24,7 +24,6 @@ import java.net.URL;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.transport.MessageFormatter;
-import org.apache.axis2.transport.http.AxisRequestEntity;
import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.commons.httpclient.methods.PutMethod;
import org.apache.commons.logging.Log;
@@ -39,8 +38,8 @@ class PutRequest extends RequestBase<Put
@Override
public void execute() throws AxisFault {
- method.setRequestEntity(new AxisRequestEntityImpl(new
AxisRequestEntity(messageFormatter, msgContext, sender.getFormat(),
- soapActionString, sender.isChunked(),
sender.isAllowedRetry())));
+ method.setRequestEntity(new
AxisRequestEntityImpl(sender.buildRequestEntity(messageFormatter, msgContext,
+ soapActionString)));
if (!sender.getHttpVersion().equals(HTTPConstants.HEADER_PROTOCOL_10)
&& sender.isChunked()) {
method.setContentChunked(true);
Modified:
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AxisRequestEntity.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AxisRequestEntity.java?rev=1779007&r1=1779006&r2=1779007&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AxisRequestEntity.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AxisRequestEntity.java
Mon Jan 16 10:53:59 2017
@@ -58,9 +58,9 @@ public final class AxisRequestEntity {
*
* @param messageFormatter
*/
- public AxisRequestEntity(MessageFormatter messageFormatter,
- MessageContext msgContext, OMOutputFormat format,
String soapAction,
- boolean chunked, boolean isAllowedRetry) {
+ AxisRequestEntity(MessageFormatter messageFormatter,
+ MessageContext msgContext, OMOutputFormat format, String
soapAction,
+ boolean chunked, boolean isAllowedRetry) {
this.messageFormatter = messageFormatter;
this.messageContext = msgContext;
this.chunked = chunked;
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=1779007&r1=1779006&r2=1779007&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 10:53:59 2017
@@ -116,6 +116,12 @@ public abstract class HTTPSender extends
request.execute();
}
+ public AxisRequestEntity buildRequestEntity(MessageFormatter
messageFormatter, MessageContext msgContext,
+ String soapActionString) {
+ return new AxisRequestEntity(messageFormatter, msgContext, format,
+ soapActionString, chunked, isAllowedRetry);
+ }
+
/**
* Used to determine the family of HTTP status codes to which the given
code
* belongs.
Modified:
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPSenderImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPSenderImpl.java?rev=1779007&r1=1779006&r2=1779007&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPSenderImpl.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPSenderImpl.java
Mon Jan 16 10:53:59 2017
@@ -19,10 +19,8 @@
package org.apache.axis2.transport.http.impl.httpclient4;
-
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMOutputFormat;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.context.ConfigurationContext;
@@ -87,23 +85,14 @@ import java.util.Map;
import java.util.Set;
import java.util.zip.GZIPInputStream;
-
public class HTTPSenderImpl extends HTTPSender {
private static final Log log = LogFactory.getLog(HTTPSenderImpl.class);
- OMOutputFormat getFormat() {
- return format;
- }
-
boolean isChunked() {
return chunked;
}
- boolean isAllowedRetry() {
- return isAllowedRetry;
- }
-
String getHttpVersion() {
return httpVersion;
}
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=1779007&r1=1779006&r2=1779007&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 10:53:59 2017
@@ -24,7 +24,6 @@ import java.net.URL;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.transport.MessageFormatter;
-import org.apache.axis2.transport.http.AxisRequestEntity;
import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -44,8 +43,8 @@ class PostRequest extends RequestBase<Ht
log.trace(Thread.currentThread() + " PostMethod " + method + " / "
+ httpClient);
}
AxisRequestEntityImpl requestEntity =
- new AxisRequestEntityImpl(new
AxisRequestEntity(messageFormatter, msgContext, sender.getFormat(),
- soapActionString,
sender.isChunked(), sender.isAllowedRetry()));
+ new
AxisRequestEntityImpl(sender.buildRequestEntity(messageFormatter, msgContext,
+ soapActionString));
method.setEntity(requestEntity);
if (!sender.getHttpVersion().equals(HTTPConstants.HEADER_PROTOCOL_10)
&& sender.isChunked()) {
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=1779007&r1=1779006&r2=1779007&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 10:53:59 2017
@@ -24,7 +24,6 @@ import java.net.URL;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.transport.MessageFormatter;
-import org.apache.axis2.transport.http.AxisRequestEntity;
import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -41,8 +40,8 @@ class PutRequest extends RequestBase<Htt
@Override
public void execute() throws AxisFault {
AxisRequestEntityImpl requestEntity =
- new AxisRequestEntityImpl(new
AxisRequestEntity(messageFormatter, msgContext, sender.getFormat(),
- soapActionString,
sender.isChunked(), sender.isAllowedRetry()));
+ new
AxisRequestEntityImpl(sender.buildRequestEntity(messageFormatter, msgContext,
+ soapActionString));
method.setEntity(requestEntity);
if (!sender.getHttpVersion().equals(HTTPConstants.HEADER_PROTOCOL_10)
&& sender.isChunked()) {
