HTTPCORE-105: Ensure class name consistency in HttpCore base and NIO modules (first pass)
git-svn-id: https://svn.apache.org/repos/asf/jakarta/httpcomponents/httpclient/trunk@560344 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
f37224cd0c
commit
eb1e575d57
|
@ -44,8 +44,8 @@ import org.apache.http.HttpRequest;
|
||||||
import org.apache.http.HttpResponse;
|
import org.apache.http.HttpResponse;
|
||||||
import org.apache.http.params.HttpParams;
|
import org.apache.http.params.HttpParams;
|
||||||
import org.apache.http.impl.SocketHttpClientConnection;
|
import org.apache.http.impl.SocketHttpClientConnection;
|
||||||
import org.apache.http.io.HttpDataReceiver;
|
import org.apache.http.io.SessionInputBuffer;
|
||||||
import org.apache.http.io.HttpDataTransmitter;
|
import org.apache.http.io.SessionOutputBuffer;
|
||||||
|
|
||||||
import org.apache.http.conn.OperatedClientConnection;
|
import org.apache.http.conn.OperatedClientConnection;
|
||||||
|
|
||||||
|
@ -136,33 +136,33 @@ public class DefaultClientConnection extends SocketHttpClientConnection
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
protected HttpDataReceiver createHttpDataReceiver(
|
protected SessionInputBuffer createHttpDataReceiver(
|
||||||
final Socket socket,
|
final Socket socket,
|
||||||
int buffersize,
|
int buffersize,
|
||||||
final HttpParams params) throws IOException {
|
final HttpParams params) throws IOException {
|
||||||
HttpDataReceiver receiver = super.createHttpDataReceiver(
|
SessionInputBuffer inbuffer = super.createSessionInputBuffer(
|
||||||
socket,
|
socket,
|
||||||
buffersize,
|
buffersize,
|
||||||
params);
|
params);
|
||||||
if (WIRE_LOG.isDebugEnabled()) {
|
if (WIRE_LOG.isDebugEnabled()) {
|
||||||
receiver = new LoggingHttpDataReceiverDecorator(receiver, new Wire(WIRE_LOG));
|
inbuffer = new LoggingSessionInputBuffer(inbuffer, new Wire(WIRE_LOG));
|
||||||
}
|
}
|
||||||
return receiver;
|
return inbuffer;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
protected HttpDataTransmitter createHttpDataTransmitter(
|
protected SessionOutputBuffer createHttpDataTransmitter(
|
||||||
final Socket socket,
|
final Socket socket,
|
||||||
int buffersize,
|
int buffersize,
|
||||||
final HttpParams params) throws IOException {
|
final HttpParams params) throws IOException {
|
||||||
HttpDataTransmitter transmitter = super.createHttpDataTransmitter(
|
SessionOutputBuffer outbuffer = super.createSessionOutputBuffer(
|
||||||
socket,
|
socket,
|
||||||
buffersize,
|
buffersize,
|
||||||
params);
|
params);
|
||||||
if (WIRE_LOG.isDebugEnabled()) {
|
if (WIRE_LOG.isDebugEnabled()) {
|
||||||
transmitter = new LoggingHttpDataTransmitterDecorator(transmitter, new Wire(WIRE_LOG));
|
outbuffer = new LoggingSessionOutputBuffer(outbuffer, new Wire(WIRE_LOG));
|
||||||
}
|
}
|
||||||
return transmitter;
|
return outbuffer;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -32,8 +32,8 @@ package org.apache.http.impl.conn;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
import org.apache.http.io.HttpDataReceiver;
|
|
||||||
import org.apache.http.io.HttpTransportMetrics;
|
import org.apache.http.io.HttpTransportMetrics;
|
||||||
|
import org.apache.http.io.SessionInputBuffer;
|
||||||
import org.apache.http.util.CharArrayBuffer;
|
import org.apache.http.util.CharArrayBuffer;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -45,20 +45,20 @@ import org.apache.http.util.CharArrayBuffer;
|
||||||
*
|
*
|
||||||
* @since 4.0
|
* @since 4.0
|
||||||
*/
|
*/
|
||||||
class LoggingHttpDataReceiverDecorator implements HttpDataReceiver {
|
class LoggingSessionInputBuffer implements SessionInputBuffer {
|
||||||
|
|
||||||
/** Original data receiver. */
|
/** Original session input buffer. */
|
||||||
private final HttpDataReceiver in;
|
private final SessionInputBuffer in;
|
||||||
|
|
||||||
/** The wire log to use for writing. */
|
/** The wire log to use for writing. */
|
||||||
private final Wire wire;
|
private final Wire wire;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create an instance that wraps the specified HTTP data receiver.
|
* Create an instance that wraps the specified session input buffer.
|
||||||
* @param in The input stream.
|
* @param in The session input buffer.
|
||||||
* @param wire The wire log to use.
|
* @param wire The wire log to use.
|
||||||
*/
|
*/
|
||||||
public LoggingHttpDataReceiverDecorator(final HttpDataReceiver in, final Wire wire) {
|
public LoggingSessionInputBuffer(final SessionInputBuffer in, final Wire wire) {
|
||||||
super();
|
super();
|
||||||
this.in = in;
|
this.in = in;
|
||||||
this.wire = wire;
|
this.wire = wire;
|
|
@ -32,8 +32,8 @@ package org.apache.http.impl.conn;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
import org.apache.http.io.HttpDataTransmitter;
|
|
||||||
import org.apache.http.io.HttpTransportMetrics;
|
import org.apache.http.io.HttpTransportMetrics;
|
||||||
|
import org.apache.http.io.SessionOutputBuffer;
|
||||||
import org.apache.http.util.CharArrayBuffer;
|
import org.apache.http.util.CharArrayBuffer;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -43,20 +43,20 @@ import org.apache.http.util.CharArrayBuffer;
|
||||||
*
|
*
|
||||||
* @since 4.0
|
* @since 4.0
|
||||||
*/
|
*/
|
||||||
class LoggingHttpDataTransmitterDecorator implements HttpDataTransmitter {
|
class LoggingSessionOutputBuffer implements SessionOutputBuffer {
|
||||||
|
|
||||||
/** Original data transmitter. */
|
/** Original data transmitter. */
|
||||||
private final HttpDataTransmitter out;
|
private final SessionOutputBuffer out;
|
||||||
|
|
||||||
/** The wire log to use. */
|
/** The wire log to use. */
|
||||||
private final Wire wire;
|
private final Wire wire;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create an instance that wraps the specified output stream.
|
* Create an instance that wraps the specified session output buffer.
|
||||||
* @param out The output stream.
|
* @param out The session output buffer.
|
||||||
* @param wire The Wire log to use.
|
* @param wire The Wire log to use.
|
||||||
*/
|
*/
|
||||||
public LoggingHttpDataTransmitterDecorator(final HttpDataTransmitter out, final Wire wire) {
|
public LoggingSessionOutputBuffer(final SessionOutputBuffer out, final Wire wire) {
|
||||||
super();
|
super();
|
||||||
this.out = out;
|
this.out = out;
|
||||||
this.wire = wire;
|
this.wire = wire;
|
Loading…
Reference in New Issue