hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1716084 [3/3] - in /httpcomponents/httpcore/trunk: httpcore-osgi/src/test/java/org/apache/hc/core5/http/osgi/ httpcore/src/examples/org/apache/hc/core5/http/examples/ httpcore/src/main/java/org/apache/hc/core5/http/impl/pool/ httpcore/src/...
Date Tue, 24 Nov 2015 09:13:46 GMT
Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestServerSidePipelining.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestServerSidePipelining.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestServerSidePipelining.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestServerSidePipelining.java
Tue Nov 24 09:13:44 2015
@@ -48,7 +48,6 @@ import org.apache.hc.core5.http.nio.enti
 import org.apache.hc.core5.http.nio.entity.NStringEntity;
 import org.apache.hc.core5.http.nio.protocol.BasicAsyncRequestHandler;
 import org.apache.hc.core5.http.nio.protocol.UriHttpAsyncRequestHandlerMapper;
-import org.apache.hc.core5.http.nio.reactor.ListenerEndpoint;
 import org.apache.hc.core5.http.nio.testserver.HttpCoreNIOTestBase;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.http.protocol.HttpRequestHandler;
@@ -56,6 +55,7 @@ import org.apache.hc.core5.http.protocol
 import org.apache.hc.core5.http.protocol.ResponseConnControl;
 import org.apache.hc.core5.http.protocol.ResponseContent;
 import org.apache.hc.core5.http.protocol.ResponseServer;
+import org.apache.hc.core5.reactor.ListenerEndpoint;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestTruncatedChunks.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestTruncatedChunks.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestTruncatedChunks.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestTruncatedChunks.java
Tue Nov 24 09:13:44 2015
@@ -52,20 +52,20 @@ import org.apache.hc.core5.http.nio.Cont
 import org.apache.hc.core5.http.nio.ContentEncoder;
 import org.apache.hc.core5.http.nio.DefaultNHttpServerConnection;
 import org.apache.hc.core5.http.nio.IOControl;
+import org.apache.hc.core5.http.nio.SessionOutputBuffer;
 import org.apache.hc.core5.http.nio.codecs.AbstractContentEncoder;
 import org.apache.hc.core5.http.nio.entity.ContentInputStream;
 import org.apache.hc.core5.http.nio.protocol.AbstractAsyncResponseConsumer;
 import org.apache.hc.core5.http.nio.protocol.BasicAsyncRequestHandler;
 import org.apache.hc.core5.http.nio.protocol.BasicAsyncRequestProducer;
-import org.apache.hc.core5.http.nio.reactor.IOSession;
-import org.apache.hc.core5.http.nio.reactor.ListenerEndpoint;
-import org.apache.hc.core5.http.nio.reactor.SessionOutputBuffer;
 import org.apache.hc.core5.http.nio.testserver.HttpCoreNIOTestBase;
 import org.apache.hc.core5.http.nio.testserver.LoggingNHttpServerConnection;
 import org.apache.hc.core5.http.nio.testserver.ServerConnectionFactory;
 import org.apache.hc.core5.http.nio.util.HeapByteBufferAllocator;
 import org.apache.hc.core5.http.nio.util.SimpleInputBuffer;
 import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.reactor.IOSession;
+import org.apache.hc.core5.reactor.ListenerEndpoint;
 import org.apache.hc.core5.util.CharArrayBuffer;
 import org.junit.After;
 import org.junit.Assert;

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/pool/TestBasicNIOConnPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/pool/TestBasicNIOConnPool.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/pool/TestBasicNIOConnPool.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/pool/TestBasicNIOConnPool.java
Tue Nov 24 09:13:44 2015
@@ -33,10 +33,11 @@ import java.util.concurrent.TimeUnit;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.config.ConnectionConfig;
 import org.apache.hc.core5.http.nio.NHttpClientConnection;
