Add JNH properties to the config Signed-off-by: jansupol <jan.supol@oracle.com>
diff --git a/core-common/src/main/java/org/glassfish/jersey/internal/config/JerseySystemPropertiesConfigurationModel.java b/core-common/src/main/java/org/glassfish/jersey/internal/config/JerseySystemPropertiesConfigurationModel.java index 78a628d..a42a860 100644 --- a/core-common/src/main/java/org/glassfish/jersey/internal/config/JerseySystemPropertiesConfigurationModel.java +++ b/core-common/src/main/java/org/glassfish/jersey/internal/config/JerseySystemPropertiesConfigurationModel.java
@@ -33,6 +33,7 @@ "org.glassfish.jersey.helidon.connector.HelidonClientProperties", "org.glassfish.jersey.jdk.connector.JdkConnectorProperties", "org.glassfish.jersey.jetty.connector.JettyClientProperties", + "org.glassfish.jersey.jnh.connector.JavaNetHttpClientProperties", "org.glassfish.jersey.netty.connector.NettyClientProperties", "org.glassfish.jersey.media.multipart.MultiPartProperties", "org.glassfish.jersey.server.oauth1.OAuth1ServerProperties");
diff --git a/tests/integration/property-check/pom.xml b/tests/integration/property-check/pom.xml index 51d2fe5..2e49deb 100644 --- a/tests/integration/property-check/pom.xml +++ b/tests/integration/property-check/pom.xml
@@ -79,6 +79,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.glassfish.jersey.connectors</groupId> + <artifactId>jersey-jnh-connector</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.glassfish.jersey.security</groupId> <artifactId>oauth1-server</artifactId> <version>${project.version}</version>
diff --git a/tests/integration/property-check/src/test/java/org/glassfish/jersey/internal/config/SystemPropertiesConfigurationModelTest.java b/tests/integration/property-check/src/test/java/org/glassfish/jersey/internal/config/SystemPropertiesConfigurationModelTest.java index 916bf81..00701ff 100644 --- a/tests/integration/property-check/src/test/java/org/glassfish/jersey/internal/config/SystemPropertiesConfigurationModelTest.java +++ b/tests/integration/property-check/src/test/java/org/glassfish/jersey/internal/config/SystemPropertiesConfigurationModelTest.java
@@ -39,6 +39,7 @@ import org.glassfish.jersey.internal.util.PropertiesClass; import org.glassfish.jersey.internal.util.Property; import org.glassfish.jersey.jetty.connector.JettyClientProperties; +import org.glassfish.jersey.jnh.connector.JavaNetHttpClientProperties; import org.glassfish.jersey.media.multipart.MultiPartProperties; import org.glassfish.jersey.message.MessageProperties; import org.glassfish.jersey.server.ServerProperties; @@ -96,6 +97,7 @@ System.setProperty(ApacheClientProperties.DISABLE_COOKIES, TEST_STRING); System.setProperty(Apache5ClientProperties.DISABLE_COOKIES, TEST_STRING); System.setProperty(JettyClientProperties.ENABLE_SSL_HOSTNAME_VERIFICATION, TEST_STRING); + System.setProperty(JavaNetHttpClientProperties.DISABLE_COOKIES, TEST_STRING); System.setProperty(MultiPartProperties.TEMP_DIRECTORY, TEST_STRING); System.setProperty(OAuth1ServerProperties.REALM, TEST_STRING); JerseySystemPropertiesConfigurationModel model = new JerseySystemPropertiesConfigurationModel(); @@ -125,6 +127,8 @@ assertFalse(properties.containsKey(Apache5ClientProperties.CONNECTION_MANAGER)); assertEquals(TEST_STRING, properties.get(JettyClientProperties.ENABLE_SSL_HOSTNAME_VERIFICATION)); assertFalse(properties.containsKey(JettyClientProperties.DISABLE_COOKIES)); + assertEquals(TEST_STRING, properties.get(JavaNetHttpClientProperties.DISABLE_COOKIES)); + assertFalse(properties.containsKey(JavaNetHttpClientProperties.SSL_PARAMETERS)); assertEquals(TEST_STRING, properties.get(MultiPartProperties.TEMP_DIRECTORY)); assertFalse(properties.containsKey(MultiPartProperties.BUFFER_THRESHOLD)); assertEquals(TEST_STRING, properties.get(OAuth1ServerProperties.REALM));