Skip to content

Commit

Permalink
8303457: Introduce convenience test library APIs for creating test se…
Browse files Browse the repository at this point in the history 
…rvers for tests in test/jdk/java/net/httpclient

Reviewed-by: dfuchs
  • Loading branch information
@jaikiran
jaikiran committed Mar 2, 2023
1 parent 3091744 commit 72de24e
Show file tree
Hide file tree
Showing 47 changed files with 387 additions and 372 deletions.
13 changes: 6 additions & 7 deletions test/jdk/java/net/httpclient/AbstractThrowingPublishers.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@

import static java.lang.String.format;
import static java.lang.System.out;
import static java.net.http.HttpClient.Version.HTTP_1_1;
import static java.net.http.HttpClient.Version.HTTP_2;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
Expand Down Expand Up @@ -692,16 +694,13 @@ public void setup() throws Exception {
// 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 = HttpTestServer.create(HTTP_1_1);
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 = HttpTestServer.create(HTTP_1_1, sslContext);
httpsTestServer.addHandler(h1_fixedLengthHandler, "/https1/fixed");
httpsTestServer.addHandler(h1_chunkHandler, "/https1/chunk");
httpsURI_fixed = "https://" + httpsTestServer.serverAuthority() + "/https1/fixed/x";
Expand All @@ -711,13 +710,13 @@ public void setup() throws Exception {
HttpTestHandler h2_fixedLengthHandler = new HTTP_FixedLengthHandler();
HttpTestHandler h2_chunkedHandler = new HTTP_ChunkedHandler();

http2TestServer = HttpTestServer.of(new Http2TestServer("localhost", false, 0));
http2TestServer = HttpTestServer.create(HTTP_2);
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, sslContext));
https2TestServer = HttpTestServer.create(HTTP_2, sslContext);
https2TestServer.addHandler(h2_fixedLengthHandler, "/https2/fixed");
https2TestServer.addHandler(h2_chunkedHandler, "/https2/chunk");
https2URI_fixed = "https://" + https2TestServer.serverAuthority() + "/https2/fixed/x";
Expand Down
5 changes: 3 additions & 2 deletions test/jdk/java/net/httpclient/AbstractThrowingPushPromises.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@
import static java.lang.System.out;
import static java.lang.System.err;
import static java.lang.String.format;
import static java.net.http.HttpClient.Version.HTTP_2;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
Expand Down Expand Up @@ -705,13 +706,13 @@ public void setup() throws Exception {
HttpTestHandler h2_fixedLengthHandler = new HTTP_FixedLengthHandler();
HttpTestHandler h2_chunkedHandler = new HTTP_ChunkedHandler();

http2TestServer = HttpTestServer.of(new Http2TestServer("localhost", false, 0));
http2TestServer = HttpTestServer.create(HTTP_2);
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, sslContext));
https2TestServer = HttpTestServer.create(HTTP_2, sslContext);
https2TestServer.addHandler(h2_fixedLengthHandler, "/https2/fixed");
https2TestServer.addHandler(h2_chunkedHandler, "/https2/chunk");
https2URI_fixed = "https://" + https2TestServer.serverAuthority() + "/https2/fixed/x";
Expand Down
13 changes: 6 additions & 7 deletions test/jdk/java/net/httpclient/AbstractThrowingSubscribers.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@

import static java.lang.System.out;
import static java.lang.String.format;
import static java.net.http.HttpClient.Version.HTTP_1_1;
import static java.net.http.HttpClient.Version.HTTP_2;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
Expand Down Expand Up @@ -683,16 +685,13 @@ public void setup() throws Exception {
// 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 = HttpTestServer.create(HTTP_1_1);
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 = HttpTestServer.create(HTTP_1_1, sslContext);
httpsTestServer.addHandler(h1_fixedLengthHandler, "/https1/fixed");
httpsTestServer.addHandler(h1_chunkHandler, "/https1/chunk");
httpsURI_fixed = "https://" + httpsTestServer.serverAuthority() + "/https1/fixed/x";
Expand All @@ -702,13 +701,13 @@ public void setup() throws Exception {
HttpTestHandler h2_fixedLengthHandler = new HTTP_FixedLengthHandler();
HttpTestHandler h2_chunkedHandler = new HTTP_ChunkedHandler();

http2TestServer = HttpTestServer.of(new Http2TestServer("localhost", false, 0));
http2TestServer = HttpTestServer.create(HTTP_2);
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, sslContext));
https2TestServer = HttpTestServer.create(HTTP_2, sslContext);
https2TestServer.addHandler(h2_fixedLengthHandler, "/https2/fixed");
https2TestServer.addHandler(h2_chunkedHandler, "/https2/chunk");
https2URI_fixed = "https://" + https2TestServer.serverAuthority() + "/https2/fixed/x";
Expand Down
15 changes: 6 additions & 9 deletions test/jdk/java/net/httpclient/AggregateRequestBodyTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@
import org.testng.annotations.Test;

