Merge pull request #3110 from jamezp/back-ported-fixes

Back ported fixes
resteasy · Jun 8, 2022 · e4bade7 · e4bade7
2 parents 3353dd3 + 39ae237
commit e4bade7
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 4 deletions.
diff --git a/arquillian/pom.xml b/arquillian/pom.xml
@@ -22,8 +22,6 @@
     <properties>
         <!-- Version properties -->
         <version.arquillian.jetty>1.0.0.CR3</version.arquillian.jetty>
-        <!-- Test properties -->
-        <additionalJvmArgs/>
     </properties>
 
     <dependencyManagement>

diff --git a/pom.xml b/pom.xml
@@ -38,6 +38,7 @@
         <javadoc.additional.params>--release=8</javadoc.additional.params>
         <!-- maven-surefire-plugin -->
         <surefire.system.args>-Xms512m -Xmx512m</surefire.system.args>
+        <additionalJvmArgs/>
         <skip.java8.tests>false</skip.java8.tests>
 
         <maven.test.skip>false</maven.test.skip>
@@ -215,6 +216,18 @@
               </plugins>
           </build>
       </profile>
+        <profile>
+            <id>Windows</id>
+            <activation>
+                <os>
+                    <family>windows</family>
+                </os>
+            </activation>
+            <properties>
+                <surefire.system.args>-Xms512m -Xmx512m -Djdk.io.File.enableADS=true</surefire.system.args>
+                <additionalJvmArgs>-Djdk.io.File.enableADS=true</additionalJvmArgs>
+            </properties>
+        </profile>
       <profile>
           <id>jboss-repository</id>
           <repositories>

diff --git a/...file-base/src/main/java/org/jboss/resteasy/microprofile/client/RestClientBuilderImpl.java b/...file-base/src/main/java/org/jboss/resteasy/microprofile/client/RestClientBuilderImpl.java
@@ -452,7 +452,7 @@ private boolean isMapperDisabled() {
             }
         }
         if (disabled) {
-            LOGGER.warnf("The default ResponseExceptionMapper has been disabled");
+            LOGGER.debug("The default ResponseExceptionMapper has been disabled");
         }
         return disabled;
     }

diff --git a/...ile-base/src/main/java/org/jboss/resteasy/microprofile/client/RestClientDelegateBean.java b/...ile-base/src/main/java/org/jboss/resteasy/microprofile/client/RestClientDelegateBean.java
@@ -4,6 +4,7 @@
 import org.eclipse.microprofile.config.ConfigProvider;
 import org.eclipse.microprofile.rest.client.RestClientBuilder;
 import org.eclipse.microprofile.rest.client.inject.RestClient;
+import org.jboss.logging.Logger;
 
 import javax.enterprise.context.Dependent;
 import javax.enterprise.context.spi.CreationalContext;
@@ -42,6 +43,7 @@
 import java.util.stream.Stream;
 
 public class RestClientDelegateBean implements Bean<Object>, PassivationCapable {
+    private static final Logger LOGGER = Logger.getLogger(RestClientDelegateBean.class);
 
     public static final String REST_URL_FORMAT = "%s/mp-rest/url";
 
@@ -283,6 +285,13 @@ private static URI uriFromString(String uriString) {
 
     @Override
     public void destroy(Object instance, CreationalContext<Object> creationalContext) {
+        if (instance instanceof AutoCloseable) {
+            try {
+                ((AutoCloseable) instance).close();
+            } catch (Exception e) {
+                LOGGER.debugf(e, "Failed to close client %s", instance);
+            }
+        }
     }
 
     @Override

diff --git a/testsuite/pom.xml b/testsuite/pom.xml
@@ -19,7 +19,6 @@
         <!-- default value required for cmd-line -->
         <securityManagerArg>-DSECMGR="false"</securityManagerArg>
         <jacoco.agent/>
-        <additionalJvmArgs/>
         <ipv6ArquillianSettings/>
         <debugJvmArgs/>
         <jboss.server.config.file.name>standalone-full.xml</jboss.server.config.file.name>
@@ -490,6 +489,22 @@
                 </additionalJvmArgs>
             </properties>
         </profile>
+        <profile>
+            <id>Windows</id>
+            <activation>
+                <property>
+                    <name>!test.java8.home</name>
+                </property>
+                <os>
+                    <family>windows</family>
+                </os>
+                <jdk>[9,)</jdk>
+            </activation>
+            <properties>
+                <surefire.system.args>-Xms512m -Xmx512m -Djdk.io.File.enableADS=true</surefire.system.args>
+                <additionalJvmArgs>--add-opens=java.base/java.util=ALL-UNNAMED -Djdk.io.File.enableADS=true</additionalJvmArgs>
+            </properties>
+        </profile>
 
         <profile>
             <id>debug</id>