Apache
/
httpcomponents-client
mirror of https://github.com/apache/httpcomponents-client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanups 

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1597032 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski 2014-05-23 08:52:38 +00:00
parent fd6ebf7be0
commit 7797380cdd
3 changed files with 13 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
httpclient/src/main/java/org/apache/http/impl/conn/CPoolProxy.java
View File

@ -230,6 +230,19 @@ class CPoolProxy implements ManagedHttpClientConnection, HttpContext {
}
}
@Override
public String toString() {
final StringBuilder sb = new StringBuilder("CPoolProxy{");
final ManagedHttpClientConnection conn = getConnection();
if (conn != null) {
sb.append(conn);
} else {
sb.append("detached");
}
sb.append('}');
return sb.toString();
}
public static HttpClientConnection newProxy(final CPoolEntry poolEntry) {
return new CPoolProxy(poolEntry);
}

89
httpclient/src/main/java/org/apache/http/impl/execchain/RequestEntityExecHandler.java
View File

@ -1,89 +0,0 @@
/*
* ====================================================================
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you 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.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
*/
package org.apache.http.impl.execchain;
import java.io.OutputStream;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import org.apache.http.HttpEntity;
import org.apache.http.annotation.NotThreadSafe;
/**
* A wrapper class for {@link HttpEntity} enclosed in a request message.
*
* @since 4.3
*/
@NotThreadSafe
class RequestEntityExecHandler implements InvocationHandler {
private static final Method WRITE_TO_METHOD;
static {
try {
WRITE_TO_METHOD = HttpEntity.class.getMethod("writeTo", OutputStream.class);
} catch (final NoSuchMethodException ex) {
throw new Error(ex);
}
}
private final HttpEntity original;
private boolean consumed = false;
RequestEntityExecHandler(final HttpEntity original) {
super();
this.original = original;
}
public HttpEntity getOriginal() {
return original;
}
public boolean isConsumed() {
return consumed;
}
@Override
public Object invoke(
final Object proxy, final Method method, final Object[] args) throws Throwable {
try {
if (method.equals(WRITE_TO_METHOD)) {
this.consumed = true;
}
return method.invoke(original, args);
} catch (final InvocationTargetException ex) {
final Throwable cause = ex.getCause();
if (cause != null) {
throw cause;
} else {
throw ex;
}
}
}
}

100
httpclient/src/main/java/org/apache/http/impl/execchain/ResponseProxyHandler.java
View File

@ -1,100 +0,0 @@
/*
* ====================================================================
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you 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.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
*/
package org.apache.http.impl.execchain;
import java.io.Closeable;
import java.io.IOException;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.annotation.NotThreadSafe;
/**
* A proxy class for {@link HttpResponse} that can be used to release client connection
* associated with the original response.
*
* @since 4.3
*/
@NotThreadSafe
class ResponseProxyHandler implements InvocationHandler {
private static final Method CLOSE_METHOD;
static {
try {
CLOSE_METHOD = Closeable.class.getMethod("close");
} catch (final NoSuchMethodException ex) {
throw new Error(ex);
}
}
private final HttpResponse original;
private final ConnectionHolder connHolder;
ResponseProxyHandler(
final HttpResponse original,
final ConnectionHolder connHolder) {
super();
this.original = original;
this.connHolder = connHolder;
final HttpEntity entity = original.getEntity();
if (entity != null && entity.isStreaming() && connHolder != null) {
this.original.setEntity(new ResponseEntityProxy(entity, connHolder));
}
}
public void close() throws IOException {
if (this.connHolder != null) {
this.connHolder.abortConnection();
}
}
@Override
public Object invoke(
final Object proxy, final Method method, final Object[] args) throws Throwable {
if (method.equals(CLOSE_METHOD)) {
close();
return null;
} else {
try {
return method.invoke(original, args);
} catch (final InvocationTargetException ex) {
final Throwable cause = ex.getCause();
if (cause != null) {
throw cause;
} else {
throw ex;
}
}
}
}
}