--- a/src/java.net.http/share/classes/java/net/http/HttpClient.java Tue Mar 13 17:12:16 2018 +0000
+++ b/src/java.net.http/share/classes/java/net/http/HttpClient.java Tue Mar 13 17:12:48 2018 +0000
@@ -83,7 +83,7 @@
* <p><b>Synchronous Example</b>
* <pre>{@code HttpClient client = HttpClient.newBuilder()
* .version(Version.HTTP_1_1)
- * .followRedirects(Redirect.SAME_PROTOCOL)
+ * .followRedirects(Redirect.NORMAL)
* .proxy(ProxySelector.of(new InetSocketAddress("proxy.example.com", 80)))
* .authenticator(Authenticator.getDefault())
* .build();
@@ -305,24 +305,26 @@
* If this method is not invoked prior to {@linkplain #build() building},
* then newly built clients will use the {@linkplain
* ProxySelector#getDefault() default proxy selector}, which is usually
- * adequate for client applications. This default behavior can be turned
- * off by supplying an explicit proxy selector to this method, such as
- * {@link #NO_PROXY} or one returned by {@link
- * ProxySelector#of(InetSocketAddress) ProxySelector::of}, before
- * {@linkplain #build() building}.
+ * adequate for client applications. The default proxy selector supports
+ * a set of system properties</a> related to
+ * <a href="{@docRoot}/java.base/java/net/doc-files/net-properties.html#Proxies">
+ * proxy settings</a>. This default behavior can be disabled by
+ * supplying an explicit proxy selector, such as {@link #NO_PROXY} or
+ * one returned by {@link ProxySelector#of(InetSocketAddress)
+ * ProxySelector::of}, before {@linkplain #build() building}.
*
- * @param selector the ProxySelector
+ * @param proxySelector the ProxySelector
* @return this builder
*/
- public Builder proxy(ProxySelector selector);
+ public Builder proxy(ProxySelector proxySelector);
/**
* Sets an authenticator to use for HTTP authentication.
*
- * @param a the Authenticator
+ * @param authenticator the Authenticator
* @return this builder
*/
- public Builder authenticator(Authenticator a);
+ public Builder authenticator(Authenticator authenticator);
/**
* Returns a new {@link HttpClient} built from the current state of this
@@ -358,7 +360,7 @@
* builder, then the {@code Optional} is empty.
*
* <p> Even though this method may return an empty optional, the {@code
- * HttpClient} may still have an non-exposed {@linkplain
+ * HttpClient} may still have a non-exposed {@linkplain
* Builder#proxy(ProxySelector) default proxy selector} that is
* used for sending HTTP requests.
*
@@ -453,6 +455,13 @@
* HttpClient.Builder#followRedirects(Redirect) Builder.followRedirects}
* method.
*
+ * @implNote When automatic redirection occurs, the request method of the
+ * redirected request may be modified depending on the specific {@code 30X}
+ * status code, as specified in <a href="https://tools.ietf.org/html/rfc7231">
+ * RFC 7231</a>. In addition, the {@code 301} and {@code 302} status codes,
+ * cause a {@code POST} request to be converted to a {@code GET} in the
+ * redirected request.
+ *
* @since 11
*/
public enum Redirect {
@@ -468,15 +477,9 @@
ALWAYS,
/**
- * Redirect to same protocol only. Redirection may occur from HTTP URLs
- * to other HTTP URLs, and from HTTPS URLs to other HTTPS URLs.
+ * Always redirect, except from HTTPS URLs to HTTP URLs.
*/
- SAME_PROTOCOL,
-
- /**
- * Redirect always except from HTTPS URLs to HTTP URLs.
- */
- SECURE
+ NORMAL
}
/**
--- a/src/java.net.http/share/classes/java/net/http/HttpRequest.java Tue Mar 13 17:12:16 2018 +0000
+++ b/src/java.net.http/share/classes/java/net/http/HttpRequest.java Tue Mar 13 17:12:48 2018 +0000
@@ -50,9 +50,9 @@
* is obtained from one of the {@link HttpRequest#newBuilder(URI) newBuilder}
* methods. A request's {@link URI}, headers, and body can be set. Request
* bodies are provided through a {@link BodyPublisher BodyPublisher} supplied
- * to one of the {@link Builder#DELETE(BodyPublisher) DELETE},
- * {@link Builder#POST(BodyPublisher) POST} or
- * {@link Builder#PUT(BodyPublisher) PUT} methods.
+ * to one of the {@link Builder#POST(BodyPublisher) POST},
+ * {@link Builder#PUT(BodyPublisher) PUT} or
+ * {@link Builder#method(String,BodyPublisher) method} methods.
* Once all required parameters have been set in the builder, {@link
* Builder#build() build} will return the {@code HttpRequest}. Builders can be
* copied and modified many times in order to build multiple related requests
@@ -242,15 +242,11 @@
public Builder PUT(BodyPublisher bodyPublisher);
/**
- * Sets the request method of this builder to DELETE and sets its
- * request body publisher to the given value.
- *
- * @param bodyPublisher the body publisher
+ * Sets the request method of this builder to DELETE.
*
* @return this builder
*/
-
- public Builder DELETE(BodyPublisher bodyPublisher);
+ public Builder DELETE();
/**
* Sets the request method and request body of this builder to the
--- a/src/java.net.http/share/classes/jdk/internal/net/http/Http1Response.java Tue Mar 13 17:12:16 2018 +0000
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Http1Response.java Tue Mar 13 17:12:48 2018 +0000
@@ -560,7 +560,12 @@
@Override
public void onSubscribe(AbstractSubscription s) {
this.subscription = s;
- parser.onSubscribe(s);
+ try {
+ parser.onSubscribe(s);
+ } catch (Throwable t) {
+ cf.completeExceptionally(t);
+ throw t;
+ }
}
@Override
--- a/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java Tue Mar 13 17:12:16 2018 +0000
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java Tue Mar 13 17:12:48 2018 +0000
@@ -450,6 +450,10 @@
try {
debugelapsed.log(Level.DEBUG, "ClientImpl (async) send %s", userRequest);
+ Executor executor = acc == null
+ ? this.executor
+ : new PrivilegedExecutor(this.executor, acc);
+
MultiExchange<T> mex = new MultiExchange<>(userRequest,
requestImpl,
this,
@@ -462,11 +466,9 @@
res = res.whenComplete(
(b,t) -> debugCompleted("ClientImpl (async)", start, userRequest));
}
+
// makes sure that any dependent actions happen in the executor
- if (acc != null) {
- res.whenCompleteAsync((r, t) -> { /* do nothing */},
- new PrivilegedExecutor(executor, acc));
- }
+ res = res.whenCompleteAsync((r, t) -> { /* do nothing */}, executor);
return res;
} catch(Throwable t) {
--- a/src/java.net.http/share/classes/jdk/internal/net/http/HttpRequestBuilderImpl.java Tue Mar 13 17:12:16 2018 +0000
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/HttpRequestBuilderImpl.java Tue Mar 13 17:12:48 2018 +0000
@@ -179,8 +179,8 @@
}
@Override
- public HttpRequest.Builder DELETE(BodyPublisher body) {
- return method0("DELETE", requireNonNull(body));
+ public HttpRequest.Builder DELETE() {
+ return method0("DELETE", null);
}
@Override
@@ -206,7 +206,6 @@
private HttpRequest.Builder method0(String method, BodyPublisher body) {
assert method != null;
- assert !method.equals("GET") ? body != null : true;
assert !method.equals("");
this.method = method;
this.bodyPublisher = body;
--- a/src/java.net.http/share/classes/jdk/internal/net/http/MultiExchange.java Tue Mar 13 17:12:16 2018 +0000
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/MultiExchange.java Tue Mar 13 17:12:48 2018 +0000
@@ -121,7 +121,10 @@
this.responseHandler = responseHandler;
if (pushPromiseHandler != null) {
- this.pushGroup = new PushGroup<>(pushPromiseHandler, request, acc);
+ Executor executor = acc == null
+ ? this.executor
+ : new PrivilegedExecutor(this.executor, acc);
+ this.pushGroup = new PushGroup<>(pushPromiseHandler, request, executor);
} else {
pushGroup = null;
}
--- a/src/java.net.http/share/classes/jdk/internal/net/http/PushGroup.java Tue Mar 13 17:12:16 2018 +0000
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/PushGroup.java Tue Mar 13 17:12:48 2018 +0000
@@ -51,7 +51,7 @@
// user's subscriber object
final PushPromiseHandler<T> pushPromiseHandler;
- private final AccessControlContext acc;
+ private final Executor executor;
int numberOfPushes;
int remainingPushes;
@@ -59,19 +59,19 @@
PushGroup(PushPromiseHandler<T> pushPromiseHandler,
HttpRequestImpl initiatingRequest,
- AccessControlContext acc) {
- this(pushPromiseHandler, initiatingRequest, new MinimalFuture<>(), acc);
+ Executor executor) {
+ this(pushPromiseHandler, initiatingRequest, new MinimalFuture<>(), executor);
}
// Check mainBodyHandler before calling nested constructor.
private PushGroup(HttpResponse.PushPromiseHandler<T> pushPromiseHandler,
HttpRequestImpl initiatingRequest,
CompletableFuture<HttpResponse<T>> mainResponse,
- AccessControlContext acc) {
+ Executor executor) {
this.noMorePushesCF = new MinimalFuture<>();
this.pushPromiseHandler = pushPromiseHandler;
this.initiatingRequest = initiatingRequest;
- this.acc = acc;
+ this.executor = executor;
}
interface Acceptor<T> {
@@ -81,16 +81,21 @@
}
private static class AcceptorImpl<T> implements Acceptor<T> {
+ private final Executor executor;
private volatile HttpResponse.BodyHandler<T> bodyHandler;
private volatile CompletableFuture<HttpResponse<T>> cf;
+ AcceptorImpl(Executor executor) {
+ this.executor = executor;
+ }
+
CompletableFuture<HttpResponse<T>> accept(BodyHandler<T> bodyHandler) {
Objects.requireNonNull(bodyHandler);
if (this.bodyHandler != null)
throw new IllegalStateException("non-null bodyHandler");
this.bodyHandler = bodyHandler;
cf = new MinimalFuture<>();
- return cf;
+ return cf.whenCompleteAsync((r,t) -> {}, executor);
}
@Override public BodyHandler<T> bodyHandler() { return bodyHandler; }
@@ -100,14 +105,14 @@
@Override public boolean accepted() { return cf != null; }
}
- Acceptor<T> acceptPushRequest(HttpRequest pushRequest, Executor e) {
- AcceptorImpl<T> acceptor = new AcceptorImpl<>();
+ Acceptor<T> acceptPushRequest(HttpRequest pushRequest) {
+ AcceptorImpl<T> acceptor = new AcceptorImpl<>(executor);
try {
pushPromiseHandler.applyPushPromise(initiatingRequest, pushRequest, acceptor::accept);
} catch (Throwable t) {
if (acceptor.accepted()) {
CompletableFuture<?> cf = acceptor.cf();
- e.execute(() -> cf.completeExceptionally(t));
+ cf.completeExceptionally(t);
}
throw t;
}
--- a/src/java.net.http/share/classes/jdk/internal/net/http/RedirectFilter.java Tue Mar 13 17:12:16 2018 +0000
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/RedirectFilter.java Tue Mar 13 17:12:48 2018 +0000
@@ -66,6 +66,22 @@
return handleResponse(r);
}
+ private static String redirectedMethod(int statusCode, String orig) {
+ switch (statusCode) {
+ case 301:
+ case 302:
+ return orig.equals("POST") ? "GET" : orig;
+ case 303:
+ return "GET";
+ case 307:
+ case 308:
+ return orig;
+ default:
+ // unexpected but return orig
+ return orig;
+ }
+ }
+
/**
* Checks to see if a new request is needed and returns it.
* Null means response is ok to return to user.
@@ -77,10 +93,11 @@
}
if (rcode >= 300 && rcode <= 399) {
URI redir = getRedirectedURI(r.headers());
+ String newMethod = redirectedMethod(rcode, method);
Log.logTrace("response code: {0}, redirected URI: {1}", rcode, redir);
if (canRedirect(redir) && ++exchange.numberOfRedirects < max_redirects) {
- Log.logTrace("redirecting to: {0}", redir);
- return HttpRequestImpl.newInstanceForRedirection(redir, method, request);
+ Log.logTrace("redirect to: {0} with method: {1}", redir, newMethod);
+ return HttpRequestImpl.newInstanceForRedirection(redir, newMethod, request);
} else {
Log.logTrace("not redirecting");
return null;
@@ -110,11 +127,9 @@
return true;
case NEVER:
return false;
- case SECURE:
+ case NORMAL:
return newScheme.equalsIgnoreCase(oldScheme)
|| newScheme.equalsIgnoreCase("https");
- case SAME_PROTOCOL:
- return newScheme.equalsIgnoreCase(oldScheme);
default:
throw new InternalError();
}
--- a/src/java.net.http/share/classes/jdk/internal/net/http/Stream.java Tue Mar 13 17:12:16 2018 +0000
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Stream.java Tue Mar 13 17:12:48 2018 +0000
@@ -476,8 +476,7 @@
PushGroup.Acceptor<T> acceptor = null;
boolean accepted = false;
try {
- acceptor = pushGroup.acceptPushRequest(pushRequest,
- connection.client().theExecutor());
+ acceptor = pushGroup.acceptPushRequest(pushRequest);
accepted = acceptor.accepted();
} catch (Throwable t) {
debug.log(Level.DEBUG,
@@ -505,7 +504,7 @@
// setup housekeeping for when the push is received
// TODO: deal with ignoring of CF anti-pattern
CompletableFuture<HttpResponse<T>> cf = pushStream.responseCF();
- cf.whenCompleteAsync((HttpResponse<T> resp, Throwable t) -> {
+ cf.whenComplete((HttpResponse<T> resp, Throwable t) -> {
t = Utils.getCompletionCause(t);
if (Log.trace()) {
Log.logTrace("Push completed on stream {0} for {1}{2}",
@@ -519,7 +518,7 @@
pushResponseCF.complete(resp);
}
pushGroup.pushCompleted();
- }, connection.client().theExecutor());
+ });
}
--- a/test/jdk/java/net/httpclient/BasicRedirectTest.java Tue Mar 13 17:12:16 2018 +0000
+++ b/test/jdk/java/net/httpclient/BasicRedirectTest.java Tue Mar 13 17:12:48 2018 +0000
@@ -95,17 +95,12 @@
{ httpsURIToLessSecure, Redirect.ALWAYS },
{ https2URIToLessSecure, Redirect.ALWAYS },
- { httpURI, Redirect.SAME_PROTOCOL },
- { httpsURI, Redirect.SAME_PROTOCOL },
- { http2URI, Redirect.SAME_PROTOCOL },
- { https2URI, Redirect.SAME_PROTOCOL },
-
- { httpURI, Redirect.SECURE },
- { httpsURI, Redirect.SECURE },
- { http2URI, Redirect.SECURE },
- { https2URI, Redirect.SECURE },
- { httpURIToMoreSecure, Redirect.SECURE },
- { http2URIToMoreSecure, Redirect.SECURE },
+ { httpURI, Redirect.NORMAL },
+ { httpsURI, Redirect.NORMAL },
+ { http2URI, Redirect.NORMAL },
+ { https2URI, Redirect.NORMAL },
+ { httpURIToMoreSecure, Redirect.NORMAL },
+ { http2URIToMoreSecure, Redirect.NORMAL },
};
}
@@ -177,13 +172,8 @@
{ httpsURIToLessSecure, Redirect.NEVER },
{ https2URIToLessSecure, Redirect.NEVER },
- { httpURIToMoreSecure, Redirect.SAME_PROTOCOL },
- { http2URIToMoreSecure, Redirect.SAME_PROTOCOL },
- { httpsURIToLessSecure, Redirect.SAME_PROTOCOL },
- { https2URIToLessSecure, Redirect.SAME_PROTOCOL },
-
- { httpsURIToLessSecure, Redirect.SECURE },
- { https2URIToLessSecure, Redirect.SECURE },
+ { httpsURIToLessSecure, Redirect.NORMAL },
+ { https2URIToLessSecure, Redirect.NORMAL },
};
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/net/httpclient/DependentActionsTest.java Tue Mar 13 17:12:48 2018 +0000
@@ -0,0 +1,674 @@
+/*
+ * Copyright (c) 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 Verify that dependent synchronous actions added before the CF
+ * completes are executed either asynchronously in an executor when the
+ * CF later completes, or in the user thread that joins.
+ * @library /lib/testlibrary http2/server
+ * @build jdk.testlibrary.SimpleSSLContext HttpServerAdapters ThrowingPublishers
+ * @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 -Djdk.internal.httpclient.debug=true DependentActionsTest
+ * @run testng/othervm/java.security.policy=dependent.policy
+ * -Djdk.internal.httpclient.debug=true DependentActionsTest
+ */
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.lang.StackWalker.StackFrame;
+import com.sun.net.httpserver.HttpServer;
+import com.sun.net.httpserver.HttpsConfigurator;
+import com.sun.net.httpserver.HttpsServer;
+import jdk.testlibrary.SimpleSSLContext;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import javax.net.ssl.SSLContext;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.URI;
+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.BodyHandlers;
+import java.net.http.HttpResponse.BodySubscriber;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Flow;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static java.lang.System.out;
+import static java.lang.String.format;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+public class DependentActionsTest implements HttpServerAdapters {
+
+ SSLContext sslContext;
+ HttpTestServer httpTestServer; // HTTP/1.1 [ 4 servers ]
+ HttpTestServer httpsTestServer; // HTTPS/1.1
+ HttpTestServer http2TestServer; // HTTP/2 ( h2c )
+ HttpTestServer 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 StackWalker WALKER =
+ StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE);
+
+ static final int ITERATION_COUNT = 1;
+ // a shared executor helps reduce the amount of threads created by the test
+ static final Executor executor = new TestExecutor(Executors.newCachedThreadPool());
+ static final ConcurrentMap<String, Throwable> FAILURES = new ConcurrentHashMap<>();
+ static volatile boolean tasksFailed;
+ static final AtomicLong serverCount = new AtomicLong();
+ static final AtomicLong clientCount = new AtomicLong();
+ static final long start = System.nanoTime();
+ public static String now() {
+ long now = System.nanoTime() - start;
+ long secs = now / 1000_000_000;
+ long mill = (now % 1000_000_000) / 1000_000;
+ long nan = now % 1000_000;
+ return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan);
+ }
+
+ private volatile HttpClient sharedClient;
+
+ static class TestExecutor implements Executor {
+ final AtomicLong tasks = new AtomicLong();
+ Executor executor;
+ TestExecutor(Executor executor) {
+ this.executor = executor;
+ }
+
+ @Override
+ public void execute(Runnable command) {
+ long id = tasks.incrementAndGet();
+ executor.execute(() -> {
+ try {
+ command.run();
+ } catch (Throwable t) {
+ tasksFailed = true;
+ System.out.printf(now() + "Task %s failed: %s%n", id, t);
+ System.err.printf(now() + "Task %s failed: %s%n", id, t);
+ FAILURES.putIfAbsent("Task " + id, t);
+ throw t;
+ }
+ });
+ }
+ }
+
+ @AfterClass
+ static final void printFailedTests() {
+ out.println("\n=========================");
+ try {
+ out.printf("%n%sCreated %d servers and %d clients%n",
+ now(), serverCount.get(), clientCount.get());
+ if (FAILURES.isEmpty()) return;
+ out.println("Failed tests: ");
+ FAILURES.entrySet().forEach((e) -> {
+ out.printf("\t%s: %s%n", e.getKey(), e.getValue());
+ e.getValue().printStackTrace(out);
+ e.getValue().printStackTrace();
+ });
+ if (tasksFailed) {
+ System.out.println("WARNING: Some tasks failed");
+ }
+ } finally {
+ out.println("\n=========================\n");
+ }
+ }
+
+ private String[] uris() {
+ return new String[] {
+ httpURI_fixed,
+ httpURI_chunk,
+ httpsURI_fixed,
+ httpsURI_chunk,
+ http2URI_fixed,
+ http2URI_chunk,
+ https2URI_fixed,
+ https2URI_chunk,
+ };
+ }
+
+ static final class SemaphoreStallerSupplier
+ implements Supplier<SemaphoreStaller> {
+ @Override
+ public SemaphoreStaller get() {
+ return new SemaphoreStaller();
+ }
+ @Override
+ public String toString() {
+ return "SemaphoreStaller";
+ }
+ }
+
+ @DataProvider(name = "noStalls")
+ public Object[][] noThrows() {
+ String[] uris = uris();
+ Object[][] result = new Object[uris.length * 2][];
+ int i = 0;
+ for (boolean sameClient : List.of(false, true)) {
+ for (String uri: uris()) {
+ result[i++] = new Object[] {uri, sameClient};
+ }
+ }
+ assert i == uris.length * 2;
+ return result;
+ }
+
+ @DataProvider(name = "variants")
+ public Object[][] variants() {
+ String[] uris = uris();
+ Object[][] result = new Object[uris.length * 2][];
+ int i = 0;
+ Supplier<? extends Staller> s = new SemaphoreStallerSupplier();
+ for (Supplier<? extends Staller> staller : List.of(s)) {
+ for (boolean sameClient : List.of(false, true)) {
+ for (String uri : uris()) {
+ result[i++] = new Object[]{uri, sameClient, staller};
+ }
+ }
+ }
+ assert i == uris.length * 2;
+ return result;
+ }
+
+ private HttpClient makeNewClient() {
+ clientCount.incrementAndGet();
+ return HttpClient.newBuilder()
+ .executor(executor)
+ .sslContext(sslContext)
+ .build();
+ }
+
+ HttpClient newHttpClient(boolean share) {
+ if (!share) return makeNewClient();
+ HttpClient shared = sharedClient;
+ if (shared != null) return shared;
+ synchronized (this) {
+ shared = sharedClient;
+ if (shared == null) {
+ shared = sharedClient = makeNewClient();
+ }
+ return shared;
+ }
+ }
+
+ @Test(dataProvider = "noStalls")
+ public void testNoStalls(String uri, boolean sameClient)
+ throws Exception {
+ HttpClient client = null;
+ out.printf("%ntestNoStalls(%s, %b)%n", uri, sameClient);
+ for (int i=0; i< ITERATION_COUNT; i++) {
+ if (!sameClient || client == null)
+ client = newHttpClient(sameClient);
+
+ HttpRequest req = HttpRequest.newBuilder(URI.create(uri))
+ .build();
+ BodyHandler<String> handler =
+ new StallingBodyHandler((w) -> {},
+ BodyHandlers.ofString());
+ HttpResponse<String> response = client.send(req, handler);
+ String body = response.body();
+ assertEquals(URI.create(body).getPath(), URI.create(uri).getPath());
+ }
+ }
+
+ @Test(dataProvider = "variants")
+ public void testAsStringAsync(String uri,
+ boolean sameClient,
+ Supplier<Staller> s)
+ throws Exception
+ {
+ Staller staller = s.get();
+ String test = format("testAsStringAsync(%s, %b, %s)",
+ uri, sameClient, staller);
+ testDependent(test, uri, sameClient, BodyHandlers::ofString,
+ this::finish, this::extractString, staller);
+ }
+
+ @Test(dataProvider = "variants")
+ public void testAsLinesAsync(String uri,
+ boolean sameClient,
+ Supplier<Staller> s)
+ throws Exception
+ {
+ Staller staller = s.get();
+ String test = format("testAsLinesAsync(%s, %b, %s)",
+ uri, sameClient, staller);
+ testDependent(test, uri, sameClient, BodyHandlers::ofLines,
+ this::finish, this::extractStream, staller);
+ }
+
+ @Test(dataProvider = "variants")
+ public void testAsInputStreamAsync(String uri,
+ boolean sameClient,
+ Supplier<Staller> s)
+ throws Exception
+ {
+ Staller staller = s.get();
+ String test = format("testAsInputStreamAsync(%s, %b, %s)",
+ uri, sameClient, staller);
+ testDependent(test, uri, sameClient, BodyHandlers::ofInputStream,
+ this::finish, this::extractInputStream, staller);
+ }
+
+ private <T,U> void testDependent(String name, String uri, boolean sameClient,
+ Supplier<BodyHandler<T>> handlers,
+ Finisher finisher,
+ Extractor extractor,
+ Staller staller)
+ throws Exception
+ {
+ out.printf("%n%s%s%n", now(), name);
+ try {
+ testDependent(uri, sameClient, handlers, finisher, extractor, staller);
+ } catch (Error | Exception x) {
+ FAILURES.putIfAbsent(name, x);
+ throw x;
+ }
+ }
+
+ private <T,U> void testDependent(String uri, boolean sameClient,
+ Supplier<BodyHandler<T>> handlers,
+ Finisher finisher,
+ Extractor extractor,
+ Staller staller)
+ throws Exception
+ {
+ HttpClient client = null;
+ for (Where where : EnumSet.of(Where.BODY_HANDLER)) {
+ if (!sameClient || client == null)
+ client = newHttpClient(sameClient);
+
+ HttpRequest req = HttpRequest.
+ newBuilder(URI.create(uri))
+ .build();
+ BodyHandler<T> handler =
+ new StallingBodyHandler(where.select(staller), handlers.get());
+ System.out.println("try stalling in " + where);
+ staller.acquire();
+ assert staller.willStall();
+ CompletableFuture<HttpResponse<T>> responseCF = client.sendAsync(req, handler);
+ assert !responseCF.isDone();
+ finisher.finish(where, responseCF, staller, extractor);
+ }
+ }
+
+ enum Where {
+ BODY_HANDLER, ON_SUBSCRIBE, ON_NEXT, ON_COMPLETE, ON_ERROR, GET_BODY, BODY_CF;
+ public Consumer<Where> select(Consumer<Where> consumer) {
+ return new Consumer<Where>() {
+ @Override
+ public void accept(Where where) {
+ if (Where.this == where) {
+ consumer.accept(where);
+ }
+ }
+ };
+ }
+ }
+
+ interface Extractor<T> {
+ public List<String> extract(HttpResponse<T> resp);
+ }
+
+ final List<String> extractString(HttpResponse<String> resp) {
+ return List.of(resp.body());
+ }
+
+ final List<String> extractStream(HttpResponse<Stream<String>> resp) {
+ return resp.body().collect(Collectors.toList());
+ }
+
+ final List<String> extractInputStream(HttpResponse<InputStream> resp) {
+ try (InputStream is = resp.body()) {
+ return new BufferedReader(new InputStreamReader(is))
+ .lines().collect(Collectors.toList());
+ } catch (IOException x) {
+ throw new CompletionException(x);
+ }
+ }
+
+ interface Finisher<T> {
+ public void finish(Where w,
+ CompletableFuture<HttpResponse<T>> cf,
+ Staller staller,
+ Extractor extractor);
+ }
+
+ Optional<StackFrame> findFrame(Stream<StackFrame> s, String name) {
+ return s.filter((f) -> f.getClassName().contains(name))
+ .filter((f) -> f.getDeclaringClass().getModule().equals(HttpClient.class.getModule()))
+ .findFirst();
+ }
+
+ <T> void checkThreadAndStack(Thread thread,
+ AtomicReference<RuntimeException> failed,
+ T result,
+ Throwable error) {
+ if (Thread.currentThread() == thread) {
+ //failed.set(new RuntimeException("Dependant action was executed in " + thread));
+ List<StackFrame> httpStack = WALKER.walk(s -> s.filter(f -> f.getDeclaringClass()
+ .getModule().equals(HttpClient.class.getModule()))
+ .collect(Collectors.toList()));
+ if (!httpStack.isEmpty()) {
+ System.out.println("Found unexpected trace: ");
+ httpStack.forEach(f -> System.out.printf("\t%s%n", f));
+ failed.set(new RuntimeException("Dependant action has unexpected frame in " +
+ Thread.currentThread() + ": " + httpStack.get(0)));
+
+ }
+ return;
+ } else if (System.getSecurityManager() != null) {
+ Optional<StackFrame> sf = WALKER.walk(s -> findFrame(s, "PrivilegedRunnable"));
+ if (!sf.isPresent()) {
+ failed.set(new RuntimeException("Dependant action does not have expected frame in "
+ + Thread.currentThread()));
+ return;
+ } else {
+ System.out.println("Found expected frame: " + sf.get());
+ }
+ } else {
+ List<StackFrame> httpStack = WALKER.walk(s -> s.filter(f -> f.getDeclaringClass()
+ .getModule().equals(HttpClient.class.getModule()))
+ .collect(Collectors.toList()));
+ if (!httpStack.isEmpty()) {
+ System.out.println("Found unexpected trace: ");
+ httpStack.forEach(f -> System.out.printf("\t%s%n", f));
+ failed.set(new RuntimeException("Dependant action has unexpected frame in " +
+ Thread.currentThread() + ": " + httpStack.get(0)));
+
+ }
+ }
+ }
+
+ <T> void finish(Where w, CompletableFuture<HttpResponse<T>> cf,
+ Staller staller,
+ Extractor<T> extractor) {
+ Thread thread = Thread.currentThread();
+ AtomicReference<RuntimeException> failed = new AtomicReference<>();
+ CompletableFuture<HttpResponse<T>> done = cf.whenComplete(
+ (r,t) -> checkThreadAndStack(thread, failed, r, t));
+ assert !cf.isDone();
+ try {
+ Thread.sleep(100);
+ } catch (Throwable t) {/* don't care */}
+ assert !cf.isDone();
+ staller.release();
+ try {
+ HttpResponse<T> response = done.join();
+ List<String> result = extractor.extract(response);
+ RuntimeException error = failed.get();
+ if (error != null) {
+ throw new RuntimeException("Test failed in "
+ + w + ": " + response, error);
+ }
+ assertEquals(result, List.of(response.request().uri().getPath()));
+ } finally {
+ staller.reset();
+ }
+ }
+
+ interface Staller extends Consumer<Where> {
+ void release();
+ void acquire();
+ void reset();
+ boolean willStall();
+ }
+
+ static final class SemaphoreStaller implements Staller {
+ final Semaphore sem = new Semaphore(1);
+ @Override
+ public void accept(Where where) {
+ System.out.println("Acquiring semaphore in "
+ + where + " permits=" + sem.availablePermits());
+ sem.acquireUninterruptibly();
+ System.out.println("Semaphored acquired in " + where);
+ }
+
+ @Override
+ public void release() {
+ System.out.println("Releasing semaphore: permits="
+ + sem.availablePermits());
+ sem.release();
+ }
+
+ @Override
+ public void acquire() {
+ sem.acquireUninterruptibly();
+ System.out.println("Semaphored acquired");
+ }
+
+ @Override
+ public void reset() {
+ System.out.println("Reseting semaphore: permits="
+ + sem.availablePermits());
+ sem.drainPermits();
+ sem.release();
+ System.out.println("Semaphore reset: permits="
+ + sem.availablePermits());
+ }
+
+ @Override
+ public boolean willStall() {
+ return sem.availablePermits() <= 0;
+ }
+
+ @Override
+ public String toString() {
+ return "SemaphoreStaller";
+ }
+ }
+
+ static final class StallingBodyHandler<T> implements BodyHandler<T> {
+ final Consumer<Where> stalling;
+ final BodyHandler<T> bodyHandler;
+ StallingBodyHandler(Consumer<Where> stalling, BodyHandler<T> bodyHandler) {
+ this.stalling = stalling;
+ this.bodyHandler = bodyHandler;
+ }
+ @Override
+ public BodySubscriber<T> apply(int statusCode, HttpHeaders responseHeaders) {
+ stalling.accept(Where.BODY_HANDLER);
+ BodySubscriber<T> subscriber = bodyHandler.apply(statusCode, responseHeaders);
+ return new StallingBodySubscriber(stalling, subscriber);
+ }
+ }
+
+ static final class StallingBodySubscriber<T> implements BodySubscriber<T> {
+ private final BodySubscriber<T> subscriber;
+ volatile boolean onSubscribeCalled;
+ final Consumer<Where> stalling;
+ StallingBodySubscriber(Consumer<Where> stalling, BodySubscriber<T> subscriber) {
+ this.stalling = stalling;
+ this.subscriber = subscriber;
+ }
+
+ @Override
+ public void onSubscribe(Flow.Subscription subscription) {
+ //out.println("onSubscribe ");
+ onSubscribeCalled = true;
+ stalling.accept(Where.ON_SUBSCRIBE);
+ subscriber.onSubscribe(subscription);
+ }
+
+ @Override
+ public void onNext(List<ByteBuffer> item) {
+ // out.println("onNext " + item);
+ assertTrue(onSubscribeCalled);
+ stalling.accept(Where.ON_NEXT);
+ subscriber.onNext(item);
+ }
+
+ @Override
+ public void onError(Throwable throwable) {
+ //out.println("onError");
+ assertTrue(onSubscribeCalled);
+ stalling.accept(Where.ON_ERROR);
+ subscriber.onError(throwable);
+ }
+
+ @Override
+ public void onComplete() {
+ //out.println("onComplete");
+ assertTrue(onSubscribeCalled, "onComplete called before onSubscribe");
+ stalling.accept(Where.ON_COMPLETE);
+ subscriber.onComplete();
+ }
+
+ @Override
+ public CompletionStage<T> getBody() {
+ stalling.accept(Where.GET_BODY);
+ try {
+ stalling.accept(Where.BODY_CF);
+ } catch (Throwable t) {
+ return CompletableFuture.failedFuture(t);
+ }
+ return subscriber.getBody();
+ }
+ }
+
+
+ @BeforeTest
+ public void setup() throws Exception {
+ sslContext = new SimpleSSLContext().get();
+ if (sslContext == null)
+ throw new AssertionError("Unexpected null sslContext");
+
+ // HTTP/1.1
+ HttpTestHandler h1_fixedLengthHandler = new HTTP_FixedLengthHandler();
+ HttpTestHandler h1_chunkHandler = new HTTP_ChunkedHandler();
+ InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
+ httpTestServer = HttpTestServer.of(HttpServer.create(sa, 0));
+ httpTestServer.addHandler(h1_fixedLengthHandler, "/http1/fixed");
+ httpTestServer.addHandler(h1_chunkHandler, "/http1/chunk");
+ httpURI_fixed = "http://" + httpTestServer.serverAuthority() + "/http1/fixed/x";
+ httpURI_chunk = "http://" + httpTestServer.serverAuthority() + "/http1/chunk/x";
+
+ HttpsServer httpsServer = HttpsServer.create(sa, 0);
+ httpsServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
+ httpsTestServer = HttpTestServer.of(httpsServer);
+ httpsTestServer.addHandler(h1_fixedLengthHandler, "/https1/fixed");
+ httpsTestServer.addHandler(h1_chunkHandler, "/https1/chunk");
+ httpsURI_fixed = "https://" + httpsTestServer.serverAuthority() + "/https1/fixed/x";
+ httpsURI_chunk = "https://" + httpsTestServer.serverAuthority() + "/https1/chunk/x";
+
+ // HTTP/2
+ HttpTestHandler h2_fixedLengthHandler = new HTTP_FixedLengthHandler();
+ HttpTestHandler h2_chunkedHandler = new HTTP_ChunkedHandler();
+
+ http2TestServer = HttpTestServer.of(new Http2TestServer("localhost", false, 0));
+ http2TestServer.addHandler(h2_fixedLengthHandler, "/http2/fixed");
+ http2TestServer.addHandler(h2_chunkedHandler, "/http2/chunk");
+ http2URI_fixed = "http://" + http2TestServer.serverAuthority() + "/http2/fixed/x";
+ http2URI_chunk = "http://" + http2TestServer.serverAuthority() + "/http2/chunk/x";
+
+ https2TestServer = HttpTestServer.of(new Http2TestServer("localhost", true, 0));
+ https2TestServer.addHandler(h2_fixedLengthHandler, "/https2/fixed");
+ https2TestServer.addHandler(h2_chunkedHandler, "/https2/chunk");
+ https2URI_fixed = "https://" + https2TestServer.serverAuthority() + "/https2/fixed/x";
+ https2URI_chunk = "https://" + https2TestServer.serverAuthority() + "/https2/chunk/x";
+
+ serverCount.addAndGet(4);
+ httpTestServer.start();
+ httpsTestServer.start();
+ http2TestServer.start();
+ https2TestServer.start();
+ }
+
+ @AfterTest
+ public void teardown() throws Exception {
+ sharedClient = null;
+ httpTestServer.stop();
+ httpsTestServer.stop();
+ http2TestServer.stop();
+ https2TestServer.stop();
+ }
+
+ static class HTTP_FixedLengthHandler implements HttpTestHandler {
+ @Override
+ public void handle(HttpTestExchange t) throws IOException {
+ out.println("HTTP_FixedLengthHandler received request to " + t.getRequestURI());
+ try (InputStream is = t.getRequestBody()) {
+ is.readAllBytes();
+ }
+ byte[] resp = t.getRequestURI().getPath().getBytes(StandardCharsets.UTF_8);
+ t.sendResponseHeaders(200, resp.length); //fixed content length
+ try (OutputStream os = t.getResponseBody()) {
+ os.write(resp);
+ }
+ }
+ }
+
+ static class HTTP_ChunkedHandler implements HttpTestHandler {
+ @Override
+ public void handle(HttpTestExchange t) throws IOException {
+ out.println("HTTP_ChunkedHandler received request to " + t.getRequestURI());
+ byte[] resp = t.getRequestURI().getPath().toString().getBytes(StandardCharsets.UTF_8);
+ try (InputStream is = t.getRequestBody()) {
+ is.readAllBytes();
+ }
+ t.sendResponseHeaders(200, -1); // chunked/variable
+ try (OutputStream os = t.getResponseBody()) {
+ os.write(resp);
+ }
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/net/httpclient/DependentPromiseActionsTest.java Tue Mar 13 17:12:48 2018 +0000
@@ -0,0 +1,761 @@
+/*
+ * Copyright (c) 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 Verify that dependent synchronous actions added before the promise CF
+ * completes are executed either asynchronously in an executor when the
+ * CF later completes, or in the user thread that joins.
+ * @library /lib/testlibrary http2/server
+ * @build jdk.testlibrary.SimpleSSLContext HttpServerAdapters ThrowingPublishers
+ * @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 -Djdk.internal.httpclient.debug=true DependentPromiseActionsTest
+ * @run testng/othervm/java.security.policy=dependent.policy
+ * -Djdk.internal.httpclient.debug=true DependentPromiseActionsTest
+ */
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.lang.StackWalker.StackFrame;
+import jdk.internal.net.http.common.HttpHeadersImpl;
+import jdk.testlibrary.SimpleSSLContext;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import javax.net.ssl.SSLContext;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+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.BodyHandlers;
+import java.net.http.HttpResponse.BodySubscriber;
+import java.net.http.HttpResponse.PushPromiseHandler;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Flow;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static java.lang.System.err;
+import static java.lang.System.out;
+import static java.lang.String.format;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+public class DependentPromiseActionsTest implements HttpServerAdapters {
+
+ SSLContext sslContext;
+ HttpTestServer http2TestServer; // HTTP/2 ( h2c )
+ HttpTestServer https2TestServer; // HTTP/2 ( h2 )
+ String http2URI_fixed;
+ String http2URI_chunk;
+ String https2URI_fixed;
+ String https2URI_chunk;
+
+ static final StackWalker WALKER =
+ StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE);
+
+ static final int ITERATION_COUNT = 1;
+ // a shared executor helps reduce the amount of threads created by the test
+ static final Executor executor = new TestExecutor(Executors.newCachedThreadPool());
+ static final ConcurrentMap<String, Throwable> FAILURES = new ConcurrentHashMap<>();
+ static volatile boolean tasksFailed;
+ static final AtomicLong serverCount = new AtomicLong();
+ static final AtomicLong clientCount = new AtomicLong();
+ static final long start = System.nanoTime();
+ public static String now() {
+ long now = System.nanoTime() - start;
+ long secs = now / 1000_000_000;
+ long mill = (now % 1000_000_000) / 1000_000;
+ long nan = now % 1000_000;
+ return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan);
+ }
+
+ private volatile HttpClient sharedClient;
+
+ static class TestExecutor implements Executor {
+ final AtomicLong tasks = new AtomicLong();
+ Executor executor;
+ TestExecutor(Executor executor) {
+ this.executor = executor;
+ }
+
+ @Override
+ public void execute(Runnable command) {
+ long id = tasks.incrementAndGet();
+ executor.execute(() -> {
+ try {
+ command.run();
+ } catch (Throwable t) {
+ tasksFailed = true;
+ System.out.printf(now() + "Task %s failed: %s%n", id, t);
+ System.err.printf(now() + "Task %s failed: %s%n", id, t);
+ FAILURES.putIfAbsent("Task " + id, t);
+ throw t;
+ }
+ });
+ }
+ }
+
+ @AfterClass
+ static final void printFailedTests() {
+ out.println("\n=========================");
+ try {
+ out.printf("%n%sCreated %d servers and %d clients%n",
+ now(), serverCount.get(), clientCount.get());
+ if (FAILURES.isEmpty()) return;
+ out.println("Failed tests: ");
+ FAILURES.entrySet().forEach((e) -> {
+ out.printf("\t%s: %s%n", e.getKey(), e.getValue());
+ e.getValue().printStackTrace(out);
+ e.getValue().printStackTrace();
+ });
+ if (tasksFailed) {
+ System.out.println("WARNING: Some tasks failed");
+ }
+ } finally {
+ out.println("\n=========================\n");
+ }
+ }
+
+ private String[] uris() {
+ return new String[] {
+ http2URI_fixed,
+ http2URI_chunk,
+ https2URI_fixed,
+ https2URI_chunk,
+ };
+ }
+
+ static final class SemaphoreStallerSupplier
+ implements Supplier<SemaphoreStaller> {
+ @Override
+ public SemaphoreStaller get() {
+ return new SemaphoreStaller();
+ }
+ @Override
+ public String toString() {
+ return "SemaphoreStaller";
+ }
+ }
+
+ @DataProvider(name = "noStalls")
+ public Object[][] noThrows() {
+ String[] uris = uris();
+ Object[][] result = new Object[uris.length * 2][];
+ int i = 0;
+ for (boolean sameClient : List.of(false, true)) {
+ for (String uri: uris()) {
+ result[i++] = new Object[] {uri, sameClient};
+ }
+ }
+ assert i == uris.length * 2;
+ return result;
+ }
+
+ @DataProvider(name = "variants")
+ public Object[][] variants() {
+ String[] uris = uris();
+ Object[][] result = new Object[uris.length * 2][];
+ int i = 0;
+ Supplier<? extends Staller> s = new SemaphoreStallerSupplier();
+ for (Supplier<? extends Staller> staller : List.of(s)) {
+ for (boolean sameClient : List.of(false, true)) {
+ for (String uri : uris()) {
+ result[i++] = new Object[]{uri, sameClient, staller};
+ }
+ }
+ }
+ assert i == uris.length * 2;
+ return result;
+ }
+
+ private HttpClient makeNewClient() {
+ clientCount.incrementAndGet();
+ return HttpClient.newBuilder()
+ .executor(executor)
+ .sslContext(sslContext)
+ .build();
+ }
+
+ HttpClient newHttpClient(boolean share) {
+ if (!share) return makeNewClient();
+ HttpClient shared = sharedClient;
+ if (shared != null) return shared;
+ synchronized (this) {
+ shared = sharedClient;
+ if (shared == null) {
+ shared = sharedClient = makeNewClient();
+ }
+ return shared;
+ }
+ }
+
+ @Test(dataProvider = "noStalls")
+ public void testNoStalls(String uri, boolean sameClient)
+ throws Exception {
+ HttpClient client = null;
+ out.printf("%ntestNoStalls(%s, %b)%n", uri, sameClient);
+ for (int i=0; i< ITERATION_COUNT; i++) {
+ if (!sameClient || client == null)
+ client = newHttpClient(sameClient);
+
+ HttpRequest req = HttpRequest.newBuilder(URI.create(uri))
+ .build();
+ BodyHandler<Stream<String>> handler =
+ new StallingBodyHandler((w) -> {},
+ BodyHandlers.ofLines());
+ Map<HttpRequest, CompletableFuture<HttpResponse<Stream<String>>>> pushPromises =
+ new ConcurrentHashMap<>();
+ PushPromiseHandler<Stream<String>> pushHandler = new PushPromiseHandler<>() {
+ @Override
+ public void applyPushPromise(HttpRequest initiatingRequest,
+ HttpRequest pushPromiseRequest,
+ Function<BodyHandler<Stream<String>>,
+ CompletableFuture<HttpResponse<Stream<String>>>>
+ acceptor) {
+ pushPromises.putIfAbsent(pushPromiseRequest, acceptor.apply(handler));
+ }
+ };
+ HttpResponse<Stream<String>> response =
+ client.sendAsync(req, BodyHandlers.ofLines(), pushHandler).get();
+ String body = response.body().collect(Collectors.joining("|"));
+ assertEquals(URI.create(body).getPath(), URI.create(uri).getPath());
+ for (HttpRequest promised : pushPromises.keySet()) {
+ out.printf("%s Received promise: %s%n\tresponse: %s%n",
+ now(), promised, pushPromises.get(promised).get());
+ String promisedBody = pushPromises.get(promised).get().body()
+ .collect(Collectors.joining("|"));
+ assertEquals(promisedBody, promised.uri().toASCIIString());
+ }
+ assertEquals(3, pushPromises.size());
+ }
+ }
+
+ @Test(dataProvider = "variants")
+ public void testAsStringAsync(String uri,
+ boolean sameClient,
+ Supplier<Staller> stallers)
+ throws Exception
+ {
+ String test = format("testAsStringAsync(%s, %b, %s)",
+ uri, sameClient, stallers);
+ testDependent(test, uri, sameClient, BodyHandlers::ofString,
+ this::finish, this::extractString, stallers);
+ }
+
+ @Test(dataProvider = "variants")
+ public void testAsLinesAsync(String uri,
+ boolean sameClient,
+ Supplier<Staller> stallers)
+ throws Exception
+ {
+ String test = format("testAsLinesAsync(%s, %b, %s)",
+ uri, sameClient, stallers);
+ testDependent(test, uri, sameClient, BodyHandlers::ofLines,
+ this::finish, this::extractStream, stallers);
+ }
+
+ @Test(dataProvider = "variants")
+ public void testAsInputStreamAsync(String uri,
+ boolean sameClient,
+ Supplier<Staller> stallers)
+ throws Exception
+ {
+ String test = format("testAsInputStreamAsync(%s, %b, %s)",
+ uri, sameClient, stallers);
+ testDependent(test, uri, sameClient, BodyHandlers::ofInputStream,
+ this::finish, this::extractInputStream, stallers);
+ }
+
+ private <T,U> void testDependent(String name, String uri, boolean sameClient,
+ Supplier<BodyHandler<T>> handlers,
+ Finisher finisher,
+ Extractor<T> extractor,
+ Supplier<Staller> stallers)
+ throws Exception
+ {
+ out.printf("%n%s%s%n", now(), name);
+ try {
+ testDependent(uri, sameClient, handlers, finisher, extractor, stallers);
+ } catch (Error | Exception x) {
+ FAILURES.putIfAbsent(name, x);
+ throw x;
+ }
+ }
+
+ private <T,U> void testDependent(String uri, boolean sameClient,
+ Supplier<BodyHandler<T>> handlers,
+ Finisher finisher,
+ Extractor<T> extractor,
+ Supplier<Staller> stallers)
+ throws Exception
+ {
+ HttpClient client = null;
+ for (Where where : EnumSet.of(Where.BODY_HANDLER)) {
+ if (!sameClient || client == null)
+ client = newHttpClient(sameClient);
+
+ HttpRequest req = HttpRequest.
+ newBuilder(URI.create(uri))
+ .build();
+ StallingPushPromiseHandler<T> promiseHandler =
+ new StallingPushPromiseHandler<>(where, handlers, stallers);
+ BodyHandler<T> handler = handlers.get();
+ System.out.println("try stalling in " + where);
+ CompletableFuture<HttpResponse<T>> responseCF =
+ client.sendAsync(req, handler, promiseHandler);
+ assert !responseCF.isDone();
+ finisher.finish(where, responseCF, promiseHandler, extractor);
+ }
+ }
+
+ enum Where {
+ ON_PUSH_PROMISE, BODY_HANDLER, ON_SUBSCRIBE, ON_NEXT, ON_COMPLETE, ON_ERROR, GET_BODY, BODY_CF;
+ public Consumer<Where> select(Consumer<Where> consumer) {
+ return new Consumer<Where>() {
+ @Override
+ public void accept(Where where) {
+ if (Where.this == where) {
+ consumer.accept(where);
+ }
+ }
+ };
+ }
+ }
+
+ static final class StallingPushPromiseHandler<T> implements PushPromiseHandler<T> {
+
+ static final class Tuple<U> {
+ public final CompletableFuture<HttpResponse<U>> response;
+ public final Staller staller;
+ public final AtomicReference<RuntimeException> failed;
+ Tuple(AtomicReference<RuntimeException> failed,
+ CompletableFuture<HttpResponse<U>> response,
+ Staller staller) {
+ this.response = response;
+ this.staller = staller;
+ this.failed = failed;
+ }
+ }
+
+ public final ConcurrentMap<HttpRequest, Tuple<T>> promiseMap =
+ new ConcurrentHashMap<>();
+ private final Supplier<Staller> stallers;
+ private final Supplier<BodyHandler<T>> handlers;
+ private final Where where;
+ private final Thread thread = Thread.currentThread(); // main thread
+
+ StallingPushPromiseHandler(Where where,
+ Supplier<BodyHandler<T>> handlers,
+ Supplier<Staller> stallers) {
+ this.where = where;
+ this.handlers = handlers;
+ this.stallers = stallers;
+ }
+
+ @Override
+ public void applyPushPromise(HttpRequest initiatingRequest,
+ HttpRequest pushPromiseRequest,
+ Function<BodyHandler<T>,
+ CompletableFuture<HttpResponse<T>>> acceptor) {
+ AtomicReference<RuntimeException> failed = new AtomicReference<>();
+ Staller staller = stallers.get();
+ staller.acquire();
+ assert staller.willStall();
+ try {
+ BodyHandler handler = new StallingBodyHandler<>(
+ where.select(staller), handlers.get());
+ CompletableFuture<HttpResponse<T>> cf = acceptor.apply(handler);
+ Tuple<T> tuple = new Tuple(failed, cf, staller);
+ promiseMap.putIfAbsent(pushPromiseRequest, tuple);
+ CompletableFuture<?> done = cf.whenComplete(
+ (r, t) -> checkThreadAndStack(thread, failed, r, t));
+ assert !cf.isDone();
+ } finally {
+ staller.release();
+ }
+ }
+ }
+
+ interface Extractor<T> {
+ public List<String> extract(HttpResponse<T> resp);
+ }
+
+ final List<String> extractString(HttpResponse<String> resp) {
+ return List.of(resp.body());
+ }
+
+ final List<String> extractStream(HttpResponse<Stream<String>> resp) {
+ return resp.body().collect(Collectors.toList());
+ }
+
+ final List<String> extractInputStream(HttpResponse<InputStream> resp) {
+ try (InputStream is = resp.body()) {
+ return new BufferedReader(new InputStreamReader(is))
+ .lines().collect(Collectors.toList());
+ } catch (IOException x) {
+ throw new CompletionException(x);
+ }
+ }
+
+ interface Finisher<T> {
+ public void finish(Where w,
+ CompletableFuture<HttpResponse<T>> cf,
+ StallingPushPromiseHandler<T> ph,
+ Extractor<T> extractor);
+ }
+
+ static Optional<StackFrame> findFrame(Stream<StackFrame> s, String name) {
+ return s.filter((f) -> f.getClassName().contains(name))
+ .filter((f) -> f.getDeclaringClass().getModule().equals(HttpClient.class.getModule()))
+ .findFirst();
+ }
+
+ static <T> void checkThreadAndStack(Thread thread,
+ AtomicReference<RuntimeException> failed,
+ T result,
+ Throwable error) {
+ if (Thread.currentThread() == thread) {
+ //failed.set(new RuntimeException("Dependant action was executed in " + thread));
+ List<StackFrame> httpStack = WALKER.walk(s -> s.filter(f -> f.getDeclaringClass()
+ .getModule().equals(HttpClient.class.getModule()))
+ .collect(Collectors.toList()));
+ if (!httpStack.isEmpty()) {
+ System.out.println("Found unexpected trace: ");
+ httpStack.forEach(f -> System.out.printf("\t%s%n", f));
+ failed.set(new RuntimeException("Dependant action has unexpected frame in " +
+ Thread.currentThread() + ": " + httpStack.get(0)));
+
+ } return;
+ } else if (System.getSecurityManager() != null) {
+ Optional<StackFrame> sf = WALKER.walk(s -> findFrame(s, "PrivilegedRunnable"));
+ if (!sf.isPresent()) {
+ failed.set(new RuntimeException("Dependant action does not have expected frame in "
+ + Thread.currentThread()));
+ return;
+ } else {
+ System.out.println("Found expected frame: " + sf.get());
+ }
+ } else {
+ List<StackFrame> httpStack = WALKER.walk(s -> s.filter(f -> f.getDeclaringClass()
+ .getModule().equals(HttpClient.class.getModule()))
+ .collect(Collectors.toList()));
+ if (!httpStack.isEmpty()) {
+ System.out.println("Found unexpected trace: ");
+ httpStack.forEach(f -> System.out.printf("\t%s%n", f));
+ failed.set(new RuntimeException("Dependant action has unexpected frame in " +
+ Thread.currentThread() + ": " + httpStack.get(0)));
+
+ }
+ }
+ }
+
+ <T> void finish(Where w,
+ StallingPushPromiseHandler.Tuple<T> tuple,
+ Extractor<T> extractor) {
+ AtomicReference<RuntimeException> failed = tuple.failed;
+ CompletableFuture<HttpResponse<T>> done = tuple.response;
+ Staller staller = tuple.staller;
+ try {
+ HttpResponse<T> response = done.join();
+ List<String> result = extractor.extract(response);
+ URI uri = response.uri();
+ RuntimeException error = failed.get();
+ if (error != null) {
+ throw new RuntimeException("Test failed in "
+ + w + ": " + uri, error);
+ }
+ assertEquals(result, List.of(response.request().uri().toASCIIString()));
+ } finally {
+ staller.reset();
+ }
+ }
+
+ <T> void finish(Where w,
+ CompletableFuture<HttpResponse<T>> cf,
+ StallingPushPromiseHandler<T> ph,
+ Extractor<T> extractor) {
+ HttpResponse<T> response = cf.join();
+ List<String> result = extractor.extract(response);
+ for (HttpRequest req : ph.promiseMap.keySet()) {
+ finish(w, ph.promiseMap.get(req), extractor);
+ }
+ assertEquals(ph.promiseMap.size(), 3,
+ "Expected 3 push promises for " + w + " in "
+ + response.request().uri());
+ assertEquals(result, List.of(response.request().uri().toASCIIString()));
+
+ }
+
+ interface Staller extends Consumer<Where> {
+ void release();
+ void acquire();
+ void reset();
+ boolean willStall();
+ }
+
+ static final class SemaphoreStaller implements Staller {
+ final Semaphore sem = new Semaphore(1);
+ @Override
+ public void accept(Where where) {
+ sem.acquireUninterruptibly();
+ }
+
+ @Override
+ public void release() {
+ sem.release();
+ }
+
+ @Override
+ public void acquire() {
+ sem.acquireUninterruptibly();
+ }
+
+ @Override
+ public void reset() {
+ sem.drainPermits();
+ sem.release();
+ }
+
+ @Override
+ public boolean willStall() {
+ return sem.availablePermits() <= 0;
+ }
+
+ @Override
+ public String toString() {
+ return "SemaphoreStaller";
+ }
+ }
+
+ static final class StallingBodyHandler<T> implements BodyHandler<T> {
+ final Consumer<Where> stalling;
+ final BodyHandler<T> bodyHandler;
+ StallingBodyHandler(Consumer<Where> stalling, BodyHandler<T> bodyHandler) {
+ this.stalling = stalling;
+ this.bodyHandler = bodyHandler;
+ }
+ @Override
+ public BodySubscriber<T> apply(int statusCode, HttpHeaders responseHeaders) {
+ stalling.accept(Where.BODY_HANDLER);
+ BodySubscriber<T> subscriber = bodyHandler.apply(statusCode, responseHeaders);
+ return new StallingBodySubscriber(stalling, subscriber);
+ }
+ }
+
+ static final class StallingBodySubscriber<T> implements BodySubscriber<T> {
+ private final BodySubscriber<T> subscriber;
+ volatile boolean onSubscribeCalled;
+ final Consumer<Where> stalling;
+ StallingBodySubscriber(Consumer<Where> stalling, BodySubscriber<T> subscriber) {
+ this.stalling = stalling;
+ this.subscriber = subscriber;
+ }
+
+ @Override
+ public void onSubscribe(Flow.Subscription subscription) {
+ //out.println("onSubscribe ");
+ onSubscribeCalled = true;
+ stalling.accept(Where.ON_SUBSCRIBE);
+ subscriber.onSubscribe(subscription);
+ }
+
+ @Override
+ public void onNext(List<ByteBuffer> item) {
+ // out.println("onNext " + item);
+ assertTrue(onSubscribeCalled);
+ stalling.accept(Where.ON_NEXT);
+ subscriber.onNext(item);
+ }
+
+ @Override
+ public void onError(Throwable throwable) {
+ //out.println("onError");
+ assertTrue(onSubscribeCalled);
+ stalling.accept(Where.ON_ERROR);
+ subscriber.onError(throwable);
+ }
+
+ @Override
+ public void onComplete() {
+ //out.println("onComplete");
+ assertTrue(onSubscribeCalled, "onComplete called before onSubscribe");
+ stalling.accept(Where.ON_COMPLETE);
+ subscriber.onComplete();
+ }
+
+ @Override
+ public CompletionStage<T> getBody() {
+ stalling.accept(Where.GET_BODY);
+ try {
+ stalling.accept(Where.BODY_CF);
+ } catch (Throwable t) {
+ return CompletableFuture.failedFuture(t);
+ }
+ return subscriber.getBody();
+ }
+ }
+
+
+ @BeforeTest
+ public void setup() throws Exception {
+ sslContext = new SimpleSSLContext().get();
+ if (sslContext == null)
+ throw new AssertionError("Unexpected null sslContext");
+
+ // HTTP/2
+ HttpTestHandler h2_fixedLengthHandler = new HTTP_FixedLengthHandler();
+ HttpTestHandler h2_chunkedHandler = new HTTP_ChunkedHandler();
+
+ http2TestServer = HttpTestServer.of(new Http2TestServer("localhost", false, 0));
+ http2TestServer.addHandler(h2_fixedLengthHandler, "/http2/fixed");
+ http2TestServer.addHandler(h2_chunkedHandler, "/http2/chunk");
+ http2URI_fixed = "http://" + http2TestServer.serverAuthority() + "/http2/fixed/y";
+ http2URI_chunk = "http://" + http2TestServer.serverAuthority() + "/http2/chunk/y";
+
+ https2TestServer = HttpTestServer.of(new Http2TestServer("localhost", true, 0));
+ https2TestServer.addHandler(h2_fixedLengthHandler, "/https2/fixed");
+ https2TestServer.addHandler(h2_chunkedHandler, "/https2/chunk");
+ https2URI_fixed = "https://" + https2TestServer.serverAuthority() + "/https2/fixed/y";
+ https2URI_chunk = "https://" + https2TestServer.serverAuthority() + "/https2/chunk/y";
+
+ serverCount.addAndGet(4);
+ http2TestServer.start();
+ https2TestServer.start();
+ }
+
+ @AfterTest
+ public void teardown() throws Exception {
+ sharedClient = null;
+ http2TestServer.stop();
+ https2TestServer.stop();
+ }
+
+ private static void pushPromiseFor(HttpTestExchange t, URI requestURI, String pushPath, boolean fixed)
+ throws IOException
+ {
+ try {
+ URI promise = new URI(requestURI.getScheme(),
+ requestURI.getAuthority(),
+ pushPath, null, null);
+ byte[] promiseBytes = promise.toASCIIString().getBytes(UTF_8);
+ out.printf("TestServer: %s Pushing promise: %s%n", now(), promise);
+ err.printf("TestServer: %s Pushing promise: %s%n", now(), promise);
+ HttpTestHeaders headers = HttpTestHeaders.of(new HttpHeadersImpl());
+ if (fixed) {
+ headers.addHeader("Content-length", String.valueOf(promiseBytes.length));
+ }
+ t.serverPush(promise, headers, promiseBytes);
+ } catch (URISyntaxException x) {
+ throw new IOException(x.getMessage(), x);
+ }
+ }
+
+ static class HTTP_FixedLengthHandler implements HttpTestHandler {
+ @Override
+ public void handle(HttpTestExchange t) throws IOException {
+ out.println("HTTP_FixedLengthHandler received request to " + t.getRequestURI());
+ try (InputStream is = t.getRequestBody()) {
+ is.readAllBytes();
+ }
+ URI requestURI = t.getRequestURI();
+ for (int i = 1; i<2; i++) {
+ String path = requestURI.getPath() + "/before/promise-" + i;
+ pushPromiseFor(t, requestURI, path, true);
+ }
+ byte[] resp = t.getRequestURI().toString().getBytes(StandardCharsets.UTF_8);
+ t.sendResponseHeaders(200, resp.length); //fixed content length
+ try (OutputStream os = t.getResponseBody()) {
+ int bytes = resp.length/3;
+ for (int i = 0; i<2; i++) {
+ String path = requestURI.getPath() + "/after/promise-" + (i + 2);
+ os.write(resp, i * bytes, bytes);
+ os.flush();
+ pushPromiseFor(t, requestURI, path, true);
+ }
+ os.write(resp, 2*bytes, resp.length - 2*bytes);
+ }
+ }
+
+ }
+
+ static class HTTP_ChunkedHandler implements HttpTestHandler {
+ @Override
+ public void handle(HttpTestExchange t) throws IOException {
+ out.println("HTTP_ChunkedHandler received request to " + t.getRequestURI());
+ byte[] resp = t.getRequestURI().toString().getBytes(StandardCharsets.UTF_8);
+ try (InputStream is = t.getRequestBody()) {
+ is.readAllBytes();
+ }
+ URI requestURI = t.getRequestURI();
+ for (int i = 1; i<2; i++) {
+ String path = requestURI.getPath() + "/before/promise-" + i;
+ pushPromiseFor(t, requestURI, path, false);
+ }
+ t.sendResponseHeaders(200, -1); // chunked/variable
+ try (OutputStream os = t.getResponseBody()) {
+ int bytes = resp.length/3;
+ for (int i = 0; i<2; i++) {
+ String path = requestURI.getPath() + "/after/promise-" + (i + 2);
+ os.write(resp, i * bytes, bytes);
+ os.flush();
+ pushPromiseFor(t, requestURI, path, false);
+ }
+ os.write(resp, 2*bytes, resp.length - 2*bytes);
+ }
+ }
+ }
+
+
+}
--- a/test/jdk/java/net/httpclient/DigestEchoClient.java Tue Mar 13 17:12:16 2018 +0000
+++ b/test/jdk/java/net/httpclient/DigestEchoClient.java Tue Mar 13 17:12:48 2018 +0000
@@ -211,10 +211,10 @@
break;
case PROXY305:
builder = builder.proxy(ProxySelector.of(server.getProxyAddress()));
- builder = builder.followRedirects(HttpClient.Redirect.SAME_PROTOCOL);
+ builder = builder.followRedirects(HttpClient.Redirect.NORMAL);
break;
case SERVER307:
- builder = builder.followRedirects(HttpClient.Redirect.SAME_PROTOCOL);
+ builder = builder.followRedirects(HttpClient.Redirect.NORMAL);
break;
default:
break;
--- a/test/jdk/java/net/httpclient/HttpClientBuilderTest.java Tue Mar 13 17:12:16 2018 +0000
+++ b/test/jdk/java/net/httpclient/HttpClientBuilderTest.java Tue Mar 13 17:12:48 2018 +0000
@@ -207,10 +207,8 @@
builder.followRedirects(Redirect.NEVER);
assertTrue(builder.build().followRedirects() == Redirect.NEVER);
assertThrows(NPE, () -> builder.followRedirects(null));
- builder.followRedirects(Redirect.SAME_PROTOCOL);
- assertTrue(builder.build().followRedirects() == Redirect.SAME_PROTOCOL);
- builder.followRedirects(Redirect.SECURE);
- assertTrue(builder.build().followRedirects() == Redirect.SECURE);
+ builder.followRedirects(Redirect.NORMAL);
+ assertTrue(builder.build().followRedirects() == Redirect.NORMAL);
}
@Test
--- a/test/jdk/java/net/httpclient/HttpRequestBuilderTest.java Tue Mar 13 17:12:16 2018 +0000
+++ b/test/jdk/java/net/httpclient/HttpRequestBuilderTest.java Tue Mar 13 17:12:48 2018 +0000
@@ -155,8 +155,7 @@
(String[]) new String[] {"foo"},
IllegalArgumentException.class);
- builder = test1("DELETE", builder, builder::DELETE,
- noBody(), null);
+ test0("DELETE", () -> HttpRequest.newBuilder(TEST_URI).DELETE().build(), null);
builder = test1("POST", builder, builder::POST,
noBody(), null);
@@ -167,10 +166,6 @@
builder = test2("method", builder, builder::method, "GET",
noBody(), null);
- builder = test1("DELETE", builder, builder::DELETE,
- (HttpRequest.BodyPublisher)null,
- NullPointerException.class);
-
builder = test1("POST", builder, builder::POST,
(HttpRequest.BodyPublisher)null,
NullPointerException.class);
@@ -231,8 +226,8 @@
() -> HttpRequest.newBuilder(TEST_URI).PUT(ofString("")).GET(),
"GET");
- method("newBuilder(TEST_URI).DELETE(ofString(\"\")).GET().build().method() == GET",
- () -> HttpRequest.newBuilder(TEST_URI).DELETE(ofString("")).GET(),
+ method("newBuilder(TEST_URI).DELETE().GET().build().method() == GET",
+ () -> HttpRequest.newBuilder(TEST_URI).DELETE().GET(),
"GET");
method("newBuilder(TEST_URI).POST(ofString(\"\")).build().method() == POST",
@@ -243,8 +238,8 @@
() -> HttpRequest.newBuilder(TEST_URI).PUT(ofString("")),
"PUT");
- method("newBuilder(TEST_URI).DELETE(ofString(\"\")).build().method() == DELETE",
- () -> HttpRequest.newBuilder(TEST_URI).DELETE(ofString("")),
+ method("newBuilder(TEST_URI).DELETE().build().method() == DELETE",
+ () -> HttpRequest.newBuilder(TEST_URI).DELETE(),
"DELETE");
method("newBuilder(TEST_URI).GET().POST(ofString(\"\")).build().method() == POST",
@@ -255,8 +250,8 @@
() -> HttpRequest.newBuilder(TEST_URI).GET().PUT(ofString("")),
"PUT");
- method("newBuilder(TEST_URI).GET().DELETE(ofString(\"\")).build().method() == DELETE",
- () -> HttpRequest.newBuilder(TEST_URI).GET().DELETE(ofString("")),
+ method("newBuilder(TEST_URI).GET().DELETE().build().method() == DELETE",
+ () -> HttpRequest.newBuilder(TEST_URI).GET().DELETE(),
"DELETE");
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/net/httpclient/RedirectMethodChange.java Tue Mar 13 17:12:48 2018 +0000
@@ -0,0 +1,320 @@
+/*
+ * Copyright (c) 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 Method change during redirection
+ * @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
+ * jdk.httpserver
+ * @library /lib/testlibrary /test/lib http2/server
+ * @build Http2TestServer
+ * @build jdk.testlibrary.SimpleSSLContext
+ * @run testng/othervm RedirectMethodChange
+ */
+
+import javax.net.ssl.SSLContext;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import com.sun.net.httpserver.HttpServer;
+import com.sun.net.httpserver.HttpsConfigurator;
+import com.sun.net.httpserver.HttpsServer;
+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.nio.charset.StandardCharsets.US_ASCII;
+import static org.testng.Assert.assertEquals;
+
+public class RedirectMethodChange implements HttpServerAdapters {
+
+ SSLContext sslContext;
+ HttpClient client;
+
+ HttpTestServer httpTestServer; // HTTP/1.1 [ 4 servers ]
+ HttpTestServer httpsTestServer; // HTTPS/1.1
+ HttpTestServer http2TestServer; // HTTP/2 ( h2c )
+ HttpTestServer https2TestServer; // HTTP/2 ( h2 )
+ String httpURI;
+ String httpsURI;
+ String http2URI;
+ String https2URI;
+
+ static final String RESPONSE = "Hello world";
+ static final String POST_BODY = "This is the POST body 123909090909090";
+
+ static HttpRequest.BodyPublisher getRequestBodyFor(String method) {
+ switch (method) {
+ case "GET":
+ case "DELETE":
+ case "HEAD":
+ return BodyPublishers.noBody();
+ case "POST":
+ case "PUT":
+ return BodyPublishers.ofString(POST_BODY);
+ default:
+ throw new AssertionError("Unknown method:" + method);
+ }
+ }
+
+ @DataProvider(name = "variants")
+ public Object[][] variants() {
+ return new Object[][] {
+ { httpURI, "GET", 301, "GET" },
+ { httpURI, "GET", 302, "GET" },
+ { httpURI, "GET", 303, "GET" },
+ { httpURI, "GET", 307, "GET" },
+ { httpURI, "GET", 308, "GET" },
+ { httpURI, "POST", 301, "GET" },
+ { httpURI, "POST", 302, "GET" },
+ { httpURI, "POST", 303, "GET" },
+ { httpURI, "POST", 307, "POST" },
+ { httpURI, "POST", 308, "POST" },
+ { httpURI, "PUT", 301, "PUT" },
+ { httpURI, "PUT", 302, "PUT" },
+ { httpURI, "PUT", 303, "GET" },
+ { httpURI, "PUT", 307, "PUT" },
+ { httpURI, "PUT", 308, "PUT" },
+
+ { httpsURI, "GET", 301, "GET" },
+ { httpsURI, "GET", 302, "GET" },
+ { httpsURI, "GET", 303, "GET" },
+ { httpsURI, "GET", 307, "GET" },
+ { httpsURI, "GET", 308, "GET" },
+ { httpsURI, "POST", 301, "GET" },
+ { httpsURI, "POST", 302, "GET" },
+ { httpsURI, "POST", 303, "GET" },
+ { httpsURI, "POST", 307, "POST" },
+ { httpsURI, "POST", 308, "POST" },
+ { httpsURI, "PUT", 301, "PUT" },
+ { httpsURI, "PUT", 302, "PUT" },
+ { httpsURI, "PUT", 303, "GET" },
+ { httpsURI, "PUT", 307, "PUT" },
+ { httpsURI, "PUT", 308, "PUT" },
+
+ { http2URI, "GET", 301, "GET" },
+ { http2URI, "GET", 302, "GET" },
+ { http2URI, "GET", 303, "GET" },
+ { http2URI, "GET", 307, "GET" },
+ { http2URI, "GET", 308, "GET" },
+ { http2URI, "POST", 301, "GET" },
+ { http2URI, "POST", 302, "GET" },
+ { http2URI, "POST", 303, "GET" },
+ { http2URI, "POST", 307, "POST" },
+ { http2URI, "POST", 308, "POST" },
+ { http2URI, "PUT", 301, "PUT" },
+ { http2URI, "PUT", 302, "PUT" },
+ { http2URI, "PUT", 303, "GET" },
+ { http2URI, "PUT", 307, "PUT" },
+ { http2URI, "PUT", 308, "PUT" },
+
+ { https2URI, "GET", 301, "GET" },
+ { https2URI, "GET", 302, "GET" },
+ { https2URI, "GET", 303, "GET" },
+ { https2URI, "GET", 307, "GET" },
+ { https2URI, "GET", 308, "GET" },
+ { https2URI, "POST", 301, "GET" },
+ { https2URI, "POST", 302, "GET" },
+ { https2URI, "POST", 303, "GET" },
+ { https2URI, "POST", 307, "POST" },
+ { https2URI, "POST", 308, "POST" },
+ { https2URI, "PUT", 301, "PUT" },
+ { https2URI, "PUT", 302, "PUT" },
+ { https2URI, "PUT", 303, "GET" },
+ { https2URI, "PUT", 307, "PUT" },
+ { https2URI, "PUT", 308, "PUT" },
+ };
+ }
+
+ @Test(dataProvider = "variants")
+ public void test(String uriString,
+ String method,
+ int redirectCode,
+ String expectedMethod)
+ throws Exception
+ {
+ HttpRequest req = HttpRequest.newBuilder(URI.create(uriString))
+ .method(method, getRequestBodyFor(method))
+ .header("X-Redirect-Code", Integer.toString(redirectCode))
+ .header("X-Expect-Method", expectedMethod)
+ .build();
+ HttpResponse<String> resp = client.send(req, BodyHandlers.ofString());
+
+ System.out.println("Response: " + resp + ", body: " + resp.body());
+ assertEquals(resp.statusCode(), 200);
+ assertEquals(resp.body(), RESPONSE);
+ }
+
+ // -- Infrastructure
+
+ @BeforeTest
+ public void setup() throws Exception {
+ sslContext = new SimpleSSLContext().get();
+ if (sslContext == null)
+ throw new AssertionError("Unexpected null sslContext");
+
+ client = HttpClient.newBuilder()
+ .followRedirects(HttpClient.Redirect.NORMAL)
+ .sslContext(sslContext)
+ .build();
+
+ InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
+
+ httpTestServer = HttpTestServer.of(HttpServer.create(sa, 0));
+ String targetURI = "http://" + httpTestServer.serverAuthority() + "/http1/redirect/rmt";
+ RedirMethodChgeHandler handler = new RedirMethodChgeHandler(targetURI);
+ httpTestServer.addHandler(handler, "/http1/");
+ httpURI = "http://" + httpTestServer.serverAuthority() + "/http1/test/rmt";
+
+ HttpsServer httpsServer = HttpsServer.create(sa, 0);
+ httpsServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
+ httpsTestServer = HttpTestServer.of(httpsServer);
+ targetURI = "https://" + httpsTestServer.serverAuthority() + "/https1/redirect/rmt";
+ handler = new RedirMethodChgeHandler(targetURI);
+ httpsTestServer.addHandler(handler,"/https1/");
+ httpsURI = "https://" + httpsTestServer.serverAuthority() + "/https1/test/rmt";
+
+ http2TestServer = HttpTestServer.of(new Http2TestServer("localhost", false, 0));
+ targetURI = "http://" + http2TestServer.serverAuthority() + "/http2/redirect/rmt";
+ handler = new RedirMethodChgeHandler(targetURI);
+ http2TestServer.addHandler(handler, "/http2/");
+ http2URI = "http://" + http2TestServer.serverAuthority() + "/http2/test/rmt";
+
+ https2TestServer = HttpTestServer.of(new Http2TestServer("localhost", true, 0));
+ targetURI = "https://" + https2TestServer.serverAuthority() + "/https2/redirect/rmt";
+ handler = new RedirMethodChgeHandler(targetURI);
+ https2TestServer.addHandler(handler, "/https2/");
+ https2URI = "https://" + https2TestServer.serverAuthority() + "/https2/test/rmt";
+
+ httpTestServer.start();
+ httpsTestServer.start();
+ http2TestServer.start();
+ https2TestServer.start();
+ }
+
+ @AfterTest
+ public void teardown() throws Exception {
+ httpTestServer.stop();
+ httpsTestServer.stop();
+ http2TestServer.stop();
+ https2TestServer.stop();
+ }
+
+ /**
+ * Stateful handler.
+ *
+ * Request to "<protocol>/test/rmt" is first, with the following checked
+ * headers:
+ * X-Redirect-Code: nnn <the redirect code to send back>
+ * X-Expect-Method: the method that the client should use for the next request
+ *
+ * The following request should be to "<protocol>/redirect/rmt" and should
+ * use the method indicated previously. If all ok, return a 200 response.
+ * Otherwise 50X error.
+ */
+ static class RedirMethodChgeHandler implements HttpTestHandler {
+
+ volatile boolean inTest;
+ volatile String expectedMethod;
+
+ final String targetURL;
+ RedirMethodChgeHandler(String targetURL) {
+ this.targetURL = targetURL;
+ }
+
+ boolean readAndCheckBody(HttpTestExchange e) throws IOException {
+ String method = e.getRequestMethod();
+ String requestBody;
+ try (InputStream is = e.getRequestBody()) {
+ requestBody = new String(is.readAllBytes(), US_ASCII);
+ }
+ if ((method.equals("POST") || method.equals("PUT"))
+ && !requestBody.equals(POST_BODY)) {
+ Throwable ex = new RuntimeException("Unexpected request body for "
+ + method + ": [" + requestBody +"]");
+ ex.printStackTrace();
+ e.sendResponseHeaders(503, 0);
+ return false;
+ }
+ return true;
+ }
+
+ @Override
+ public void handle(HttpTestExchange he) throws IOException {
+ boolean newtest = he.getRequestURI().getPath().endsWith("/test/rmt");
+ if ((newtest && inTest) || (!newtest && !inTest)) {
+ Throwable ex = new RuntimeException("Unexpected newtest:" + newtest
+ + ", inTest:" + inTest + ", for " + he.getRequestURI());
+ ex.printStackTrace();
+ he.sendResponseHeaders(500, 0);
+ return;
+ }
+
+ if (newtest) {
+ HttpTestHeaders hdrs = he.getRequestHeaders();
+ String value = hdrs.firstValue("X-Redirect-Code").get();
+ int redirectCode = Integer.parseInt(value);
+ expectedMethod = hdrs.firstValue("X-Expect-Method").get();
+ if (!readAndCheckBody(he))
+ return;
+ hdrs = he.getResponseHeaders();
+ hdrs.addHeader("Location", targetURL);
+ he.sendResponseHeaders(redirectCode, 0);
+ inTest = true;
+ } else {
+ // should be the redirect
+ if (!he.getRequestURI().getPath().endsWith("/redirect/rmt")) {
+ Throwable ex = new RuntimeException("Unexpected redirected request, got:"
+ + he.getRequestURI());
+ ex.printStackTrace();
+ he.sendResponseHeaders(501, 0);
+ } else if (!he.getRequestMethod().equals(expectedMethod)) {
+ Throwable ex = new RuntimeException("Expected: " + expectedMethod
+ + " Got: " + he.getRequestMethod());
+ ex.printStackTrace();
+ he.sendResponseHeaders(504, 0);
+ } else {
+ if (!readAndCheckBody(he))
+ return;
+ he.sendResponseHeaders(200, RESPONSE.length());
+ try (OutputStream os = he.getResponseBody()) {
+ os.write(RESPONSE.getBytes(US_ASCII));
+ }
+ }
+ inTest = false;
+ }
+ }
+ }
+}
--- a/test/jdk/java/net/httpclient/RequestBuilderTest.java Tue Mar 13 17:12:16 2018 +0000
+++ b/test/jdk/java/net/httpclient/RequestBuilderTest.java Tue Mar 13 17:12:48 2018 +0000
@@ -94,7 +94,6 @@
assertThrows(NPE, () -> builder.setHeader("name", null));
assertThrows(NPE, () -> builder.setHeader(null, "value"));
assertThrows(NPE, () -> builder.timeout(null));
- assertThrows(NPE, () -> builder.DELETE(null));
assertThrows(NPE, () -> builder.POST(null));
assertThrows(NPE, () -> builder.PUT(null));
}
@@ -144,7 +143,7 @@
assertEquals(request.method(), "GET");
assertTrue(!request.bodyPublisher().isPresent());
- request = newBuilder(uri).DELETE(BodyPublishers.ofString("")).GET().build();
+ request = newBuilder(uri).DELETE().GET().build();
assertEquals(request.method(), "GET");
assertTrue(!request.bodyPublisher().isPresent());
@@ -156,9 +155,9 @@
assertEquals(request.method(), "PUT");
assertTrue(request.bodyPublisher().isPresent());
- request = newBuilder(uri).DELETE(BodyPublishers.ofString("")).build();
+ request = newBuilder(uri).DELETE().build();
assertEquals(request.method(), "DELETE");
- assertTrue(request.bodyPublisher().isPresent());
+ assertTrue(!request.bodyPublisher().isPresent());
request = newBuilder(uri).GET().POST(BodyPublishers.ofString("")).build();
assertEquals(request.method(), "POST");
@@ -168,9 +167,9 @@
assertEquals(request.method(), "PUT");
assertTrue(request.bodyPublisher().isPresent());
- request = newBuilder(uri).GET().DELETE(BodyPublishers.ofString("")).build();
+ request = newBuilder(uri).GET().DELETE().build();
assertEquals(request.method(), "DELETE");
- assertTrue(request.bodyPublisher().isPresent());
+ assertTrue(!request.bodyPublisher().isPresent());
// CONNECT is disallowed in the implementation, since it is used for
// tunneling, and is handled separately for security checks.
--- a/test/jdk/java/net/httpclient/ThrowingSubscribers.java Tue Mar 13 17:12:16 2018 +0000
+++ b/test/jdk/java/net/httpclient/ThrowingSubscribers.java Tue Mar 13 17:12:48 2018 +0000
@@ -63,6 +63,7 @@
import java.net.http.HttpResponse.BodySubscriber;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
+import java.util.EnumSet;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
@@ -229,6 +230,36 @@
}
}
+ enum SubscriberType {
+ INLINE, // In line subscribers complete their CF on ON_COMPLETE
+ // e.g. BodySubscribers::ofString
+ OFFLINE; // Off line subscribers complete their CF immediately
+ // but require the client to pull the data after the
+ // CF completes (e.g. BodySubscribers::ofInputStream)
+ }
+
+ static EnumSet<Where> excludes(SubscriberType type) {
+ EnumSet<Where> set = EnumSet.noneOf(Where.class);
+
+ if (type == SubscriberType.OFFLINE) {
+ // Throwing on onSubscribe needs some more work
+ // for the case of InputStream, where the body has already
+ // completed by the time the subscriber is subscribed.
+ // The only way we have at that point to relay the exception
+ // is to call onError on the subscriber, but should we if
+ // Subscriber::onSubscribed has thrown an exception and
+ // not completed normally?
+ set.add(Where.ON_SUBSCRIBE);
+ }
+
+ // Don't know how to make the stack reliably cause onError
+ // to be called without closing the connection.
+ // And how do we get the exception if onError throws anyway?
+ set.add(Where.ON_ERROR);
+
+ return set;
+ }
+
@Test(dataProvider = "noThrows")
public void testNoThrows(String uri, boolean sameClient)
throws Exception {
@@ -258,7 +289,8 @@
String test = format("testThrowingAsString(%s, %b, %s)",
uri, sameClient, thrower);
testThrowing(test, uri, sameClient, BodyHandlers::ofString,
- this::shouldHaveThrown, thrower,false);
+ this::shouldHaveThrown, thrower,false,
+ excludes(SubscriberType.INLINE));
}
@Test(dataProvider = "variants")
@@ -270,7 +302,8 @@
String test = format("testThrowingAsLines(%s, %b, %s)",
uri, sameClient, thrower);
testThrowing(test, uri, sameClient, BodyHandlers::ofLines,
- this::checkAsLines, thrower,false);
+ this::checkAsLines, thrower,false,
+ excludes(SubscriberType.OFFLINE));
}
@Test(dataProvider = "variants")
@@ -282,7 +315,8 @@
String test = format("testThrowingAsInputStream(%s, %b, %s)",
uri, sameClient, thrower);
testThrowing(test, uri, sameClient, BodyHandlers::ofInputStream,
- this::checkAsInputStream, thrower,false);
+ this::checkAsInputStream, thrower,false,
+ excludes(SubscriberType.OFFLINE));
}
@Test(dataProvider = "variants")
@@ -294,7 +328,8 @@
String test = format("testThrowingAsStringAsync(%s, %b, %s)",
uri, sameClient, thrower);
testThrowing(test, uri, sameClient, BodyHandlers::ofString,
- this::shouldHaveThrown, thrower, true);
+ this::shouldHaveThrown, thrower, true,
+ excludes(SubscriberType.INLINE));
}
@Test(dataProvider = "variants")
@@ -306,7 +341,8 @@
String test = format("testThrowingAsLinesAsync(%s, %b, %s)",
uri, sameClient, thrower);
testThrowing(test, uri, sameClient, BodyHandlers::ofLines,
- this::checkAsLines, thrower,true);
+ this::checkAsLines, thrower,true,
+ excludes(SubscriberType.OFFLINE));
}
@Test(dataProvider = "variants")
@@ -318,17 +354,19 @@
String test = format("testThrowingAsInputStreamAsync(%s, %b, %s)",
uri, sameClient, thrower);
testThrowing(test, uri, sameClient, BodyHandlers::ofInputStream,
- this::checkAsInputStream, thrower,true);
+ this::checkAsInputStream, thrower,true,
+ excludes(SubscriberType.OFFLINE));
}
private <T,U> void testThrowing(String name, String uri, boolean sameClient,
Supplier<BodyHandler<T>> handlers,
- Finisher finisher, Thrower thrower, boolean async)
+ Finisher finisher, Thrower thrower,
+ boolean async, EnumSet<Where> excludes)
throws Exception
{
out.printf("%n%s%s%n", now(), name);
try {
- testThrowing(uri, sameClient, handlers, finisher, thrower, async);
+ testThrowing(uri, sameClient, handlers, finisher, thrower, async, excludes);
} catch (Error | Exception x) {
FAILURES.putIfAbsent(name, x);
throw x;
@@ -338,13 +376,13 @@
private <T,U> void testThrowing(String uri, boolean sameClient,
Supplier<BodyHandler<T>> handlers,
Finisher finisher, Thrower thrower,
- boolean async)
+ boolean async,
+ EnumSet<Where> excludes)
throws Exception
{
HttpClient client = null;
- for (Where where : Where.values()) {
- if (where == Where.ON_SUBSCRIBE) continue;
- if (where == Where.ON_ERROR) continue;
+ for (Where where : EnumSet.complementOf(excludes)) {
+
if (!sameClient || client == null)
client = newHttpClient(sameClient);
--- a/test/jdk/java/net/httpclient/TimeoutBasic.java Tue Mar 13 17:12:16 2018 +0000
+++ b/test/jdk/java/net/httpclient/TimeoutBasic.java Tue Mar 13 17:12:48 2018 +0000
@@ -98,8 +98,7 @@
}
static HttpRequest.Builder DELETE(HttpRequest.Builder builder) {
- HttpRequest.BodyPublisher noBody = HttpRequest.BodyPublishers.noBody();
- return builder.DELETE(noBody);
+ return builder.DELETE();
}
static HttpRequest.Builder PUT(HttpRequest.Builder builder) {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/net/httpclient/dependent.policy Tue Mar 13 17:12:48 2018 +0000
@@ -0,0 +1,68 @@
+//
+// Copyright (c) 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.
+//
+
+// for JTwork/classes/0/lib/testlibrary/jdk/testlibrary/SimpleSSLContext.class
+grant codeBase "file:${test.classes}/../../../../lib/testlibrary/-" {
+ permission java.util.PropertyPermission "test.src.path", "read";
+ permission java.io.FilePermission "${test.src}/../../../lib/testlibrary/jdk/testlibrary/testkeys", "read";
+};
+
+// for JTwork//classes/0/java/net/httpclient/http2/server/*
+grant codeBase "file:${test.classes}/../../../../java/net/httpclient/http2/server/*" {
+ permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.common";
+ permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.frame";
+ permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.hpack";
+ permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www.http";
+
+ permission java.net.SocketPermission "localhost:*", "listen,accept,resolve";
+ permission java.lang.RuntimePermission "modifyThread";
+};
+
+grant codeBase "file:${test.classes}/*" {
+ permission java.io.FilePermission "${user.dir}${/}asFileDownloadTest.tmp.dir", "read,write";
+ permission java.io.FilePermission "${user.dir}${/}asFileDownloadTest.tmp.dir/-", "read,write";
+
+ permission java.net.URLPermission "http://localhost:*/http1/-", "GET,POST";
+ permission java.net.URLPermission "https://localhost:*/https1/-", "GET,POST";
+ permission java.net.URLPermission "http://localhost:*/http2/-", "GET,POST";
+ permission java.net.URLPermission "https://localhost:*/https2/-", "GET,POST";
+
+
+ // needed to grant permission to the HTTP/2 server
+ permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.common";
+ permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.frame";
+ permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.net.http.hpack";
+ permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www.http";
+
+ // for HTTP/1.1 server logging
+ permission java.util.logging.LoggingPermission "control";
+
+ // needed to grant the HTTP servers
+ permission java.net.SocketPermission "localhost:*", "listen,accept,resolve";
+
+ permission java.util.PropertyPermission "*", "read";
+ permission java.lang.RuntimePermission "modifyThread";
+
+ // Permission for DependentActionsTest
+ permission java.lang.RuntimePermission "getStackWalkerWithClassReference";
+};
--- a/test/jdk/java/net/httpclient/examples/JavadocExamples.java Tue Mar 13 17:12:16 2018 +0000
+++ b/test/jdk/java/net/httpclient/examples/JavadocExamples.java Tue Mar 13 17:12:48 2018 +0000
@@ -62,7 +62,7 @@
//Synchronous Example
HttpClient client = HttpClient.newBuilder()
.version(Version.HTTP_1_1)
- .followRedirects(Redirect.SAME_PROTOCOL)
+ .followRedirects(Redirect.NORMAL)
.proxy(ProxySelector.of(new InetSocketAddress("proxy.example.com", 80)))
.authenticator(Authenticator.getDefault())
.build();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/net/httpclient/whitebox/DefaultProxyDriver.java Tue Mar 13 17:12:48 2018 +0000
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 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
+ * @modules java.net.http/jdk.internal.net.http
+ * @summary Verifies that the HTTP Client, by default, uses the system-wide
+ * proxy selector, and that that selector supports the standard HTTP proxy
+ * system properties.
+ * @run testng/othervm
+ * -Dhttp.proxyHost=foo.proxy.com
+ * -Dhttp.proxyPort=9876
+ * -Dhttp.nonProxyHosts=*.direct.com
+ * -Dhttps.proxyHost=secure.proxy.com
+ * -Dhttps.proxyPort=5443
+ * java.net.http/jdk.internal.net.http.DefaultProxy
+ */
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/DefaultProxy.java Tue Mar 13 17:12:48 2018 +0000
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 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.
+ */
+
+package jdk.internal.net.http;
+
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.ProxySelector;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.util.List;
+import org.testng.annotations.Test;
+import static org.testng.Assert.assertEquals;
+
+public class DefaultProxy {
+
+ static ProxySelector getProxySelector() {
+ return (((HttpClientFacade)HttpClient.newHttpClient()).impl).proxySelector();
+ }
+
+ @Test
+ public void testDefault() {
+ ProxySelector ps = getProxySelector();
+ System.out.println("HttpClientImpl proxySelector:" + ps);
+ assertEquals(ps, ProxySelector.getDefault());
+ }
+
+ // From the test driver
+ // -Dhttp.proxyHost=foo.proxy.com
+ // -Dhttp.proxyPort=9876
+ // -Dhttp.nonProxyHosts=*.direct.com
+ @Test
+ public void testHttpProxyProps() {
+ ProxySelector ps = getProxySelector();
+
+ URI uri = URI.create("http://foo.com/example.html");
+ List<Proxy> plist = ps.select(uri);
+ System.out.println("proxy list for " + uri + " : " + plist);
+ assertEquals(plist.size(), 1);
+ Proxy proxy = plist.get(0);
+ assertEquals(proxy.type(), Proxy.Type.HTTP);
+ InetSocketAddress expectedAddr =
+ InetSocketAddress.createUnresolved("foo.proxy.com", 9876);
+ assertEquals(proxy.address(), expectedAddr);
+
+ // nonProxyHosts
+ uri = URI.create("http://foo.direct.com/example.html");
+ plist = ps.select(uri);
+ System.out.println("proxy list for " + uri + " : " + plist);
+ assertEquals(plist.size(), 1);
+ proxy = plist.get(0);
+ assertEquals(proxy.type(), Proxy.Type.DIRECT);
+ assertEquals(proxy.address(), null);
+ }
+
+ // From the test driver
+ // -Dhttp.proxyHost=secure.proxy.com
+ // -Dhttp.proxyPort=5443
+ @Test
+ public void testHttpsProxyProps() {
+ ProxySelector ps = getProxySelector();
+
+ URI uri = URI.create("https://foo.com/example.html");
+ List<Proxy> plist = ps.select(uri);
+ System.out.println("proxy list for " + uri + " : " + plist);
+ assertEquals(plist.size(), 1);
+ Proxy proxy = plist.get(0);
+ assertEquals(proxy.type(), Proxy.Type.HTTP);
+ InetSocketAddress expectedAddr =
+ InetSocketAddress.createUnresolved("secure.proxy.com", 5443);
+ assertEquals(proxy.address(), expectedAddr);
+
+ // nonProxyHosts
+ uri = URI.create("https://foo.direct.com/example.html");
+ plist = ps.select(uri);
+ System.out.println("proxy list for " + uri + " : " + plist);
+ assertEquals(plist.size(), 1);
+ proxy = plist.get(0);
+ assertEquals(proxy.type(), Proxy.Type.DIRECT);
+ assertEquals(proxy.address(), null);
+ }
+
+}