HPCC4J-604 Suppress EclWatch redirects (#711)

Signed-off-by: Pastrana <[email protected]>
Co-authored-by: Pastrana <[email protected]>

wsclient/src/main/java/org/hpccsystems/ws/client/BaseHPCCWsClient.java

@@ -561,7 +561,7 @@ protected Integer getStubConnectionTO() throws AxisFault
     final static UsernamePasswordCredentials emptyCreds = new UsernamePasswordCredentials("", null);
 
     /**
-     * Sets the stub options defaults preemptiveauth to 'true;
+     * Sets the stub options defaults preemptiveauth to 'true';
      *
      * @param thestub
      *            The Axis generated service stub
@@ -573,7 +573,12 @@ protected Integer getStubConnectionTO() throws AxisFault
      */
     static public Stub setStubOptions(Stub thestub, Connection connection) throws AxisFault
     {
+        //Add "rawxml_" query param to request ESP to suppress any default redirects
         Options opt = thestub._getServiceClient().getOptions();
+        EndpointReference toRef = opt.getTo();
+        String toAddress = toRef.getAddress() + (toRef.getAddress().contains("?") ? "&" : "?") + "rawxml_";
+        toRef.setAddress(toAddress);
+        opt.setTo(toRef);
 
         opt.setProperty(HTTPConstants.SO_TIMEOUT, connection.getSocketTimeoutMilli());
         opt.setProperty(HTTPConstants.CONNECTION_TIMEOUT, connection.getConnectTimeoutMilli());