Author: veithen
Date: Sun Jan 15 22:46:30 2017
New Revision: 1778953
URL: http://svn.apache.org/viewvc?rev=1778953&view=rev
Log:
Remove unnecessary code.
Modified:
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/DeleteRequest.java
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/src/org/apache/axis2/transport/http/impl/httpclient4/DeleteRequest.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
Modified:
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/DeleteRequest.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/DeleteRequest.java?rev=1778953&r1=1778952&r2=1778953&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/DeleteRequest.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/DeleteRequest.java
Sun Jan 15 22:46:30 2017
@@ -46,18 +46,18 @@ class DeleteRequest implements Request {
@Override
public void execute() throws AxisFault {
- DeleteMethod deleteMethod = new DeleteMethod();
+ DeleteMethod method = new DeleteMethod();
HttpClient httpClient = sender.getHttpClient(msgContext);
- sender.populateCommonProperties(msgContext, url, deleteMethod,
httpClient, soapActiionString);
+ sender.populateCommonProperties(msgContext, url, method, httpClient,
soapActiionString);
try {
- sender.executeMethod(httpClient, msgContext, url, deleteMethod);
- sender.handleResponse(msgContext, deleteMethod);
+ sender.executeMethod(httpClient, msgContext, url, method);
+ sender.handleResponse(msgContext, method);
} catch (IOException e) {
log.info("Unable to sendViaDelete to url[" + url + "]", e);
throw AxisFault.makeFault(e);
} finally {
- sender.cleanup(msgContext, deleteMethod);
+ sender.cleanup(msgContext, method);
}
}
}
\ No newline at end of file
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=1778953&r1=1778952&r2=1778953&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
Sun Jan 15 22:46:30 2017
@@ -48,9 +48,9 @@ class GetRequest implements Request {
@Override
public void execute() throws AxisFault {
- GetMethod getMethod = new GetMethod();
+ GetMethod method = new GetMethod();
HttpClient httpClient = sender.getHttpClient(msgContext);
- MessageFormatter messageFormatter =
sender.populateCommonProperties(msgContext, url, getMethod,
+ MessageFormatter messageFormatter =
sender.populateCommonProperties(msgContext, url, method,
httpClient, soapActiionString);
// Need to have this here because we can have soap action when using
the
@@ -59,16 +59,16 @@ class GetRequest implements Request {
.formatSOAPAction(msgContext, sender.getFormat(),
soapActiionString);
if (soapAction != null && !msgContext.isDoingREST()) {
- getMethod.setRequestHeader(HTTPConstants.HEADER_SOAP_ACTION,
soapAction);
+ method.setRequestHeader(HTTPConstants.HEADER_SOAP_ACTION,
soapAction);
}
try {
- sender.executeMethod(httpClient, msgContext, url, getMethod);
- sender.handleResponse(msgContext, getMethod);
+ sender.executeMethod(httpClient, msgContext, url, method);
+ sender.handleResponse(msgContext, method);
} catch (IOException e) {
log.info("Unable to sendViaGet to url[" + url + "]", e);
throw AxisFault.makeFault(e);
} finally {
- sender.cleanup(msgContext, getMethod);
+ sender.cleanup(msgContext, method);
}
}
}
\ No newline at end of file
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=1778953&r1=1778952&r2=1778953&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
Sun Jan 15 22:46:30 2017
@@ -60,37 +60,37 @@ class PostRequest implements Request {
* MessageContext.DEFAULT_CHAR_SET_ENCODING; }
*/
- PostMethod postMethod = new PostMethod();
+ PostMethod method = new PostMethod();
if (log.isTraceEnabled()) {
- log.trace(Thread.currentThread() + " PostMethod " + postMethod + "
/ " + httpClient);
+ log.trace(Thread.currentThread() + " PostMethod " + method + " / "
+ httpClient);
}
- MessageFormatter messageFormatter =
sender.populateCommonProperties(msgContext, url, postMethod,
+ MessageFormatter messageFormatter =
sender.populateCommonProperties(msgContext, url, method,
httpClient, soapActionString);
- postMethod.setRequestEntity(new
AxisRequestEntityImpl(messageFormatter, msgContext, sender.getFormat(),
+ method.setRequestEntity(new AxisRequestEntityImpl(messageFormatter,
msgContext, sender.getFormat(),
soapActionString, sender.isChunked(),
sender.isAllowedRetry()));
if (!sender.getHttpVersion().equals(HTTPConstants.HEADER_PROTOCOL_10)
&& sender.isChunked()) {
- postMethod.setContentChunked(true);
+ method.setContentChunked(true);
}
String soapAction = messageFormatter.formatSOAPAction(msgContext,
sender.getFormat(), soapActionString);
if (soapAction != null && !msgContext.isDoingREST()) {
- postMethod.setRequestHeader(HTTPConstants.HEADER_SOAP_ACTION,
soapAction);
+ method.setRequestHeader(HTTPConstants.HEADER_SOAP_ACTION,
soapAction);
}
/*
* main excecution takes place..
*/
try {
- sender.executeMethod(httpClient, msgContext, url, postMethod);
- sender.handleResponse(msgContext, postMethod);
+ sender.executeMethod(httpClient, msgContext, url, method);
+ sender.handleResponse(msgContext, method);
} catch (IOException e) {
log.info("Unable to sendViaPost to url[" + url + "]", e);
throw AxisFault.makeFault(e);
} finally {
- sender.cleanup(msgContext, postMethod);
+ sender.cleanup(msgContext, method);
}
}
}
\ No newline at end of file
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=1778953&r1=1778952&r2=1778953&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
Sun Jan 15 22:46:30 2017
@@ -60,33 +60,33 @@ class PutRequest implements Request {
* MessageContext.DEFAULT_CHAR_SET_ENCODING; }
*/
- PutMethod putMethod = new PutMethod();
- MessageFormatter messageFormatter =
sender.populateCommonProperties(msgContext, url, putMethod,
+ PutMethod method = new PutMethod();
+ MessageFormatter messageFormatter =
sender.populateCommonProperties(msgContext, url, method,
httpClient, soapActionString);
- putMethod.setRequestEntity(new AxisRequestEntityImpl(messageFormatter,
msgContext, sender.getFormat(),
+ method.setRequestEntity(new AxisRequestEntityImpl(messageFormatter,
msgContext, sender.getFormat(),
soapActionString, sender.isChunked(),
sender.isAllowedRetry()));
if (!sender.getHttpVersion().equals(HTTPConstants.HEADER_PROTOCOL_10)
&& sender.isChunked()) {
- putMethod.setContentChunked(true);
+ method.setContentChunked(true);
}
String soapAction = messageFormatter.formatSOAPAction(msgContext,
sender.getFormat(), soapActionString);
if (soapAction != null && !msgContext.isDoingREST()) {
- putMethod.setRequestHeader(HTTPConstants.HEADER_SOAP_ACTION,
soapAction);
+ method.setRequestHeader(HTTPConstants.HEADER_SOAP_ACTION,
soapAction);
}
/*
* main excecution takes place..
*/
try {
- sender.executeMethod(httpClient, msgContext, url, putMethod);
- sender.handleResponse(msgContext, putMethod);
+ sender.executeMethod(httpClient, msgContext, url, method);
+ sender.handleResponse(msgContext, method);
} catch (IOException e) {
log.info("Unable to sendViaPut to url[" + url + "]", e);
throw AxisFault.makeFault(e);
} finally {
- sender.cleanup(msgContext, putMethod);
+ sender.cleanup(msgContext, method);
}
}
}
\ No newline at end of file
Modified:
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/DeleteRequest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/DeleteRequest.java?rev=1778953&r1=1778952&r2=1778953&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/DeleteRequest.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/DeleteRequest.java
Sun Jan 15 22:46:30 2017
@@ -47,16 +47,16 @@ class DeleteRequest implements Request {
@Override
public void execute() throws AxisFault {
- HttpDelete deleteMethod = new HttpDelete();
+ HttpDelete method = new HttpDelete();
AbstractHttpClient httpClient = sender.getHttpClient(msgContext);
- sender.populateCommonProperties(msgContext, url, deleteMethod,
httpClient, soapActionString);
+ sender.populateCommonProperties(msgContext, url, method, httpClient,
soapActionString);
/*
* main execution takes place..
*/
HttpResponse response = null;
try {
- response = sender.executeMethod(httpClient, msgContext, url,
deleteMethod);
+ response = sender.executeMethod(httpClient, msgContext, url,
method);
sender.handleResponse(msgContext, response);
} catch (IOException e) {
log.info("Unable to sendViaDelete to url[" + url + "]", e);
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=1778953&r1=1778952&r2=1778953&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
Sun Jan 15 22:46:30 2017
@@ -49,9 +49,9 @@ class GetRequest implements Request {
@Override
public void execute() throws AxisFault {
- HttpGet httpGet = new HttpGet();
+ HttpGet method = new HttpGet();
AbstractHttpClient httpClient = sender.getHttpClient(msgContext);
- MessageFormatter messageFormatter =
sender.populateCommonProperties(msgContext, url, httpGet,
+ MessageFormatter messageFormatter =
sender.populateCommonProperties(msgContext, url, method,
httpClient, soapActionString);
// Need to have this here because we can have soap action when using
the
@@ -60,7 +60,7 @@ class GetRequest implements Request {
.formatSOAPAction(msgContext, sender.getFormat(),
soapActionString);
if (soapAction != null && !msgContext.isDoingREST()) {
- httpGet.setHeader(HTTPConstants.HEADER_SOAP_ACTION, soapAction);
+ method.setHeader(HTTPConstants.HEADER_SOAP_ACTION, soapAction);
}
/*
@@ -68,7 +68,7 @@ class GetRequest implements Request {
*/
HttpResponse response = null;
try {
- response = sender.executeMethod(httpClient, msgContext, url,
httpGet);
+ response = sender.executeMethod(httpClient, msgContext, url,
method);
sender.handleResponse(msgContext, response);
} catch (IOException e) {
log.info("Unable to sendViaGet to url[" + url + "]", e);
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=1778953&r1=1778952&r2=1778953&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
Sun Jan 15 22:46:30 2017
@@ -61,16 +61,16 @@ class PostRequest implements Request {
* MessageContext.DEFAULT_CHAR_SET_ENCODING; }
*/
- HttpPost postMethod = new HttpPost();
+ HttpPost method = new HttpPost();
if (log.isTraceEnabled()) {
- log.trace(Thread.currentThread() + " PostMethod " + postMethod + "
/ " + httpClient);
+ log.trace(Thread.currentThread() + " PostMethod " + method + " / "
+ httpClient);
}
- MessageFormatter messageFormatter =
sender.populateCommonProperties(msgContext, url, postMethod,
+ MessageFormatter messageFormatter =
sender.populateCommonProperties(msgContext, url, method,
httpClient, soapActionString);
AxisRequestEntityImpl requestEntity =
new AxisRequestEntityImpl(messageFormatter, msgContext,
sender.getFormat(),
soapActionString,
sender.isChunked(), sender.isAllowedRetry());
- postMethod.setEntity(requestEntity);
+ method.setEntity(requestEntity);
if (!sender.getHttpVersion().equals(HTTPConstants.HEADER_PROTOCOL_10)
&& sender.isChunked()) {
requestEntity.setChunked(sender.isChunked());
@@ -79,7 +79,7 @@ class PostRequest implements Request {
String soapAction = messageFormatter.formatSOAPAction(msgContext,
sender.getFormat(), soapActionString);
if (soapAction != null && !msgContext.isDoingREST()) {
- postMethod.setHeader(HTTPConstants.HEADER_SOAP_ACTION, soapAction);
+ method.setHeader(HTTPConstants.HEADER_SOAP_ACTION, soapAction);
}
/*
@@ -87,7 +87,7 @@ class PostRequest implements Request {
*/
HttpResponse response = null;
try {
- response = sender.executeMethod(httpClient, msgContext, url,
postMethod);
+ response = sender.executeMethod(httpClient, msgContext, url,
method);
sender.handleResponse(msgContext, response);
} catch (IOException e) {
log.info("Unable to sendViaPost to url[" + url + "]", e);
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=1778953&r1=1778952&r2=1778953&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
Sun Jan 15 22:46:30 2017
@@ -61,13 +61,13 @@ class PutRequest implements Request {
* MessageContext.DEFAULT_CHAR_SET_ENCODING; }
*/
- HttpPut putMethod = new HttpPut();
- MessageFormatter messageFormatter =
sender.populateCommonProperties(msgContext, url, putMethod,
+ HttpPut method = new HttpPut();
+ MessageFormatter messageFormatter =
sender.populateCommonProperties(msgContext, url, method,
httpClient, soapActionString);
AxisRequestEntityImpl requestEntity =
new AxisRequestEntityImpl(messageFormatter, msgContext,
sender.getFormat(),
soapActionString,
sender.isChunked(), sender.isAllowedRetry());
- putMethod.setEntity(requestEntity);
+ method.setEntity(requestEntity);
if (!sender.getHttpVersion().equals(HTTPConstants.HEADER_PROTOCOL_10)
&& sender.isChunked()) {
requestEntity.setChunked(sender.isChunked());
@@ -75,7 +75,7 @@ class PutRequest implements Request {
String soapAction = messageFormatter.formatSOAPAction(msgContext,
sender.getFormat(), soapActionString);
if (soapAction != null && !msgContext.isDoingREST()) {
- putMethod.setHeader(HTTPConstants.HEADER_SOAP_ACTION, soapAction);
+ method.setHeader(HTTPConstants.HEADER_SOAP_ACTION, soapAction);
}
/*
@@ -83,7 +83,7 @@ class PutRequest implements Request {
*/
HttpResponse response = null;
try {
- response = sender.executeMethod(httpClient, msgContext, url,
putMethod);
+ response = sender.executeMethod(httpClient, msgContext, url,
method);
sender.handleResponse(msgContext, response);
} catch (IOException e) {
log.info("Unable to sendViaPut to url[" + url + "]", e);
