Mailing-List: contact commits-help@hc.apache.org; run by ezmlm
Precedence: bulk
Reply-To: "HttpComponents Project" <dev@hc.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1752927 [3/3] - in /httpcomponents/httpcore/trunk/httpcore5/src:
 examples/org/apache/hc/core5/http/examples/
 main/java/org/apache/hc/core5/http/bootstrap/nio/
 main/java/org/apache/hc/core5/http/impl/nio/
 main/java/org/apache/hc/core5/http/...
Date: Sat, 16 Jul 2016 11:27:18 -0000
To: commits@hc.apache.org
From: olegk@apache.org
Message-Id: <20160716112718.C8E213A02E6@svn01-us-west.apache.org>
archived-at: Sat, 16 Jul 2016 11:27:26 -0000

Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/testserver/nio/HttpServerNio.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/testserver/nio/HttpServerNio.java?rev=1752927&r1=1752926&r2=1752927&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/testserver/nio/HttpServerNio.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/testserver/nio/HttpServerNio.java Sat Jul 16 11:27:17 2016
@@ -27,6 +27,7 @@
 
 package org.apache.hc.core5.http.testserver.nio;
 
+import java.io.IOException;
 import java.net.SocketException;
 import java.util.concurrent.TimeUnit;
 
@@ -44,30 +45,28 @@ import org.apache.hc.core5.http.nio.NHtt
 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 {
 
     private final UriHttpAsyncRequestHandlerMapper reqistry;
-    private volatile HttpAsyncExpectationVerifier expectationVerifier;
-    private volatile NHttpConnectionFactory<DefaultNHttpServerConnection> connectionFactory;
-    private volatile HttpProcessor httpProcessor;
+    private final HttpServer server;
 
-    private volatile int timeout;
-
-    private volatile HttpServer server;
-
-    public HttpServerNio() {
+    public HttpServerNio(
+            final HttpProcessor httpProcessor,
+            final NHttpConnectionFactory<DefaultNHttpServerConnection> connectionFactory,
+            final HttpAsyncExpectationVerifier expectationVerifier,
+            final IOReactorConfig reactorConfig) throws IOException {
         super();
         this.reqistry = new UriHttpAsyncRequestHandlerMapper();
-    }
-
-    public int getTimeout() {
-        return this.timeout;
-    }
-
-    public void setTimeout(final int timeout) {
-        this.timeout = timeout;
+        this.server = ServerBootstrap.bootstrap()
+                .setIOReactorConfig(reactorConfig)
+                .setServerInfo("TEST-SERVER/1.1")
+                .setConnectionFactory(connectionFactory)
+                .setExceptionLogger(new SimpleExceptionLogger())
+                .setExpectationVerifier(expectationVerifier)
+                .setHttpProcessor(httpProcessor)
+                .setHandlerMapper(this.reqistry)
+                .create();
     }
 
     public void registerHandler(
@@ -76,18 +75,6 @@ public class HttpServerNio {
         this.reqistry.register(pattern, handler);
     }
 
-    public void setExpectationVerifier(final HttpAsyncExpectationVerifier expectationVerifier) {
-        this.expectationVerifier = expectationVerifier;
-    }
-
-    public void setConnectionFactory(final NHttpConnectionFactory<DefaultNHttpServerConnection> connectionFactory) {
-        this.connectionFactory = connectionFactory;
-    }
-
-    public void setHttpProcessor(final HttpProcessor httpProcessor) {
-        this.httpProcessor = httpProcessor;
-    }
-
     public ListenerEndpoint getListenerEndpoint() {
         final HttpServer local = this.server;
         if (local != null) {
@@ -97,27 +84,11 @@ public class HttpServerNio {
     }
 
     public void start() {
-        Asserts.check(this.server == null, "Server already running");
-        this.server = ServerBootstrap.bootstrap()
-                .setIOReactorConfig(IOReactorConfig.custom()
-                        .setSoTimeout(this.timeout)
-                        .build())
-                .setServerInfo("TEST-SERVER/1.1")
-                .setConnectionFactory(connectionFactory)
-                .setExceptionLogger(new SimpleExceptionLogger())
-                .setExpectationVerifier(this.expectationVerifier)
-                .setHttpProcessor(this.httpProcessor)
-                .setHandlerMapper(this.reqistry)
-                .create();
         this.server.start();
     }
 
     public void shutdown() {
-        final HttpServer local = this.server;
-        this.server = null;
-        if (local != null) {
-            local.shutdown(5, TimeUnit.SECONDS);
-        }
+        this.server.shutdown(5, TimeUnit.SECONDS);
     }
 
     static class SimpleExceptionLogger implements ExceptionLogger {

Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/testserver/nio/LoggingIOSession.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/testserver/nio/LoggingIOSession.java?rev=1752927&r1=1752926&r2=1752927&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/testserver/nio/LoggingIOSession.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/testserver/nio/LoggingIOSession.java Sat Jul 16 11:27:17 2016
@@ -34,6 +34,7 @@ import java.nio.channels.ByteChannel;
 import java.nio.channels.SelectionKey;
 
 import org.apache.commons.logging.Log;
+import org.apache.hc.core5.reactor.IOEventHandler;
 import org.apache.hc.core5.reactor.IOSession;
 import org.apache.hc.core5.reactor.SessionBufferStatus;
 
@@ -198,6 +199,16 @@ public class LoggingIOSession implements
     }
 
     @Override
+    public IOEventHandler getHandler() {
+        return this.session.getHandler();
+    }
+
+    @Override
+    public void setHandler(final IOEventHandler handler) {
+        this.session.setHandler(handler);
+    }
+
+    @Override
     public String toString() {
         return this.id + " " + this.session.toString();
     }