import static java.lang.System.out;
import static java.net.http.HttpClient.Version.HTTP_1_1;
import static java.net.http.HttpClient.Version.HTTP_2;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
Expand Down Expand Up @@ -817,25 +819,20 @@ public void setup() throws Exception {
throw new AssertionError("Unexpected null sslContext");

HttpTestHandler handler = new HttpTestEchoHandler();
InetSocketAddress loopback = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);

HttpServer http1 = HttpServer.create(loopback, 0);
http1TestServer = HttpTestServer.of(http1);
http1TestServer = HttpTestServer.create(HTTP_1_1);
http1TestServer.addHandler(handler, "/http1/echo/");
http1URI = "http://" + http1TestServer.serverAuthority() + "/http1/echo/x";

HttpsServer https1 = HttpsServer.create(loopback, 0);
https1.setHttpsConfigurator(new HttpsConfigurator(sslContext));
https1TestServer = HttpTestServer.of(https1);
https1TestServer = HttpTestServer.create(HTTP_1_1, sslContext);
https1TestServer.addHandler(handler, "/https1/echo/");
https1URI = "https://" + https1TestServer.serverAuthority() + "/https1/echo/x";

// HTTP/2
http2TestServer = HttpTestServer.of(new Http2TestServer("localhost", false, 0));
http2TestServer = HttpTestServer.create(HTTP_2);
http2TestServer.addHandler(handler, "/http2/echo/");
http2URI = "http://" + http2TestServer.serverAuthority() + "/http2/echo/x";

https2TestServer = HttpTestServer.of(new Http2TestServer("localhost", true, sslContext));
https2TestServer = HttpTestServer.create(HTTP_2, sslContext);
https2TestServer.addHandler(handler, "/https2/echo/");
https2URI = "https://" + https2TestServer.serverAuthority() + "/https2/echo/x";

Expand Down
16 changes: 7 additions & 9 deletions test/jdk/java/net/httpclient/AsyncExecutorShutdown.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@

import static java.lang.System.out;
import static java.net.http.HttpClient.Builder.NO_PROXY;
import static java.net.http.HttpClient.Version.HTTP_1_1;
import static java.net.http.HttpClient.Version.HTTP_2;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull;
Expand Down Expand Up @@ -316,21 +318,17 @@ public void setup() throws Exception {
if (sslContext == null)
throw new AssertionError("Unexpected null sslContext");

InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);

httpTestServer = HttpTestServer.of(HttpServer.create(sa, 0));
httpTestServer = HttpTestServer.create(HTTP_1_1);
httpTestServer.addHandler(new ServerRequestHandler(), "/http1/exec/");
httpURI = "http://" + httpTestServer.serverAuthority() + "/http1/exec/retry";
HttpsServer httpsServer = HttpsServer.create(sa, 0);
httpsServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
httpsTestServer = HttpTestServer.of(httpsServer);
httpsTestServer = HttpTestServer.create(HTTP_1_1, sslContext);
httpsTestServer.addHandler(new ServerRequestHandler(),"/https1/exec/");
httpsURI = "https://" + httpsTestServer.serverAuthority() + "/https1/exec/retry";

http2TestServer = HttpTestServer.of(new Http2TestServer("localhost", false, 0));
http2TestServer = HttpTestServer.create(HTTP_2);
http2TestServer.addHandler(new ServerRequestHandler(), "/http2/exec/");
http2URI = "http://" + http2TestServer.serverAuthority() + "/http2/exec/retry";
https2TestServer = HttpTestServer.of(new Http2TestServer("localhost", true, sslContext));
https2TestServer = HttpTestServer.create(HTTP_2, sslContext);
https2TestServer.addHandler(new ServerRequestHandler(), "/https2/exec/");
https2URI = "https://" + https2TestServer.serverAuthority() + "/https2/exec/retry";