-import org.apache.hc.core5.http.nio.reactor.ConnectingIOReactor;
-import org.apache.hc.core5.http.nio.reactor.IOSession;
-import org.apache.hc.core5.http.nio.reactor.SessionRequest;
-import org.apache.hc.core5.http.nio.reactor.SessionRequestCallback;
+import org.apache.hc.core5.pool.nio.NIOConnFactory;
+import org.apache.hc.core5.reactor.ConnectingIOReactor;
+import org.apache.hc.core5.reactor.IOSession;
+import org.apache.hc.core5.reactor.SessionRequest;
+import org.apache.hc.core5.reactor.SessionRequestCallback;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestHttpAsyncRequester.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestHttpAsyncRequester.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestHttpAsyncRequester.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestHttpAsyncRequester.java
Tue Nov 24 09:13:44 2015
@@ -36,11 +36,11 @@ import org.apache.hc.core5.http.HttpHost
 import org.apache.hc.core5.http.nio.NHttpClientConnection;
 import org.apache.hc.core5.http.nio.pool.BasicNIOPoolEntry;
 import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequester.ConnRequestCallback;
-import org.apache.hc.core5.http.pool.ConnPool;
-import org.apache.hc.core5.http.pool.PoolEntry;
 import org.apache.hc.core5.http.protocol.BasicHttpContext;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.http.protocol.HttpProcessor;
+import org.apache.hc.core5.pool.ConnPool;
+import org.apache.hc.core5.pool.PoolEntry;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestHttpAsyncService.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestHttpAsyncService.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestHttpAsyncService.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestHttpAsyncService.java
Tue Nov 24 09:13:44 2015
@@ -53,11 +53,11 @@ import org.apache.hc.core5.http.nio.prot
 import org.apache.hc.core5.http.nio.protocol.HttpAsyncService.Outgoing;
 import org.apache.hc.core5.http.nio.protocol.HttpAsyncService.PipelineEntry;
 import org.apache.hc.core5.http.nio.protocol.HttpAsyncService.State;
-import org.apache.hc.core5.http.nio.reactor.SessionBufferStatus;
 import org.apache.hc.core5.http.protocol.BasicHttpContext;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.http.protocol.HttpCoreContext;
 import org.apache.hc.core5.http.protocol.HttpProcessor;
+import org.apache.hc.core5.reactor.SessionBufferStatus;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/ClientConnectionFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/ClientConnectionFactory.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/ClientConnectionFactory.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/ClientConnectionFactory.java
Tue Nov 24 09:13:44 2015
@@ -30,10 +30,10 @@ import javax.net.ssl.SSLContext;
 
 import org.apache.hc.core5.http.nio.DefaultNHttpClientConnection;
 import org.apache.hc.core5.http.nio.NHttpConnectionFactory;
