Merge branch 'master' into zkofiro/response-time-reporting

Author: zkofiro

.gitignore

@@ -42,7 +42,7 @@ tank_vmManager/settings.xml
 tank.mwb
 agent/http_client_3/settings.xml
 agent/http_client_4/settings.xml
-agent/ok_http_client/settings.xml
+agent/http_client_jdk/settings.xml
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

agent/agent_common/pom.xml

@@ -22,11 +22,6 @@
       <version>${project.version}</version>
     </dependency>
 
-    <dependency>
-       <groupId>commons-fileupload</groupId>
-       <artifactId>commons-fileupload</artifactId>
-     </dependency>
-
     <dependency>
       <groupId>org.jdom</groupId>
       <artifactId>jdom2</artifactId>

agent/agent_common/src/main/java/com/intuit/tank/http/BaseRequest.java

@@ -171,6 +171,16 @@ public void doPost(BaseResponse response) {
 
     }
 
+    /**
+     * Execute the PATCH.
+     */
+    public void doPatch(BaseResponse response) {
+        this.response = response;
+        requestUrl = TankHttpUtil.buildUrl(protocol, host, port, path, urlVariables).toString();
+        httpclient.doPatch(this);
+
+    }
+
     /**
      * Set as value in the request
      * 

agent/agent_common/src/main/java/com/intuit/tank/http/TankHttpClient.java

@@ -38,6 +38,13 @@ public interface TankHttpClient {
      */
     public void doPost(BaseRequest request);
 
+    /**
+     * Execute the PATCH.
+     *
+     * @param request
+     */
+    public void doPatch(BaseRequest request);
+
     /**
      * Adds the authentication
      * 

agent/agent_common/src/main/java/com/intuit/tank/http/TankHttpUtil.java

@@ -2,7 +2,6 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLEncoder;
@@ -13,14 +12,14 @@
 import java.util.Map;
 
 import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.fileupload.MultipartStream;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 import com.intuit.tank.http.binary.BinaryResponse;
 import com.intuit.tank.http.json.JsonResponse;
 import com.intuit.tank.http.xml.XMLResponse;
+import org.apache.tomcat.util.http.fileupload.MultipartStream;
 
 import static java.util.stream.Collectors.joining;
 

agent/agent_common/src/test/java/com/intuit/tank/http/MockTankHttpClient.java

@@ -32,6 +32,11 @@ public void doPost(BaseRequest request) {
 
     }
 
+    @Override
+    public void doPatch(BaseRequest request) {
+
+    }
+
     @Override
     public void addAuth(AuthCredentials creds) {
 

agent/agent_startup_pkg/tank_agent/startAgent.sh

@@ -1,4 +1,4 @@
 #!/bin/sh                                                                                                                                                                                                                                    
 vm_arguments="-Dnetworkaddress.cache.ttl=5 -Dnetworkaddress.cache.negative.ttl=0";
-java -cp apiharness-1.0-all.jar $2 $vm_arguments com.intuit.tank.harness.APITestHarness $1
+java -cp apiharness-1.0-all.jar "${@:2}" $vm_arguments com.intuit.tank.harness.APITestHarness $1
 echo DONE

agent/apiharness/src/main/java/com/intuit/tank/harness/logging/LogEvent.java

@@ -18,6 +18,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.TreeMap;
+import java.util.UUID;
 import java.util.regex.Pattern;
 
 import org.apache.commons.lang3.StringUtils;
@@ -67,7 +68,7 @@ static enum HttpType {
     private BaseRequest request;
     private Variables variables; // all static and dynamic parameters set by the user
     private String validationStatus; // if validation is not set then the field can contain value = "NA"
-    private String transactionId; // Transaction Id
+    private UUID transactionId; // Transaction Id
     private String stepGroupName; // Step group name
 
     public LogEvent() {
@@ -84,7 +85,7 @@ public Map<String, String> buildMessage() {
     	Map<String, String> map = new TreeMap<>();
         appendField(map, LogFields.EventType, eventType.name());
         appendField(map, LogFields.SourceType, sourceType.name());
-        appendField(map, LogFields.TransactionId, transactionId);
+        appendField(map, LogFields.TransactionId, getTransactionId().toString());
         appendField(map, LogFields.LoggingKey, loggingKey);
         appendField(map, LogFields.TestPlanName, testPlan != null ? testPlan.getTestPlanName() : null);
         appendField(map, LogFields.GroupName, group != null ? group.getName() : null);
@@ -228,11 +229,11 @@ public void setStepGroupName(String stepGroupName) {
         this.stepGroupName = stepGroupName;
     }
 
-    public String getTransactionId() {
-        return transactionId;
+    public UUID getTransactionId() {
+        return transactionId = (transactionId == null) ? UUID.randomUUID() : transactionId;
     }
 
-    public void setTransactionId(String transactionId) {
+    public void setTransactionId(UUID transactionId) {
         this.transactionId = transactionId;
     }
 

agent/apiharness/src/main/java/com/intuit/tank/runner/TestPlanRunner.java

@@ -15,7 +15,6 @@
 
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 
 import com.intuit.tank.harness.StopBehavior;
 import org.apache.commons.lang3.StringUtils;
@@ -276,7 +275,6 @@ private void runScriptSteps(HDScriptUseCase hdScriptUseCase) throws KillScriptEx
             }
             TestStep testStep = scriptSteps.get(i);
             logEvent.setStep(testStep);
-            logEvent.setTransactionId(UUID.randomUUID().toString());
             testStep.setParent(hdScriptUseCase);
             if (gotoGroup != null) {
                 if (testStep instanceof RequestStep) {

agent/apiharness/src/main/java/com/intuit/tank/runner/method/RequestRunner.java

@@ -178,6 +178,8 @@ public String execute() {
                 baseRequest.doPost(baseResponse);
             } else if (method.equalsIgnoreCase("PUT")) {
                 baseRequest.doPut(baseResponse);
+            } else if (method.equalsIgnoreCase("PATCH")) {
+                baseRequest.doPatch(baseResponse);
             } else if (method.equalsIgnoreCase("DELETE")) {
                 baseRequest.doDelete(baseResponse);
             } else if (method.equalsIgnoreCase("OPTIONS")) {
@@ -432,7 +434,6 @@ private void processVariables(Variables variables, BaseResponse reqResponse) {
         }
 
         for (AssignmentData assignmentData : bodyVariable) {
-            variables.addVariable("RESPONSE_BODY", reqResponse.getResponseBody());
             String value = stripEquals(assignmentData.getValue());
             String realValue = null;
             if (ValidationUtil.isFunction(value)) {
@@ -446,7 +447,6 @@ private void processVariables(Variables variables, BaseResponse reqResponse) {
             }
             variables.addVariable(assignmentData.getKey(), realValue);
             LOG.debug("Setting variable " + assignmentData.getKey() + "=" + realValue);
-            variables.removeVariable("RESPONSE_BODY");
         }
     }