You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2021/05/26 21:35:20 UTC
[httpcomponents-core] branch java8-alpn updated (5fcde2f -> c3d20f0)
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a change to branch java8-alpn
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git.
discard 5fcde2f Use jep244 (ALPN support) was back-ported to java 8u251
new c3d20f0 Use jep244 (ALPN support) was back-ported to java 8u251
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (5fcde2f)
\
N -- N -- N refs/heads/java8-alpn (c3d20f0)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.travis.yml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
[httpcomponents-core] 01/01: Use jep244 (ALPN support) was
back-ported to java 8u251
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a commit to branch java8-alpn
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
commit c3d20f02d36b82ce7a5e267e11b28d134dd18d33
Author: Oleg Kalnichevski <ol...@apache.org>
AuthorDate: Wed May 26 22:55:18 2021 +0200
Use jep244 (ALPN support) was back-ported to java 8u251
---
.travis.yml | 3 +-
.../hc/core5/http2/ssl/ConscryptSupport.java | 2 +-
.../apache/hc/core5/http2/ssl/H2TlsSupport.java | 6 +++-
.../apache/hc/core5/testing/nio/H2AlpnTest.java | 16 ---------
.../testing/nio/H2ProtocolNegotiationTest.java | 40 +---------------------
.../nio/H2ServerAndMultiplexingRequesterTest.java | 18 ----------
.../testing/nio/H2ServerAndRequesterTest.java | 18 ----------
.../testing/nio/JSSEProviderIntegrationTest.java | 7 ----
.../apache/hc/core5/reactor/ssl/SSLIOSession.java | 3 +-
.../apache/hc/core5/ssl/TestSSLContextBuilder.java | 8 -----
pom.xml | 1 +
11 files changed, 10 insertions(+), 112 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 2116214..b733bed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,9 +21,8 @@ services:
- docker
jdk:
- - oraclejdk8
+ - openjdk8
- openjdk11
- - oraclejdk11
- oraclejdk16
- openjdk-ea
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/ssl/ConscryptSupport.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/ssl/ConscryptSupport.java
index 4cd7a6e..6e4010e 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/ssl/ConscryptSupport.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/ssl/ConscryptSupport.java
@@ -56,7 +56,7 @@ public final class ConscryptSupport {
sslEngine.setSSLParameters(sslParameters);
Conscrypt.setApplicationProtocols(sslEngine, appProtocols);
} else {
- H2TlsSupport.setApplicationProtocols(sslParameters, appProtocols);
+ sslParameters.setApplicationProtocols(appProtocols);
sslEngine.setSSLParameters(sslParameters);
}
if (initializer != null) {
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/ssl/H2TlsSupport.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/ssl/H2TlsSupport.java
index 4362ee3..3cf0263 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/ssl/H2TlsSupport.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/ssl/H2TlsSupport.java
@@ -46,6 +46,10 @@ public final class H2TlsSupport {
ReflectionUtils.callSetter(sslParameters, "EnableRetransmissions", Boolean.TYPE, value);
}
+ /**
+ * @deprecated Use {@link SSLParameters#setApplicationProtocols(String[])}.
+ */
+ @Deprecated
public static void setApplicationProtocols(final SSLParameters sslParameters, final String[] values) {
ReflectionUtils.callSetter(sslParameters, "ApplicationProtocols", String[].class, values);
}
@@ -71,7 +75,7 @@ public final class H2TlsSupport {
sslParameters.setProtocols(TLS.excludeWeak(sslParameters.getProtocols()));
sslParameters.setCipherSuites(TlsCiphers.excludeH2Blacklisted(sslParameters.getCipherSuites()));
setEnableRetransmissions(sslParameters, false);
- setApplicationProtocols(sslParameters, selectApplicationProtocols(attachment));
+ sslParameters.setApplicationProtocols(selectApplicationProtocols(attachment));
sslEngine.setSSLParameters(sslParameters);
if (initializer != null) {
initializer.initialize(endpoint, sslEngine);
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2AlpnTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2AlpnTest.java
index 1775200..fc5cc36 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2AlpnTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2AlpnTest.java
@@ -60,13 +60,9 @@ import org.apache.hc.core5.io.CloseMode;
import org.apache.hc.core5.reactor.IOReactorConfig;
import org.apache.hc.core5.reactor.ListenerEndpoint;
import org.apache.hc.core5.testing.SSLTestContexts;
-import org.apache.hc.core5.util.ReflectionUtils;
import org.apache.hc.core5.util.Timeout;
import org.hamcrest.CoreMatchers;
import org.hamcrest.MatcherAssert;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExternalResource;
@@ -165,18 +161,6 @@ public class H2AlpnTest {
};
- private static int JAVA_VER;
-
- @BeforeClass
- public static void determineJavaVersion() {
- JAVA_VER = ReflectionUtils.determineJRELevel();
- }
-
- @Before
- public void checkVersion() {
- Assume.assumeTrue("Java version must be 9 or greater and less than 16", JAVA_VER >= 9 && JAVA_VER < 16);
- }
-
@Test
public void testALPN() throws Exception {
server.start();
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ProtocolNegotiationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ProtocolNegotiationTest.java
index 974ff98..1e3b06d 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ProtocolNegotiationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ProtocolNegotiationTest.java
@@ -29,8 +29,6 @@ package org.apache.hc.core5.testing.nio;
import java.net.InetSocketAddress;
import java.util.concurrent.Future;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
import org.apache.hc.core5.http.ContentType;
import org.apache.hc.core5.http.HttpHost;
@@ -57,13 +55,9 @@ import org.apache.hc.core5.reactor.IOReactorConfig;
import org.apache.hc.core5.reactor.ListenerEndpoint;
import org.apache.hc.core5.testing.SSLTestContexts;
import org.apache.hc.core5.testing.classic.LoggingConnPoolListener;
-import org.apache.hc.core5.util.ReflectionUtils;
import org.apache.hc.core5.util.Timeout;
import org.hamcrest.CoreMatchers;
import org.hamcrest.MatcherAssert;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExternalResource;
@@ -145,18 +139,6 @@ public class H2ProtocolNegotiationTest {
};
- private static int JAVA_VER;
-
- @BeforeClass
- public static void determineJavaVersion() {
- JAVA_VER = ReflectionUtils.determineJRELevel();
- }
-
- @Before
- public void checkVersion() {
- Assume.assumeTrue("Java version must be 1.8 or greater", JAVA_VER >= 8);
- }
-
@Test
public void testForceHttp1() throws Exception {
server.start();
@@ -223,27 +205,7 @@ public class H2ProtocolNegotiationTest {
MatcherAssert.assertThat(message1, CoreMatchers.notNullValue());
final HttpResponse response1 = message1.getHead();
MatcherAssert.assertThat(response1.getCode(), CoreMatchers.equalTo(HttpStatus.SC_OK));
-
- if (isAlpnSupported()) {
- MatcherAssert.assertThat(response1.getVersion(), CoreMatchers.equalTo(HttpVersion.HTTP_2));
- } else {
- MatcherAssert.assertThat(response1.getVersion(), CoreMatchers.equalTo(HttpVersion.HTTP_1_1));
- }
- }
-
- private boolean isAlpnSupported() {
- if (JAVA_VER == 8) {
- // The 'java.version' property values are structured "1.8.0_[BUILD NUMBER]" in java 8 releases.
- final Matcher matcher = Pattern.compile("^1\\.8\\.0_(\\d+)$")
- .matcher(System.getProperty("java.version"));
- if (matcher.matches()) {
- final int java8Build = Integer.parseInt(matcher.group(1));
- // jep244 (alpn) was backported to java 8u251.
- // https://bugs.java.com/bugdatabase/view_bug.do?bug_id=8230977
- return java8Build >= 251;
- }
- }
- return JAVA_VER > 8 && JAVA_VER < 16;
+ MatcherAssert.assertThat(response1.getVersion(), CoreMatchers.equalTo(HttpVersion.HTTP_2));
}
}
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerAndMultiplexingRequesterTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerAndMultiplexingRequesterTest.java
index c048bd0..7fb874e 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerAndMultiplexingRequesterTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerAndMultiplexingRequesterTest.java
@@ -61,14 +61,10 @@ import org.apache.hc.core5.io.CloseMode;
import org.apache.hc.core5.reactor.IOReactorConfig;
import org.apache.hc.core5.reactor.ListenerEndpoint;
import org.apache.hc.core5.testing.SSLTestContexts;
-import org.apache.hc.core5.util.ReflectionUtils;
import org.apache.hc.core5.util.TimeValue;
import org.apache.hc.core5.util.Timeout;
import org.hamcrest.CoreMatchers;
import org.hamcrest.MatcherAssert;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExternalResource;
@@ -160,20 +156,6 @@ public class H2ServerAndMultiplexingRequesterTest {
};
- private static int javaVersion;
-
- @BeforeClass
- public static void determineJavaVersion() {
- javaVersion = ReflectionUtils.determineJRELevel();
- }
-
- @Before
- public void checkVersion() {
- if (scheme == URIScheme.HTTPS) {
- Assume.assumeTrue("Java version must be 1.8 or greater", javaVersion > 7);
- }
- }
-
@Test
public void testSequentialRequests() throws Exception {
server.start();
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerAndRequesterTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerAndRequesterTest.java
index c0e7977..a52d588 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerAndRequesterTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerAndRequesterTest.java
@@ -59,13 +59,9 @@ import org.apache.hc.core5.reactor.IOReactorConfig;
import org.apache.hc.core5.reactor.ListenerEndpoint;
import org.apache.hc.core5.testing.SSLTestContexts;
import org.apache.hc.core5.testing.classic.LoggingConnPoolListener;
-import org.apache.hc.core5.util.ReflectionUtils;
import org.apache.hc.core5.util.Timeout;
import org.hamcrest.CoreMatchers;
import org.hamcrest.MatcherAssert;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExternalResource;
@@ -163,20 +159,6 @@ public class H2ServerAndRequesterTest {
};
- private static int javaVersion;
-
- @BeforeClass
- public static void determineJavaVersion() {
- javaVersion = ReflectionUtils.determineJRELevel();
- }
-
- @Before
- public void checkVersion() {
- if (scheme == URIScheme.HTTPS) {
- Assume.assumeTrue("Java version must be 1.8 or greater", javaVersion > 7);
- }
- }
-
@Test
public void testSequentialRequests() throws Exception {
server.start();
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/JSSEProviderIntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/JSSEProviderIntegrationTest.java
index 160352b..d4cb7c6 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/JSSEProviderIntegrationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/JSSEProviderIntegrationTest.java
@@ -52,13 +52,11 @@ import org.apache.hc.core5.http.protocol.HttpProcessor;
import org.apache.hc.core5.http.protocol.RequestValidateHost;
import org.apache.hc.core5.reactor.IOReactorConfig;
import org.apache.hc.core5.ssl.SSLContextBuilder;
-import org.apache.hc.core5.util.ReflectionUtils;
import org.apache.hc.core5.util.TimeValue;
import org.apache.hc.core5.util.Timeout;
import org.conscrypt.Conscrypt;
import org.junit.Assert;
import org.junit.Assume;
-import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExternalResource;
@@ -99,11 +97,6 @@ public class JSSEProviderIntegrationTest {
private Http1TestServer server;
private Http1TestClient client;
- @BeforeClass
- public static void determineJavaVersion() {
- Assume.assumeTrue("Java version must be 8 or greater", ReflectionUtils.determineJRELevel() >= 8);
- }
-
@Rule
public TestRule resourceRules = RuleChain.outerRule(new ExternalResource() {
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/reactor/ssl/SSLIOSession.java b/httpcore5/src/main/java/org/apache/hc/core5/reactor/ssl/SSLIOSession.java
index 24c04c4..ca3617a 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/reactor/ssl/SSLIOSession.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/reactor/ssl/SSLIOSession.java
@@ -57,7 +57,6 @@ import org.apache.hc.core5.reactor.IOEventHandler;
import org.apache.hc.core5.reactor.IOSession;
import org.apache.hc.core5.util.Args;
import org.apache.hc.core5.util.Asserts;
-import org.apache.hc.core5.util.ReflectionUtils;
import org.apache.hc.core5.util.Timeout;
/**
@@ -381,7 +380,7 @@ public class SSLIOSession implements IOSession {
}
if (this.tlsDetails == null) {
final SSLSession sslSession = this.sslEngine.getSession();
- final String applicationProtocol = ReflectionUtils.callGetter(this.sslEngine, "ApplicationProtocol", String.class);
+ final String applicationProtocol = this.sslEngine.getApplicationProtocol();
this.tlsDetails = new TlsDetails(sslSession, applicationProtocol);
}
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/ssl/TestSSLContextBuilder.java b/httpcore5/src/test/java/org/apache/hc/core5/ssl/TestSSLContextBuilder.java
index 211813c..51cad2d 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/ssl/TestSSLContextBuilder.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/ssl/TestSSLContextBuilder.java
@@ -59,12 +59,9 @@ import javax.net.ssl.SSLSession;
import javax.net.ssl.SSLSocket;
import javax.net.ssl.TrustManagerFactory;
-import org.apache.hc.core5.util.ReflectionUtils;
import org.apache.hc.core5.util.Timeout;
import org.junit.After;
import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.BeforeClass;
import org.junit.Test;
/**
@@ -78,11 +75,6 @@ public class TestSSLContextBuilder {
return System.getProperty("os.name").contains("Windows");
}
- @BeforeClass
- public static void determineJavaVersion() {
- Assume.assumeTrue("Java version must be 8 or greater", ReflectionUtils.determineJRELevel() >= 8);
- }
-
private static final Timeout TIMEOUT = Timeout.ofSeconds(5);
private ExecutorService executorService;
diff --git a/pom.xml b/pom.xml
index 866e36a..0e51ac3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,6 +78,7 @@
<log4j.version>2.8.2</log4j.version>
<rxjava.version>2.2.8</rxjava.version>
<api.comparison.version>5.1</api.comparison.version>
+ <hc.animal-sniffer.signature.ignores>javax.net.ssl.SSLEngine,javax.net.ssl.SSLParameters</hc.animal-sniffer.signature.ignores>
</properties>
<dependencyManagement>