--- /dev/null 2017-10-28 22:49:55.551349757 -0700 +++ new/test/jdk/java/net/httpclient/CustomResponseSubscriber.java 2017-11-30 04:05:56.203298694 -0800 @@ -0,0 +1,283 @@ +/* + * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @summary Tests response body subscribers's onComplete is not invoked before onSubscribe + * @library /lib/testlibrary http2/server + * @build jdk.testlibrary.SimpleSSLContext + * @modules java.base/sun.net.www.http + * jdk.incubator.httpclient/jdk.incubator.http.internal.common + * jdk.incubator.httpclient/jdk.incubator.http.internal.frame + * jdk.incubator.httpclient/jdk.incubator.http.internal.hpack + * @run testng/othervm CustomResponseSubscriber + */ + +import java.io.IOException; +import java.io.InputStream; +import java.net.InetSocketAddress; +import java.net.URI; +import java.nio.ByteBuffer; +import java.util.List; +import java.util.concurrent.CompletionStage; +import java.util.concurrent.Executor; +import java.util.concurrent.Executors; +import java.util.concurrent.Flow; +import com.sun.net.httpserver.HttpExchange; +import com.sun.net.httpserver.HttpHandler; +import com.sun.net.httpserver.HttpServer; +import com.sun.net.httpserver.HttpsConfigurator; +import com.sun.net.httpserver.HttpsServer; +import jdk.incubator.http.HttpClient; +import jdk.incubator.http.HttpHeaders; +import jdk.incubator.http.HttpRequest; +import jdk.incubator.http.HttpResponse; +import jdk.incubator.http.HttpResponse.BodyHandler; +import jdk.incubator.http.HttpResponse.BodySubscriber; +import javax.net.ssl.SSLContext; +import jdk.testlibrary.SimpleSSLContext; +import org.testng.annotations.AfterTest; +import org.testng.annotations.BeforeTest; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Test; +import static java.lang.System.out; +import static java.nio.charset.StandardCharsets.UTF_8; +import static jdk.incubator.http.HttpResponse.BodySubscriber.asString; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + +public class CustomResponseSubscriber { + + SSLContext sslContext; + HttpServer httpTestServer; // HTTP/1.1 [ 4 servers ] + HttpsServer httpsTestServer; // HTTPS/1.1 + Http2TestServer http2TestServer; // HTTP/2 ( h2c ) + Http2TestServer https2TestServer; // HTTP/2 ( h2 ) + String httpURI_fixed; + String httpURI_chunk; + String httpsURI_fixed; + String httpsURI_chunk; + String http2URI_fixed; + String http2URI_chunk; + String https2URI_fixed; + String https2URI_chunk; + + static final int ITERATION_COUNT = 10; + // a shared executor helps reduce the amount of threads created by the test + static final Executor executor = Executors.newCachedThreadPool(); + + @DataProvider(name = "variants") + public Object[][] variants() { + return new Object[][]{ + { httpURI_fixed, false }, + { httpURI_chunk, false }, + { httpsURI_fixed, false }, + { httpsURI_chunk, false }, + { http2URI_fixed, false }, + { http2URI_chunk, false }, + { https2URI_fixed, false,}, + { https2URI_chunk, false }, + + { httpURI_fixed, true }, + { httpURI_chunk, true }, + { httpsURI_fixed, true }, + { httpsURI_chunk, true }, + { http2URI_fixed, true }, + { http2URI_chunk, true }, + { https2URI_fixed, true,}, + { https2URI_chunk, true }, + }; + } + + HttpClient newHttpClient() { + return HttpClient.newBuilder() + .executor(executor) + .sslContext(sslContext) + .build(); + } + + @Test(dataProvider = "variants") + public void testAsString(String uri, boolean sameClient) throws Exception { + HttpClient client = null; + for (int i=0; i< ITERATION_COUNT; i++) { + if (!sameClient || client == null) + client = newHttpClient(); + + HttpRequest req = HttpRequest.newBuilder(URI.create(uri)) + .build(); + BodyHandler handler = new CRSBodyHandler(); + HttpResponse response = client.send(req, handler); + String body = response.body(); + assertEquals(body, ""); + } + } + + static class CRSBodyHandler implements BodyHandler { + @Override + public BodySubscriber apply(int statusCode, HttpHeaders responseHeaders) { + assertEquals(statusCode, 200); + return new CRSBodySubscriber(); + } + } + + static class CRSBodySubscriber implements BodySubscriber { + private final BodySubscriber asString = asString(UTF_8); + volatile boolean onSubscribeCalled; + + @Override + public void onSubscribe(Flow.Subscription subscription) { + //out.println("onSubscribe "); + onSubscribeCalled = true; + asString.onSubscribe(subscription); + } + + @Override + public void onNext(List item) { + // out.println("onNext " + item); + assertTrue(onSubscribeCalled); + asString.onNext(item); + } + + @Override + public void onError(Throwable throwable) { + //out.println("onError"); + assertTrue(onSubscribeCalled); + asString.onError(throwable); + } + + @Override + public void onComplete() { + //out.println("onComplete"); + assertTrue(onSubscribeCalled, "onComplete called before onSubscribe"); + asString.onComplete(); + } + + @Override + public CompletionStage getBody() { + return asString.getBody(); + } + } + + + @BeforeTest + public void setup() throws Exception { + sslContext = new SimpleSSLContext().get(); + if (sslContext == null) + throw new AssertionError("Unexpected null sslContext"); + + // HTTP/1.1 + HttpHandler h1_fixedLengthHandler = new HTTP1_FixedLengthHandler(); + HttpHandler h1_chunkHandler = new HTTP1_ChunkedHandler(); + InetSocketAddress sa = new InetSocketAddress("localhost", 0); + httpTestServer = HttpServer.create(sa, 0); + httpTestServer.createContext("/http1/fixed", h1_fixedLengthHandler); + httpTestServer.createContext("/http1/chunk", h1_chunkHandler); + httpURI_fixed = "http://127.0.0.1:" + httpTestServer.getAddress().getPort() + "/http1/fixed"; + httpURI_chunk = "http://127.0.0.1:" + httpTestServer.getAddress().getPort() + "/http1/chunk"; + + httpsTestServer = HttpsServer.create(sa, 0); + httpsTestServer.setHttpsConfigurator(new HttpsConfigurator(sslContext)); + httpsTestServer.createContext("/https1/fixed", h1_fixedLengthHandler); + httpsTestServer.createContext("/https1/chunk", h1_chunkHandler); + httpsURI_fixed = "https://127.0.0.1:" + httpsTestServer.getAddress().getPort() + "/https1/fixed"; + httpsURI_chunk = "https://127.0.0.1:" + httpsTestServer.getAddress().getPort() + "/https1/chunk"; + + // HTTP/2 + Http2Handler h2_fixedLengthHandler = new HTTP2_FixedLengthHandler(); + Http2Handler h2_chunkedHandler = new HTTP2_VariableHandler(); + + http2TestServer = new Http2TestServer("127.0.0.1", false, 0); + http2TestServer.addHandler(h2_fixedLengthHandler, "/http2/fixed"); + http2TestServer.addHandler(h2_chunkedHandler, "/http2/chunk"); + int port = http2TestServer.getAddress().getPort(); + http2URI_fixed = "http://127.0.0.1:" + port + "/http2/fixed"; + http2URI_chunk = "http://127.0.0.1:" + port + "/http2/chunk"; + + https2TestServer = new Http2TestServer("127.0.0.1", true, 0); + https2TestServer.addHandler(h2_fixedLengthHandler, "/https2/fixed"); + https2TestServer.addHandler(h2_chunkedHandler, "/https2/chunk"); + port = https2TestServer.getAddress().getPort(); + https2URI_fixed = "https://127.0.0.1:" + port + "/https2/fixed"; + https2URI_chunk = "https://127.0.0.1:" + port + "/https2/chunk"; + + httpTestServer.start(); + httpsTestServer.start(); + http2TestServer.start(); + https2TestServer.start(); + } + + @AfterTest + public void teardown() throws Exception { + httpTestServer.stop(0); + httpsTestServer.stop(0); + http2TestServer.stop(); + https2TestServer.stop(); + } + + static class HTTP1_FixedLengthHandler implements HttpHandler { + @Override + public void handle(HttpExchange t) throws IOException { + out.println("HTTP1_FixedLengthHandler received request to " + t.getRequestURI()); + try (InputStream is = t.getRequestBody()) { + is.readAllBytes(); + } + t.sendResponseHeaders(200, -1); //no body + } + } + + static class HTTP1_ChunkedHandler implements HttpHandler { + @Override + public void handle(HttpExchange t) throws IOException { + out.println("HTTP1_ChunkedHandler received request to " + t.getRequestURI()); + try (InputStream is = t.getRequestBody()) { + is.readAllBytes(); + } + t.sendResponseHeaders(200, 0); // chunked + t.getResponseBody().close(); // no body + } + } + + static class HTTP2_FixedLengthHandler implements Http2Handler { + @Override + public void handle(Http2TestExchange t) throws IOException { + out.println("HTTP2_FixedLengthHandler received request to " + t.getRequestURI()); + try (InputStream is = t.getRequestBody()) { + is.readAllBytes(); + } + t.sendResponseHeaders(200, 0); + t.getResponseBody().close(); + } + } + + static class HTTP2_VariableHandler implements Http2Handler { + @Override + public void handle(Http2TestExchange t) throws IOException { + out.println("HTTP2_VariableHandler received request to " + t.getRequestURI()); + try (InputStream is = t.getRequestBody()) { + is.readAllBytes(); + } + t.sendResponseHeaders(200, -1); // variable + t.getResponseBody().close(); //no body + } + } +}