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 2012/09/09 19:47:12 UTC
svn commit: r1382547 - in /httpcomponents/httpcore/trunk:
httpcore-nio/src/examples/org/apache/http/examples/nio/
httpcore-nio/src/main/java/org/apache/http/nio/protocol/
httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/
httpcore-nio/src/tes...
Author: olegk
Date: Sun Sep 9 17:47:11 2012
New Revision: 1382547
URL: http://svn.apache.org/viewvc?rev=1382547&view=rev
Log:
Removed references to deprecated classes
Modified:
httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpReverseProxy.java
httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpServer.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncService.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpRequestHandlerRegistry.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/impl/nio/reactor/TestDefaultListeningIOReactor.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlerCancellable.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/TestHttpAsyncPrematureTermination.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestPipelining.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestTruncatedChunks.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncService.java
httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/http/examples/ElementalHttpServer.java
httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/http/examples/ElementalReverseProxy.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpService.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/UriHttpRequestHandlerMapper.java
httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpRequestHandlerRegistry.java
httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpService.java
httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/testserver/HttpServer.java
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpReverseProxy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpReverseProxy.java?rev=1382547&r1=1382546&r2=1382547&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpReverseProxy.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpReverseProxy.java Sun Sep 9 17:47:11 2012
@@ -70,13 +70,13 @@ import org.apache.http.nio.protocol.Http
import org.apache.http.nio.protocol.HttpAsyncRequestConsumer;
import org.apache.http.nio.protocol.HttpAsyncRequestExecutor;
import org.apache.http.nio.protocol.HttpAsyncRequestHandler;
-import org.apache.http.nio.protocol.HttpAsyncRequestHandlerRegistry;
-import org.apache.http.nio.protocol.HttpAsyncRequestHandlerResolver;
+import org.apache.http.nio.protocol.HttpAsyncRequestHandlerMapper;
import org.apache.http.nio.protocol.HttpAsyncRequestProducer;
import org.apache.http.nio.protocol.HttpAsyncRequester;
import org.apache.http.nio.protocol.HttpAsyncResponseConsumer;
import org.apache.http.nio.protocol.HttpAsyncResponseProducer;
import org.apache.http.nio.protocol.HttpAsyncService;
+import org.apache.http.nio.protocol.UriHttpAsyncRequestHandlerMapper;
import org.apache.http.nio.reactor.ConnectingIOReactor;
import org.apache.http.nio.reactor.IOEventDispatch;
import org.apache.http.nio.reactor.ListeningIOReactor;
@@ -160,7 +160,7 @@ public class NHttpReverseProxy {
connPool.setMaxTotal(100);
connPool.setDefaultMaxPerRoute(20);
- HttpAsyncRequestHandlerRegistry handlerRegistry = new HttpAsyncRequestHandlerRegistry();
+ UriHttpAsyncRequestHandlerMapper handlerRegistry = new UriHttpAsyncRequestHandlerMapper();
handlerRegistry.register("*", new ProxyRequestHandler(targetHost, executor, connPool));
ProxyServiceHandler serviceHandler = new ProxyServiceHandler(
@@ -795,7 +795,7 @@ public class NHttpReverseProxy {
public ProxyServiceHandler(
final HttpProcessor httpProcessor,
final ConnectionReuseStrategy reuseStrategy,
- final HttpAsyncRequestHandlerResolver handlerResolver,
+ final HttpAsyncRequestHandlerMapper handlerResolver,
final HttpParams params) {
super(httpProcessor, reuseStrategy, handlerResolver, params);
}
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpServer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpServer.java?rev=1382547&r1=1382546&r2=1382547&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpServer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpServer.java Sun Sep 9 17:47:11 2012
@@ -47,9 +47,9 @@ import org.apache.http.HttpStatus;
import org.apache.http.MethodNotSupportedException;
import org.apache.http.entity.ContentType;
import org.apache.http.impl.DefaultConnectionReuseStrategy;
+import org.apache.http.impl.nio.DefaultHttpServerIODispatch;
import org.apache.http.impl.nio.DefaultNHttpServerConnection;
import org.apache.http.impl.nio.DefaultNHttpServerConnectionFactory;
-import org.apache.http.impl.nio.DefaultHttpServerIODispatch;
import org.apache.http.impl.nio.SSLNHttpServerConnectionFactory;
import org.apache.http.impl.nio.reactor.DefaultListeningIOReactor;
import org.apache.http.nio.NHttpConnection;
@@ -59,11 +59,11 @@ import org.apache.http.nio.entity.NFileE
import org.apache.http.nio.entity.NStringEntity;
import org.apache.http.nio.protocol.BasicAsyncRequestConsumer;
import org.apache.http.nio.protocol.BasicAsyncResponseProducer;
+import org.apache.http.nio.protocol.HttpAsyncExchange;
import org.apache.http.nio.protocol.HttpAsyncRequestConsumer;
import org.apache.http.nio.protocol.HttpAsyncRequestHandler;
-import org.apache.http.nio.protocol.HttpAsyncRequestHandlerRegistry;
-import org.apache.http.nio.protocol.HttpAsyncExchange;
import org.apache.http.nio.protocol.HttpAsyncService;
+import org.apache.http.nio.protocol.UriHttpAsyncRequestHandlerMapper;
import org.apache.http.nio.reactor.IOEventDispatch;
import org.apache.http.nio.reactor.ListeningIOReactor;
import org.apache.http.params.HttpCoreConfigBuilder;
@@ -109,7 +109,7 @@ public class NHttpServer {
new ResponseConnControl()
});
// Create request handler registry
- HttpAsyncRequestHandlerRegistry reqistry = new HttpAsyncRequestHandlerRegistry();
+ UriHttpAsyncRequestHandlerMapper reqistry = new UriHttpAsyncRequestHandlerMapper();
// Register the default handler for all URIs
reqistry.register("*", new HttpFileHandler(docRoot));
// Create server-side HTTP protocol handler
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=1382547&r1=1382546&r2=1382547&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 Sun Sep 9 17:47:11 2012
@@ -840,6 +840,7 @@ public class HttpAsyncService implements
/**
* Adaptor class to transition from HttpAsyncRequestHandlerResolver to HttpAsyncRequestHandlerMapper.
*/
+ @Deprecated
private static class HttpAsyncRequestHandlerResolverAdapter implements HttpAsyncRequestHandlerMapper {
private final HttpAsyncRequestHandlerResolver resolver;
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpRequestHandlerRegistry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpRequestHandlerRegistry.java?rev=1382547&r1=1382546&r2=1382547&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpRequestHandlerRegistry.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpRequestHandlerRegistry.java Sun Sep 9 17:47:11 2012
@@ -48,7 +48,7 @@ import org.apache.http.protocol.UriPatte
*
* @since 4.0
*
- * @deprecated (4.2) use {@link HttpAsyncRequestHandlerRegistry}
+ * @deprecated (4.2) use {@link UriHttpAsyncRequestHandlerMapper}
*/
@Deprecated
public class NHttpRequestHandlerRegistry implements NHttpRequestHandlerResolver {
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=1382547&r1=1382546&r2=1382547&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 Sun Sep 9 17:47:11 2012
@@ -53,12 +53,12 @@ import org.apache.http.message.BasicHttp
import org.apache.http.nio.NHttpClientConnection;
import org.apache.http.nio.NHttpConnectionFactory;
import org.apache.http.nio.NHttpServerConnection;
+import org.apache.http.nio.protocol.BasicAsyncRequestHandler;
import org.apache.http.nio.protocol.BasicAsyncRequestProducer;
import org.apache.http.nio.protocol.BasicAsyncResponseConsumer;
-import org.apache.http.nio.protocol.BasicAsyncRequestHandler;
import org.apache.http.nio.protocol.HttpAsyncRequestExecutor;
-import org.apache.http.nio.protocol.HttpAsyncRequestHandlerRegistry;
import org.apache.http.nio.protocol.HttpAsyncService;
+import org.apache.http.nio.protocol.UriHttpAsyncRequestHandlerMapper;
import org.apache.http.nio.reactor.IOReactorException;
import org.apache.http.nio.reactor.IOReactorExceptionHandler;
import org.apache.http.nio.reactor.IOReactorStatus;
@@ -113,7 +113,7 @@ public class TestDefaultIOReactors exten
this.connpool.setDefaultMaxPerRoute(connNo);
this.connpool.setMaxTotal(connNo);
- HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
+ UriHttpAsyncRequestHandlerMapper registry = new UriHttpAsyncRequestHandlerMapper();
HttpAsyncService serviceHandler = new HttpAsyncService(
this.serverHttpProc,
DefaultConnectionReuseStrategy.INSTANCE,
@@ -198,7 +198,7 @@ public class TestDefaultIOReactors exten
};
- HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
+ UriHttpAsyncRequestHandlerMapper registry = new UriHttpAsyncRequestHandlerMapper();
registry.register("*", new BasicAsyncRequestHandler(requestHandler));
HttpAsyncService serviceHandler = new HttpAsyncService(
this.serverHttpProc,
@@ -281,7 +281,7 @@ public class TestDefaultIOReactors exten
};
- HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
+ UriHttpAsyncRequestHandlerMapper registry = new UriHttpAsyncRequestHandlerMapper();
registry.register("*", new BasicAsyncRequestHandler(requestHandler));
HttpAsyncService serviceHandler = new HttpAsyncService(
this.serverHttpProc,
@@ -365,7 +365,7 @@ public class TestDefaultIOReactors exten
};
- HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
+ UriHttpAsyncRequestHandlerMapper registry = new UriHttpAsyncRequestHandlerMapper();
registry.register("*", new BasicAsyncRequestHandler(requestHandler));
HttpAsyncService serviceHandler = new HttpAsyncService(
this.serverHttpProc,
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultListeningIOReactor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultListeningIOReactor.java?rev=1382547&r1=1382546&r2=1382547&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultListeningIOReactor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultListeningIOReactor.java Sun Sep 9 17:47:11 2012
@@ -37,8 +37,8 @@ import java.util.concurrent.TimeUnit;
import org.apache.http.HttpResponseInterceptor;
import org.apache.http.impl.DefaultConnectionReuseStrategy;
import org.apache.http.impl.nio.DefaultHttpServerIODispatch;
-import org.apache.http.nio.protocol.HttpAsyncRequestHandlerRegistry;
import org.apache.http.nio.protocol.HttpAsyncService;
+import org.apache.http.nio.protocol.UriHttpAsyncRequestHandlerMapper;
import org.apache.http.nio.reactor.IOEventDispatch;
import org.apache.http.nio.reactor.IOReactorExceptionHandler;
import org.apache.http.nio.reactor.IOReactorStatus;
@@ -71,7 +71,7 @@ public class TestDefaultListeningIOReact
HttpAsyncService serviceHandler = new HttpAsyncService(
httpproc,
DefaultConnectionReuseStrategy.INSTANCE,
- new HttpAsyncRequestHandlerRegistry(),
+ new UriHttpAsyncRequestHandlerMapper(),
params);
return new DefaultHttpServerIODispatch(serviceHandler, params);
}
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlerCancellable.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlerCancellable.java?rev=1382547&r1=1382546&r2=1382547&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlerCancellable.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlerCancellable.java Sun Sep 9 17:47:11 2012
@@ -58,9 +58,9 @@ import org.apache.http.nio.protocol.Basi
import org.apache.http.nio.protocol.HttpAsyncExchange;
import org.apache.http.nio.protocol.HttpAsyncRequestConsumer;
import org.apache.http.nio.protocol.HttpAsyncRequestHandler;
-import org.apache.http.nio.protocol.HttpAsyncRequestHandlerRegistry;
import org.apache.http.nio.protocol.HttpAsyncResponseProducer;
import org.apache.http.nio.protocol.HttpAsyncService;
+import org.apache.http.nio.protocol.UriHttpAsyncRequestHandlerMapper;
import org.apache.http.nio.reactor.IOReactorStatus;
import org.apache.http.nio.reactor.ListenerEndpoint;
import org.apache.http.params.HttpParams;
@@ -127,7 +127,7 @@ public class TestHttpAsyncHandlerCancell
};
- HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
+ UriHttpAsyncRequestHandlerMapper registry = new UriHttpAsyncRequestHandlerMapper();
registry.register("*", new HttpAsyncRequestHandler<HttpRequest>() {
public HttpAsyncRequestConsumer<HttpRequest> processRequest(
@@ -190,7 +190,7 @@ public class TestHttpAsyncHandlerCancell
}
};
- HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
+ UriHttpAsyncRequestHandlerMapper registry = new UriHttpAsyncRequestHandlerMapper();
registry.register("*", new HttpAsyncRequestHandler<HttpRequest>() {
public HttpAsyncRequestConsumer<HttpRequest> processRequest(
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=1382547&r1=1382546&r2=1382547&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 Sun Sep 9 17:47:11 2012
@@ -64,10 +64,10 @@ import org.apache.http.nio.protocol.Http
import org.apache.http.nio.protocol.HttpAsyncRequestConsumer;
import org.apache.http.nio.protocol.HttpAsyncRequestExecutor;
import org.apache.http.nio.protocol.HttpAsyncRequestHandler;
-import org.apache.http.nio.protocol.HttpAsyncRequestHandlerRegistry;
-import org.apache.http.nio.protocol.HttpAsyncRequestHandlerResolver;
+import org.apache.http.nio.protocol.HttpAsyncRequestHandlerMapper;
import org.apache.http.nio.protocol.HttpAsyncRequester;
import org.apache.http.nio.protocol.HttpAsyncService;
+import org.apache.http.nio.protocol.UriHttpAsyncRequestHandlerMapper;
import org.apache.http.nio.reactor.IOReactorStatus;
import org.apache.http.nio.reactor.ListenerEndpoint;
import org.apache.http.params.CoreProtocolPNames;
@@ -117,7 +117,7 @@ public class TestHttpAsyncHandlers exten
}
private InetSocketAddress start(
- final HttpAsyncRequestHandlerResolver requestHandlerResolver,
+ final HttpAsyncRequestHandlerMapper requestHandlerResolver,
final HttpAsyncExpectationVerifier expectationVerifier) throws Exception {
HttpAsyncService serviceHandler = new HttpAsyncService(
this.serverHttpProc,
@@ -151,7 +151,7 @@ public class TestHttpAsyncHandlers exten
@Test
public void testHttpGets() throws Exception {
- HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
+ UriHttpAsyncRequestHandlerMapper registry = new UriHttpAsyncRequestHandlerMapper();
registry.register("*", new BasicAsyncRequestHandler(new SimpleRequestHandler()));
InetSocketAddress address = start(registry, null);
@@ -184,7 +184,7 @@ public class TestHttpAsyncHandlers exten
@Test
public void testHttpHeads() throws Exception {
- HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
+ UriHttpAsyncRequestHandlerMapper registry = new UriHttpAsyncRequestHandlerMapper();
registry.register("*", new BasicAsyncRequestHandler(new SimpleRequestHandler()));
InetSocketAddress address = start(registry, null);
@@ -216,7 +216,7 @@ public class TestHttpAsyncHandlers exten
@Test
public void testHttpPostsWithContentLength() throws Exception {
- HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
+ UriHttpAsyncRequestHandlerMapper registry = new UriHttpAsyncRequestHandlerMapper();
registry.register("*", new BasicAsyncRequestHandler(new SimpleRequestHandler()));
InetSocketAddress address = start(registry, null);
@@ -252,7 +252,7 @@ public class TestHttpAsyncHandlers exten
@Test
public void testHttpPostsChunked() throws Exception {
- HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
+ UriHttpAsyncRequestHandlerMapper registry = new UriHttpAsyncRequestHandlerMapper();
registry.register("*", new BasicAsyncRequestHandler(new SimpleRequestHandler()));
InetSocketAddress address = start(registry, null);
@@ -289,7 +289,7 @@ public class TestHttpAsyncHandlers exten
@Test
public void testHttpPostsHTTP10() throws Exception {
- HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
+ UriHttpAsyncRequestHandlerMapper registry = new UriHttpAsyncRequestHandlerMapper();
registry.register("*", new BasicAsyncRequestHandler(new SimpleRequestHandler()));
InetSocketAddress address = start(registry, null);
@@ -325,7 +325,7 @@ public class TestHttpAsyncHandlers exten
@Test
public void testHttpPostsNoEntity() throws Exception {
- HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
+ UriHttpAsyncRequestHandlerMapper registry = new UriHttpAsyncRequestHandlerMapper();
registry.register("*", new BasicAsyncRequestHandler(new SimpleRequestHandler()));
InetSocketAddress address = start(registry, null);
@@ -359,7 +359,7 @@ public class TestHttpAsyncHandlers exten
@Test
public void testHttpPostNoContentLength() throws Exception {
- HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
+ UriHttpAsyncRequestHandlerMapper registry = new UriHttpAsyncRequestHandlerMapper();
registry.register("*", new BasicAsyncRequestHandler(new SimpleRequestHandler()));
this.clientHttpProc = new ImmutableHttpProcessor(new HttpRequestInterceptor[] {
@@ -399,7 +399,7 @@ public class TestHttpAsyncHandlers exten
@Test
public void testHttpPostIdentity() throws Exception {
- HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
+ UriHttpAsyncRequestHandlerMapper registry = new UriHttpAsyncRequestHandlerMapper();
registry.register("*", new BasicAsyncRequestHandler(new SimpleRequestHandler()));
this.clientHttpProc = new ImmutableHttpProcessor(new HttpRequestInterceptor[] {
@@ -448,7 +448,7 @@ public class TestHttpAsyncHandlers exten
@Test
public void testHttpPostsWithExpectContinue() throws Exception {
- HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
+ UriHttpAsyncRequestHandlerMapper registry = new UriHttpAsyncRequestHandlerMapper();
registry.register("*", new BasicAsyncRequestHandler(new SimpleRequestHandler()));
InetSocketAddress address = start(registry, null);
@@ -508,7 +508,7 @@ public class TestHttpAsyncHandlers exten
};
- HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
+ UriHttpAsyncRequestHandlerMapper registry = new UriHttpAsyncRequestHandlerMapper();
registry.register("*", new BasicAsyncRequestHandler(new SimpleRequestHandler()));
InetSocketAddress address = start(registry, expectationVerifier);
@@ -596,7 +596,7 @@ public class TestHttpAsyncHandlers exten
}
- HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
+ UriHttpAsyncRequestHandlerMapper registry = new UriHttpAsyncRequestHandlerMapper();
registry.register("*", new DelayedRequestHandler());
InetSocketAddress address = start(registry, null);
@@ -659,7 +659,7 @@ public class TestHttpAsyncHandlers exten
};
- HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
+ UriHttpAsyncRequestHandlerMapper registry = new UriHttpAsyncRequestHandlerMapper();
registry.register("*", new BasicAsyncRequestHandler(new SimpleRequestHandler()));
InetSocketAddress address = start(registry, expectationVerifier);
@@ -726,7 +726,7 @@ public class TestHttpAsyncHandlers exten
}
- HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
+ UriHttpAsyncRequestHandlerMapper registry = new UriHttpAsyncRequestHandlerMapper();
registry.register("*", new FailingRequestHandler());
InetSocketAddress address = start(registry, null);
@@ -758,7 +758,7 @@ public class TestHttpAsyncHandlers exten
@Test
public void testNoServiceHandler() throws Exception {
- HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
+ UriHttpAsyncRequestHandlerMapper registry = new UriHttpAsyncRequestHandlerMapper();
InetSocketAddress address = start(registry, null);
this.connpool.setDefaultMaxPerRoute(3);
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncPrematureTermination.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncPrematureTermination.java?rev=1382547&r1=1382546&r2=1382547&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncPrematureTermination.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncPrematureTermination.java Sun Sep 9 17:47:11 2012
@@ -59,9 +59,9 @@ import org.apache.http.nio.protocol.Http
import org.apache.http.nio.protocol.HttpAsyncRequestConsumer;
import org.apache.http.nio.protocol.HttpAsyncRequestExecutor;
import org.apache.http.nio.protocol.HttpAsyncRequestHandler;
-import org.apache.http.nio.protocol.HttpAsyncRequestHandlerRegistry;
-import org.apache.http.nio.protocol.HttpAsyncRequestHandlerResolver;
+import org.apache.http.nio.protocol.HttpAsyncRequestHandlerMapper;
import org.apache.http.nio.protocol.HttpAsyncService;
+import org.apache.http.nio.protocol.UriHttpAsyncRequestHandlerMapper;
import org.apache.http.nio.reactor.IOReactorStatus;
import org.apache.http.nio.reactor.ListenerEndpoint;
import org.apache.http.params.HttpParams;
@@ -101,7 +101,7 @@ public class TestHttpAsyncPrematureTermi
}
private InetSocketAddress start(
- final HttpAsyncRequestHandlerResolver requestHandlerResolver,
+ final HttpAsyncRequestHandlerMapper requestHandlerResolver,
final HttpAsyncExpectationVerifier expectationVerifier) throws Exception {
HttpAsyncService serviceHandler = new HttpAsyncService(
this.serverHttpProc,
@@ -123,7 +123,7 @@ public class TestHttpAsyncPrematureTermi
@Test
public void testConnectionTerminatedProcessingRequest() throws Exception {
- HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
+ UriHttpAsyncRequestHandlerMapper registry = new UriHttpAsyncRequestHandlerMapper();
registry.register("*", new HttpAsyncRequestHandler<HttpRequest>() {
public HttpAsyncRequestConsumer<HttpRequest> processRequest(
@@ -178,7 +178,7 @@ public class TestHttpAsyncPrematureTermi
@Test
public void testConnectionTerminatedHandlingRequest() throws Exception {
- HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
+ UriHttpAsyncRequestHandlerMapper registry = new UriHttpAsyncRequestHandlerMapper();
registry.register("*", new HttpAsyncRequestHandler<HttpRequest>() {
public HttpAsyncRequestConsumer<HttpRequest> processRequest(
@@ -233,7 +233,7 @@ public class TestHttpAsyncPrematureTermi
@Test
public void testConnectionTerminatedSendingResponse() throws Exception {
- HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
+ UriHttpAsyncRequestHandlerMapper registry = new UriHttpAsyncRequestHandlerMapper();
registry.register("*", new HttpAsyncRequestHandler<HttpRequest>() {
public HttpAsyncRequestConsumer<HttpRequest> processRequest(
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestPipelining.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestPipelining.java?rev=1382547&r1=1382546&r2=1382547&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestPipelining.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestPipelining.java Sun Sep 9 17:47:11 2012
@@ -58,8 +58,8 @@ import org.apache.http.nio.protocol.Basi
import org.apache.http.nio.protocol.HttpAsyncExchange;
import org.apache.http.nio.protocol.HttpAsyncRequestConsumer;
import org.apache.http.nio.protocol.HttpAsyncRequestHandler;
-import org.apache.http.nio.protocol.HttpAsyncRequestHandlerRegistry;
import org.apache.http.nio.protocol.HttpAsyncService;
+import org.apache.http.nio.protocol.UriHttpAsyncRequestHandlerMapper;
import org.apache.http.nio.reactor.IOReactorStatus;
import org.apache.http.nio.reactor.ListenerEndpoint;
import org.apache.http.params.HttpParams;
@@ -108,7 +108,7 @@ public class TestPipelining extends Http
@Test
public void testBasicPipelining() throws Exception {
- HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
+ UriHttpAsyncRequestHandlerMapper registry = new UriHttpAsyncRequestHandlerMapper();
registry.register("*", new BasicAsyncRequestHandler(new HttpRequestHandler() {
public void handle(
@@ -198,7 +198,7 @@ public class TestPipelining extends Http
}
};
- HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
+ UriHttpAsyncRequestHandlerMapper registry = new UriHttpAsyncRequestHandlerMapper();
registry.register("/long", new HttpAsyncRequestHandler<HttpRequest>() {
public HttpAsyncRequestConsumer<HttpRequest> processRequest(final HttpRequest request,
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=1382547&r1=1382546&r2=1382547&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 Sun Sep 9 17:47:11 2012
@@ -61,12 +61,12 @@ import org.apache.http.nio.IOControl;
import org.apache.http.nio.NHttpConnectionFactory;
import org.apache.http.nio.entity.ContentInputStream;
import org.apache.http.nio.protocol.AbstractAsyncResponseConsumer;
+import org.apache.http.nio.protocol.BasicAsyncRequestHandler;
import org.apache.http.nio.protocol.BasicAsyncRequestProducer;
import org.apache.http.nio.protocol.BasicAsyncResponseConsumer;
-import org.apache.http.nio.protocol.BasicAsyncRequestHandler;
import org.apache.http.nio.protocol.HttpAsyncRequestExecutor;
-import org.apache.http.nio.protocol.HttpAsyncRequestHandlerRegistry;
import org.apache.http.nio.protocol.HttpAsyncService;
+import org.apache.http.nio.protocol.UriHttpAsyncRequestHandlerMapper;
import org.apache.http.nio.reactor.IOReactorStatus;
import org.apache.http.nio.reactor.IOSession;
import org.apache.http.nio.reactor.ListenerEndpoint;
@@ -193,7 +193,7 @@ public class TestTruncatedChunks extends
@Test
public void testTruncatedChunkException() throws Exception {
- HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
+ UriHttpAsyncRequestHandlerMapper registry = new UriHttpAsyncRequestHandlerMapper();
registry.register("*", new BasicAsyncRequestHandler(new SimpleRequestHandler(true)));
HttpAsyncService serviceHandler = new HttpAsyncService(
this.serverHttpProc,
@@ -278,7 +278,7 @@ public class TestTruncatedChunks extends
@Test
public void testIgnoreTruncatedChunkException() throws Exception {
- HttpAsyncRequestHandlerRegistry registry = new HttpAsyncRequestHandlerRegistry();
+ UriHttpAsyncRequestHandlerMapper registry = new UriHttpAsyncRequestHandlerMapper();
registry.register("*", new BasicAsyncRequestHandler(new SimpleRequestHandler(true)));
HttpAsyncService serviceHandler = new HttpAsyncService(
this.serverHttpProc,
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncService.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncService.java?rev=1382547&r1=1382546&r2=1382547&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncService.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncService.java Sun Sep 9 17:47:11 2012
@@ -65,7 +65,7 @@ import org.mockito.Mockito;
public class TestHttpAsyncService {
- private HttpAsyncRequestHandlerRegistry handlerResolver;
+ private UriHttpAsyncRequestHandlerMapper handlerResolver;
private HttpAsyncService protocolHandler;
private HttpProcessor httpProcessor;
private ConnectionReuseStrategy reuseStrategy;
@@ -86,7 +86,7 @@ public class TestHttpAsyncService {
this.requestHandler = Mockito.mock(HttpAsyncRequestHandler.class);
this.requestConsumer = Mockito.mock(HttpAsyncRequestConsumer.class);
this.responseProducer = Mockito.mock(HttpAsyncResponseProducer.class);
- this.handlerResolver = new HttpAsyncRequestHandlerRegistry();
+ this.handlerResolver = new UriHttpAsyncRequestHandlerMapper();
this.handlerResolver.register("/", this.requestHandler);
this.httpProcessor = Mockito.mock(HttpProcessor.class);
this.reuseStrategy = Mockito.mock(ConnectionReuseStrategy.class);
Modified: httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/http/examples/ElementalHttpServer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/http/examples/ElementalHttpServer.java?rev=1382547&r1=1382546&r2=1382547&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/http/examples/ElementalHttpServer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/http/examples/ElementalHttpServer.java Sun Sep 9 17:47:11 2012
@@ -54,19 +54,19 @@ import org.apache.http.impl.DefaultHttpR
import org.apache.http.impl.DefaultHttpServerConnection;
import org.apache.http.params.BasicHttpParams;
import org.apache.http.params.CoreConnectionPNames;
-import org.apache.http.params.HttpParams;
import org.apache.http.params.CoreProtocolPNames;
-import org.apache.http.protocol.HttpContext;
+import org.apache.http.params.HttpParams;
import org.apache.http.protocol.BasicHttpContext;
+import org.apache.http.protocol.HttpContext;
import org.apache.http.protocol.HttpProcessor;
import org.apache.http.protocol.HttpRequestHandler;
-import org.apache.http.protocol.HttpRequestHandlerRegistry;
import org.apache.http.protocol.HttpService;
import org.apache.http.protocol.ImmutableHttpProcessor;
import org.apache.http.protocol.ResponseConnControl;
import org.apache.http.protocol.ResponseContent;
import org.apache.http.protocol.ResponseDate;
import org.apache.http.protocol.ResponseServer;
+import org.apache.http.protocol.UriHttpRequestHandlerMapper;
import org.apache.http.util.EntityUtils;
/**
@@ -171,7 +171,7 @@ public class ElementalHttpServer {
});
// Set up request handlers
- HttpRequestHandlerRegistry reqistry = new HttpRequestHandlerRegistry();
+ UriHttpRequestHandlerMapper reqistry = new UriHttpRequestHandlerMapper();
reqistry.register("*", new HttpFileHandler(docroot));
// Set up the HTTP service
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=1382547&r1=1382546&r2=1382547&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 Sun Sep 9 17:47:11 2012
@@ -57,7 +57,6 @@ import org.apache.http.protocol.HttpCont
import org.apache.http.protocol.HttpProcessor;
import org.apache.http.protocol.HttpRequestExecutor;
import org.apache.http.protocol.HttpRequestHandler;
-import org.apache.http.protocol.HttpRequestHandlerRegistry;
import org.apache.http.protocol.HttpService;
import org.apache.http.protocol.ImmutableHttpProcessor;
import org.apache.http.protocol.RequestConnControl;
@@ -69,6 +68,7 @@ import org.apache.http.protocol.Response
import org.apache.http.protocol.ResponseContent;
import org.apache.http.protocol.ResponseDate;
import org.apache.http.protocol.ResponseServer;
+import org.apache.http.protocol.UriHttpRequestHandlerMapper;
/**
* Rudimentary HTTP/1.1 reverse proxy.
@@ -208,7 +208,7 @@ public class ElementalReverseProxy {
HttpRequestExecutor httpexecutor = new HttpRequestExecutor();
// Set up incoming request handler
- HttpRequestHandlerRegistry reqistry = new HttpRequestHandlerRegistry();
+ UriHttpRequestHandlerMapper reqistry = new UriHttpRequestHandlerMapper();
reqistry.register("*", new ProxyHandler(
this.target,
outhttpproc,
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpService.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpService.java?rev=1382547&r1=1382546&r2=1382547&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpService.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpService.java Sun Sep 9 17:47:11 2012
@@ -420,6 +420,7 @@ public class HttpService {
/**
* Adaptor class to transition from HttpRequestHandlerResolver to HttpRequestHandlerMapper.
*/
+ @Deprecated
private static class HttpRequestHandlerResolverAdapter implements HttpRequestHandlerMapper {
private final HttpRequestHandlerResolver resolver;
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/UriHttpRequestHandlerMapper.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/UriHttpRequestHandlerMapper.java?rev=1382547&r1=1382546&r2=1382547&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/UriHttpRequestHandlerMapper.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/UriHttpRequestHandlerMapper.java Sun Sep 9 17:47:11 2012
@@ -95,8 +95,6 @@ public class UriHttpRequestHandlerMapper
/**
* Get the handler map.
* @return The map of handlers and their associated URI patterns.
- *
- * @since 4.3
*/
public Map<String, HttpRequestHandler> getHandlers() {
return matcher.getObjects();
Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpRequestHandlerRegistry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpRequestHandlerRegistry.java?rev=1382547&r1=1382546&r2=1382547&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpRequestHandlerRegistry.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpRequestHandlerRegistry.java Sun Sep 9 17:47:11 2012
@@ -37,6 +37,7 @@ import org.apache.http.HttpResponse;
import org.junit.Assert;
import org.junit.Test;
+@Deprecated
public class TestHttpRequestHandlerRegistry {
private static class DummyHttpRequestHandler implements HttpRequestHandler {
Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpService.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpService.java?rev=1382547&r1=1382546&r2=1382547&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpService.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpService.java Sun Sep 9 17:47:11 2012
@@ -58,7 +58,7 @@ public class TestHttpService {
HttpProcessor httprocessor = Mockito.mock(HttpProcessor.class);
ConnectionReuseStrategy connReuseStrategy = Mockito.mock(ConnectionReuseStrategy.class);
HttpResponseFactory responseFactory = Mockito.mock(HttpResponseFactory.class);
- HttpRequestHandlerResolver handlerResolver = Mockito.mock(HttpRequestHandlerResolver.class);
+ HttpRequestHandlerMapper handlerResolver = Mockito.mock(HttpRequestHandlerMapper.class);
HttpParams params = new BasicHttpParams();
try {
new HttpService(
@@ -107,7 +107,7 @@ public class TestHttpService {
HttpProcessor httprocessor = Mockito.mock(HttpProcessor.class);
ConnectionReuseStrategy connReuseStrategy = Mockito.mock(ConnectionReuseStrategy.class);
HttpResponseFactory responseFactory = Mockito.mock(HttpResponseFactory.class);
- HttpRequestHandlerResolver handlerResolver = Mockito.mock(HttpRequestHandlerResolver.class);
+ HttpRequestHandlerMapper handlerResolver = Mockito.mock(HttpRequestHandlerMapper.class);
HttpParams params = new BasicHttpParams();
HttpService httpservice = new HttpService(
@@ -145,7 +145,7 @@ public class TestHttpService {
HttpProcessor httprocessor = Mockito.mock(HttpProcessor.class);
ConnectionReuseStrategy connReuseStrategy = Mockito.mock(ConnectionReuseStrategy.class);
HttpResponseFactory responseFactory = Mockito.mock(HttpResponseFactory.class);
- HttpRequestHandlerResolver handlerResolver = Mockito.mock(HttpRequestHandlerResolver.class);
+ HttpRequestHandlerMapper handlerResolver = Mockito.mock(HttpRequestHandlerMapper.class);
HttpParams params = new BasicHttpParams();
HttpService httpservice = new HttpService(
@@ -172,7 +172,7 @@ public class TestHttpService {
HttpProcessor httprocessor = Mockito.mock(HttpProcessor.class);
ConnectionReuseStrategy connReuseStrategy = Mockito.mock(ConnectionReuseStrategy.class);
HttpResponseFactory responseFactory = Mockito.mock(HttpResponseFactory.class);
- HttpRequestHandlerResolver handlerResolver = Mockito.mock(HttpRequestHandlerResolver.class);
+ HttpRequestHandlerMapper handlerResolver = Mockito.mock(HttpRequestHandlerMapper.class);
HttpParams params = new BasicHttpParams();
HttpService httpservice = new HttpService(
@@ -199,7 +199,7 @@ public class TestHttpService {
HttpProcessor httprocessor = Mockito.mock(HttpProcessor.class);
ConnectionReuseStrategy connReuseStrategy = Mockito.mock(ConnectionReuseStrategy.class);
HttpResponseFactory responseFactory = Mockito.mock(HttpResponseFactory.class);
- HttpRequestHandlerResolver handlerResolver = Mockito.mock(HttpRequestHandlerResolver.class);
+ HttpRequestHandlerMapper handlerResolver = Mockito.mock(HttpRequestHandlerMapper.class);
HttpParams params = new BasicHttpParams();
HttpService httpservice = new HttpService(
@@ -243,7 +243,7 @@ public class TestHttpService {
HttpProcessor httprocessor = Mockito.mock(HttpProcessor.class);
ConnectionReuseStrategy connReuseStrategy = Mockito.mock(ConnectionReuseStrategy.class);
HttpResponseFactory responseFactory = Mockito.mock(HttpResponseFactory.class);
- HttpRequestHandlerResolver handlerResolver = Mockito.mock(HttpRequestHandlerResolver.class);
+ HttpRequestHandlerMapper handlerResolver = Mockito.mock(HttpRequestHandlerMapper.class);
HttpParams params = new BasicHttpParams();
HttpService httpservice = new HttpService(
@@ -291,7 +291,7 @@ public class TestHttpService {
HttpProcessor httprocessor = Mockito.mock(HttpProcessor.class);
ConnectionReuseStrategy connReuseStrategy = Mockito.mock(ConnectionReuseStrategy.class);
HttpResponseFactory responseFactory = Mockito.mock(HttpResponseFactory.class);
- HttpRequestHandlerResolver handlerResolver = Mockito.mock(HttpRequestHandlerResolver.class);
+ HttpRequestHandlerMapper handlerResolver = Mockito.mock(HttpRequestHandlerMapper.class);
HttpParams params = new BasicHttpParams();
HttpExpectationVerifier expectationVerifier = new HttpExpectationVerifier() {
@@ -348,7 +348,7 @@ public class TestHttpService {
ConnectionReuseStrategy connReuseStrategy = Mockito.mock(ConnectionReuseStrategy.class);
HttpResponseFactory responseFactory = Mockito.mock(HttpResponseFactory.class);
HttpExpectationVerifier expectationVerifier = Mockito.mock(HttpExpectationVerifier.class);
- HttpRequestHandlerResolver handlerResolver = Mockito.mock(HttpRequestHandlerResolver.class);
+ HttpRequestHandlerMapper handlerResolver = Mockito.mock(HttpRequestHandlerMapper.class);
HttpParams params = new BasicHttpParams();
HttpService httpservice = new HttpService(
@@ -396,7 +396,7 @@ public class TestHttpService {
HttpProcessor httprocessor = Mockito.mock(HttpProcessor.class);
ConnectionReuseStrategy connReuseStrategy = Mockito.mock(ConnectionReuseStrategy.class);
HttpResponseFactory responseFactory = Mockito.mock(HttpResponseFactory.class);
- HttpRequestHandlerResolver handlerResolver = Mockito.mock(HttpRequestHandlerResolver.class);
+ HttpRequestHandlerMapper handlerResolver = Mockito.mock(HttpRequestHandlerMapper.class);
HttpRequestHandler requestHandler = Mockito.mock(HttpRequestHandler.class);
HttpParams params = new BasicHttpParams();
@@ -415,7 +415,7 @@ public class TestHttpService {
Mockito.when(responseFactory.newHttpResponse(HttpVersion.HTTP_1_1, 200, context)).thenReturn(response);
HttpResponse error = new BasicHttpResponse(HttpVersion.HTTP_1_0, 500, "Oppsie");
Mockito.when(responseFactory.newHttpResponse(HttpVersion.HTTP_1_0, 500, context)).thenReturn(error);
- Mockito.when(handlerResolver.lookup("/")).thenReturn(requestHandler);
+ Mockito.when(handlerResolver.lookup(request)).thenReturn(requestHandler);
Mockito.doThrow(new MethodNotSupportedException("whatever")).when(
requestHandler).handle(request, response, context);
Mockito.when(connReuseStrategy.keepAlive(error, context)).thenReturn(false);
@@ -441,7 +441,7 @@ public class TestHttpService {
HttpProcessor httprocessor = Mockito.mock(HttpProcessor.class);
ConnectionReuseStrategy connReuseStrategy = Mockito.mock(ConnectionReuseStrategy.class);
HttpResponseFactory responseFactory = Mockito.mock(HttpResponseFactory.class);
- HttpRequestHandlerResolver handlerResolver = Mockito.mock(HttpRequestHandlerResolver.class);
+ HttpRequestHandlerMapper handlerResolver = Mockito.mock(HttpRequestHandlerMapper.class);
HttpRequestHandler requestHandler = Mockito.mock(HttpRequestHandler.class);
HttpParams params = new BasicHttpParams();
@@ -460,7 +460,7 @@ public class TestHttpService {
Mockito.when(responseFactory.newHttpResponse(HttpVersion.HTTP_1_1, 200, context)).thenReturn(response);
HttpResponse error = new BasicHttpResponse(HttpVersion.HTTP_1_0, 500, "Oppsie");
Mockito.when(responseFactory.newHttpResponse(HttpVersion.HTTP_1_0, 500, context)).thenReturn(error);
- Mockito.when(handlerResolver.lookup("/")).thenReturn(requestHandler);
+ Mockito.when(handlerResolver.lookup(request)).thenReturn(requestHandler);
Mockito.doThrow(new UnsupportedHttpVersionException()).when(
requestHandler).handle(request, response, context);
Mockito.when(connReuseStrategy.keepAlive(error, context)).thenReturn(false);
@@ -486,7 +486,7 @@ public class TestHttpService {
HttpProcessor httprocessor = Mockito.mock(HttpProcessor.class);
ConnectionReuseStrategy connReuseStrategy = Mockito.mock(ConnectionReuseStrategy.class);
HttpResponseFactory responseFactory = Mockito.mock(HttpResponseFactory.class);
- HttpRequestHandlerResolver handlerResolver = Mockito.mock(HttpRequestHandlerResolver.class);
+ HttpRequestHandlerMapper handlerResolver = Mockito.mock(HttpRequestHandlerMapper.class);
HttpRequestHandler requestHandler = Mockito.mock(HttpRequestHandler.class);
HttpParams params = new BasicHttpParams();
@@ -505,7 +505,7 @@ public class TestHttpService {
Mockito.when(responseFactory.newHttpResponse(HttpVersion.HTTP_1_1, 200, context)).thenReturn(response);
HttpResponse error = new BasicHttpResponse(HttpVersion.HTTP_1_0, 500, "Oppsie");
Mockito.when(responseFactory.newHttpResponse(HttpVersion.HTTP_1_0, 500, context)).thenReturn(error);
- Mockito.when(handlerResolver.lookup("/")).thenReturn(requestHandler);
+ Mockito.when(handlerResolver.lookup(request)).thenReturn(requestHandler);
Mockito.doThrow(new ProtocolException("oh, this world is wrong")).when(
requestHandler).handle(request, response, context);
Mockito.when(connReuseStrategy.keepAlive(error, context)).thenReturn(false);
@@ -531,7 +531,7 @@ public class TestHttpService {
HttpProcessor httprocessor = Mockito.mock(HttpProcessor.class);
ConnectionReuseStrategy connReuseStrategy = Mockito.mock(ConnectionReuseStrategy.class);
HttpResponseFactory responseFactory = Mockito.mock(HttpResponseFactory.class);
- HttpRequestHandlerResolver handlerResolver = Mockito.mock(HttpRequestHandlerResolver.class);
+ HttpRequestHandlerMapper handlerResolver = Mockito.mock(HttpRequestHandlerMapper.class);
HttpRequestHandler requestHandler = Mockito.mock(HttpRequestHandler.class);
HttpParams params = new BasicHttpParams();
@@ -547,7 +547,7 @@ public class TestHttpService {
Mockito.when(conn.receiveRequestHeader()).thenReturn(request);
HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, 200, "OK");
Mockito.when(responseFactory.newHttpResponse(HttpVersion.HTTP_1_1, 200, context)).thenReturn(response);
- Mockito.when(handlerResolver.lookup("/")).thenReturn(requestHandler);
+ Mockito.when(handlerResolver.lookup(request)).thenReturn(requestHandler);
Mockito.when(connReuseStrategy.keepAlive(response, context)).thenReturn(true);
httpservice.handleRequest(conn, context);
Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/testserver/HttpServer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/testserver/HttpServer.java?rev=1382547&r1=1382546&r2=1382547&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/testserver/HttpServer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/testserver/HttpServer.java Sun Sep 9 17:47:11 2012
@@ -51,13 +51,13 @@ import org.apache.http.protocol.HttpCont
import org.apache.http.protocol.HttpExpectationVerifier;
import org.apache.http.protocol.HttpProcessor;
import org.apache.http.protocol.HttpRequestHandler;
-import org.apache.http.protocol.HttpRequestHandlerRegistry;
import org.apache.http.protocol.HttpService;
import org.apache.http.protocol.ImmutableHttpProcessor;
import org.apache.http.protocol.ResponseConnControl;
import org.apache.http.protocol.ResponseContent;
import org.apache.http.protocol.ResponseDate;
import org.apache.http.protocol.ResponseServer;
+import org.apache.http.protocol.UriHttpRequestHandlerMapper;
public class HttpServer {
@@ -65,7 +65,7 @@ public class HttpServer {
private final HttpProcessor httpproc;
private final ConnectionReuseStrategy connStrategy;
private final HttpResponseFactory responseFactory;
- private final HttpRequestHandlerRegistry reqistry;
+ private final UriHttpRequestHandlerMapper reqistry;
private final ServerSocket serversocket;
private HttpExpectationVerifier expectationVerifier;
@@ -91,7 +91,7 @@ public class HttpServer {
});
this.connStrategy = DefaultConnectionReuseStrategy.INSTANCE;
this.responseFactory = DefaultHttpResponseFactory.INSTANCE;
- this.reqistry = new HttpRequestHandlerRegistry();
+ this.reqistry = new UriHttpRequestHandlerMapper();
this.serversocket = new ServerSocket(0);
}