-import org.apache.hc.core5.http.nio.reactor.IOSession;
-import org.apache.hc.core5.http.nio.reactor.ssl.SSLIOSession;
-import org.apache.hc.core5.http.nio.reactor.ssl.SSLMode;
-import org.apache.hc.core5.http.nio.reactor.ssl.SSLSetupHandler;
+import org.apache.hc.core5.reactor.IOSession;
+import org.apache.hc.core5.reactor.ssl.SSLIOSession;
+import org.apache.hc.core5.reactor.ssl.SSLMode;
+import org.apache.hc.core5.reactor.ssl.SSLSetupHandler;
 
 public class ClientConnectionFactory implements NHttpConnectionFactory<DefaultNHttpClientConnection>
{
 

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/HttpClientNio.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/HttpClientNio.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/HttpClientNio.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/HttpClientNio.java
Tue Nov 24 09:13:44 2015
@@ -48,21 +48,12 @@ import org.apache.hc.core5.http.nio.NHtt
 import org.apache.hc.core5.http.nio.NHttpClientEventHandler;
 import org.apache.hc.core5.http.nio.pool.BasicNIOConnPool;
 import org.apache.hc.core5.http.nio.pool.BasicNIOPoolEntry;
-import org.apache.hc.core5.http.nio.pool.NIOConnFactory;
 import org.apache.hc.core5.http.nio.protocol.BasicAsyncRequestProducer;
 import org.apache.hc.core5.http.nio.protocol.BasicAsyncResponseConsumer;
 import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequestExecutor;
 import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequestProducer;
 import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequester;
 import org.apache.hc.core5.http.nio.protocol.HttpAsyncResponseConsumer;
-import org.apache.hc.core5.http.nio.reactor.ConnectingIOReactor;
-import org.apache.hc.core5.http.nio.reactor.DefaultConnectingIOReactor;
-import org.apache.hc.core5.http.nio.reactor.ExceptionEvent;
-import org.apache.hc.core5.http.nio.reactor.IOEventDispatch;
-import org.apache.hc.core5.http.nio.reactor.IOReactorExceptionHandler;
-import org.apache.hc.core5.http.nio.reactor.IOReactorStatus;
-import org.apache.hc.core5.http.nio.reactor.IOSession;
-import org.apache.hc.core5.http.nio.reactor.SessionRequest;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.http.protocol.HttpCoreContext;
 import org.apache.hc.core5.http.protocol.HttpProcessor;
@@ -72,6 +63,15 @@ import org.apache.hc.core5.http.protocol
 import org.apache.hc.core5.http.protocol.RequestExpectContinue;
 import org.apache.hc.core5.http.protocol.RequestTargetHost;
 import org.apache.hc.core5.http.protocol.RequestUserAgent;
+import org.apache.hc.core5.pool.nio.NIOConnFactory;
+import org.apache.hc.core5.reactor.ConnectingIOReactor;
+import org.apache.hc.core5.reactor.DefaultConnectingIOReactor;
+import org.apache.hc.core5.reactor.ExceptionEvent;
+import org.apache.hc.core5.reactor.IOEventDispatch;
+import org.apache.hc.core5.reactor.IOReactorExceptionHandler;
+import org.apache.hc.core5.reactor.IOReactorStatus;
+import org.apache.hc.core5.reactor.IOSession;
+import org.apache.hc.core5.reactor.SessionRequest;
 
 public class HttpClientNio {
 

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/HttpServerNio.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/HttpServerNio.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/HttpServerNio.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/HttpServerNio.java
Tue Nov 24 09:13:44 2015
@@ -42,9 +42,9 @@ import org.apache.hc.core5.http.nio.boot
 import org.apache.hc.core5.http.nio.protocol.HttpAsyncExpectationVerifier;
 import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequestHandler;
 import org.apache.hc.core5.http.nio.protocol.UriHttpAsyncRequestHandlerMapper;
-import org.apache.hc.core5.http.nio.reactor.IOReactorConfig;
-import org.apache.hc.core5.http.nio.reactor.ListenerEndpoint;
 import org.apache.hc.core5.http.protocol.HttpProcessor;
+import org.apache.hc.core5.reactor.IOReactorConfig;
+import org.apache.hc.core5.reactor.ListenerEndpoint;
 import org.apache.hc.core5.util.Asserts;
 
 public class HttpServerNio {

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/LoggingIOSession.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/LoggingIOSession.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/LoggingIOSession.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/LoggingIOSession.java
Tue Nov 24 09:13:44 2015
@@ -34,8 +34,8 @@ import java.nio.channels.ByteChannel;
 import java.nio.channels.SelectionKey;
 
 import org.apache.commons.logging.Log;
-import org.apache.hc.core5.http.nio.reactor.IOSession;
-import org.apache.hc.core5.http.nio.reactor.SessionBufferStatus;
+import org.apache.hc.core5.reactor.IOSession;
+import org.apache.hc.core5.reactor.SessionBufferStatus;
 
