fixing issues found after review

SmartBear · Jan 24, 2017 · f27ec58 · f27ec58
1 parent 17e9389
commit f27ec58
Showing 1 changed file with 38 additions and 10 deletions.
diff --git a/.../java/com/eviware/soapui/impl/wsdl/submit/transports/http/HttpClientRequestTransport.java b/.../java/com/eviware/soapui/impl/wsdl/submit/transports/http/HttpClientRequestTransport.java
@@ -17,6 +17,7 @@
 package com.eviware.soapui.impl.wsdl.submit.transports.http;
 
 import com.eviware.soapui.SoapUI;
+import com.eviware.soapui.impl.rest.RestRequestInterface;
 import com.eviware.soapui.impl.support.AbstractHttpRequestInterface;
 import com.eviware.soapui.impl.support.HttpUtils;
 import com.eviware.soapui.impl.support.http.HttpRequestInterface;
@@ -51,10 +52,13 @@
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpRequestBase;
 import org.apache.http.conn.params.ConnRoutePNames;
+import org.apache.http.impl.client.EntityEnclosingRequestWrapper;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.util.EntityUtils;
 
 import javax.annotation.CheckForNull;
+import javax.servlet.http.HttpServletResponse;
+
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -174,10 +178,7 @@ public Response sendRequest(SubmitContext submitContext, Request request) throws
         submitContext.setProperty(WSDL_REQUEST, httpRequest);
         submitContext.setProperty(RESPONSE_PROPERTIES, new StringToStringMap());
 
-
-        for (RequestFilter filter : filters) {
-            filter.filterRequest(submitContext, httpRequest);
-        }
+        filterRequest(submitContext, httpRequest);
 
         try {
             Settings settings = httpRequest.getSettings();
@@ -239,7 +240,7 @@ public Response sendRequest(SubmitContext submitContext, Request request) throws
                     EntityUtils.consume(httpResponse.getEntity());
                 }
 
-                httpMethod = followRedirects(httpClient, 0, httpMethod, httpResponse, httpContext);
+                httpMethod = followRedirects(httpClient, 0, httpMethod, httpResponse, httpContext, submitContext);
                 submitContext.setProperty(HTTP_METHOD, httpMethod);
             }
         } catch (Throwable t) {
@@ -312,10 +313,36 @@ private boolean isRedirectResponse(int statusCode) {
 
         return false;
     }
-
-    private ExtendedGetMethod followRedirects(HttpClient httpClient, int redirectCount, ExtendedHttpMethod httpMethod,
-                                              org.apache.http.HttpResponse httpResponse, HttpContext httpContext) throws Exception {
-        ExtendedGetMethod getMethod = new ExtendedGetMethod();
+
+    private void filterRequest(SubmitContext submitContext, AbstractHttpRequestInterface<?> httpRequest) {
+		for(RequestFilter filter: filters) {
+			filter.filterRequest(submitContext, httpRequest);
+		}
+	}
+
+    private boolean isPostMethod(EntityEnclosingRequestWrapper httpRequestWrapper, org.apache.http.HttpResponse httpResponse) {
+		int statusCode = httpResponse.getStatusLine().getStatusCode();
+		return (statusCode != HttpServletResponse.SC_SEE_OTHER && 
+				httpRequestWrapper != null &&
+				httpRequestWrapper.getMethod()
+				.equals(RestRequestInterface.HttpMethod.POST.toString());
+	}
+
+    private ExtendedHttpMethod followRedirects(HttpClient httpClient, int redirectCount, ExtendedHttpMethod httpMethod,
+    										   org.apache.http.HttpResponse httpResponse, HttpContext httpContext, SubmitContext submitContext) throws Exception {
+    	EntityEnclosingRequestWrapper httpRequestWrapper = (EntityEnclosingRequestWrapper)httpContext
+			.getAttribute(org.apache.http.protocol.ExecutionContext.HTTP_REQUEST);
+
+		ExtendedHttpMethod getMethod;
+		if(isPostMethod(httpRequestWrapper, httpResponse))
+			getMethod = new ExtendedPostMethod();
+		else {
+			getMethod = new ExtendedGetMethod();
+		}
+
+		submitContext.setProperty("httpMethod", getMethod);
+		AbstractHttpRequestInterface<?> httpRequest = (AbstractHttpRequestInterface<?>)submitContext.getProperty(WSDL_REQUEST);
+		filterRequest(submitContext, httpRequest);
 
         getMethod
                 .getMetrics()
@@ -342,7 +369,8 @@ private ExtendedGetMethod followRedirects(HttpClient httpClient, int redirectCou
             }
 
             try {
-                getMethod = followRedirects(httpClient, redirectCount + 1, getMethod, response, httpContext);
+                getMethod = followRedirects(httpClient, redirectCount + 1, getMethod, response, httpContext, 
+								submitContext);
             } finally {
                 //TODO: check if this is necessary!
                 //getMethod.releaseConnection();