Merge remote-tracking branch 'origin/candidate-9.6.x'

Signed-off-by: Jake Smith <[email protected]>

# Conflicts:
#	commons-hpcc/pom.xml
#	dfsclient/pom.xml
#	pom.xml
#	wsclient/pom.xml

Author: jakesmith

dfsclient/src/test/java/org/hpccsystems/dfs/client/DFSReadWriteTest.java

@@ -65,12 +65,10 @@
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class DFSReadWriteTest extends BaseRemoteTest
 {
-    private static final String[] datasets       = { "~benchmark::integer::20kb", "~unit_test::all_types::thor", "~unit_test::all_types::xml", "~unit_test::all_types::json", "~unit_test::all_types::csv" };
-    private static final int[]    expectedCounts = { 1250, 5600, 10000, 10000, 10000, 10000};
+    // private static final String[] datasets       = { "~benchmark::integer::20kb", "~unit_test::all_types::thor", "~unit_test::all_types::xml", "~unit_test::all_types::json", "~unit_test::all_types::csv" };
+    private static final String[] datasets       = { "~unit_test::all_types::xml", "~unit_test::all_types::json", "~unit_test::all_types::csv" };
+    private static final int[]    expectedCounts = { 1250, 100000, 100000, 100000, 100000, 100000};
 
-    //use until standard test is working
-    //        private static final String[] datasets       = { "~benchmark::integer::20kb", "~benchmark::all_types::200kb"};//, "~unit_test::all_types::xml", "~unit_test::all_types::json", "~unit_test::all_types::csv" };
-    //        private static final int[]    expectedCounts = { 1250, 5600 };//, 10000, 10000, 10000, 10000};
     private static final Version newProtocolVersion = new Version(8,12,10);
 
 

dfsclient/src/test/resources/generate-datasets.ecl

@@ -2,7 +2,7 @@ IMPORT Std;
 
 unique_keys :=  100000;  // Should be less than number of records
 unique_values := 10212; // Should be less than number of records
-totalrecs1 := 10000;
+totalrecs1 := 100000;
 
 childRec := {STRING8 childField1, INTEGER8 childField2, REAL8 childField3};
 

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());