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 2011/12/21 17:29:08 UTC
svn commit: r1221790 - in /httpcomponents/httpcore/trunk/httpcore-nio/src:
main/java/org/apache/http/nio/protocol/
test/java/org/apache/http/impl/nio/reactor/
test/java/org/apache/http/nio/integration/
test/java/org/apache/http/nio/protocol/
Author: olegk
Date: Wed Dec 21 16:29:07 2011
New Revision: 1221790
URL: http://svn.apache.org/viewvc?rev=1221790&view=rev
Log:
Renamed class
Added:
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncRequestHandler.java (contents, props changed)
- copied, changed from r1221788, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BufferingAsyncRequestHandler.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBasicAsyncRequestHandler.java (contents, props changed)
- copied, changed from r1221788, httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBufferingAsyncRequestHandler.java
Removed:
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BufferingAsyncRequestHandler.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBufferingAsyncRequestHandler.java
Modified:
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/SimpleNHttpRequestHandler.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactors.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlers.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestTruncatedChunks.java
Copied: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncRequestHandler.java (from r1221788, httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BufferingAsyncRequestHandler.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncRequestHandler.java?p2=httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncRequestHandler.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BufferingAsyncRequestHandler.java&r1=1221788&r2=1221790&rev=1221790&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BufferingAsyncRequestHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncRequestHandler.java Wed Dec 21 16:29:07 2011
@@ -44,11 +44,11 @@ import org.apache.http.protocol.HttpRequ
* @since 4.2
*/
@Immutable
-public class BufferingAsyncRequestHandler implements HttpAsyncRequestHandler<HttpRequest> {
+public class BasicAsyncRequestHandler implements HttpAsyncRequestHandler<HttpRequest> {
private final HttpRequestHandler handler;
- public BufferingAsyncRequestHandler(final HttpRequestHandler handler) {
+ public BasicAsyncRequestHandler(final HttpRequestHandler handler) {
super();
if (handler == null) {
throw new IllegalArgumentException("Request handler may not be null");
Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncRequestHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncRequestHandler.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncRequestHandler.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/SimpleNHttpRequestHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/SimpleNHttpRequestHandler.java?rev=1221790&r1=1221789&r2=1221790&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/SimpleNHttpRequestHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/SimpleNHttpRequestHandler.java Wed Dec 21 16:29:07 2011
@@ -42,7 +42,7 @@ import org.apache.http.protocol.HttpCont
*
* @since 4.0
*
- * @deprecated use {@link BufferingAsyncRequestHandler}
+ * @deprecated use {@link BasicAsyncRequestHandler}
*/
@Deprecated
@Immutable
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactors.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactors.java?rev=1221790&r1=1221789&r2=1221790&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactors.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactors.java Wed Dec 21 16:29:07 2011
@@ -55,7 +55,7 @@ import org.apache.http.nio.NHttpConnecti
import org.apache.http.nio.NHttpServerConnection;
import org.apache.http.nio.protocol.BasicAsyncRequestProducer;
import org.apache.http.nio.protocol.BasicAsyncResponseConsumer;
-import org.apache.http.nio.protocol.BufferingAsyncRequestHandler;
+import org.apache.http.nio.protocol.BasicAsyncRequestHandler;
import org.apache.http.nio.protocol.HttpAsyncClientProtocolHandler;
import org.apache.http.nio.protocol.HttpAsyncRequestHandlerRegistry;
import org.apache.http.nio.protocol.HttpAsyncServerProtocolHandler;
@@ -199,7 +199,7 @@ public class TestDefaultIOReactors exten
};
HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
- registry.register("*", new BufferingAsyncRequestHandler(requestHandler));
+ registry.register("*", new BasicAsyncRequestHandler(requestHandler));
HttpAsyncServerProtocolHandler serviceHandler = new HttpAsyncServerProtocolHandler(
this.serverHttpProc,
new DefaultConnectionReuseStrategy(),
@@ -282,7 +282,7 @@ public class TestDefaultIOReactors exten
};
HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
- registry.register("*", new BufferingAsyncRequestHandler(requestHandler));
+ registry.register("*", new BasicAsyncRequestHandler(requestHandler));
HttpAsyncServerProtocolHandler serviceHandler = new HttpAsyncServerProtocolHandler(
this.serverHttpProc,
new DefaultConnectionReuseStrategy(),
@@ -366,7 +366,7 @@ public class TestDefaultIOReactors exten
};
HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
- registry.register("*", new BufferingAsyncRequestHandler(requestHandler));
+ registry.register("*", new BasicAsyncRequestHandler(requestHandler));
HttpAsyncServerProtocolHandler serviceHandler = new HttpAsyncServerProtocolHandler(
this.serverHttpProc,
new DefaultConnectionReuseStrategy(),
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=1221790&r1=1221789&r2=1221790&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 Wed Dec 21 16:29:07 2011
@@ -57,7 +57,7 @@ import org.apache.http.nio.protocol.Basi
import org.apache.http.nio.protocol.BasicAsyncRequestProducer;
import org.apache.http.nio.protocol.BasicAsyncResponseConsumer;
import org.apache.http.nio.protocol.BasicAsyncResponseProducer;
-import org.apache.http.nio.protocol.BufferingAsyncRequestHandler;
+import org.apache.http.nio.protocol.BasicAsyncRequestHandler;
import org.apache.http.nio.protocol.HttpAsyncClientProtocolHandler;
import org.apache.http.nio.protocol.HttpAsyncExpectationVerifier;
import org.apache.http.nio.protocol.HttpAsyncRequestConsumer;
@@ -144,7 +144,7 @@ public class TestHttpAsyncHandlers exten
@Test
public void testHttpGets() throws Exception {
HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
- registry.register("*", new BufferingAsyncRequestHandler(new SimpleRequestHandler()));
+ registry.register("*", new BasicAsyncRequestHandler(new SimpleRequestHandler()));
InetSocketAddress address = start(registry, null);
this.connpool.setDefaultMaxPerRoute(3);
@@ -177,7 +177,7 @@ public class TestHttpAsyncHandlers exten
@Test
public void testHttpHeads() throws Exception {
HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
- registry.register("*", new BufferingAsyncRequestHandler(new SimpleRequestHandler()));
+ registry.register("*", new BasicAsyncRequestHandler(new SimpleRequestHandler()));
InetSocketAddress address = start(registry, null);
this.connpool.setDefaultMaxPerRoute(3);
@@ -209,7 +209,7 @@ public class TestHttpAsyncHandlers exten
@Test
public void testHttpPostsWithContentLength() throws Exception {
HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
- registry.register("*", new BufferingAsyncRequestHandler(new SimpleRequestHandler()));
+ registry.register("*", new BasicAsyncRequestHandler(new SimpleRequestHandler()));
InetSocketAddress address = start(registry, null);
this.connpool.setDefaultMaxPerRoute(3);
@@ -245,7 +245,7 @@ public class TestHttpAsyncHandlers exten
@Test
public void testHttpPostsChunked() throws Exception {
HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
- registry.register("*", new BufferingAsyncRequestHandler(new SimpleRequestHandler()));
+ registry.register("*", new BasicAsyncRequestHandler(new SimpleRequestHandler()));
InetSocketAddress address = start(registry, null);
this.connpool.setDefaultMaxPerRoute(3);
@@ -282,7 +282,7 @@ public class TestHttpAsyncHandlers exten
@Test
public void testHttpPostsHTTP10() throws Exception {
HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
- registry.register("*", new BufferingAsyncRequestHandler(new SimpleRequestHandler()));
+ registry.register("*", new BasicAsyncRequestHandler(new SimpleRequestHandler()));
InetSocketAddress address = start(registry, null);
this.connpool.setDefaultMaxPerRoute(3);
@@ -318,7 +318,7 @@ public class TestHttpAsyncHandlers exten
@Test
public void testHttpPostsNoEntity() throws Exception {
HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
- registry.register("*", new BufferingAsyncRequestHandler(new SimpleRequestHandler()));
+ registry.register("*", new BasicAsyncRequestHandler(new SimpleRequestHandler()));
InetSocketAddress address = start(registry, null);
this.connpool.setDefaultMaxPerRoute(3);
@@ -352,7 +352,7 @@ public class TestHttpAsyncHandlers exten
@Test
public void testHttpPostsWithExpectContinue() throws Exception {
HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
- registry.register("*", new BufferingAsyncRequestHandler(new SimpleRequestHandler()));
+ registry.register("*", new BasicAsyncRequestHandler(new SimpleRequestHandler()));
InetSocketAddress address = start(registry, null);
this.connpool.setDefaultMaxPerRoute(3);
@@ -412,7 +412,7 @@ public class TestHttpAsyncHandlers exten
};
HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
- registry.register("*", new BufferingAsyncRequestHandler(new SimpleRequestHandler()));
+ registry.register("*", new BasicAsyncRequestHandler(new SimpleRequestHandler()));
InetSocketAddress address = start(registry, expectationVerifier);
BasicHttpEntityEnclosingRequest request1 = new BasicHttpEntityEnclosingRequest(
@@ -563,7 +563,7 @@ public class TestHttpAsyncHandlers exten
};
HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
- registry.register("*", new BufferingAsyncRequestHandler(new SimpleRequestHandler()));
+ registry.register("*", new BasicAsyncRequestHandler(new SimpleRequestHandler()));
InetSocketAddress address = start(registry, expectationVerifier);
BasicHttpEntityEnclosingRequest request1 = new BasicHttpEntityEnclosingRequest(
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestTruncatedChunks.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestTruncatedChunks.java?rev=1221790&r1=1221789&r2=1221790&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestTruncatedChunks.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestTruncatedChunks.java Wed Dec 21 16:29:07 2011
@@ -60,7 +60,7 @@ import org.apache.http.nio.entity.Conten
import org.apache.http.nio.protocol.AbstractAsyncResponseConsumer;
import org.apache.http.nio.protocol.BasicAsyncRequestProducer;
import org.apache.http.nio.protocol.BasicAsyncResponseConsumer;
-import org.apache.http.nio.protocol.BufferingAsyncRequestHandler;
+import org.apache.http.nio.protocol.BasicAsyncRequestHandler;
import org.apache.http.nio.protocol.HttpAsyncClientProtocolHandler;
import org.apache.http.nio.protocol.HttpAsyncRequestHandlerRegistry;
import org.apache.http.nio.protocol.HttpAsyncServerProtocolHandler;
@@ -192,7 +192,7 @@ public class TestTruncatedChunks extends
@Test
public void testTruncatedChunkException() throws Exception {
HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
- registry.register("*", new BufferingAsyncRequestHandler(new SimpleRequestHandler(true)));
+ registry.register("*", new BasicAsyncRequestHandler(new SimpleRequestHandler(true)));
HttpAsyncServerProtocolHandler serviceHandler = new HttpAsyncServerProtocolHandler(
this.serverHttpProc,
new DefaultConnectionReuseStrategy(),
@@ -273,7 +273,7 @@ public class TestTruncatedChunks extends
@Test
public void testIgnoreTruncatedChunkException() throws Exception {
HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
- registry.register("*", new BufferingAsyncRequestHandler(new SimpleRequestHandler(true)));
+ registry.register("*", new BasicAsyncRequestHandler(new SimpleRequestHandler(true)));
HttpAsyncServerProtocolHandler serviceHandler = new HttpAsyncServerProtocolHandler(
this.serverHttpProc,
new DefaultConnectionReuseStrategy(),
Copied: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBasicAsyncRequestHandler.java (from r1221788, httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBufferingAsyncRequestHandler.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBasicAsyncRequestHandler.java?p2=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBasicAsyncRequestHandler.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBufferingAsyncRequestHandler.java&r1=1221788&r2=1221790&rev=1221790&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBufferingAsyncRequestHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBasicAsyncRequestHandler.java Wed Dec 21 16:29:07 2011
@@ -41,10 +41,10 @@ import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
-public class TestBufferingAsyncRequestHandler {
+public class TestBasicAsyncRequestHandler {
private HttpRequestHandler requestHandler;
- private BufferingAsyncRequestHandler asyncRequestHandler;
+ private BasicAsyncRequestHandler asyncRequestHandler;
private HttpContext context;
private HttpRequest request;
private HttpResponse response;
@@ -53,7 +53,7 @@ public class TestBufferingAsyncRequestHa
@Before
public void setUp() throws Exception {
this.requestHandler = Mockito.mock(HttpRequestHandler.class);
- this.asyncRequestHandler = new BufferingAsyncRequestHandler(this.requestHandler);
+ this.asyncRequestHandler = new BasicAsyncRequestHandler(this.requestHandler);
this.context = new BasicHttpContext();
this.request = Mockito.mock(HttpRequest.class);
this.response = Mockito.mock(HttpResponse.class);
@@ -70,7 +70,7 @@ public class TestBufferingAsyncRequestHa
@Test
public void testInvalidConstruction() throws Exception {
try {
- new BufferingAsyncRequestHandler(null);
+ new BasicAsyncRequestHandler(null);
Assert.fail("IllegalArgumentException expected");
} catch (IllegalArgumentException ex) {
}
Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBasicAsyncRequestHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBasicAsyncRequestHandler.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBasicAsyncRequestHandler.java
------------------------------------------------------------------------------
svn:mime-type = text/plain