 /**
  * Decorator class intended to transparently extend an {@link IOSession}

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/LoggingNHttpClientConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/LoggingNHttpClientConnection.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/LoggingNHttpClientConnection.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/LoggingNHttpClientConnection.java
Tue Nov 24 09:13:44 2015
@@ -38,7 +38,7 @@ import org.apache.hc.core5.http.HttpRequ
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.nio.DefaultNHttpClientConnection;
 import org.apache.hc.core5.http.nio.NHttpClientEventHandler;
-import org.apache.hc.core5.http.nio.reactor.IOSession;
+import org.apache.hc.core5.reactor.IOSession;
 
 public class LoggingNHttpClientConnection extends DefaultNHttpClientConnection {
 

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/LoggingNHttpServerConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/LoggingNHttpServerConnection.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/LoggingNHttpServerConnection.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/LoggingNHttpServerConnection.java
Tue Nov 24 09:13:44 2015
@@ -38,7 +38,7 @@ import org.apache.hc.core5.http.HttpRequ
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.nio.DefaultNHttpServerConnection;
 import org.apache.hc.core5.http.nio.NHttpServerEventHandler;
-import org.apache.hc.core5.http.nio.reactor.IOSession;
+import org.apache.hc.core5.reactor.IOSession;
 
 public class LoggingNHttpServerConnection extends DefaultNHttpServerConnection {
 

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/ServerConnectionFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/ServerConnectionFactory.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/ServerConnectionFactory.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/testserver/ServerConnectionFactory.java
Tue Nov 24 09:13:44 2015
@@ -30,10 +30,10 @@ import javax.net.ssl.SSLContext;
 
 import org.apache.hc.core5.http.nio.DefaultNHttpServerConnection;
 import org.apache.hc.core5.http.nio.NHttpConnectionFactory;
-import org.apache.hc.core5.http.nio.reactor.IOSession;
-import org.apache.hc.core5.http.nio.reactor.ssl.SSLIOSession;
-import org.apache.hc.core5.http.nio.reactor.ssl.SSLMode;
-import org.apache.hc.core5.http.nio.reactor.ssl.SSLSetupHandler;
+import org.apache.hc.core5.reactor.IOSession;
+import org.apache.hc.core5.reactor.ssl.SSLIOSession;
+import org.apache.hc.core5.reactor.ssl.SSLMode;
+import org.apache.hc.core5.reactor.ssl.SSLSetupHandler;
 
 public class ServerConnectionFactory implements NHttpConnectionFactory<DefaultNHttpServerConnection>
{
 

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/util/ContentEncoderMock.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/util/ContentEncoderMock.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/util/ContentEncoderMock.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/util/ContentEncoderMock.java
Tue Nov 24 09:13:44 2015
@@ -32,8 +32,8 @@ import java.nio.ByteBuffer;
 import java.nio.channels.WritableByteChannel;
 
 import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
+import org.apache.hc.core5.http.nio.SessionOutputBuffer;
 import org.apache.hc.core5.http.nio.codecs.AbstractContentEncoder;
-import org.apache.hc.core5.http.nio.reactor.SessionOutputBuffer;
 import org.apache.hc.core5.util.Asserts;
 
 public class ContentEncoderMock extends AbstractContentEncoder {

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/util/TestBuffers.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/util/TestBuffers.java?rev=1716084&r1=1716083&r2=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/util/TestBuffers.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/util/TestBuffers.java
Tue Nov 24 09:13:44 2015
@@ -39,8 +39,8 @@ import org.apache.hc.core5.http.Readable
 import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
 import org.apache.hc.core5.http.nio.ContentDecoder;
 import org.apache.hc.core5.http.nio.ContentEncoder;
-import org.apache.hc.core5.http.nio.reactor.SessionOutputBuffer;
-import org.apache.hc.core5.http.nio.reactor.SessionOutputBufferImpl;
+import org.apache.hc.core5.http.nio.SessionOutputBuffer;
+import org.apache.hc.core5.http.nio.SessionOutputBufferImpl;
 import org.junit.Assert;
 import org.junit.Test;
 

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/pool/io/TestConnPool.java
(from r1715834, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/pool/TestConnPool.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/pool/io/TestConnPool.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/pool/io/TestConnPool.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/pool/TestConnPool.java&r1=1715834&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/pool/TestConnPool.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/pool/io/TestConnPool.java
Tue Nov 24 09:13:44 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.pool;
+package org.apache.hc.core5.pool.io;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -34,6 +34,8 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 import org.apache.hc.core5.http.BHttpConnection;
+import org.apache.hc.core5.pool.PoolEntry;
+import org.apache.hc.core5.pool.PoolStats;
 import org.junit.Assert;
 import org.junit.Test;
 import org.mockito.Mockito;

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/pool/io/TestPoolEntry.java
(from r1715834, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/pool/TestPoolEntry.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/pool/io/TestPoolEntry.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/pool/io/TestPoolEntry.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/pool/TestPoolEntry.java&r1=1715834&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/pool/TestPoolEntry.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/pool/io/TestPoolEntry.java
Tue Nov 24 09:13:44 2015
@@ -24,12 +24,13 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.pool;
+package org.apache.hc.core5.pool.io;
 
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.hc.core5.http.HttpConnection;
+import org.apache.hc.core5.pool.PoolEntry;
 import org.junit.Assert;
 import org.junit.Test;
 import org.mockito.Mockito;

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/pool/io/TestRouteSpecificPool.java
(from r1715834, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/pool/TestRouteSpecificPool.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/pool/io/TestRouteSpecificPool.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/pool/io/TestRouteSpecificPool.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/pool/TestRouteSpecificPool.java&r1=1715834&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/pool/TestRouteSpecificPool.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/pool/io/TestRouteSpecificPool.java
Tue Nov 24 09:13:44 2015
@@ -24,11 +24,12 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.pool;
+package org.apache.hc.core5.pool.io;
 
 import java.io.IOException;
+import java.net.Socket;
 
-import org.apache.hc.core5.http.HttpConnection;
+import org.apache.hc.core5.pool.PoolEntry;
 import org.junit.Assert;
 import org.junit.Test;
 import org.mockito.Mockito;
@@ -37,10 +38,10 @@ public class TestRouteSpecificPool {
 
     private static final String ROUTE = "whatever";
 
-    static class LocalPoolEntry extends PoolEntry<String, HttpConnection> {
+    static class LocalPoolEntry extends PoolEntry<String, Socket> {
 
-        public LocalPoolEntry(final String route, final HttpConnection conn) {
-            super(null, route, conn);
+        public LocalPoolEntry(final String route, final Socket socket) {
+            super(null, route, socket);
         }
 
         @Override
@@ -53,20 +54,20 @@ public class TestRouteSpecificPool {
 
         @Override
         public boolean isClosed() {
-            return !getConnection().isOpen();
+            return getConnection().isClosed();
         }
 
     }
 
-    static class LocalRoutePool extends RouteSpecificPool<String, HttpConnection, LocalPoolEntry>
{
+    static class LocalRoutePool extends RouteSpecificPool<String, Socket, LocalPoolEntry>
{
 
         public LocalRoutePool() {
             super(ROUTE);
         }
 
         @Override
-        protected LocalPoolEntry createEntry(final HttpConnection conn) {
-            return new LocalPoolEntry(getRoute(), conn);
+        protected LocalPoolEntry createEntry(final Socket socket) {
+            return new LocalPoolEntry(getRoute(), socket);
         }
 
     }
@@ -86,8 +87,8 @@ public class TestRouteSpecificPool {
     @Test
     public void testAdd() throws Exception {
         final LocalRoutePool pool = new LocalRoutePool();
-        final HttpConnection conn = Mockito.mock(HttpConnection.class);
-        final PoolEntry<String, HttpConnection> entry = pool.add(conn);
+        final Socket conn = Mockito.mock(Socket.class);
+        final PoolEntry<String, Socket> entry = pool.add(conn);
         Assert.assertEquals(1, pool.getAllocatedCount());
         Assert.assertEquals(0, pool.getAvailableCount());
         Assert.assertEquals(1, pool.getLeasedCount());
@@ -99,11 +100,11 @@ public class TestRouteSpecificPool {
     @Test
     public void testLeaseRelease() throws Exception {
         final LocalRoutePool pool = new LocalRoutePool();
-        final HttpConnection conn1 = Mockito.mock(HttpConnection.class);
+        final Socket conn1 = Mockito.mock(Socket.class);
         final LocalPoolEntry entry1 = pool.add(conn1);
-        final HttpConnection conn2 = Mockito.mock(HttpConnection.class);
+        final Socket conn2 = Mockito.mock(Socket.class);
         final LocalPoolEntry entry2 = pool.add(conn2);
-        final HttpConnection conn3 = Mockito.mock(HttpConnection.class);
+        final Socket conn3 = Mockito.mock(Socket.class);
         final LocalPoolEntry entry3 = pool.add(conn3);
 
         Assert.assertNotNull(entry1);
@@ -139,11 +140,11 @@ public class TestRouteSpecificPool {
     @Test
     public void testLeaseOrder() throws Exception {
         final LocalRoutePool pool = new LocalRoutePool();
-        final HttpConnection conn1 = Mockito.mock(HttpConnection.class);
+        final Socket conn1 = Mockito.mock(Socket.class);
         final LocalPoolEntry entry1 = pool.add(conn1);
-        final HttpConnection conn2 = Mockito.mock(HttpConnection.class);
+        final Socket conn2 = Mockito.mock(Socket.class);
         final LocalPoolEntry entry2 = pool.add(conn2);
-        final HttpConnection conn3 = Mockito.mock(HttpConnection.class);
+        final Socket conn3 = Mockito.mock(Socket.class);
         final LocalPoolEntry entry3 = pool.add(conn3);
 
         Assert.assertNotNull(entry1);
@@ -169,11 +170,11 @@ public class TestRouteSpecificPool {
     @Test
     public void testLeaseReleaseStateful() throws Exception {
         final LocalRoutePool pool = new LocalRoutePool();
-        final HttpConnection conn1 = Mockito.mock(HttpConnection.class);
+        final Socket conn1 = Mockito.mock(Socket.class);
         final LocalPoolEntry entry1 = pool.add(conn1);
-        final HttpConnection conn2 = Mockito.mock(HttpConnection.class);
+        final Socket conn2 = Mockito.mock(Socket.class);
         final LocalPoolEntry entry2 = pool.add(conn2);
-        final HttpConnection conn3 = Mockito.mock(HttpConnection.class);
+        final Socket conn3 = Mockito.mock(Socket.class);
         final LocalPoolEntry entry3 = pool.add(conn3);
 
         Assert.assertNotNull(entry1);
@@ -213,7 +214,7 @@ public class TestRouteSpecificPool {
     @Test(expected=IllegalStateException.class)
     public void testReleaseInvalidEntry() throws Exception {
         final LocalRoutePool pool = new LocalRoutePool();
-        final HttpConnection conn = Mockito.mock(HttpConnection.class);
+        final Socket conn = Mockito.mock(Socket.class);
         final LocalPoolEntry entry = new LocalPoolEntry(ROUTE, conn);
         pool.free(entry, true);
     }
@@ -221,11 +222,11 @@ public class TestRouteSpecificPool {
     @Test
     public void testRemove() throws Exception {
         final LocalRoutePool pool = new LocalRoutePool();
-        final HttpConnection conn1 = Mockito.mock(HttpConnection.class);
+        final Socket conn1 = Mockito.mock(Socket.class);
         final LocalPoolEntry entry1 = pool.add(conn1);
-        final HttpConnection conn2 = Mockito.mock(HttpConnection.class);
+        final Socket conn2 = Mockito.mock(Socket.class);
         final LocalPoolEntry entry2 = pool.add(conn2);
-        final HttpConnection conn3 = Mockito.mock(HttpConnection.class);
+        final Socket conn3 = Mockito.mock(Socket.class);
         final LocalPoolEntry entry3 = pool.add(conn3);
 
         Assert.assertNotNull(entry1);
@@ -302,9 +303,9 @@ public class TestRouteSpecificPool {
     @Test
     public void testShutdown() throws Exception {
         final LocalRoutePool pool = new LocalRoutePool();
-        final HttpConnection conn1 = Mockito.mock(HttpConnection.class);
+        final Socket conn1 = Mockito.mock(Socket.class);
         final LocalPoolEntry entry1 = pool.add(conn1);
-        final HttpConnection conn2 = Mockito.mock(HttpConnection.class);
+        final Socket conn2 = Mockito.mock(Socket.class);
         final LocalPoolEntry entry2 = pool.add(conn2);
 
         @SuppressWarnings("unchecked")

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/pool/nio/TestNIOConnPool.java
(from r1715835, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/pool/TestNIOConnPool.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/pool/nio/TestNIOConnPool.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/pool/nio/TestNIOConnPool.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/pool/TestNIOConnPool.java&r1=1715835&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/pool/TestNIOConnPool.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/pool/nio/TestNIOConnPool.java
Tue Nov 24 09:13:44 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.nio.pool;
+package org.apache.hc.core5.pool.nio;
 
 import java.io.IOException;
 import java.net.ConnectException;
@@ -37,13 +37,13 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.hc.core5.concurrent.BasicFuture;
-import org.apache.hc.core5.http.nio.reactor.ConnectingIOReactor;
-import org.apache.hc.core5.http.nio.reactor.IOReactorStatus;
-import org.apache.hc.core5.http.nio.reactor.IOSession;
-import org.apache.hc.core5.http.nio.reactor.SessionRequest;
-import org.apache.hc.core5.http.nio.reactor.SessionRequestCallback;
-import org.apache.hc.core5.http.pool.PoolEntry;
-import org.apache.hc.core5.http.pool.PoolStats;
+import org.apache.hc.core5.pool.PoolEntry;
+import org.apache.hc.core5.pool.PoolStats;
+import org.apache.hc.core5.reactor.ConnectingIOReactor;
+import org.apache.hc.core5.reactor.IOReactorStatus;
+import org.apache.hc.core5.reactor.IOSession;
+import org.apache.hc.core5.reactor.SessionRequest;
+import org.apache.hc.core5.reactor.SessionRequestCallback;
 import org.junit.Assert;
 import org.junit.Test;
 import org.mockito.Matchers;

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/pool/nio/TestRouteSpecificPool.java
(from r1715835, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/pool/TestRouteSpecificPool.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/pool/nio/TestRouteSpecificPool.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/pool/nio/TestRouteSpecificPool.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/pool/TestRouteSpecificPool.java&r1=1715835&r2=1716084&rev=1716084&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/pool/TestRouteSpecificPool.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/pool/nio/TestRouteSpecificPool.java
Tue Nov 24 09:13:44 2015
@@ -24,16 +24,16 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.core5.http.nio.pool;
+package org.apache.hc.core5.pool.nio;
 
 import java.io.IOException;
 import java.net.ConnectException;
 import java.util.concurrent.ExecutionException;
 
 import org.apache.hc.core5.concurrent.BasicFuture;
-import org.apache.hc.core5.http.nio.reactor.IOSession;
-import org.apache.hc.core5.http.nio.reactor.SessionRequest;
-import org.apache.hc.core5.http.pool.PoolEntry;
+import org.apache.hc.core5.pool.PoolEntry;
+import org.apache.hc.core5.reactor.IOSession;
+import org.apache.hc.core5.reactor.SessionRequest;
 import org.junit.Assert;
 import org.junit.Test;
 import org.mockito.Mockito;



Mime
View raw message