You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2017/01/22 09:09:27 UTC
svn commit: r1779784 - in /axis/axis2/java/core/trunk/modules/transport:
http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/
http/src/org/apache/axis2/transport/http/
http/src/org/apache/axis2/transport/http/impl/httpclient4/
Author: veithen
Date: Sun Jan 22 09:09:27 2017
New Revision: 1779784
URL: http://svn.apache.org/viewvc?rev=1779784&view=rev
Log:
Use Axiom's Header class instead of NamedValue.
Modified:
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/RequestImpl.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/RequestImpl.java
Modified: axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/RequestImpl.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/RequestImpl.java?rev=1779784&r1=1779783&r2=1779784&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/RequestImpl.java (original)
+++ axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/RequestImpl.java Sun Jan 22 09:09:27 2017
@@ -23,9 +23,9 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.List;
+import org.apache.axiom.mime.Header;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.context.NamedValue;
import org.apache.axis2.context.OperationContext;
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.transport.http.AxisRequestEntity;
@@ -35,7 +35,6 @@ import org.apache.axis2.transport.http.H
import org.apache.axis2.transport.http.Request;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.httpclient.Credentials;
-import org.apache.commons.httpclient.Header;
import org.apache.commons.httpclient.HostConfiguration;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpMethodBase;
@@ -118,11 +117,11 @@ final class RequestImpl implements Reque
}
@Override
- public NamedValue[] getRequestHeaders() {
- Header[] headers = method.getRequestHeaders();
- NamedValue[] result = new NamedValue[headers.length];
+ public Header[] getRequestHeaders() {
+ org.apache.commons.httpclient.Header[] headers = method.getRequestHeaders();
+ Header[] result = new Header[headers.length];
for (int i=0; i<headers.length; i++) {
- result[i] = new NamedValue(headers[i].getName(), headers[i].getValue());
+ result[i] = new Header(headers[i].getName(), headers[i].getValue());
}
return result;
}
@@ -185,7 +184,7 @@ final class RequestImpl implements Reque
// Save the HttpMethod so that we can release the connection when
// cleaning up
msgContext.setProperty(HTTPConstants.HTTP_METHOD, method);
- Header contenttypeHeader = method.getResponseHeader(HTTPConstants.HEADER_CONTENT_TYPE);
+ org.apache.commons.httpclient.Header contenttypeHeader = method.getResponseHeader(HTTPConstants.HEADER_CONTENT_TYPE);
String value = null;
if (contenttypeHeader != null) {
value = contenttypeHeader.getValue();
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=1779784&r1=1779783&r2=1779784&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 Sun Jan 22 09:09:27 2017
@@ -20,6 +20,7 @@
package org.apache.axis2.transport.http;
+import org.apache.axiom.mime.Header;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
@@ -190,10 +191,10 @@ public abstract class HTTPSender extends
for (Object headerEntry : headerEntries) {
if (headerEntry instanceof Map.Entry) {
- NamedValue[] headers = request.getRequestHeaders();
+ Header[] headers = request.getRequestHeaders();
boolean headerAdded = false;
- for (NamedValue header : headers) {
+ for (Header header : headers) {
if (header.getName() != null
&& header.getName().equals(((Map.Entry) headerEntry).getKey())) {
headerAdded = true;
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=1779784&r1=1779783&r2=1779784&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 Sun Jan 22 09:09:27 2017
@@ -18,8 +18,8 @@
*/
package org.apache.axis2.transport.http;
+import org.apache.axiom.mime.Header;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.context.NamedValue;
/**
* Interface to prepare and execute an HTTP request.
@@ -28,7 +28,7 @@ public interface Request {
void enableHTTP10();
void setHeader(String name, String value);
void addHeader(String name, String value);
- NamedValue[] getRequestHeaders();
+ Header[] getRequestHeaders();
void enableAuthentication(HTTPAuthenticator authenticator);
void execute() throws AxisFault;
}
Modified: axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/RequestImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/RequestImpl.java?rev=1779784&r1=1779783&r2=1779784&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/RequestImpl.java (original)
+++ axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/RequestImpl.java Sun Jan 22 09:09:27 2017
@@ -26,9 +26,9 @@ import java.util.ArrayList;
import java.util.List;
import java.util.zip.GZIPInputStream;
+import org.apache.axiom.mime.Header;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.context.NamedValue;
import org.apache.axis2.context.OperationContext;
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.transport.http.AxisRequestEntity;
@@ -40,7 +40,6 @@ import org.apache.axis2.util.Utils;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.http.Header;
import org.apache.http.HttpEntity;
import org.apache.http.HttpHost;
import org.apache.http.HttpResponse;
@@ -130,11 +129,11 @@ final class RequestImpl implements Reque
}
@Override
- public NamedValue[] getRequestHeaders() {
- Header[] headers = method.getAllHeaders();
- NamedValue[] result = new NamedValue[headers.length];
+ public Header[] getRequestHeaders() {
+ org.apache.http.Header[] headers = method.getAllHeaders();
+ Header[] result = new Header[headers.length];
for (int i=0; i<headers.length; i++) {
- result[i] = new NamedValue(headers[i].getName(), headers[i].getValue());
+ result[i] = new Header(headers[i].getName(), headers[i].getValue());
}
return result;
}
@@ -206,7 +205,7 @@ final class RequestImpl implements Reque
HttpEntity httpEntity = response.getEntity();
if (httpEntity != null) {
InputStream in = httpEntity.getContent();
- Header contentEncoding = httpEntity.getContentEncoding();
+ org.apache.http.Header contentEncoding = httpEntity.getContentEncoding();
if (contentEncoding != null) {
if (contentEncoding.getValue().equalsIgnoreCase(HTTPConstants.COMPRESSION_GZIP)) {
in = new GZIPInputStream(in);