Expand Down Expand Up @@ -376,7 +374,7 @@ public void handle(HttpTestExchange t) throws IOException {
String uuid = uuids.get(0);
// retrying
if (closedRequests.putIfAbsent(uuid, t.getRequestURI().toString()) == null) {
if (t.getExchangeVersion() == HttpClient.Version.HTTP_1_1) {
if (t.getExchangeVersion() == HTTP_1_1) {
// Throwing an exception here only causes a retry
// with HTTP_1_1 - where it forces the server to close
// the connection.
Expand Down
15 changes: 7 additions & 8 deletions test/jdk/java/net/httpclient/AuthFilterCacheTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@

import javax.net.ssl.SSLContext;

import static java.net.http.HttpClient.Version.HTTP_1_1;
import static java.net.http.HttpClient.Version.HTTP_2;

/**
* @test
* @bug 8232853
Expand Down Expand Up @@ -87,7 +90,7 @@ public class AuthFilterCacheTest implements HttpServerAdapters {
ProxySelector proxySelector;
MyAuthenticator auth;
HttpClient client;
Executor executor = Executors.newCachedThreadPool();
ExecutorService executor = Executors.newCachedThreadPool();

@DataProvider(name = "uris")
Object[][] testURIs() {
Expand Down Expand Up @@ -119,9 +122,7 @@ public void setUp() throws Exception {
auth = new MyAuthenticator();

// HTTP/1.1
HttpServer server1 = HttpServer.create(sa, 0);
server1.setExecutor(executor);
http1Server = HttpTestServer.of(server1);
http1Server = HttpTestServer.create(HTTP_1_1, null, executor);
http1Server.addHandler(new TestHandler(), "/AuthFilterCacheTest/http1/");
http1Server.start();
http1URI = new URI("http://" + http1Server.serverAuthority()
Expand All @@ -138,16 +139,14 @@ public void setUp() throws Exception {
+ "/AuthFilterCacheTest/https1/");

// HTTP/2.0
http2Server = HttpTestServer.of(
new Http2TestServer("localhost", false, 0));
http2Server = HttpTestServer.create(HTTP_2);
http2Server.addHandler(new TestHandler(), "/AuthFilterCacheTest/http2/");
http2Server.start();
http2URI = new URI("http://" + http2Server.serverAuthority()
+ "/AuthFilterCacheTest/http2/");

// HTTPS/2.0
https2Server = HttpTestServer.of(
new Http2TestServer("localhost", true, 0));
https2Server = HttpTestServer.create(HTTP_2, SSLContext.getDefault());
https2Server.addHandler(new TestHandler(), "/AuthFilterCacheTest/https2/");
https2Server.start();
https2URI = new URI("https://" + https2Server.serverAuthority()
Expand Down
14 changes: 6 additions & 8 deletions test/jdk/java/net/httpclient/BasicRedirectTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import static java.lang.System.out;
import static java.net.http.HttpClient.Version.HTTP_1_1;
import static java.net.http.HttpClient.Version.HTTP_2;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
Expand Down Expand Up @@ -209,21 +211,17 @@ public void setup() throws Exception {
if (sslContext == null)
throw new AssertionError("Unexpected null sslContext");

InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);

httpTestServer = HttpTestServer.of(HttpServer.create(sa, 0));
httpTestServer = HttpTestServer.create(HTTP_1_1);
httpTestServer.addHandler(new BasicHttpRedirectHandler(), "/http1/same/");
httpURI = "http://" + httpTestServer.serverAuthority() + "/http1/same/redirect";
HttpsServer httpsServer = HttpsServer.create(sa, 0);
httpsServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
httpsTestServer = HttpTestServer.of(httpsServer);
httpsTestServer = HttpTestServer.create(HTTP_1_1, sslContext);
httpsTestServer.addHandler(new BasicHttpRedirectHandler(),"/https1/same/");
httpsURI = "https://" + httpsTestServer.serverAuthority() + "/https1/same/redirect";

http2TestServer = HttpTestServer.of(new Http2TestServer("localhost", false, 0));
http2TestServer = HttpTestServer.create(HTTP_2);
http2TestServer.addHandler(new BasicHttpRedirectHandler(), "/http2/same/");
http2URI = "http://" + http2TestServer.serverAuthority() + "/http2/same/redirect";
https2TestServer = HttpTestServer.of(new Http2TestServer("localhost", true, sslContext));
https2TestServer = HttpTestServer.create(HTTP_2, sslContext);
https2TestServer.addHandler(new BasicHttpRedirectHandler(), "/https2/same/");
https2URI = "https://" + https2TestServer.serverAuthority() + "/https2/same/redirect";

Expand Down
13 changes: 6 additions & 7 deletions test/jdk/java/net/httpclient/CancelRequestTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@
import static java.lang.System.arraycopy;
import static java.lang.System.out;
import static java.lang.System.err;
import static java.net.http.HttpClient.Version.HTTP_1_1;
import static java.net.http.HttpClient.Version.HTTP_2;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
Expand Down Expand Up @@ -593,25 +595,22 @@ public void setup() throws Exception {

// HTTP/1.1
HttpTestHandler h1_chunkHandler = new HTTPSlowHandler();
InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
httpTestServer = HttpTestServer.of(HttpServer.create(sa, 0));
httpTestServer = HttpTestServer.create(HTTP_1_1);
httpTestServer.addHandler(h1_chunkHandler, "/http1/x/");
httpURI = "http://" + httpTestServer.serverAuthority() + "/http1/x/";

HttpsServer httpsServer = HttpsServer.create(sa, 0);
httpsServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
httpsTestServer = HttpTestServer.of(httpsServer);
httpsTestServer = HttpTestServer.create(HTTP_1_1, sslContext);
httpsTestServer.addHandler(h1_chunkHandler, "/https1/x/");
httpsURI = "https://" + httpsTestServer.serverAuthority() + "/https1/x/";

// HTTP/2
HttpTestHandler h2_chunkedHandler = new HTTPSlowHandler();

http2TestServer = HttpTestServer.of(new Http2TestServer("localhost", false, 0));
http2TestServer = HttpTestServer.create(HTTP_2);
http2TestServer.addHandler(h2_chunkedHandler, "/http2/x/");
http2URI = "http://" + http2TestServer.serverAuthority() + "/http2/x/";

https2TestServer = HttpTestServer.of(new Http2TestServer("localhost", true, sslContext));
https2TestServer = HttpTestServer.create(HTTP_2, sslContext);
https2TestServer.addHandler(h2_chunkedHandler, "/https2/x/");
https2URI = "https://" + https2TestServer.serverAuthority() + "/https2/x/";

Expand Down
13 changes: 6 additions & 7 deletions test/jdk/java/net/httpclient/CancelStreamedBodyTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@

import static java.lang.System.arraycopy;
import static java.lang.System.out;
import static java.net.http.HttpClient.Version.HTTP_1_1;
import static java.net.http.HttpClient.Version.HTTP_2;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
Expand Down Expand Up @@ -343,25 +345,22 @@ public void setup() throws Exception {

// HTTP/1.1
HttpTestHandler h1_chunkHandler = new HTTPSlowHandler();
InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
httpTestServer = HttpTestServer.of(HttpServer.create(sa, 0));
httpTestServer = HttpTestServer.create(HTTP_1_1);
httpTestServer.addHandler(h1_chunkHandler, "/http1/x/");
httpURI = "http://" + httpTestServer.serverAuthority() + "/http1/x/";

HttpsServer httpsServer = HttpsServer.create(sa, 0);
httpsServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
httpsTestServer = HttpTestServer.of(httpsServer);
httpsTestServer = HttpTestServer.create(HTTP_1_1, sslContext);
httpsTestServer.addHandler(h1_chunkHandler, "/https1/x/");
httpsURI = "https://" + httpsTestServer.serverAuthority() + "/https1/x/";

// HTTP/2
HttpTestHandler h2_chunkedHandler = new HTTPSlowHandler();

http2TestServer = HttpTestServer.of(new Http2TestServer("localhost", false, 0));
http2TestServer = HttpTestServer.create(HTTP_2);
http2TestServer.addHandler(h2_chunkedHandler, "/http2/x/");
http2URI = "http://" + http2TestServer.serverAuthority() + "/http2/x/";

https2TestServer = HttpTestServer.of(new Http2TestServer("localhost", true, sslContext));
https2TestServer = HttpTestServer.create(HTTP_2, sslContext);
https2TestServer.addHandler(h2_chunkedHandler, "/https2/x/");
https2URI = "https://" + https2TestServer.serverAuthority() + "/https2/x/";

Expand Down
Loading

3 comments on commit 72de24e

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review

Issues

@varada1110
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 72de24e Nov 23, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@varada1110 Could not automatically backport 72de24e5 to openjdk/jdk17u-dev due to conflicts in the following files:

  • test/jdk/java/net/httpclient/AsyncExecutorShutdown.java
  • test/jdk/java/net/httpclient/CancelRequestTest.java
  • test/jdk/java/net/httpclient/CancelStreamedBodyTest.java
  • test/jdk/java/net/httpclient/ExecutorShutdown.java
  • test/jdk/java/net/httpclient/ExpectContinueTest.java
  • test/jdk/java/net/httpclient/HeadTest.java
  • test/jdk/java/net/httpclient/HttpClientLocalAddrTest.java
  • test/jdk/java/net/httpclient/HttpServerAdapters.java
  • test/jdk/java/net/httpclient/HttpSlowServerTest.java
  • test/jdk/java/net/httpclient/LargeHandshakeTest.java
  • test/jdk/java/net/httpclient/LargeResponseTest.java
  • test/jdk/java/net/httpclient/Response1xxTest.java

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk17u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk17u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b varada1110-backport-72de24e5

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git 72de24e59a80a38ea4ea6a8a3f966f555987ac86

# Backport the commit
$ git cherry-pick --no-commit 72de24e59a80a38ea4ea6a8a3f966f555987ac86
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 72de24e59a80a38ea4ea6a8a3f966f555987ac86'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk17u-dev with the title Backport 72de24e59a80a38ea4ea6a8a3f966f555987ac86.

Please sign in to comment.