--- a/src/java.net.http/share/classes/java/net/http/HttpResponse.java Tue Feb 20 10:16:00 2018 +0000
+++ b/src/java.net.http/share/classes/java/net/http/HttpResponse.java Tue Feb 20 14:52:06 2018 +0000
@@ -300,7 +300,7 @@
* @return a response body handler
*/
public static <S extends Subscriber<? super List<ByteBuffer>>,T> BodyHandler<T>
- fromSubscriber(S subscriber, Function<S,T> finisher) {
+ fromSubscriber(S subscriber, Function<S,? extends T> finisher) {
Objects.requireNonNull(subscriber);
Objects.requireNonNull(finisher);
return (status, headers) -> BodySubscriber.fromSubscriber(subscriber,
@@ -393,7 +393,7 @@
*/
public static <S extends Subscriber<? super String>,T> BodyHandler<T>
fromLineSubscriber(S subscriber,
- Function<S,T> finisher,
+ Function<? super S,? extends T> finisher,
String lineSeparator) {
Objects.requireNonNull(subscriber);
Objects.requireNonNull(finisher);
@@ -656,6 +656,7 @@
* BodySubscriber.buffering} with a subscriber obtained from the given
* downstream handler and the {@code bufferSize} parameter.
*
+ * @param <T> the response body type
* @param downstreamHandler the downstream handler
* @param bufferSize the buffer size parameter passed to {@link
* BodySubscriber#buffering(BodySubscriber,int) BodySubscriber.buffering}
@@ -819,13 +820,12 @@
* @apiNote This method can be used as an adapter between {@code
* BodySubscriber} and {@code Flow.Subscriber}.
*
- * @param <S> the type of the Subscriber
* @param subscriber the subscriber
* @return a body subscriber
*/
- public static <S extends Subscriber<? super List<ByteBuffer>>> BodySubscriber<Void>
- fromSubscriber(S subscriber) {
- return new ResponseSubscribers.SubscriberAdapter<S,Void>(subscriber, s -> null);
+ public static BodySubscriber<Void>
+ fromSubscriber(Subscriber<? super List<ByteBuffer>> subscriber) {
+ return new ResponseSubscribers.SubscriberAdapter<>(subscriber, s -> null);
}
/**
@@ -852,8 +852,8 @@
*/
public static <S extends Subscriber<? super List<ByteBuffer>>,T> BodySubscriber<T>
fromSubscriber(S subscriber,
- Function<S,T> finisher) {
- return new ResponseSubscribers.SubscriberAdapter<S,T>(subscriber, finisher);
+ Function<? super S,? extends T> finisher) {
+ return new ResponseSubscribers.SubscriberAdapter<>(subscriber, finisher);
}
/**
@@ -874,13 +874,12 @@
* fromLineSubscriber(subscriber, s -> null, StandardCharsets.UTF_8, null)
* }</pre>
*
- * @param <S> the type of the Subscriber
* @param subscriber the subscriber
* @return a body subscriber
*/
- public static <S extends Subscriber<? super String>> BodySubscriber<Void>
- fromLineSubscriber(S subscriber) {
- return fromLineSubscriber(subscriber, s -> null,
+ public static BodySubscriber<Void>
+ fromLineSubscriber(Subscriber<? super String> subscriber) {
+ return fromLineSubscriber(subscriber, s -> null,
StandardCharsets.UTF_8, null);
}
@@ -914,7 +913,7 @@
*/
public static <S extends Subscriber<? super String>,T> BodySubscriber<T>
fromLineSubscriber(S subscriber,
- Function<S,T> finisher,
+ Function<? super S,? extends T> finisher,
Charset charset,
String lineSeparator) {
return LineSubscriberAdapter.create(subscriber,
@@ -1123,6 +1122,7 @@
* <p> The returned subscriber delegates its {@link #getBody()} method
* to the downstream subscriber.
*
+ * @param <T> the type of the response body
* @param downstream the downstream subscriber
* @param bufferSize the buffer size
* @return a buffering body subscriber
@@ -1132,7 +1132,7 @@
int bufferSize) {
if (bufferSize <= 0)
throw new IllegalArgumentException("must be greater than 0");
- return new BufferingSubscriber<T>(downstream, bufferSize);
+ return new BufferingSubscriber<>(downstream, bufferSize);
}
/**
@@ -1170,9 +1170,9 @@
* @return a mapping body subscriber
*/
public static <T,U> BodySubscriber<U> mapping(BodySubscriber<T> upstream,
- Function<T, U> mapper)
+ Function<? super T, ? extends U> mapper)
{
- return new ResponseSubscribers.MappingSubscriber<T, U>(upstream, mapper);
+ return new ResponseSubscribers.MappingSubscriber<>(upstream, mapper);
}
}
}
--- a/src/java.net.http/share/classes/jdk/internal/net/http/LineSubscriberAdapter.java Tue Feb 20 10:16:00 2018 +0000
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/LineSubscriberAdapter.java Tue Feb 20 14:52:06 2018 +0000
@@ -53,13 +53,13 @@
implements BodySubscriber<R> {
private final CompletableFuture<R> cf = new MinimalFuture<>();
private final S subscriber;
- private final Function<S, R> finisher;
+ private final Function<? super S, ? extends R> finisher;
private final Charset charset;
private final String eol;
private volatile LineSubscription downstream;
private LineSubscriberAdapter(S subscriber,
- Function<S, R> finisher,
+ Function<? super S, ? extends R> finisher,
Charset charset,
String eol) {
if (eol != null && eol.isEmpty())
@@ -113,7 +113,7 @@
}
public static <S extends Subscriber<? super String>, R> LineSubscriberAdapter<S, R>
- create(S subscriber, Function<S, R> finisher, Charset charset, String eol)
+ create(S subscriber, Function<? super S, ? extends R> finisher, Charset charset, String eol)
{
if (eol != null && eol.isEmpty())
throw new IllegalArgumentException("empty line separator");
--- a/src/java.net.http/share/classes/jdk/internal/net/http/ResponseSubscribers.java Tue Feb 20 10:16:00 2018 +0000
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/ResponseSubscribers.java Tue Feb 20 14:52:06 2018 +0000
@@ -523,10 +523,10 @@
{
private final CompletableFuture<R> cf = new MinimalFuture<>();
private final S subscriber;
- private final Function<S,R> finisher;
+ private final Function<? super S,? extends R> finisher;
private volatile Subscription subscription;
- public SubscriberAdapter(S subscriber, Function<S,R> finisher) {
+ public SubscriberAdapter(S subscriber, Function<? super S,? extends R> finisher) {
this.subscriber = Objects.requireNonNull(subscriber);
this.finisher = Objects.requireNonNull(finisher);
}
@@ -595,9 +595,10 @@
*/
public static class MappingSubscriber<T,U> implements BodySubscriber<U> {
private final BodySubscriber<T> upstream;
- private final Function<T,U> mapper;
+ private final Function<? super T,? extends U> mapper;
- public MappingSubscriber(BodySubscriber<T> upstream, Function<T,U> mapper) {
+ public MappingSubscriber(BodySubscriber<T> upstream,
+ Function<? super T,? extends U> mapper) {
this.upstream = Objects.requireNonNull(upstream);
this.mapper = Objects.requireNonNull(mapper);
}
--- a/test/jdk/java/net/httpclient/FlowAdaptersCompileOnly.java Tue Feb 20 10:16:00 2018 +0000
+++ b/test/jdk/java/net/httpclient/FlowAdaptersCompileOnly.java Tue Feb 20 14:52:06 2018 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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
@@ -104,4 +104,45 @@
@Override public void onError(Throwable throwable) { }
@Override public void onComplete() { }
}
+
+ // ---
+
+ static final Function<ListSubscriber,Integer> f1 = subscriber -> 1;
+ static final Function<ListSubscriber,Number> f2 = subscriber -> 2;
+ static final Function<ListSubscriberX,Integer> f3 = subscriber -> 3;
+ static final Function<ListSubscriberX,Number> f4 = subscriber -> 4;
+
+ static class ListSubscriberX extends ListSubscriber {
+ int getIntegerX() { return 5; }
+ }
+
+ static void makesSureDifferentGenericFunctionSignaturesCompile() {
+ BodyHandler<Integer> bh01 = BodyHandler.fromSubscriber(new ListSubscriber(), s -> 6);
+ BodyHandler<Number> bh02 = BodyHandler.fromSubscriber(new ListSubscriber(), s -> 7);
+ BodyHandler<Integer> bh03 = BodyHandler.fromSubscriber(new ListSubscriber(), f1);
+ BodyHandler<Number> bh04 = BodyHandler.fromSubscriber(new ListSubscriber(), f1);
+ BodyHandler<Number> bh05 = BodyHandler.fromSubscriber(new ListSubscriber(), f2);
+ BodyHandler<Integer> bh06 = BodyHandler.fromSubscriber(new ListSubscriberX(), f1);
+ BodyHandler<Number> bh07 = BodyHandler.fromSubscriber(new ListSubscriberX(), f1);
+ BodyHandler<Number> bh08 = BodyHandler.fromSubscriber(new ListSubscriberX(), f2);
+ BodyHandler<Integer> bh09 = BodyHandler.fromSubscriber(new ListSubscriberX(), ListSubscriberX::getIntegerX);
+ BodyHandler<Number> bh10 = BodyHandler.fromSubscriber(new ListSubscriberX(), ListSubscriberX::getIntegerX);
+ BodyHandler<Integer> bh11 = BodyHandler.fromSubscriber(new ListSubscriberX(), f3);
+ BodyHandler<Number> bh12 = BodyHandler.fromSubscriber(new ListSubscriberX(), f3);
+ BodyHandler<Number> bh13 = BodyHandler.fromSubscriber(new ListSubscriberX(), f4);
+
+ BodySubscriber<Integer> bs01 = BodySubscriber.fromSubscriber(new ListSubscriber(), s -> 6);
+ BodySubscriber<Number> bs02 = BodySubscriber.fromSubscriber(new ListSubscriber(), s -> 7);
+ BodySubscriber<Integer> bs03 = BodySubscriber.fromSubscriber(new ListSubscriber(), f1);
+ BodySubscriber<Number> bs04 = BodySubscriber.fromSubscriber(new ListSubscriber(), f1);
+ BodySubscriber<Number> bs05 = BodySubscriber.fromSubscriber(new ListSubscriber(), f2);
+ BodySubscriber<Integer> bs06 = BodySubscriber.fromSubscriber(new ListSubscriberX(), f1);
+ BodySubscriber<Number> bs07 = BodySubscriber.fromSubscriber(new ListSubscriberX(), f1);
+ BodySubscriber<Number> bs08 = BodySubscriber.fromSubscriber(new ListSubscriberX(), f2);
+ BodySubscriber<Integer> bs09 = BodySubscriber.fromSubscriber(new ListSubscriberX(), ListSubscriberX::getIntegerX);
+ BodySubscriber<Number> bs10 = BodySubscriber.fromSubscriber(new ListSubscriberX(), ListSubscriberX::getIntegerX);
+ BodySubscriber<Integer> bs11 = BodySubscriber.fromSubscriber(new ListSubscriberX(), f3);
+ BodySubscriber<Number> bs12 = BodySubscriber.fromSubscriber(new ListSubscriberX(), f3);
+ BodySubscriber<Number> bs13 = BodySubscriber.fromSubscriber(new ListSubscriberX(), f4);
+ }
}
--- a/test/jdk/java/net/httpclient/LineAdaptersCompileOnly.java Tue Feb 20 10:16:00 2018 +0000
+++ b/test/jdk/java/net/httpclient/LineAdaptersCompileOnly.java Tue Feb 20 14:52:06 2018 +0000
@@ -21,11 +21,12 @@
* questions.
*/
-import java.nio.charset.StandardCharsets;
import java.util.concurrent.Flow;
import java.util.function.Function;
import java.net.http.HttpResponse.BodyHandler;
import java.net.http.HttpResponse.BodySubscriber;
+import static java.util.function.Function.identity;
+import static java.nio.charset.StandardCharsets.*;
/*
* @test
@@ -40,36 +41,27 @@
}
static void makesSureDifferentGenericSignaturesCompile() {
-
BodyHandler.fromLineSubscriber(new StringSubscriber());
BodyHandler.fromLineSubscriber(new CharSequenceSubscriber());
BodyHandler.fromLineSubscriber(new ObjectSubscriber());
-
BodySubscriber.fromLineSubscriber(new StringSubscriber());
BodySubscriber.fromLineSubscriber(new CharSequenceSubscriber());
BodySubscriber.fromLineSubscriber(new ObjectSubscriber());
-
- BodyHandler.fromLineSubscriber(new StringSubscriber(), Function.identity(), "\n");
- BodyHandler.fromLineSubscriber(new CharSequenceSubscriber(), Function.identity(), "\r\n");
- BodyHandler.fromLineSubscriber(new ObjectSubscriber(), Function.identity(), "\n");
- BodyHandler.fromLineSubscriber(new StringSubscriber(), Function.identity(), null);
- BodyHandler.fromLineSubscriber(new CharSequenceSubscriber(), Function.identity(), null);
- BodyHandler.fromLineSubscriber(new ObjectSubscriber(), Function.identity(), null);
+ BodyHandler.fromLineSubscriber(new StringSubscriber(), identity(), "\n");
+ BodyHandler.fromLineSubscriber(new CharSequenceSubscriber(), identity(), "\r\n");
+ BodyHandler.fromLineSubscriber(new ObjectSubscriber(), identity(), "\n");
+ BodyHandler.fromLineSubscriber(new StringSubscriber(), identity(), null);
+ BodyHandler.fromLineSubscriber(new CharSequenceSubscriber(), identity(), null);
+ BodyHandler.fromLineSubscriber(new ObjectSubscriber(), identity(), null);
- BodySubscriber.fromLineSubscriber(new StringSubscriber(), Function.identity(),
- StandardCharsets.UTF_8, "\n");
- BodySubscriber.fromLineSubscriber(new CharSequenceSubscriber(), Function.identity(),
- StandardCharsets.UTF_16, "\r\n");
- BodySubscriber.fromLineSubscriber(new ObjectSubscriber(), Function.identity(),
- StandardCharsets.US_ASCII, "\n");
- BodySubscriber.fromLineSubscriber(new StringSubscriber(), Function.identity(),
- StandardCharsets.UTF_8, null);
- BodySubscriber.fromLineSubscriber(new CharSequenceSubscriber(), Function.identity(),
- StandardCharsets.UTF_16, null);
- BodySubscriber.fromLineSubscriber(new ObjectSubscriber(), Function.identity(),
- StandardCharsets.US_ASCII, null);
+ BodySubscriber.fromLineSubscriber(new StringSubscriber(), identity(), UTF_8, "\n");
+ BodySubscriber.fromLineSubscriber(new CharSequenceSubscriber(), identity(), UTF_16, "\r\n");
+ BodySubscriber.fromLineSubscriber(new ObjectSubscriber(), identity(), US_ASCII, "\n");
+ BodySubscriber.fromLineSubscriber(new StringSubscriber(), identity(), UTF_8, null);
+ BodySubscriber.fromLineSubscriber(new CharSequenceSubscriber(), identity(), UTF_16, null);
+ BodySubscriber.fromLineSubscriber(new ObjectSubscriber(), identity(), US_ASCII, null);
}
static class StringSubscriber implements Flow.Subscriber<String> {
@@ -92,4 +84,45 @@
@Override public void onError(Throwable throwable) { }
@Override public void onComplete() { }
}
+
+ // ---
+
+ static final Function<StringSubscriber,Integer> f1 = subscriber -> 1;
+ static final Function<StringSubscriber,Number> f2 = subscriber -> 2;
+ static final Function<StringSubscriberX,Integer> f3 = subscriber -> 3;
+ static final Function<StringSubscriberX,Number> f4 = subscriber -> 4;
+
+ static class StringSubscriberX extends StringSubscriber {
+ int getIntegerX() { return 5; }
+ }
+
+ static void makesSureDifferentGenericFunctionSignaturesCompile() {
+ BodyHandler<Integer> bh01 = BodyHandler.fromLineSubscriber(new StringSubscriber(), s -> 6, "\n");
+ BodyHandler<Number> bh02 = BodyHandler.fromLineSubscriber(new StringSubscriber(), s -> 7, "\n");
+ BodyHandler<Integer> bh03 = BodyHandler.fromLineSubscriber(new StringSubscriber(), f1, "\n");
+ BodyHandler<Number> bh04 = BodyHandler.fromLineSubscriber(new StringSubscriber(), f1, "\n");
+ BodyHandler<Number> bh05 = BodyHandler.fromLineSubscriber(new StringSubscriber(), f2, "\n");
+ BodyHandler<Integer> bh06 = BodyHandler.fromLineSubscriber(new StringSubscriberX(), f1, "\n");
+ BodyHandler<Number> bh07 = BodyHandler.fromLineSubscriber(new StringSubscriberX(), f1, "\n");
+ BodyHandler<Number> bh08 = BodyHandler.fromLineSubscriber(new StringSubscriberX(), f2, "\n");
+ BodyHandler<Integer> bh09 = BodyHandler.fromLineSubscriber(new StringSubscriberX(), StringSubscriberX::getIntegerX, "\n");
+ BodyHandler<Number> bh10 = BodyHandler.fromLineSubscriber(new StringSubscriberX(), StringSubscriberX::getIntegerX, "\n");
+ BodyHandler<Integer> bh11 = BodyHandler.fromLineSubscriber(new StringSubscriberX(), f3, "\n");
+ BodyHandler<Number> bh12 = BodyHandler.fromLineSubscriber(new StringSubscriberX(), f3, "\n");
+ BodyHandler<Number> bh13 = BodyHandler.fromLineSubscriber(new StringSubscriberX(), f4, "\n");
+
+ BodySubscriber<Integer> bs01 = BodySubscriber.fromLineSubscriber(new StringSubscriber(), s -> 6, UTF_8, "\n");
+ BodySubscriber<Number> bs02 = BodySubscriber.fromLineSubscriber(new StringSubscriber(), s -> 7, UTF_8, "\n");
+ BodySubscriber<Integer> bs03 = BodySubscriber.fromLineSubscriber(new StringSubscriber(), f1, UTF_8, "\n");
+ BodySubscriber<Number> bs04 = BodySubscriber.fromLineSubscriber(new StringSubscriber(), f1, UTF_8, "\n");
+ BodySubscriber<Number> bs05 = BodySubscriber.fromLineSubscriber(new StringSubscriber(), f2, UTF_8, "\n");
+ BodySubscriber<Integer> bs06 = BodySubscriber.fromLineSubscriber(new StringSubscriberX(), f1, UTF_8, "\n");
+ BodySubscriber<Number> bs07 = BodySubscriber.fromLineSubscriber(new StringSubscriberX(), f1, UTF_8, "\n");
+ BodySubscriber<Number> bs08 = BodySubscriber.fromLineSubscriber(new StringSubscriberX(), f2, UTF_8, "\n");
+ BodySubscriber<Integer> bs09 = BodySubscriber.fromLineSubscriber(new StringSubscriberX(), StringSubscriberX::getIntegerX, UTF_8, "\n");
+ BodySubscriber<Number> bs10 = BodySubscriber.fromLineSubscriber(new StringSubscriberX(), StringSubscriberX::getIntegerX, UTF_8, "\n");
+ BodySubscriber<Integer> bs11 = BodySubscriber.fromLineSubscriber(new StringSubscriberX(), f3, UTF_8, "\n");
+ BodySubscriber<Number> bs12 = BodySubscriber.fromLineSubscriber(new StringSubscriberX(), f3, UTF_8, "\n");
+ BodySubscriber<Number> bs13 = BodySubscriber.fromLineSubscriber(new StringSubscriberX(), f4, UTF_8, "\n");
+ }
}
--- a/test/jdk/java/net/httpclient/MappedResponseSubscriber.java Tue Feb 20 10:16:00 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,307 +0,0 @@
-/*
- * 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 mapped response subscriber
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext
- * @modules java.base/sun.net.www.http
- * java.net.http/jdk.internal.net.http.common
- * java.net.http/jdk.internal.net.http.frame
- * java.net.http/jdk.internal.net.http.hpack
- * @run testng/othervm MappedResponseSubscriber
- */
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-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 java.net.http.HttpClient;
-import java.net.http.HttpHeaders;
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
-import java.net.http.HttpResponse.BodyHandler;
-import java.net.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 java.net.http.HttpResponse.BodySubscriber.asString;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-
-public class MappedResponseSubscriber {
-
- 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 testAsBytes(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<byte[]> handler = new CRSBodyHandler();
- HttpResponse<byte[]> response = client.send(req, handler);
- byte[] body = response.body();
- assertEquals(body, bytes);
- }
- }
-
- static class CRSBodyHandler implements BodyHandler<byte[]> {
- @Override
- public BodySubscriber<byte[]> apply(int statusCode, HttpHeaders responseHeaders) {
- assertEquals(statusCode, 200);
- return HttpResponse.BodySubscriber.mapping(
- new CRSBodySubscriber(), (s) -> s.getBytes()
- );
- }
- }
-
- static class CRSBodySubscriber implements BodySubscriber<String> {
- private final BodySubscriber<String> 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<ByteBuffer> 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<String> 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 byte[] bytes;
-
- static {
- bytes = new byte[128 * 1024];
- int b = 'A';
-
- for (int i=0; i< bytes.length; i++) {
- bytes[i] = (byte)b;
- b = b == 'Z'? 'A' : b + 1;
- }
- }
-
- 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, bytes.length); //no body
- OutputStream os = t.getResponseBody();
- os.write(bytes);
- os.close();
- }
- }
-
- 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
- OutputStream os = t.getResponseBody();
- os.write(bytes);
- os.close();
- }
- }
-
- 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); // chunked
- OutputStream os = t.getResponseBody();
- os.write(bytes);
- os.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, bytes.length); //no body
- OutputStream os = t.getResponseBody();
- os.write(bytes);
- os.close();
- }
- }
-}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/net/httpclient/MappingResponseSubscriber.java Tue Feb 20 14:52:06 2018 +0000
@@ -0,0 +1,333 @@
+/*
+ * Copyright (c) 2017, 2018, 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 mapped response subscriber
+ * @library /lib/testlibrary http2/server
+ * @build jdk.testlibrary.SimpleSSLContext
+ * @modules java.base/sun.net.www.http
+ * java.net.http/jdk.internal.net.http.common
+ * java.net.http/jdk.internal.net.http.frame
+ * java.net.http/jdk.internal.net.http.hpack
+ * @run testng/othervm MappingResponseSubscriber
+ */
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+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 java.net.http.HttpClient;
+import java.net.http.HttpHeaders;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandler;
+import java.net.http.HttpResponse.BodySubscriber;
+import java.util.function.Function;
+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.net.http.HttpResponse.BodySubscriber.mapping;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.net.http.HttpResponse.BodySubscriber.asString;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+public class MappingResponseSubscriber {
+
+ 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 testAsBytes(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<byte[]> handler = new CRSBodyHandler();
+ HttpResponse<byte[]> response = client.send(req, handler);
+ byte[] body = response.body();
+ assertEquals(body, bytes);
+ }
+ }
+
+ static class CRSBodyHandler implements BodyHandler<byte[]> {
+ @Override
+ public BodySubscriber<byte[]> apply(int statusCode, HttpHeaders responseHeaders) {
+ assertEquals(statusCode, 200);
+ return HttpResponse.BodySubscriber.mapping(
+ new CRSBodySubscriber(), (s) -> s.getBytes(UTF_8)
+ );
+ }
+ }
+
+ static class CRSBodySubscriber implements BodySubscriber<String> {
+ private final BodySubscriber<String> 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<ByteBuffer> 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<String> 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 byte[] bytes;
+
+ static {
+ bytes = new byte[128 * 1024];
+ int b = 'A';
+
+ for (int i=0; i< bytes.length; i++) {
+ bytes[i] = (byte)b;
+ b = b == 'Z'? 'A' : b + 1;
+ }
+ }
+
+ 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, bytes.length); //no body
+ OutputStream os = t.getResponseBody();
+ os.write(bytes);
+ os.close();
+ }
+ }
+
+ 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
+ OutputStream os = t.getResponseBody();
+ os.write(bytes);
+ os.close();
+ }
+ }
+
+ 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); // chunked
+ OutputStream os = t.getResponseBody();
+ os.write(bytes);
+ os.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, bytes.length); //no body
+ OutputStream os = t.getResponseBody();
+ os.write(bytes);
+ os.close();
+ }
+ }
+
+ // -- Compile only. Verifies generic signatures
+
+ static final Function<CharSequence,Integer> f1 = subscriber -> 1;
+ static final Function<CharSequence,Number> f2 = subscriber -> 2;
+ static final Function<String,Integer> f3 = subscriber -> 3;
+ static final Function<String,Number> f4 = subscriber -> 4;
+
+ public void compileOnly() throws Exception {
+ HttpClient client = null;
+ HttpRequest req = null;
+
+ HttpResponse<Integer> r1 = client.send(req, (c,h) -> mapping(asString(UTF_8), s -> 1));
+ HttpResponse<Number> r2 = client.send(req, (c,h) -> mapping(asString(UTF_8), s -> 1));
+ HttpResponse<String> r3 = client.send(req, (c,h) -> mapping(asString(UTF_8), s -> "s"));
+ HttpResponse<CharSequence> r4 = client.send(req, (c,h) -> mapping(asString(UTF_8), s -> "s"));
+
+ HttpResponse<Integer> x1 = client.send(req, (c,h) -> mapping(asString(UTF_8), f1));
+ HttpResponse<Number> x2 = client.send(req, (c,h) -> mapping(asString(UTF_8), f1));
+ HttpResponse<Number> x3 = client.send(req, (c,h) -> mapping(asString(UTF_8), f2));
+ HttpResponse<Integer> x4 = client.send(req, (c,h) -> mapping(asString(UTF_8), f3));
+ HttpResponse<Number> x5 = client.send(req, (c,h) -> mapping(asString(UTF_8), f3));
+ HttpResponse<Number> x7 = client.send(req, (c,h) -> mapping(asString(UTF_8), f4));
+ }
+}