You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2014/10/24 09:15:01 UTC
svn commit: r1634009 [2/3] - in /httpcomponents/httpcore/trunk:
httpcore-ab/src/main/java/org/apache/http/benchmark/
httpcore-nio/src/examples/org/apache/http/examples/nio/
httpcore-nio/src/main/java/org/apache/http/impl/nio/
httpcore-nio/src/main/java...
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/IOReactorConfig.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/IOReactorConfig.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/IOReactorConfig.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/IOReactorConfig.java Fri Oct 24 07:14:58 2014
@@ -42,38 +42,19 @@ public final class IOReactorConfig imple
public static final IOReactorConfig DEFAULT = new Builder().build();
- // TODO: make final
- private long selectInterval;
- private long shutdownGracePeriod;
- private boolean interestOpQueued;
- private int ioThreadCount;
- private int soTimeout;
- private boolean soReuseAddress;
- private int soLinger;
- private boolean soKeepAlive;
- private boolean tcpNoDelay;
- private int connectTimeout;
- private int sndBufSize;
- private int rcvBufSize;
- private int backlogSize;
-
- @Deprecated
- public IOReactorConfig() {
- super();
- this.selectInterval = 1000;
- this.shutdownGracePeriod = 500;
- this.interestOpQueued = false;
- this.ioThreadCount = AVAIL_PROCS;
- this.soTimeout = 0;
- this.soReuseAddress = false;
- this.soLinger = -1;
- this.soKeepAlive = false;
- this.tcpNoDelay = true;
- this.connectTimeout = 0;
- this.sndBufSize = 0;
- this.rcvBufSize = 0;
- this.backlogSize = 0;
- }
+ private final long selectInterval;
+ private final long shutdownGracePeriod;
+ private final boolean interestOpQueued;
+ private final int ioThreadCount;
+ private final int soTimeout;
+ private final boolean soReuseAddress;
+ private final int soLinger;
+ private final boolean soKeepAlive;
+ private final boolean tcpNoDelay;
+ private final int connectTimeout;
+ private final int sndBufSize;
+ private final int rcvBufSize;
+ private final int backlogSize;
IOReactorConfig(
final long selectInterval,
@@ -116,15 +97,6 @@ public final class IOReactorConfig imple
}
/**
- * @deprecated (4.3) use {@link Builder#setSelectInterval(long)}
- */
- @Deprecated
- public void setSelectInterval(final long selectInterval) {
- Args.positive(selectInterval, "Select internal");
- this.selectInterval = selectInterval;
- }
-
- /**
* Determines grace period in milliseconds the I/O reactors are expected to block waiting
* for individual worker threads to terminate cleanly.
* <p>
@@ -135,15 +107,6 @@ public final class IOReactorConfig imple
}
/**
- * @deprecated (4.3) use {@link Builder#setShutdownGracePeriod(long)}
- */
- @Deprecated
- public void setShutdownGracePeriod(final long gracePeriod) {
- Args.positive(gracePeriod, "Shutdown grace period");
- this.shutdownGracePeriod = gracePeriod;
- }
-
- /**
* Determines whether or not I/O interest operations are to be queued and executed
* asynchronously by the I/O reactor thread or to be applied to the underlying
* {@link java.nio.channels.SelectionKey} immediately.
@@ -159,14 +122,6 @@ public final class IOReactorConfig imple
}
/**
- * @deprecated (4.3) use {@link Builder#setInterestOpQueued(boolean)}
- */
- @Deprecated
- public void setInterestOpQueued(final boolean interestOpQueued) {
- this.interestOpQueued = interestOpQueued;
- }
-
- /**
* Determines the number of I/O dispatch threads to be used by the I/O reactor.
* <p>
* Default: {@code 2}
@@ -176,15 +131,6 @@ public final class IOReactorConfig imple
}
/**
- * @deprecated (4.3) use {@link Builder#setIoThreadCount(int)}
- */
- @Deprecated
- public void setIoThreadCount(final int ioThreadCount) {
- Args.positive(ioThreadCount, "I/O thread count");
- this.ioThreadCount = ioThreadCount;
- }
-
- /**
* Determines the default socket timeout value for non-blocking I/O operations.
* <p>
* Default: {@code 0} (no timeout)
@@ -196,14 +142,6 @@ public final class IOReactorConfig imple
}
/**
- * @deprecated (4.3) use {@link Builder#setSoTimeout(int)}
- */
- @Deprecated
- public void setSoTimeout(final int soTimeout) {
- this.soTimeout = soTimeout;
- }
-
- /**
* Determines the default value of the {@link java.net.SocketOptions#SO_REUSEADDR} parameter
* for newly created sockets.
* <p>
@@ -216,14 +154,6 @@ public final class IOReactorConfig imple
}
/**
- * @deprecated (4.3) use {@link Builder#setSoReuseAddress(boolean)}
- */
- @Deprecated
- public void setSoReuseAddress(final boolean soReuseAddress) {
- this.soReuseAddress = soReuseAddress;
- }
-
- /**
* Determines the default value of the {@link java.net.SocketOptions#SO_LINGER} parameter
* for newly created sockets.
* <p>
@@ -236,14 +166,6 @@ public final class IOReactorConfig imple
}
/**
- * @deprecated (4.3) use {@link Builder#setSoLinger(int)}
- */
- @Deprecated
- public void setSoLinger(final int soLinger) {
- this.soLinger = soLinger;
- }
-
- /**
* Determines the default value of the {@link java.net.SocketOptions#SO_KEEPALIVE} parameter
* for newly created sockets.
* <p>
@@ -256,14 +178,6 @@ public final class IOReactorConfig imple
}
/**
- * @deprecated (4.3) use {@link Builder#setSoKeepAlive(boolean)}
- */
- @Deprecated
- public void setSoKeepalive(final boolean soKeepAlive) {
- this.soKeepAlive = soKeepAlive;
- }
-
- /**
* Determines the default value of the {@link java.net.SocketOptions#TCP_NODELAY} parameter
* for newly created sockets.
* <p>
@@ -276,14 +190,6 @@ public final class IOReactorConfig imple
}
/**
- * @deprecated (4.3) use {@link Builder#setTcpNoDelay(boolean)}
- */
- @Deprecated
- public void setTcpNoDelay(final boolean tcpNoDelay) {
- this.tcpNoDelay = tcpNoDelay;
- }
-
- /**
* Determines the default connect timeout value for non-blocking connection requests.
* <p>
* Default: {@code 0} (no timeout)
@@ -293,14 +199,6 @@ public final class IOReactorConfig imple
}
/**
- * @deprecated (4.3) use {@link Builder#setConnectTimeout(int)}
- */
- @Deprecated
- public void setConnectTimeout(final int connectTimeout) {
- this.connectTimeout = connectTimeout;
- }
-
- /**
* Determines the default value of the {@link java.net.SocketOptions#SO_SNDBUF} parameter
* for newly created sockets.
* <p>
@@ -313,14 +211,6 @@ public final class IOReactorConfig imple
}
/**
- * @deprecated (4.3) use {@link Builder#setSndBufSize(int)}
- */
- @Deprecated
- public void setSndBufSize(final int sndBufSize) {
- this.sndBufSize = sndBufSize;
- }
-
- /**
* Determines the default value of the {@link java.net.SocketOptions#SO_RCVBUF} parameter
* for newly created sockets.
* <p>
@@ -333,14 +223,6 @@ public final class IOReactorConfig imple
}
/**
- * @deprecated (4.3) use {@link Builder#setRcvBufSize(int)}
- */
- @Deprecated
- public void setRcvBufSize(final int rcvBufSize) {
- this.rcvBufSize = rcvBufSize;
- }
-
- /**
* Determines the default backlog size value for server sockets binds.
* <p>
* Default: {@code 0} (system default)
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionInputBufferImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionInputBufferImpl.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionInputBufferImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionInputBufferImpl.java Fri Oct 24 07:14:58 2014
@@ -36,7 +36,6 @@ import java.nio.charset.CharacterCodingE
import java.nio.charset.Charset;
import java.nio.charset.CharsetDecoder;
import java.nio.charset.CoderResult;
-import java.nio.charset.CodingErrorAction;
import org.apache.http.MessageConstraintException;
import org.apache.http.annotation.NotThreadSafe;
@@ -45,12 +44,9 @@ import org.apache.http.nio.reactor.Sessi
import org.apache.http.nio.util.ByteBufferAllocator;
import org.apache.http.nio.util.ExpandableBuffer;
import org.apache.http.nio.util.HeapByteBufferAllocator;
-import org.apache.http.params.CoreProtocolPNames;
-import org.apache.http.params.HttpParams;
import org.apache.http.protocol.HTTP;
import org.apache.http.util.Args;
import org.apache.http.util.CharArrayBuffer;
-import org.apache.http.util.CharsetUtils;
/**
* Default implementation of {@link SessionInputBuffer} based on
@@ -58,7 +54,6 @@ import org.apache.http.util.CharsetUtils
*
* @since 4.0
*/
-@SuppressWarnings("deprecation")
@NotThreadSafe
public class SessionInputBufferImpl extends ExpandableBuffer implements SessionInputBuffer {
@@ -117,47 +112,6 @@ public class SessionInputBufferImpl exte
}
/**
- * @deprecated (4.3) use
- * {@link SessionInputBufferImpl#SessionInputBufferImpl(int, int, CharsetDecoder,
- * ByteBufferAllocator)}
- */
- @Deprecated
- public SessionInputBufferImpl(
- final int buffersize,
- final int lineBuffersize,
- final ByteBufferAllocator allocator,
- final HttpParams params) {
- super(buffersize, allocator);
- this.lineBuffersize = Args.positive(lineBuffersize, "Line buffer size");
- final String charsetName = (String) params.getParameter(CoreProtocolPNames.HTTP_ELEMENT_CHARSET);
- final Charset charset = CharsetUtils.lookup(charsetName);
- if (charset != null) {
- this.chardecoder = charset.newDecoder();
- final CodingErrorAction a1 = (CodingErrorAction) params.getParameter(
- CoreProtocolPNames.HTTP_MALFORMED_INPUT_ACTION);
- this.chardecoder.onMalformedInput(a1 != null ? a1 : CodingErrorAction.REPORT);
- final CodingErrorAction a2 = (CodingErrorAction) params.getParameter(
- CoreProtocolPNames.HTTP_UNMAPPABLE_INPUT_ACTION);
- this.chardecoder.onUnmappableCharacter(a2 != null? a2 : CodingErrorAction.REPORT);
- } else {
- this.chardecoder = null;
- }
- this.constraints = MessageConstraints.DEFAULT;
- }
-
- /**
- * @deprecated (4.3) use
- * {@link SessionInputBufferImpl#SessionInputBufferImpl(int, int, Charset)}
- */
- @Deprecated
- public SessionInputBufferImpl(
- final int buffersize,
- final int linebuffersize,
- final HttpParams params) {
- this(buffersize, linebuffersize, HeapByteBufferAllocator.INSTANCE, params);
- }
-
- /**
* @since 4.3
*/
public SessionInputBufferImpl(
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionOutputBufferImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionOutputBufferImpl.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionOutputBufferImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionOutputBufferImpl.java Fri Oct 24 07:14:58 2014
@@ -36,19 +36,15 @@ import java.nio.charset.CharacterCodingE
import java.nio.charset.Charset;
import java.nio.charset.CharsetEncoder;
import java.nio.charset.CoderResult;
-import java.nio.charset.CodingErrorAction;
import org.apache.http.annotation.NotThreadSafe;
import org.apache.http.nio.reactor.SessionOutputBuffer;
import org.apache.http.nio.util.ByteBufferAllocator;
import org.apache.http.nio.util.ExpandableBuffer;
import org.apache.http.nio.util.HeapByteBufferAllocator;
-import org.apache.http.params.CoreProtocolPNames;
-import org.apache.http.params.HttpParams;
import org.apache.http.protocol.HTTP;
import org.apache.http.util.Args;
import org.apache.http.util.CharArrayBuffer;
-import org.apache.http.util.CharsetUtils;
/**
* Default implementation of {@link SessionOutputBuffer} based on
@@ -56,7 +52,6 @@ import org.apache.http.util.CharsetUtils
*
* @since 4.0
*/
-@SuppressWarnings("deprecation")
@NotThreadSafe
public class SessionOutputBufferImpl extends ExpandableBuffer implements SessionOutputBuffer {
@@ -91,46 +86,6 @@ public class SessionOutputBufferImpl ext
}
/**
- * @deprecated (4.3) use
- * {@link SessionOutputBufferImpl#SessionOutputBufferImpl(int, int, CharsetEncoder,
- * ByteBufferAllocator)}
- */
- @Deprecated
- public SessionOutputBufferImpl(
- final int buffersize,
- final int lineBuffersize,
- final ByteBufferAllocator allocator,
- final HttpParams params) {
- super(buffersize, allocator);
- this.lineBuffersize = Args.positive(lineBuffersize, "Line buffer size");
- final String charsetName = (String) params.getParameter(CoreProtocolPNames.HTTP_ELEMENT_CHARSET);
- final Charset charset = CharsetUtils.lookup(charsetName);
- if (charset != null) {
- this.charencoder = charset.newEncoder();
- final CodingErrorAction a1 = (CodingErrorAction) params.getParameter(
- CoreProtocolPNames.HTTP_MALFORMED_INPUT_ACTION);
- this.charencoder.onMalformedInput(a1 != null ? a1 : CodingErrorAction.REPORT);
- final CodingErrorAction a2 = (CodingErrorAction) params.getParameter(
- CoreProtocolPNames.HTTP_UNMAPPABLE_INPUT_ACTION);
- this.charencoder.onUnmappableCharacter(a2 != null? a2 : CodingErrorAction.REPORT);
- } else {
- this.charencoder = null;
- }
- }
-
- /**
- * @deprecated (4.3) use
- * {@link SessionOutputBufferImpl#SessionOutputBufferImpl(int, int, Charset)}
- */
- @Deprecated
- public SessionOutputBufferImpl(
- final int buffersize,
- final int linebuffersize,
- final HttpParams params) {
- this(buffersize, linebuffersize, HeapByteBufferAllocator.INSTANCE, params);
- }
-
- /**
* @since 4.3
*/
public SessionOutputBufferImpl(final int buffersize) {
@@ -157,10 +112,6 @@ public class SessionOutputBufferImpl ext
this(buffersize, linebuffersize, null, HeapByteBufferAllocator.INSTANCE);
}
- public void reset(final HttpParams params) {
- clear();
- }
-
@Override
public int flush(final WritableByteChannel channel) throws IOException {
Args.notNull(channel, "Channel");
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NByteArrayEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NByteArrayEntity.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NByteArrayEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NByteArrayEntity.java Fri Oct 24 07:14:58 2014
@@ -46,26 +46,13 @@ import org.apache.http.util.Args;
*
* @since 4.0
*/
-@SuppressWarnings("deprecation")
@NotThreadSafe
-public class NByteArrayEntity extends AbstractHttpEntity
- implements HttpAsyncContentProducer, ProducingNHttpEntity {
+public class NByteArrayEntity extends AbstractHttpEntity implements HttpAsyncContentProducer {
private final byte[] b;
private final int off, len;
private final ByteBuffer buf;
/**
- * @deprecated (4.2)
- */
- @Deprecated
- protected final byte[] content;
- /**
- * @deprecated (4.2)
- */
- @Deprecated
- protected final ByteBuffer buffer;
-
- /**
* @since 4.2
*/
public NByteArrayEntity(final byte[] b, final ContentType contentType) {
@@ -75,8 +62,6 @@ public class NByteArrayEntity extends Ab
this.off = 0;
this.len = b.length;
this.buf = ByteBuffer.wrap(b);
- this.content = b;
- this.buffer = this.buf;
if (contentType != null) {
setContentType(contentType.toString());
}
@@ -96,8 +81,6 @@ public class NByteArrayEntity extends Ab
this.off = off;
this.len = len;
this.buf = ByteBuffer.wrap(b, off, len);
- this.content = b;
- this.buffer = this.buf;
if (contentType != null) {
setContentType(contentType.toString());
}
@@ -121,16 +104,6 @@ public class NByteArrayEntity extends Ab
this.buf.rewind();
}
- /**
- * {@inheritDoc}
- *
- * @deprecated (4.2) use {@link #close()}
- */
- @Deprecated
- public void finish() {
- close();
- }
-
@Override
public void produceContent(final ContentEncoder encoder, final IOControl ioctrl)
throws IOException {
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NFileEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NFileEntity.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NFileEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NFileEntity.java Fri Oct 24 07:14:58 2014
@@ -52,10 +52,8 @@ import org.apache.http.util.Args;
*
* @since 4.0
*/
-@SuppressWarnings("deprecation")
@NotThreadSafe
-public class NFileEntity extends AbstractHttpEntity
- implements HttpAsyncContentProducer, ProducingNHttpEntity {
+public class NFileEntity extends AbstractHttpEntity implements HttpAsyncContentProducer {
private final File file;
private RandomAccessFile accessfile;
@@ -106,25 +104,6 @@ public class NFileEntity extends Abstrac
}
/**
- * @deprecated (4.2) use {@link #NFileEntity(File, ContentType, boolean)}
- */
- @Deprecated
- public NFileEntity(final File file, final String contentType, final boolean useFileChannels) {
- Args.notNull(file, "File");
- this.file = file;
- this.useFileChannels = useFileChannels;
- setContentType(contentType);
- }
-
- /**
- * @deprecated (4.2) use {@link #NFileEntity(File, ContentType)}
- */
- @Deprecated
- public NFileEntity(final File file, final String contentType) {
- this(file, contentType, true);
- }
-
- /**
* {@inheritDoc}
*
* @since 4.2
@@ -138,16 +117,6 @@ public class NFileEntity extends Abstrac
fileChannel = null;
}
- /**
- * {@inheritDoc}
- *
- * @deprecated (4.2) use {@link #close()}
- */
- @Deprecated
- public void finish() throws IOException {
- close();
- }
-
@Override
public long getContentLength() {
return file.length();
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NStringEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NStringEntity.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NStringEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NStringEntity.java Fri Oct 24 07:14:58 2014
@@ -50,23 +50,11 @@ import org.apache.http.util.Args;
* @since 4.0
*
*/
-@SuppressWarnings("deprecation")
@NotThreadSafe
-public class NStringEntity extends AbstractHttpEntity
- implements HttpAsyncContentProducer, ProducingNHttpEntity {
+public class NStringEntity extends AbstractHttpEntity implements HttpAsyncContentProducer {
private final byte[] b;
private final ByteBuffer buf;
- /**
- * @deprecated (4.2)
- */
- @Deprecated
- protected final byte[] content;
- /**
- * @deprecated (4.2)
- */
- @Deprecated
- protected final ByteBuffer buffer;
/**
* Creates a NStringEntity with the specified content and content type.
@@ -87,8 +75,6 @@ public class NStringEntity extends Abstr
}
this.b = s.getBytes(charset);
this.buf = ByteBuffer.wrap(this.b);
- this.content = b;
- this.buffer = this.buf;
if (contentType != null) {
setContentType(contentType.toString());
}
@@ -160,16 +146,6 @@ public class NStringEntity extends Abstr
this.buf.rewind();
}
- /**
- * {@inheritDoc}
- *
- * @deprecated (4.2) use {@link #close()}
- */
- @Deprecated
- public void finish() {
- close();
- }
-
@Override
public void produceContent(
final ContentEncoder encoder, final IOControl ioctrl) throws IOException {
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/pool/AbstractNIOConnPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/pool/AbstractNIOConnPool.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/pool/AbstractNIOConnPool.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/pool/AbstractNIOConnPool.java Fri Oct 24 07:14:58 2014
@@ -90,50 +90,6 @@ public abstract class AbstractNIOConnPoo
private volatile int maxTotal;
/**
- * @deprecated use {@link AbstractNIOConnPool#AbstractNIOConnPool(ConnectingIOReactor,
- * NIOConnFactory, SocketAddressResolver, int, int)}
- */
- @Deprecated
- public AbstractNIOConnPool(
- final ConnectingIOReactor ioreactor,
- final NIOConnFactory<T, C> connFactory,
- final int defaultMaxPerRoute,
- final int maxTotal) {
- super();
- Args.notNull(ioreactor, "I/O reactor");
- Args.notNull(connFactory, "Connection factory");
- Args.positive(defaultMaxPerRoute, "Max per route value");
- Args.positive(maxTotal, "Max total value");
- this.ioreactor = ioreactor;
- this.connFactory = connFactory;
- this.addressResolver = new SocketAddressResolver<T>() {
-
- @Override
- public SocketAddress resolveLocalAddress(final T route) throws IOException {
- return AbstractNIOConnPool.this.resolveLocalAddress(route);
- }
-
- @Override
- public SocketAddress resolveRemoteAddress(final T route) throws IOException {
- return AbstractNIOConnPool.this.resolveRemoteAddress(route);
- }
-
- };
- this.sessionRequestCallback = new InternalSessionRequestCallback();
- this.routeToPool = new HashMap<T, RouteSpecificPool<T, C, E>>();
- this.leasingRequests = new LinkedList<LeaseRequest<T, C, E>>();
- this.pending = new HashSet<SessionRequest>();
- this.leased = new HashSet<E>();
- this.available = new LinkedList<E>();
- this.maxPerRoute = new HashMap<T, Integer>();
- this.completedRequests = new ConcurrentLinkedQueue<LeaseRequest<T, C, E>>();
- this.lock = new ReentrantLock();
- this.isShutDown = new AtomicBoolean(false);
- this.defaultMaxPerRoute = defaultMaxPerRoute;
- this.maxTotal = maxTotal;
- }
-
- /**
* @since 4.3
*/
public AbstractNIOConnPool(
@@ -165,22 +121,6 @@ public abstract class AbstractNIOConnPoo
this.maxTotal = maxTotal;
}
- /**
- * @deprecated (4.3) use {@link SocketAddressResolver}
- */
- @Deprecated
- protected SocketAddress resolveRemoteAddress(final T route) {
- return null;
- }
-
- /**
- * @deprecated (4.3) use {@link SocketAddressResolver}
- */
- @Deprecated
- protected SocketAddress resolveLocalAddress(final T route) {
- return null;
- }
-
protected abstract E createEntry(T route, C conn);
/**
@@ -720,21 +660,6 @@ public abstract class AbstractNIOConnPoo
}
}
- /**
- * Use {@link #enumLeased(org.apache.http.pool.PoolEntryCallback)}
- * or {@link #enumAvailable(org.apache.http.pool.PoolEntryCallback)} instead.
- *
- * @deprecated (4.3.2)
- */
- @Deprecated
- protected void enumEntries(final Iterator<E> it, final PoolEntryCallback<T, C> callback) {
- while (it.hasNext()) {
- final E entry = it.next();
- callback.process(entry);
- }
- processPendingRequests();
- }
-
private void purgePoolMap() {
final Iterator<Map.Entry<T, RouteSpecificPool<T, C, E>>> it = this.routeToPool.entrySet().iterator();
while (it.hasNext()) {
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequester.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequester.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequester.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequester.java Fri Oct 24 07:14:58 2014
@@ -40,7 +40,6 @@ import org.apache.http.concurrent.BasicF
import org.apache.http.concurrent.FutureCallback;
import org.apache.http.impl.DefaultConnectionReuseStrategy;
import org.apache.http.nio.NHttpClientConnection;
-import org.apache.http.params.HttpParams;
import org.apache.http.pool.ConnPool;
import org.apache.http.pool.PoolEntry;
import org.apache.http.protocol.BasicHttpContext;
@@ -57,7 +56,6 @@ import org.apache.http.util.Args;
*
* @since 4.2
*/
-@SuppressWarnings("deprecation")
@Immutable
public class HttpAsyncRequester {
@@ -66,18 +64,6 @@ public class HttpAsyncRequester {
private final ExceptionLogger exceptionLogger;
/**
- * @deprecated (4.3) use {@link HttpAsyncRequester#HttpAsyncRequester(HttpProcessor,
- * ConnectionReuseStrategy)}
- */
- @Deprecated
- public HttpAsyncRequester(
- final HttpProcessor httpprocessor,
- final ConnectionReuseStrategy reuseStrategy,
- final HttpParams params) {
- this(httpprocessor, reuseStrategy);
- }
-
- /**
* Creates new instance of {@code HttpAsyncRequester}.
* @param httpprocessor HTTP protocol processor.
* @param connReuseStrategy Connection re-use strategy. If {@code null}
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncService.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncService.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncService.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncService.java Fri Oct 24 07:14:58 2014
@@ -58,7 +58,6 @@ import org.apache.http.nio.NHttpServerCo
import org.apache.http.nio.NHttpServerEventHandler;
import org.apache.http.nio.entity.NStringEntity;
import org.apache.http.nio.reactor.SessionBufferStatus;
-import org.apache.http.params.HttpParams;
import org.apache.http.protocol.BasicHttpContext;
import org.apache.http.protocol.HttpContext;
import org.apache.http.protocol.HttpCoreContext;
@@ -97,7 +96,6 @@ import org.apache.http.util.Asserts;
*
* @since 4.2
*/
-@SuppressWarnings("deprecation")
@Immutable // provided injected dependencies are immutable
public class HttpAsyncService implements NHttpServerEventHandler {
@@ -113,60 +111,6 @@ public class HttpAsyncService implements
/**
* Creates new instance of {@code HttpAsyncServerProtocolHandler}.
*
- * @param httpProcessor HTTP protocol processor (required).
- * @param connStrategy Connection re-use strategy (required).
- * @param responseFactory HTTP response factory (required).
- * @param handlerResolver Request handler resolver.
- * @param expectationVerifier Request expectation verifier (optional).
- * @param params HTTP parameters (required).
- *
- * @deprecated (4.3) use {@link HttpAsyncService#HttpAsyncService(HttpProcessor,
- * ConnectionReuseStrategy, HttpResponseFactory, HttpAsyncRequestHandlerMapper,
- * HttpAsyncExpectationVerifier)}
- */
- @Deprecated
- public HttpAsyncService(
- final HttpProcessor httpProcessor,
- final ConnectionReuseStrategy connStrategy,
- final HttpResponseFactory responseFactory,
- final HttpAsyncRequestHandlerResolver handlerResolver,
- final HttpAsyncExpectationVerifier expectationVerifier,
- final HttpParams params) {
- this(httpProcessor,
- connStrategy,
- responseFactory,
- new HttpAsyncRequestHandlerResolverAdapter(handlerResolver),
- expectationVerifier);
- }
-
- /**
- * Creates new instance of {@code HttpAsyncServerProtocolHandler}.
- *
- * @param httpProcessor HTTP protocol processor (required).
- * @param connStrategy Connection re-use strategy (required).
- * @param handlerResolver Request handler resolver.
- * @param params HTTP parameters (required).
- *
- * @deprecated (4.3) use {@link HttpAsyncService#HttpAsyncService(HttpProcessor,
- * ConnectionReuseStrategy, HttpResponseFactory, HttpAsyncRequestHandlerMapper,
- * HttpAsyncExpectationVerifier)}
- */
- @Deprecated
- public HttpAsyncService(
- final HttpProcessor httpProcessor,
- final ConnectionReuseStrategy connStrategy,
- final HttpAsyncRequestHandlerResolver handlerResolver,
- final HttpParams params) {
- this(httpProcessor,
- connStrategy,
- DefaultHttpResponseFactory.INSTANCE,
- new HttpAsyncRequestHandlerResolverAdapter(handlerResolver),
- null);
- }
-
- /**
- * Creates new instance of {@code HttpAsyncServerProtocolHandler}.
- *
* @param httpProcessor HTTP protocol processor.
* @param connStrategy Connection re-use strategy. If {@code null}
* {@link DefaultConnectionReuseStrategy#INSTANCE} will be used.
@@ -1068,23 +1012,4 @@ public class HttpAsyncService implements
}
- /**
- * Adaptor class to transition from HttpAsyncRequestHandlerResolver to HttpAsyncRequestHandlerMapper.
- */
- @Deprecated
- private static class HttpAsyncRequestHandlerResolverAdapter implements HttpAsyncRequestHandlerMapper {
-
- private final HttpAsyncRequestHandlerResolver resolver;
-
- public HttpAsyncRequestHandlerResolverAdapter(final HttpAsyncRequestHandlerResolver resolver) {
- this.resolver = resolver;
- }
-
- @Override
- public HttpAsyncRequestHandler<?> lookup(final HttpRequest request) {
- return resolver.lookup(request.getRequestLine().getUri());
- }
-
- }
-
}
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/SSLIOSession.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/SSLIOSession.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/SSLIOSession.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/SSLIOSession.java Fri Oct 24 07:14:58 2014
@@ -193,20 +193,6 @@ public class SSLIOSession implements IOS
}
/**
- * Initializes the session in the given {@link SSLMode}. This method
- * invokes the {@link SSLSetupHandler#initalize(SSLEngine)} callback
- * if an instance of {@link SSLSetupHandler} was specified at
- * the construction time.
- *
- * @deprecated (4.3) SSL mode must be set at construction time.
- */
- @Deprecated
- public synchronized void initialize(final SSLMode sslMode) throws SSLException {
- this.sslMode = sslMode;
- initialize();
- }
-
- /**
* Initializes the session. This method invokes the {@link
* SSLSetupHandler#initalize(SSLEngine)} callback if an instance of
* {@link SSLSetupHandler} was specified at the construction time.
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/ContentInputBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/ContentInputBuffer.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/ContentInputBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/ContentInputBuffer.java Fri Oct 24 07:14:58 2014
@@ -29,8 +29,6 @@ package org.apache.http.nio.util;
import java.io.IOException;
-import org.apache.http.nio.ContentDecoder;
-
/**
* Generic content input buffer.
*
@@ -39,19 +37,6 @@ import org.apache.http.nio.ContentDecode
public interface ContentInputBuffer {
/**
- * Reads content from the given {@link ContentDecoder} and stores it in
- * this buffer.
- *
- * @param decoder the content decoder.
- * @return number of bytes read.
- * @throws IOException in case of an I/O error.
- *
- * @deprecated (4.3) use implementation specific methods.
- */
- @Deprecated
- int consumeContent(ContentDecoder decoder) throws IOException;
-
- /**
* Resets the buffer by clearing its state and stored content.
*/
void reset();
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/ContentOutputBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/ContentOutputBuffer.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/ContentOutputBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/ContentOutputBuffer.java Fri Oct 24 07:14:58 2014
@@ -29,8 +29,6 @@ package org.apache.http.nio.util;
import java.io.IOException;
-import org.apache.http.nio.ContentEncoder;
-
/**
* Generic content output buffer.
*
@@ -39,29 +37,11 @@ import org.apache.http.nio.ContentEncode
public interface ContentOutputBuffer {
/**
- * Writes content from this buffer to the given {@link ContentEncoder}.
- *
- * @param encoder content encoder.
- * @return number of bytes written.
- * @throws IOException in case of an I/O error.
- *
- * @deprecated (4.3) use implementation specific methods.
- */
- @Deprecated
- int produceContent(ContentEncoder encoder) throws IOException;
-
- /**
* Resets the buffer by clearing its state and stored content.
*/
void reset();
/**
- * @deprecated (4.2) No longer used.
- */
- @Deprecated
- void flush() throws IOException;
-
- /**
* Writes {@code len} bytes from the specified byte array
* starting at offset {@code off} to this buffer.
* <p>
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/ExpandableBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/ExpandableBuffer.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/ExpandableBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/ExpandableBuffer.java Fri Oct 24 07:14:58 2014
@@ -42,9 +42,8 @@ import org.apache.http.util.Args;
*
* @since 4.0
*/
-@SuppressWarnings("deprecation")
@NotThreadSafe
-public class ExpandableBuffer implements BufferInfo, org.apache.http.nio.util.BufferInfo {
+public class ExpandableBuffer implements BufferInfo {
public final static int INPUT_MODE = 0;
public final static int OUTPUT_MODE = 1;
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/SharedInputBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/SharedInputBuffer.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/SharedInputBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/SharedInputBuffer.java Fri Oct 24 07:14:58 2014
@@ -41,7 +41,8 @@ import org.apache.http.nio.IOControl;
* a worker thread.
* <p>
* The I/O dispatch thread is expect to transfer data from {@link ContentDecoder} to the buffer
- * by calling {@link #consumeContent(ContentDecoder)}.
+ * by calling {@link #consumeContent(org.apache.http.nio.ContentDecoder,
+ * org.apache.http.nio.IOControl)}.
* <p>
* The worker thread is expected to read the data from the buffer by calling
* {@link #read()} or {@link #read(byte[], int, int)} methods.
@@ -62,17 +63,6 @@ public class SharedInputBuffer extends E
private volatile boolean endOfStream = false;
/**
- * @deprecated (4.3) use {@link SharedInputBuffer#SharedInputBuffer(int, ByteBufferAllocator)}
- */
- @Deprecated
- public SharedInputBuffer(final int buffersize, final IOControl ioctrl, final ByteBufferAllocator allocator) {
- super(buffersize, allocator);
- this.ioctrl = ioctrl;
- this.lock = new ReentrantLock();
- this.condition = this.lock.newCondition();
- }
-
- /**
* @since 4.3
*/
public SharedInputBuffer(final int buffersize, final ByteBufferAllocator allocator) {
@@ -103,15 +93,6 @@ public class SharedInputBuffer extends E
}
/**
- * @deprecated (4.3) use {@link #consumeContent(ContentDecoder, IOControl)}
- */
- @Override
- @Deprecated
- public int consumeContent(final ContentDecoder decoder) throws IOException {
- return consumeContent(decoder, null);
- }
-
- /**
* @since 4.3
*/
public int consumeContent(final ContentDecoder decoder, final IOControl ioctrl) throws IOException {
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/SharedOutputBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/SharedOutputBuffer.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/SharedOutputBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/SharedOutputBuffer.java Fri Oct 24 07:14:58 2014
@@ -34,7 +34,6 @@ import java.util.concurrent.locks.Reentr
import org.apache.http.annotation.ThreadSafe;
import org.apache.http.nio.ContentEncoder;
import org.apache.http.nio.IOControl;
-import org.apache.http.util.Args;
import org.apache.http.util.Asserts;
/**
@@ -43,7 +42,8 @@ import org.apache.http.util.Asserts;
* a worker thread.
* <p>
* The I/O dispatch thread is expected to transfer data from the buffer to
- * {@link ContentEncoder} by calling {@link #produceContent(ContentEncoder)}.
+ * {@link ContentEncoder} by calling {@link #produceContent(org.apache.http.nio.ContentEncoder,
+ * org.apache.http.nio.IOControl)}.
* <p>
* The worker thread is expected to write data to the buffer by calling
* {@link #write(int)}, {@link #write(byte[], int, int)} or {@link #writeCompleted()}
@@ -64,18 +64,6 @@ public class SharedOutputBuffer extends
private volatile boolean endOfStream = false;
/**
- * @deprecated (4.3) use {@link SharedOutputBuffer#SharedOutputBuffer(int, ByteBufferAllocator)}
- */
- @Deprecated
- public SharedOutputBuffer(final int buffersize, final IOControl ioctrl, final ByteBufferAllocator allocator) {
- super(buffersize, allocator);
- Args.notNull(ioctrl, "I/O content control");
- this.ioctrl = ioctrl;
- this.lock = new ReentrantLock();
- this.condition = this.lock.newCondition();
- }
-
- /**
* @since 4.3
*/
public SharedOutputBuffer(final int buffersize, final ByteBufferAllocator allocator) {
@@ -146,15 +134,6 @@ public class SharedOutputBuffer extends
}
/**
- * @deprecated (4.3) use {@link #produceContent(ContentEncoder, IOControl)}
- */
- @Override
- @Deprecated
- public int produceContent(final ContentEncoder encoder) throws IOException {
- return produceContent(encoder, null);
- }
-
- /**
* @since 4.3
*/
public int produceContent(final ContentEncoder encoder, final IOControl ioctrl) throws IOException {
@@ -260,10 +239,6 @@ public class SharedOutputBuffer extends
}
}
- @Override
- public void flush() throws IOException {
- }
-
private void flushContent() throws IOException {
this.lock.lock();
try {
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/SimpleInputBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/SimpleInputBuffer.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/SimpleInputBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/SimpleInputBuffer.java Fri Oct 24 07:14:58 2014
@@ -60,7 +60,6 @@ public class SimpleInputBuffer extends E
super.clear();
}
- @Override
public int consumeContent(final ContentDecoder decoder) throws IOException {
setInputMode();
int totalRead = 0;
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/SimpleOutputBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/SimpleOutputBuffer.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/SimpleOutputBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/SimpleOutputBuffer.java Fri Oct 24 07:14:58 2014
@@ -55,7 +55,6 @@ public class SimpleOutputBuffer extends
this(buffersize, HeapByteBufferAllocator.INSTANCE);
}
- @Override
public int produceContent(final ContentEncoder encoder) throws IOException {
setOutputMode();
final int bytesWritten = encoder.write(this.buffer);
@@ -105,10 +104,6 @@ public class SimpleOutputBuffer extends
}
@Override
- public void flush() {
- }
-
- @Override
public void writeCompleted() {
this.endOfStream = true;
}
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlers.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlers.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlers.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlers.java Fri Oct 24 07:14:58 2014
@@ -333,7 +333,7 @@ public class TestHttpAsyncHandlers exten
new RequestTargetHost(),
new RequestConnControl(),
new RequestUserAgent(),
- new RequestExpectContinue(true));
+ new RequestExpectContinue());
final HttpHost target = start(clientHttpProc, null, registry, null);
@@ -373,7 +373,7 @@ public class TestHttpAsyncHandlers exten
new RequestTargetHost(),
new RequestConnControl(),
new RequestUserAgent(),
- new RequestExpectContinue(true));
+ new RequestExpectContinue());
final HttpHost target = start(clientHttpProc, null, registry, null);
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpClientNio.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpClientNio.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpClientNio.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpClientNio.java Fri Oct 24 07:14:58 2014
@@ -73,7 +73,6 @@ import org.apache.http.protocol.RequestE
import org.apache.http.protocol.RequestTargetHost;
import org.apache.http.protocol.RequestUserAgent;
-@SuppressWarnings("deprecation")
public class HttpClientNio {
public static final HttpProcessor DEFAULT_HTTP_PROC = new ImmutableHttpProcessor(
@@ -82,7 +81,7 @@ public class HttpClientNio {
new RequestTargetHost(),
new RequestConnControl(),
new RequestUserAgent("TEST-CLIENT/1.1"),
- new RequestExpectContinue(true)});
+ new RequestExpectContinue()});
private final DefaultConnectingIOReactor ioReactor;
private final BasicNIOConnPool connpool;
Modified: httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/http/examples/ElementalHttpGet.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/http/examples/ElementalHttpGet.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/http/examples/ElementalHttpGet.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/http/examples/ElementalHttpGet.java Fri Oct 24 07:14:58 2014
@@ -57,7 +57,7 @@ public class ElementalHttpGet {
.add(new RequestTargetHost())
.add(new RequestConnControl())
.add(new RequestUserAgent("Test/1.1"))
- .add(new RequestExpectContinue(true)).build();
+ .add(new RequestExpectContinue()).build();
HttpRequestExecutor httpexecutor = new HttpRequestExecutor();
Modified: httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/http/examples/ElementalHttpPost.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/http/examples/ElementalHttpPost.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/http/examples/ElementalHttpPost.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/http/examples/ElementalHttpPost.java Fri Oct 24 07:14:58 2014
@@ -64,7 +64,7 @@ public class ElementalHttpPost {
.add(new RequestTargetHost())
.add(new RequestConnControl())
.add(new RequestUserAgent("Test/1.1"))
- .add(new RequestExpectContinue(true)).build();
+ .add(new RequestExpectContinue()).build();
HttpRequestExecutor httpexecutor = new HttpRequestExecutor();
Modified: httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/http/examples/ElementalPoolingHttpGet.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/http/examples/ElementalPoolingHttpGet.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/http/examples/ElementalPoolingHttpGet.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/http/examples/ElementalPoolingHttpGet.java Fri Oct 24 07:14:58 2014
@@ -63,7 +63,7 @@ public class ElementalPoolingHttpGet {
.add(new RequestTargetHost())
.add(new RequestConnControl())
.add(new RequestUserAgent("Test/1.1"))
- .add(new RequestExpectContinue(true)).build();
+ .add(new RequestExpectContinue()).build();
final HttpRequestExecutor httpexecutor = new HttpRequestExecutor();
Modified: httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/http/examples/ElementalReverseProxy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/http/examples/ElementalReverseProxy.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/http/examples/ElementalReverseProxy.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/http/examples/ElementalReverseProxy.java Fri Oct 24 07:14:58 2014
@@ -174,7 +174,7 @@ public class ElementalReverseProxy {
new RequestTargetHost(),
new RequestConnControl(),
new RequestUserAgent("Test/1.1"),
- new RequestExpectContinue(true)
+ new RequestExpectContinue()
});
// Set up HTTP protocol processor for outgoing connections
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HttpEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HttpEntity.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HttpEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HttpEntity.java Fri Oct 24 07:14:58 2014
@@ -169,31 +169,4 @@ public interface HttpEntity {
*/
boolean isStreaming(); // don't expect an exception here
- /**
- * This method is deprecated since version 4.1. Please use standard
- * java convention to ensure resource deallocation by calling
- * {@link InputStream#close()} on the input stream returned by
- * {@link #getContent()}
- * <p>
- * This method is called to indicate that the content of this entity
- * is no longer required. All entity implementations are expected to
- * release all allocated resources as a result of this method
- * invocation. Content streaming entities are also expected to
- * dispose of the remaining content, if any. Wrapping entities should
- * delegate this call to the wrapped entity.
- * <p>
- * This method is of particular importance for entities being
- * received from a {@link HttpConnection connection}. The entity
- * needs to be consumed completely in order to re-use the connection
- * with keep-alive.
- *
- * @throws IOException if an I/O error occurs.
- *
- * @deprecated (4.1) Use {@link org.apache.http.util.EntityUtils#consume(HttpEntity)}
- *
- * @see #getContent() and #writeTo(OutputStream)
- */
- @Deprecated
- void consumeContent() throws IOException;
-
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HttpMessage.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HttpMessage.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HttpMessage.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HttpMessage.java Fri Oct 24 07:14:58 2014
@@ -27,8 +27,6 @@
package org.apache.http;
-import org.apache.http.params.HttpParams;
-
/**
* HTTP messages consist of requests from client to server and responses
* from server to client.
@@ -53,7 +51,6 @@ import org.apache.http.params.HttpParams
*
* @since 4.0
*/
-@SuppressWarnings("deprecation")
public interface HttpMessage {
/**
@@ -187,24 +184,4 @@ public interface HttpMessage {
*/
HeaderIterator headerIterator(String name);
- /**
- * Returns the parameters effective for this message as set by
- * {@link #setParams(HttpParams)}.
- *
- * @deprecated (4.3) use configuration classes provided 'org.apache.http.config'
- * and 'org.apache.http.client.config'
- */
- @Deprecated
- HttpParams getParams();
-
- /**
- * Provides parameters to be used for the processing of this message.
- * @param params the parameters
- *
- * @deprecated (4.3) use configuration classes provided 'org.apache.http.config'
- * and 'org.apache.http.client.config'
- */
- @Deprecated
- void setParams(HttpParams params);
-
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/AbstractHttpEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/AbstractHttpEntity.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/AbstractHttpEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/AbstractHttpEntity.java Fri Oct 24 07:14:58 2014
@@ -27,8 +27,6 @@
package org.apache.http.entity;
-import java.io.IOException;
-
import org.apache.http.Header;
import org.apache.http.HttpEntity;
import org.apache.http.annotation.NotThreadSafe;
@@ -180,18 +178,6 @@ public abstract class AbstractHttpEntity
this.chunked = b;
}
-
- /**
- * The default implementation does not consume anything.
- *
- * @deprecated (4.1) Either use {@link #getContent()} and call {@link java.io.InputStream#close()} on that;
- * otherwise call {@link #writeTo(java.io.OutputStream)} which is required to free the resources.
- */
- @Override
- @Deprecated
- public void consumeContent() throws IOException {
- }
-
@Override
public String toString() {
final StringBuilder sb = new StringBuilder();
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/ByteArrayEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/ByteArrayEntity.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/ByteArrayEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/ByteArrayEntity.java Fri Oct 24 07:14:58 2014
@@ -43,22 +43,15 @@ import org.apache.http.util.Args;
@NotThreadSafe
public class ByteArrayEntity extends AbstractHttpEntity implements Cloneable {
- /**
- * @deprecated (4.2)
- */
- @Deprecated
- protected final byte[] content;
private final byte[] b;
private final int off, len;
/**
* @since 4.2
*/
- @SuppressWarnings("deprecation")
public ByteArrayEntity(final byte[] b, final ContentType contentType) {
super();
Args.notNull(b, "Source byte array");
- this.content = b;
this.b = b;
this.off = 0;
this.len = this.b.length;
@@ -70,7 +63,6 @@ public class ByteArrayEntity extends Abs
/**
* @since 4.2
*/
- @SuppressWarnings("deprecation")
public ByteArrayEntity(final byte[] b, final int off, final int len, final ContentType contentType) {
super();
Args.notNull(b, "Source byte array");
@@ -78,7 +70,6 @@ public class ByteArrayEntity extends Abs
((off + len) < 0) || ((off + len) > b.length)) {
throw new IndexOutOfBoundsException("off: " + off + " len: " + len + " b.length: " + b.length);
}
- this.content = b;
this.b = b;
this.off = off;
this.len = len;
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/FileEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/FileEntity.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/FileEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/FileEntity.java Fri Oct 24 07:14:58 2014
@@ -47,16 +47,6 @@ public class FileEntity extends Abstract
protected final File file;
/**
- * @deprecated (4.1.3) {@link #FileEntity(File, ContentType)}
- */
- @Deprecated
- public FileEntity(final File file, final String contentType) {
- super();
- this.file = Args.notNull(file, "File");
- setContentType(contentType);
- }
-
- /**
* @since 4.2
*/
public FileEntity(final File file, final ContentType contentType) {
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/HttpEntityWrapper.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/HttpEntityWrapper.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/HttpEntityWrapper.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/HttpEntityWrapper.java Fri Oct 24 07:14:58 2014
@@ -101,14 +101,4 @@ public class HttpEntityWrapper implement
return wrappedEntity.isStreaming();
}
- /**
- * @deprecated (4.1) Either use {@link #getContent()} and call {@link java.io.InputStream#close()} on that;
- * otherwise call {@link #writeTo(OutputStream)} which is required to free the resources.
- */
- @Override
- @Deprecated
- public void consumeContent() throws IOException {
- wrappedEntity.consumeContent();
- }
-
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/StringEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/StringEntity.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/StringEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/StringEntity.java Fri Oct 24 07:14:58 2014
@@ -76,32 +76,6 @@ public class StringEntity extends Abstra
}
/**
- * Creates a StringEntity with the specified content, MIME type and charset
- *
- * @param string content to be used. Not {@code null}.
- * @param mimeType MIME type to be used. May be {@code null}, in which case the default
- * is {@link HTTP#PLAIN_TEXT_TYPE} i.e. "text/plain"
- * @param charset character set to be used. May be {@code null}, in which case the default
- * is {@link HTTP#DEF_CONTENT_CHARSET} i.e. "ISO-8859-1"
- * @throws UnsupportedEncodingException If the named charset is not supported.
- *
- * @since 4.1
- * @throws IllegalArgumentException if the string parameter is null
- *
- * @deprecated (4.1.3) use {@link #StringEntity(String, ContentType)}
- */
- @Deprecated
- public StringEntity(
- final String string, final String mimeType, final String charset) throws UnsupportedEncodingException {
- super();
- Args.notNull(string, "Source string");
- final String mt = mimeType != null ? mimeType : HTTP.PLAIN_TEXT_TYPE;
- final String cs = charset != null ? charset :HTTP.DEFAULT_CONTENT_CHARSET;
- this.content = string.getBytes(cs);
- setContentType(mt + HTTP.CHARSET_PARAM + cs);
- }
-
- /**
* Creates a StringEntity with the specified content and charset. The MIME type defaults
* to "text/plain".
*
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/AbstractMessageParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/AbstractMessageParser.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/AbstractMessageParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/AbstractMessageParser.java Fri Oct 24 07:14:58 2014
@@ -43,8 +43,6 @@ import org.apache.http.io.HttpMessagePar
import org.apache.http.io.SessionInputBuffer;
import org.apache.http.message.BasicLineParser;
import org.apache.http.message.LineParser;
-import org.apache.http.params.HttpParamConfig;
-import org.apache.http.params.HttpParams;
import org.apache.http.util.Args;
import org.apache.http.util.CharArrayBuffer;
@@ -54,7 +52,6 @@ import org.apache.http.util.CharArrayBuf
*
* @since 4.0
*/
-@SuppressWarnings("deprecation")
@NotThreadSafe
public abstract class AbstractMessageParser<T extends HttpMessage> implements HttpMessageParser<T> {
@@ -70,31 +67,6 @@ public abstract class AbstractMessagePar
private T message;
/**
- * Creates an instance of AbstractMessageParser.
- *
- * @param buffer the session input buffer.
- * @param parser the line parser.
- * @param params HTTP parameters.
- *
- * @deprecated (4.3) use {@link AbstractMessageParser#AbstractMessageParser(SessionInputBuffer,
- * LineParser, MessageConstraints)}
- */
- @Deprecated
- public AbstractMessageParser(
- final SessionInputBuffer buffer,
- final LineParser parser,
- final HttpParams params) {
- super();
- Args.notNull(buffer, "Session input buffer");
- Args.notNull(params, "HTTP parameters");
- this.sessionBuffer = buffer;
- this.messageConstraints = HttpParamConfig.getMessageConstraints(params);
- this.lineParser = (parser != null) ? parser : BasicLineParser.INSTANCE;
- this.headerLines = new ArrayList<CharArrayBuffer>();
- this.state = HEAD_LINE;
- }
-
- /**
* Creates new instance of AbstractMessageParser.
*
* @param buffer the session input buffer.
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/AbstractMessageWriter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/AbstractMessageWriter.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/AbstractMessageWriter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/AbstractMessageWriter.java Fri Oct 24 07:14:58 2014
@@ -38,7 +38,6 @@ import org.apache.http.io.HttpMessageWri
import org.apache.http.io.SessionOutputBuffer;
import org.apache.http.message.BasicLineFormatter;
import org.apache.http.message.LineFormatter;
-import org.apache.http.params.HttpParams;
import org.apache.http.util.Args;
import org.apache.http.util.CharArrayBuffer;
@@ -48,7 +47,6 @@ import org.apache.http.util.CharArrayBuf
*
* @since 4.0
*/
-@SuppressWarnings("deprecation")
@NotThreadSafe
public abstract class AbstractMessageWriter<T extends HttpMessage> implements HttpMessageWriter<T> {
@@ -60,27 +58,6 @@ public abstract class AbstractMessageWri
* Creates an instance of AbstractMessageWriter.
*
* @param buffer the session output buffer.
- * @param formatter the line formatter.
- * @param params HTTP parameters.
- *
- * @deprecated (4.3) use
- * {@link AbstractMessageWriter#AbstractMessageWriter(SessionOutputBuffer, LineFormatter)}
- */
- @Deprecated
- public AbstractMessageWriter(final SessionOutputBuffer buffer,
- final LineFormatter formatter,
- final HttpParams params) {
- super();
- Args.notNull(buffer, "Session input buffer");
- this.sessionBuffer = buffer;
- this.lineBuf = new CharArrayBuffer(128);
- this.lineFormatter = (formatter != null) ? formatter : BasicLineFormatter.INSTANCE;
- }
-
- /**
- * Creates an instance of AbstractMessageWriter.
- *
- * @param buffer the session output buffer.
* @param formatter the line formatter If {@code null} {@link BasicLineFormatter#INSTANCE}
* will be used.
*
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/ChunkedOutputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/ChunkedOutputStream.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/ChunkedOutputStream.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/ChunkedOutputStream.java Fri Oct 24 07:14:58 2014
@@ -63,36 +63,6 @@ public class ChunkedOutputStream extends
/**
* Wraps a session output buffer and chunk-encodes the output.
*
- * @param out The session output buffer
- * @param bufferSize The minimum chunk size (excluding last chunk)
- * @throws IOException not thrown
- *
- * @deprecated (4.3) use {@link ChunkedOutputStream#ChunkedOutputStream(int, SessionOutputBuffer)}
- */
- @Deprecated
- public ChunkedOutputStream(final SessionOutputBuffer out, final int bufferSize)
- throws IOException {
- this(bufferSize, out);
- }
-
- /**
- * Wraps a session output buffer and chunks the output. The default buffer
- * size of 2048 was chosen because the chunk overhead is less than 0.5%
- *
- * @param out the output buffer to wrap
- * @throws IOException not thrown
- *
- * @deprecated (4.3) use {@link ChunkedOutputStream#ChunkedOutputStream(int, SessionOutputBuffer)}
- */
- @Deprecated
- public ChunkedOutputStream(final SessionOutputBuffer out)
- throws IOException {
- this(2048, out);
- }
-
- /**
- * Wraps a session output buffer and chunk-encodes the output.
- *
* @param bufferSize The minimum chunk size (excluding last chunk)
* @param out The session output buffer
*/
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpRequestParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpRequestParser.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpRequestParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpRequestParser.java Fri Oct 24 07:14:58 2014
@@ -41,8 +41,6 @@ import org.apache.http.impl.DefaultHttpR
import org.apache.http.io.SessionInputBuffer;
import org.apache.http.message.LineParser;
import org.apache.http.message.ParserCursor;
-import org.apache.http.params.HttpParams;
-import org.apache.http.util.Args;
import org.apache.http.util.CharArrayBuffer;
/**
@@ -51,7 +49,6 @@ import org.apache.http.util.CharArrayBuf
*
* @since 4.2
*/
-@SuppressWarnings("deprecation")
@NotThreadSafe
public class DefaultHttpRequestParser extends AbstractMessageParser<HttpRequest> {
@@ -59,30 +56,6 @@ public class DefaultHttpRequestParser ex
private final CharArrayBuffer lineBuf;
/**
- * Creates an instance of this class.
- *
- * @param buffer the session input buffer.
- * @param lineParser the line parser.
- * @param requestFactory the factory to use to create
- * {@link HttpRequest}s.
- * @param params HTTP parameters.
- *
- * @deprecated (4.3) use
- * {@link DefaultHttpRequestParser#DefaultHttpRequestParser(SessionInputBuffer, LineParser,
- * HttpRequestFactory, MessageConstraints)}
- */
- @Deprecated
- public DefaultHttpRequestParser(
- final SessionInputBuffer buffer,
- final LineParser lineParser,
- final HttpRequestFactory requestFactory,
- final HttpParams params) {
- super(buffer, lineParser, params);
- this.requestFactory = Args.notNull(requestFactory, "Request factory");
- this.lineBuf = new CharArrayBuffer(128);
- }
-
- /**
* Creates new instance of DefaultHttpRequestParser.
*
* @param buffer the session input buffer.
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpResponseParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpResponseParser.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpResponseParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpResponseParser.java Fri Oct 24 07:14:58 2014
@@ -41,8 +41,6 @@ import org.apache.http.impl.DefaultHttpR
import org.apache.http.io.SessionInputBuffer;
import org.apache.http.message.LineParser;
import org.apache.http.message.ParserCursor;
-import org.apache.http.params.HttpParams;
-import org.apache.http.util.Args;
import org.apache.http.util.CharArrayBuffer;
/**
@@ -51,7 +49,6 @@ import org.apache.http.util.CharArrayBuf
*
* @since 4.2
*/
-@SuppressWarnings("deprecation")
@NotThreadSafe
public class DefaultHttpResponseParser extends AbstractMessageParser<HttpResponse> {
@@ -59,30 +56,6 @@ public class DefaultHttpResponseParser e
private final CharArrayBuffer lineBuf;
/**
- * Creates an instance of this class.
- *
- * @param buffer the session input buffer.
- * @param lineParser the line parser.
- * @param responseFactory the factory to use to create
- * {@link HttpResponse}s.
- * @param params HTTP parameters.
- *
- * @deprecated (4.3) use
- * {@link DefaultHttpResponseParser#DefaultHttpResponseParser(SessionInputBuffer, LineParser,
- * HttpResponseFactory, MessageConstraints)}
- */
- @Deprecated
- public DefaultHttpResponseParser(
- final SessionInputBuffer buffer,
- final LineParser lineParser,
- final HttpResponseFactory responseFactory,
- final HttpParams params) {
- super(buffer, lineParser, params);
- this.responseFactory = Args.notNull(responseFactory, "Response factory");
- this.lineBuf = new CharArrayBuffer(128);
- }
-
- /**
* Creates new instance of DefaultHttpResponseParser.
*
* @param buffer the session input buffer.
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/SessionInputBufferImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/SessionInputBufferImpl.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/SessionInputBufferImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/SessionInputBufferImpl.java Fri Oct 24 07:14:58 2014
@@ -400,11 +400,6 @@ public class SessionInputBufferImpl impl
}
@Override
- public boolean isDataAvailable(final int timeout) throws IOException {
- return hasBufferedData();
- }
-
- @Override
public HttpTransportMetrics getMetrics() {
return this.metrics;
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/BasicConnFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/BasicConnFactory.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/BasicConnFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/BasicConnFactory.java Fri Oct 24 07:14:58 2014
@@ -39,13 +39,8 @@ import org.apache.http.HttpHost;
import org.apache.http.annotation.Immutable;
import org.apache.http.config.ConnectionConfig;
import org.apache.http.config.SocketConfig;
-import org.apache.http.impl.DefaultBHttpClientConnection;
import org.apache.http.impl.DefaultBHttpClientConnectionFactory;
-import org.apache.http.params.CoreConnectionPNames;
-import org.apache.http.params.HttpParamConfig;
-import org.apache.http.params.HttpParams;
import org.apache.http.pool.ConnFactory;
-import org.apache.http.util.Args;
/**
* A very basic {@link ConnFactory} implementation that creates
@@ -54,7 +49,6 @@ import org.apache.http.util.Args;
* @see HttpHost
* @since 4.2
*/
-@SuppressWarnings("deprecation")
@Immutable
public class BasicConnFactory implements ConnFactory<HttpHost, HttpClientConnection> {
@@ -65,32 +59,6 @@ public class BasicConnFactory implements
private final HttpConnectionFactory<? extends HttpClientConnection> connFactory;
/**
- * @deprecated (4.3) use
- * {@link BasicConnFactory#BasicConnFactory(SocketFactory, SSLSocketFactory, int,
- * SocketConfig, ConnectionConfig)}.
- */
- @Deprecated
- public BasicConnFactory(final SSLSocketFactory sslfactory, final HttpParams params) {
- super();
- Args.notNull(params, "HTTP params");
- this.plainfactory = null;
- this.sslfactory = sslfactory;
- this.connectTimeout = params.getIntParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, 0);
- this.sconfig = HttpParamConfig.getSocketConfig(params);
- this.connFactory = new DefaultBHttpClientConnectionFactory(
- HttpParamConfig.getConnectionConfig(params));
- }
-
- /**
- * @deprecated (4.3) use
- * {@link BasicConnFactory#BasicConnFactory(int, SocketConfig, ConnectionConfig)}.
- */
- @Deprecated
- public BasicConnFactory(final HttpParams params) {
- this(null, params);
- }
-
- /**
* @since 4.3
*/
public BasicConnFactory(
@@ -130,17 +98,6 @@ public class BasicConnFactory implements
this(null, null, 0, SocketConfig.DEFAULT, ConnectionConfig.DEFAULT);
}
- /**
- * @deprecated (4.3) no longer used.
- */
- @Deprecated
- protected HttpClientConnection create(final Socket socket, final HttpParams params) throws IOException {
- final int bufsize = params.getIntParameter(CoreConnectionPNames.SOCKET_BUFFER_SIZE, 8 * 1024);
- final DefaultBHttpClientConnection conn = new DefaultBHttpClientConnection(bufsize);
- conn.bind(socket);
- return conn;
- }
-
@Override
public HttpClientConnection create(final HttpHost host) throws IOException {
final String scheme = host.getSchemeName();
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/BasicConnPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/BasicConnPool.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/BasicConnPool.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/BasicConnPool.java Fri Oct 24 07:14:58 2014
@@ -33,7 +33,6 @@ import org.apache.http.HttpHost;
import org.apache.http.annotation.ThreadSafe;
import org.apache.http.config.ConnectionConfig;
import org.apache.http.config.SocketConfig;
-import org.apache.http.params.HttpParams;
import org.apache.http.pool.AbstractConnPool;
import org.apache.http.pool.ConnFactory;
@@ -47,7 +46,6 @@ import org.apache.http.pool.ConnFactory;
* @see HttpHost
* @since 4.2
*/
-@SuppressWarnings("deprecation")
@ThreadSafe
public class BasicConnPool extends AbstractConnPool<HttpHost, HttpClientConnection, BasicPoolEntry> {
@@ -58,14 +56,6 @@ public class BasicConnPool extends Abstr
}
/**
- * @deprecated (4.3) use {@link BasicConnPool#BasicConnPool(SocketConfig, ConnectionConfig)}
- */
- @Deprecated
- public BasicConnPool(final HttpParams params) {
- super(new BasicConnFactory(params), 2, 20);
- }
-
- /**
* @since 4.3
*/
public BasicConnPool(final SocketConfig sconfig, final ConnectionConfig cconfig) {
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/io/SessionInputBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/io/SessionInputBuffer.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/io/SessionInputBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/io/SessionInputBuffer.java Fri Oct 24 07:14:58 2014
@@ -127,21 +127,6 @@ public interface SessionInputBuffer {
*/
String readLine() throws IOException;
- /** Blocks until some data becomes available in the session buffer or the
- * given timeout period in milliseconds elapses. If the timeout value is
- * {@code 0} this method blocks indefinitely.
- *
- * @param timeout in milliseconds.
- * @return {@code true} if some data is available in the session
- * buffer or {@code false} otherwise.
- * @exception IOException if an I/O error occurs.
- *
- * @deprecated (4.3) do not use. This function should be provided at the
- * connection level
- */
- @Deprecated
- boolean isDataAvailable(int timeout) throws IOException;
-
/**
* Returns {@link HttpTransportMetrics} for this session buffer.
*
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/AbstractHttpMessage.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/AbstractHttpMessage.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/AbstractHttpMessage.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/AbstractHttpMessage.java Fri Oct 24 07:14:58 2014
@@ -31,8 +31,6 @@ import org.apache.http.Header;
import org.apache.http.HeaderIterator;
import org.apache.http.HttpMessage;
import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.params.BasicHttpParams;
-import org.apache.http.params.HttpParams;
import org.apache.http.util.Args;
/**
@@ -40,27 +38,13 @@ import org.apache.http.util.Args;
*
* @since 4.0
*/
-@SuppressWarnings("deprecation")
@NotThreadSafe
public abstract class AbstractHttpMessage implements HttpMessage {
protected HeaderGroup headergroup;
- @Deprecated
- protected HttpParams params;
-
- /**
- * @deprecated (4.3) use {@link AbstractHttpMessage#AbstractHttpMessage()}
- */
- @Deprecated
- protected AbstractHttpMessage(final HttpParams params) {
- super();
- this.headergroup = new HeaderGroup();
- this.params = params;
- }
-
protected AbstractHttpMessage() {
- this(null);
+ this.headergroup = new HeaderGroup();
}
// non-javadoc, see interface HttpMessage
@@ -157,24 +141,4 @@ public abstract class AbstractHttpMessag
return this.headergroup.iterator(name);
}
- /**
- * @deprecated (4.3) use constructor parameters of configuration API provided by HttpClient
- */
- @Override
- @Deprecated
- public HttpParams getParams() {
- if (this.params == null) {
- this.params = new BasicHttpParams();
- }
- return this.params;
- }
-
- /**
- * @deprecated (4.3) use constructor parameters of configuration API provided by HttpClient
- */
- @Override
- @Deprecated
- public void setParams(final HttpParams params) {
- this.params = Args.notNull(params, "HTTP parameters");
- }
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderValueFormatter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderValueFormatter.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderValueFormatter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderValueFormatter.java Fri Oct 24 07:14:58 2014
@@ -43,18 +43,6 @@ import org.apache.http.util.CharArrayBuf
@Immutable
public class BasicHeaderValueFormatter implements HeaderValueFormatter {
- /**
- * A default instance of this class, for use as default or fallback.
- * Note that {@link BasicHeaderValueFormatter} is not a singleton, there
- * can be many instances of the class itself and of derived classes.
- * The instance here provides non-customized, default behavior.
- *
- * @deprecated (4.3) use {@link #INSTANCE}
- */
- @Deprecated
- public final static
- BasicHeaderValueFormatter DEFAULT = new BasicHeaderValueFormatter();
-
public final static BasicHeaderValueFormatter INSTANCE = new BasicHeaderValueFormatter();
/**
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderValueParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderValueParser.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderValueParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderValueParser.java Fri Oct 24 07:14:58 2014
@@ -48,18 +48,6 @@ import org.apache.http.util.CharArrayBuf
@Immutable
public class BasicHeaderValueParser implements HeaderValueParser {
- /**
- * A default instance of this class, for use as default or fallback.
- * Note that {@link BasicHeaderValueParser} is not a singleton, there
- * can be many instances of the class itself and of derived classes.
- * The instance here provides non-customized, default behavior.
- *
- * @deprecated (4.3) use {@link #INSTANCE}
- */
- @Deprecated
- public final static
- BasicHeaderValueParser DEFAULT = new BasicHeaderValueParser();
-
public final static BasicHeaderValueParser INSTANCE = new BasicHeaderValueParser();
private final static char PARAM_DELIMITER = ';';
@@ -254,40 +242,6 @@ public class BasicHeaderValueParser impl
}
/**
- * @deprecated (4.4) use {@link org.apache.http.message.TokenParser}
- */
- @Deprecated
- public NameValuePair parseNameValuePair(final CharArrayBuffer buffer,
- final ParserCursor cursor,
- final char[] delimiters) {
- Args.notNull(buffer, "Char array buffer");
- Args.notNull(cursor, "Parser cursor");
-
- final BitSet delimSet = new BitSet();
- if (delimiters != null) {
- for (char delimiter: delimiters) {
- delimSet.set(delimiter);
- }
- }
- delimSet.set('=');
- final String name = tokenParser.parseToken(buffer, cursor, delimSet);
- if (cursor.atEnd()) {
- return new BasicNameValuePair(name, null);
- }
- final int delim = buffer.charAt(cursor.getPos());
- cursor.updatePos(cursor.getPos() + 1);
- if (delim != '=') {
- return createNameValuePair(name, null);
- }
- delimSet.clear('=');
- final String value = tokenParser.parseValue(buffer, cursor, delimSet);
- if (!cursor.atEnd()) {
- cursor.updatePos(cursor.getPos() + 1);
- }
- return createNameValuePair(name, value);
- }
-
- /**
* Creates a name-value pair.
* Called from {@link #parseNameValuePair}.
*