Move response to a separate property.

Author: rober710

independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/api/WebClientApplicationException.java

@@ -20,25 +20,43 @@
 import org.jboss.resteasy.reactive.common.jaxrs.StatusTypeImpl;
 
 /**
- * Subclass of {@link WebApplicationException} for use by clients.
+ * Subclass of {@link WebApplicationException} for use by clients, which forbids setting a response that
+ * would be used by the server.
+ * FIXME: I'd rather this be disjoint from WebApplicationException, but changing the exception type could break existing
+ * clients catching this exception.
  */
 @SuppressWarnings("serial")
 public class WebClientApplicationException extends WebApplicationException implements ResteasyReactiveClientProblem {
 
+    /**
+     * The response received by the client after making the request.
+     * Saved in an alternate field to prevent it from being used by the server.
+     */
+    private final transient Response clientResponse;
+
     public WebClientApplicationException(int responseStatus) {
         this(responseStatus, (String) null);
     }
 
     public WebClientApplicationException(int responseStatus, String responseReasonPhrase) {
         super("Server response is: " + responseStatus, null, new DummyResponse(responseStatus, responseReasonPhrase));
+        this.clientResponse = getResponse();
+    }
+
+    public WebClientApplicationException(Response clientResponse) {
+        super("Server response is: " + clientResponse.getStatus(), new DummyResponse(clientResponse.getStatus(),
+                clientResponse.getStatusInfo().getReasonPhrase()));
+        this.clientResponse = clientResponse;
     }
 
-    public WebClientApplicationException(int responseStatus, Response response) {
-        super("Server response is: " + responseStatus, response);
+    public WebClientApplicationException(Throwable cause, Response clientResponse) {
+        super("Server response is: " + clientResponse.getStatus(), cause, new DummyResponse(clientResponse.getStatus(),
+                clientResponse.getStatusInfo().getReasonPhrase()));
+        this.clientResponse = clientResponse;
     }
 
-    public WebClientApplicationException(int responseStatus, Throwable cause, Response response) {
-        super("Server response is: " + responseStatus, cause, response);
+    public Response getClientResponse() {
+        return clientResponse;
     }
 
     /**

independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientSetResponseEntityRestHandler.java

@@ -29,7 +29,7 @@ public void handle(RestClientRequestContext context) throws Exception {
             StatusType effectiveResponseStatus = determineEffectiveResponseStatus(context, requestContext);
             if (Response.Status.Family.familyOf(effectiveResponseStatus.getStatusCode()) != Response.Status.Family.SUCCESSFUL) {
                 Response response = ClientResponseCompleteRestHandler.mapToResponse(context, effectiveResponseStatus, true);
-                throw new WebClientApplicationException(effectiveResponseStatus.getStatusCode(), response);
+                throw new WebClientApplicationException(response);
             }
         }
 

independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/RestClientRequestContext.java

@@ -31,6 +31,7 @@
 import org.jboss.resteasy.reactive.ClientWebApplicationException;
 import org.jboss.resteasy.reactive.RestResponse;
 import org.jboss.resteasy.reactive.client.api.QuarkusRestClientProperties;
+import org.jboss.resteasy.reactive.client.api.WebClientApplicationException;
 import org.jboss.resteasy.reactive.client.impl.multipart.QuarkusMultipartForm;
 import org.jboss.resteasy.reactive.client.spi.ClientRestHandler;
 import org.jboss.resteasy.reactive.client.spi.MultipartResponseData;
@@ -199,10 +200,12 @@ protected Throwable unwrapException(Throwable t) {
                         + invokedMethod.getDeclaringClass().getName() + "#"
                         + invokedMethod.getName() + "'";
             }
+            Response response = webApplicationException instanceof WebClientApplicationException wcae ? wcae.getClientResponse()
+                    : webApplicationException.getResponse();
             return new ClientWebApplicationException(message,
                     webApplicationException instanceof ClientWebApplicationException ? webApplicationException.getCause()
                             : webApplicationException,
-                    webApplicationException.getResponse());
+                    response);
         }
         return res;
     }