[jboss-svn-commits] JBoss Portal SVN: r5637 - in trunk: common/src/main/org/jboss/portal/common/http portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests server/src/main/org/jboss/portal/test/server/charset server/src/main/org/jboss/portal/test/server/parameters test/src/main/org/jboss/portal/test/framework/driver/http test/src/main/org/jboss/portal/test/framework/driver/http/command test/src/main/org/jboss/portal/test/framework/driver/http/response
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Nov 13 20:04:36 EST 2006
Author: julien at jboss.com
Date: 2006-11-13 20:04:15 -0500 (Mon, 13 Nov 2006)
New Revision: 5637
Added:
trunk/common/src/main/org/jboss/portal/common/http/HttpRequest.java
Modified:
trunk/common/src/main/org/jboss/portal/common/http/HttpHeader.java
trunk/common/src/main/org/jboss/portal/common/http/HttpHeaders.java
trunk/common/src/main/org/jboss/portal/common/http/HttpResponse.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherSequenceBuilder.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestsSequenceBuilder.java
trunk/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataNoCharsetTest.java
trunk/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataUTF8Test.java
trunk/server/src/main/org/jboss/portal/test/server/charset/PostTest.java
trunk/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedNoCharsetTest.java
trunk/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedUTF8Test.java
trunk/server/src/main/org/jboss/portal/test/server/parameters/PostApplicationXWWWFormURLEncodedTest.java
trunk/server/src/main/org/jboss/portal/test/server/parameters/PostMultipartFormDataTest.java
trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriverClient.java
trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/DoGetCommand.java
trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/DoPostCommand.java
trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/InvokeGetResponse.java
trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/InvokePostResponse.java
Log:
extract code that modelise the body of a post into common http classes
Modified: trunk/common/src/main/org/jboss/portal/common/http/HttpHeader.java
===================================================================
--- trunk/common/src/main/org/jboss/portal/common/http/HttpHeader.java 2006-11-14 00:12:28 UTC (rev 5636)
+++ trunk/common/src/main/org/jboss/portal/common/http/HttpHeader.java 2006-11-14 01:04:15 UTC (rev 5637)
@@ -211,4 +211,37 @@
}
}
}
+
+ public String getValue()
+ {
+ StringBuffer buffer = new StringBuffer();
+ for (Iterator j = elements();j.hasNext();)
+ {
+ HttpHeader.Element elt = (HttpHeader.Element)j.next();
+ buffer.append(elt.getName());
+ if (elt.getValue() != null)
+ {
+ buffer.append("=").append(elt.getValue());
+ }
+ for (Iterator k = elt.params();k.hasNext();)
+ {
+ HttpHeader.Element.Param param = (HttpHeader.Element.Param)k.next();
+ buffer.append(";").append(param.getName());
+ if (param.getValue() != null)
+ {
+ buffer.append("=").append(param.getValue());
+ }
+ }
+ if (j.hasNext())
+ {
+ buffer.append(",");
+ }
+ }
+ return buffer.toString();
+ }
+
+ public String toString()
+ {
+ return name + ": " + getValue();
+ }
}
Modified: trunk/common/src/main/org/jboss/portal/common/http/HttpHeaders.java
===================================================================
--- trunk/common/src/main/org/jboss/portal/common/http/HttpHeaders.java 2006-11-14 00:12:28 UTC (rev 5636)
+++ trunk/common/src/main/org/jboss/portal/common/http/HttpHeaders.java 2006-11-14 01:04:15 UTC (rev 5637)
@@ -69,35 +69,18 @@
return null;
}
+ public Iterator headers()
+ {
+ return headers.iterator();
+ }
+
public String toString()
{
StringBuffer buffer = new StringBuffer();
for (Iterator i = headers.iterator();i.hasNext();)
{
HttpHeader header = (HttpHeader)i.next();
- buffer.append(header.getName()).append(": ");
- for (Iterator j = header.elements();j.hasNext();)
- {
- HttpHeader.Element elt = (HttpHeader.Element)j.next();
- buffer.append(elt.getName());
- if (elt.getValue() != null)
- {
- buffer.append("=").append(elt.getValue());
- }
- for (Iterator k = elt.params();k.hasNext();)
- {
- HttpHeader.Element.Param param = (HttpHeader.Element.Param)k.next();
- buffer.append(";").append(param.getName());
- if (param.getValue() != null)
- {
- buffer.append("=").append(param.getValue());
- }
- }
- if (j.hasNext())
- {
- buffer.append(",");
- }
- }
+ buffer.append(header.toString());
buffer.append("\n");
}
return buffer.toString();
Added: trunk/common/src/main/org/jboss/portal/common/http/HttpRequest.java
===================================================================
--- trunk/common/src/main/org/jboss/portal/common/http/HttpRequest.java 2006-11-14 00:12:28 UTC (rev 5636)
+++ trunk/common/src/main/org/jboss/portal/common/http/HttpRequest.java 2006-11-14 01:04:15 UTC (rev 5637)
@@ -0,0 +1,112 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.common.http;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.Collections;
+
+/**
+ * Just used to define the request body.
+ *
+ * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public class HttpRequest implements Serializable
+{
+
+ public abstract static class Body implements Serializable
+ {
+ }
+
+ public static class Raw extends Body
+ {
+
+ /** . */
+ private byte[] bytes;
+
+ public byte[] getBytes()
+ {
+ return bytes;
+ }
+
+ public void setBytes(byte[] bytes)
+ {
+ this.bytes = bytes;
+ }
+ }
+
+ public static class Form extends Body
+ {
+
+ /** . */
+ private Map parameters = new HashMap();
+
+ public void addParameter(String name, String[] values)
+ {
+ if (name == null)
+ {
+ throw new IllegalStateException();
+ }
+ if (values == null)
+ {
+ throw new IllegalStateException();
+ }
+ for (int i = 0; i < values.length; i++)
+ {
+ String value = values[i];
+ if (value == null)
+ {
+ throw new IllegalStateException();
+ }
+ }
+ parameters.put(name, values.clone());
+ }
+
+ public void removeParameter(String name)
+ {
+ if (name == null)
+ {
+ throw new IllegalStateException();
+ }
+ parameters.remove(name);
+ }
+
+ public Set getParameterNames()
+ {
+ return Collections.unmodifiableSet(parameters.keySet());
+ }
+
+ public String[] getParameterValues(String name)
+ {
+ if (name == null)
+ {
+ throw new IllegalStateException();
+ }
+ String[] values = (String[])parameters.get(name);
+ return (String[])values.clone();
+ }
+ }
+}
Modified: trunk/common/src/main/org/jboss/portal/common/http/HttpResponse.java
===================================================================
--- trunk/common/src/main/org/jboss/portal/common/http/HttpResponse.java 2006-11-14 00:12:28 UTC (rev 5636)
+++ trunk/common/src/main/org/jboss/portal/common/http/HttpResponse.java 2006-11-14 01:04:15 UTC (rev 5637)
@@ -22,15 +22,12 @@
******************************************************************************/
package org.jboss.portal.common.http;
+import java.io.Serializable;
+
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-public class HttpResponse
+public class HttpResponse implements Serializable
{
-
- private byte[] body;
-
-
-
}
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherSequenceBuilder.java 2006-11-14 00:12:28 UTC (rev 5636)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherSequenceBuilder.java 2006-11-14 01:04:15 UTC (rev 5637)
@@ -102,7 +102,7 @@
// Invoke render with header
InvokeGetResponse render = new InvokeGetResponse(response.createRenderURL().toString());
- render.setHeader("myheader", "render-value");
+ render.addHeader("myheader").addElement("render-value");
return render;
}
});
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestsSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestsSequenceBuilder.java 2006-11-14 00:12:28 UTC (rev 5636)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestsSequenceBuilder.java 2006-11-14 01:04:15 UTC (rev 5637)
@@ -26,6 +26,7 @@
import org.jboss.portal.common.test.driver.response.EndTestResponse;
import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
import org.jboss.portal.common.test.driver.DriverResponse;
+import org.jboss.portal.common.http.HttpRequest;
import org.jboss.portal.test.framework.driver.http.response.InvokePostResponse;
import org.jboss.portal.test.framework.portlet.Sequence;
import org.jboss.portal.test.framework.portlet.SequenceRegistry;
@@ -80,7 +81,7 @@
url.setParameter("g_foo2", new String[]{"g_bar2_1", "g_bar2_2"});
url.setParameter("g_foo3", new String[]{"g_bar3_1"});
iur.setURL(url.toString());
- InvokePostResponse.FormBody body = new InvokePostResponse.FormBody();
+ HttpRequest.Form body = new HttpRequest.Form();
body.addParameter("g_foo3", new String[]{"g_bar3_2"});
body.addParameter("g_foo4", new String[]{"g_bar4_1"});
body.addParameter("g_foo5", new String[]{"g_bar5_1", "g_bar5_2"});
@@ -150,7 +151,7 @@
url.setParameter("g_foo1", "g_bar1_1");
url.setParameter("g_foo2", new String[]{"g_bar2_1", "g_bar2_2"});
iur.setURL(url.toString());
- InvokePostResponse.RawBody body = new InvokePostResponse.RawBody();
+ HttpRequest.Raw body = new HttpRequest.Raw();
body.setBytes(byteContent);
iur.setBody(body);
iur.setContentType(InvokePostResponse.MULTIPART_FORM_DATA);
@@ -228,7 +229,7 @@
url.setParameter("g_foo1", "g_bar1_1");
url.setParameter("g_foo2", new String[]{"g_bar2_1", "g_bar2_2"});
iur.setURL(url.toString());
- InvokePostResponse.RawBody body = new InvokePostResponse.RawBody();
+ HttpRequest.Raw body = new HttpRequest.Raw();
body.setBytes(byteContent);
iur.setBody(body);
iur.setContentType(InvokePostResponse.MULTIPART_FORM_DATA);
@@ -352,8 +353,7 @@
PortletURL url = response.createActionURL();
url.setParameter("foo1", "bar1");
url.setParameter("foo2", new String[]{"bar2_1", "bar2_2"});
- InvokeGetResponse iur = new InvokeGetResponse(url.toString());
- return iur;
+ return new InvokeGetResponse(url.toString());
}
});
@@ -412,7 +412,7 @@
// Invoke render with header
InvokeGetResponse render = new InvokeGetResponse(response.createRenderURL().toString());
- render.setHeader("myheader", "render-value");
+ render.addHeader("myheader").addElement("render-value");
return render;
}
});
@@ -432,7 +432,7 @@
// Invoke action with header
InvokeGetResponse action = new InvokeGetResponse(response.createActionURL().toString());
- action.setHeader("myheader", "action-value");
+ action.addHeader("myheader").addElement("action-value");
return action;
}
});
Modified: trunk/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataNoCharsetTest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataNoCharsetTest.java 2006-11-14 00:12:28 UTC (rev 5636)
+++ trunk/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataNoCharsetTest.java 2006-11-14 01:04:15 UTC (rev 5637)
@@ -32,6 +32,7 @@
import org.jboss.portal.common.test.driver.response.EndTestResponse;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
+import org.jboss.portal.common.http.HttpRequest;
import javax.servlet.http.HttpServletRequest;
@@ -57,7 +58,7 @@
InvokePostResponse post = new InvokePostResponse();
post.setURL(s);
post.setContentType(PortalConstants.MULTIPART_FORM_DATA);
- post.setBody(new InvokePostResponse.FormBody());
+ post.setBody(new HttpRequest.Form());
return post;
}
else
Modified: trunk/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataUTF8Test.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataUTF8Test.java 2006-11-14 00:12:28 UTC (rev 5636)
+++ trunk/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataUTF8Test.java 2006-11-14 01:04:15 UTC (rev 5637)
@@ -31,6 +31,7 @@
import org.jboss.portal.test.framework.driver.http.response.InvokePostResponse;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
+import org.jboss.portal.common.http.HttpRequest;
import org.jboss.portal.test.framework.server.driver.AbstractTest;
import javax.servlet.http.HttpServletRequest;
@@ -57,7 +58,7 @@
InvokePostResponse post = new InvokePostResponse();
post.setURL(s);
post.setContentType(PortalConstants.MULTIPART_FORM_DATA);
- post.setBody(new InvokePostResponse.FormBody());
+ post.setBody(new HttpRequest.Form());
return post;
}
else
Modified: trunk/server/src/main/org/jboss/portal/test/server/charset/PostTest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/charset/PostTest.java 2006-11-14 00:12:28 UTC (rev 5636)
+++ trunk/server/src/main/org/jboss/portal/test/server/charset/PostTest.java 2006-11-14 01:04:15 UTC (rev 5637)
@@ -29,6 +29,7 @@
import org.jboss.portal.common.test.driver.response.EndTestResponse;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
+import org.jboss.portal.common.http.HttpRequest;
import org.jboss.portal.test.framework.driver.http.response.InvokePostResponse;
import org.jboss.portal.test.framework.server.driver.AbstractTest;
@@ -55,7 +56,7 @@
String s = invocation.getResponse().encodeURL(url);
InvokePostResponse post = new InvokePostResponse();
post.setURL(s);
- post.setBody(new InvokePostResponse.FormBody());
+ post.setBody(new HttpRequest.Form());
return post;
}
else
Modified: trunk/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedNoCharsetTest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedNoCharsetTest.java 2006-11-14 00:12:28 UTC (rev 5636)
+++ trunk/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedNoCharsetTest.java 2006-11-14 01:04:15 UTC (rev 5637)
@@ -32,6 +32,7 @@
import org.jboss.portal.common.test.driver.response.EndTestResponse;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
+import org.jboss.portal.common.http.HttpRequest;
import javax.servlet.http.HttpServletRequest;
@@ -58,7 +59,7 @@
InvokePostResponse post = new InvokePostResponse();
post.setURL(s);
post.setContentType(PortalConstants.APPLICATION_X_WWW_FORM_URLENCODED);
- post.setBody(new InvokePostResponse.FormBody());
+ post.setBody(new HttpRequest.Form());
return post;
}
else
Modified: trunk/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedUTF8Test.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedUTF8Test.java 2006-11-14 00:12:28 UTC (rev 5636)
+++ trunk/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedUTF8Test.java 2006-11-14 01:04:15 UTC (rev 5637)
@@ -31,6 +31,7 @@
import org.jboss.portal.test.framework.driver.http.response.InvokePostResponse;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
+import org.jboss.portal.common.http.HttpRequest;
import org.jboss.portal.test.framework.server.driver.AbstractTest;
import javax.servlet.http.HttpServletRequest;
@@ -57,7 +58,7 @@
InvokePostResponse post = new InvokePostResponse();
post.setURL(s);
post.setContentType(PortalConstants.APPLICATION_X_WWW_FORM_URLENCODED + "; charset=" + PortalConstants.UTF_8.name());
- post.setBody(new InvokePostResponse.FormBody());
+ post.setBody(new HttpRequest.Form());
return post;
}
else
Modified: trunk/server/src/main/org/jboss/portal/test/server/parameters/PostApplicationXWWWFormURLEncodedTest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/parameters/PostApplicationXWWWFormURLEncodedTest.java 2006-11-14 00:12:28 UTC (rev 5636)
+++ trunk/server/src/main/org/jboss/portal/test/server/parameters/PostApplicationXWWWFormURLEncodedTest.java 2006-11-14 01:04:15 UTC (rev 5637)
@@ -32,6 +32,7 @@
import org.jboss.portal.test.server.Utils;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
+import org.jboss.portal.common.http.HttpRequest;
import java.util.Map;
@@ -54,7 +55,7 @@
{
AbstractServerURL url = new AbstractServerURL();
url.setPortalRequestPath("/index.html");
- InvokePostResponse.FormBody body = new InvokePostResponse.FormBody();
+ HttpRequest.Form body = new HttpRequest.Form();
//
url.setParameterValue("a", "b");
Modified: trunk/server/src/main/org/jboss/portal/test/server/parameters/PostMultipartFormDataTest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/parameters/PostMultipartFormDataTest.java 2006-11-14 00:12:28 UTC (rev 5636)
+++ trunk/server/src/main/org/jboss/portal/test/server/parameters/PostMultipartFormDataTest.java 2006-11-14 01:04:15 UTC (rev 5637)
@@ -31,6 +31,7 @@
import org.jboss.portal.test.framework.server.driver.AbstractTest;
import org.jboss.portal.common.test.driver.response.EndTestResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
+import org.jboss.portal.common.http.HttpRequest;
import java.util.Map;
@@ -52,7 +53,7 @@
{
AbstractServerURL url = new AbstractServerURL();
url.setPortalRequestPath("/index.html");
- InvokePostResponse.FormBody body = new InvokePostResponse.FormBody();
+ HttpRequest.Form body = new HttpRequest.Form();
//
url.setParameterValue("a", "b");
Modified: trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriverClient.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriverClient.java 2006-11-14 00:12:28 UTC (rev 5636)
+++ trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriverClient.java 2006-11-14 01:04:15 UTC (rev 5637)
@@ -41,6 +41,7 @@
import org.jboss.portal.common.test.info.TestItemInfo;
import org.jboss.portal.common.http.HttpHeader;
import org.jboss.portal.common.http.HttpHeaders;
+import org.jboss.portal.common.http.HttpRequest;
import org.jboss.portal.test.framework.server.Node;
import org.jboss.portal.test.framework.server.NodeId;
import org.jboss.portal.test.framework.server.NodeManager;
@@ -63,7 +64,6 @@
import java.util.Collection;
import java.util.ArrayList;
import java.util.Iterator;
-import java.util.Map;
import junit.framework.AssertionFailedError;
@@ -220,7 +220,7 @@
else if (resp instanceof InvokePostResponse)
{
InvokePostResponse ipr = (InvokePostResponse)resp;
- DoPostCommand.Body dpcb = ipr.getBody().getBody();
+ HttpRequest.Body dpcb = ipr.getBody();
return new DoPostCommand(ipr.getURL(), ipr.getContentType(), dpcb);
}
else
@@ -270,26 +270,25 @@
{
post = new PostMethod(doPostCmd.getURL());
post.setFollowRedirects(false);
- DoPostCommand.Body body = doPostCmd.getBody();
+ HttpRequest.Body body = doPostCmd.getBody();
if (doPostCmd.getContentType() != null)
{
post.addRequestHeader("Content-Type", doPostCmd.getContentType());
}
- if (body instanceof DoPostCommand.RawBody)
+ if (body instanceof HttpRequest.Raw)
{
- DoPostCommand.RawBody rb = (DoPostCommand.RawBody)body;
+ HttpRequest.Raw rb = (HttpRequest.Raw)body;
ByteArrayRequestEntity entity = new ByteArrayRequestEntity(rb.getBytes());
post.setRequestEntity(entity);
}
- else if (body instanceof DoPostCommand.FormBody)
+ else if (body instanceof HttpRequest.Form)
{
- DoPostCommand.FormBody fb = (DoPostCommand.FormBody)body;
+ HttpRequest.Form fb = (HttpRequest.Form)body;
Collection tmp = new ArrayList();
- for (Iterator i = fb.getParameters().entrySet().iterator(); i.hasNext();)
+ for (Iterator i = fb.getParameterNames().iterator(); i.hasNext();)
{
- Map.Entry entry = (Map.Entry)i.next();
- String name = (String)entry.getKey();
- String[] values = (String[])entry.getValue();
+ String name = (String)i.next();
+ String[] values = fb.getParameterValues(name);
for (int j = 0; j < values.length; j++)
{
String value = values[j];
@@ -318,13 +317,12 @@
try
{
get = new GetMethod(doGetCmd.getURL());
- Map headers = doGetCmd.getHeaders();
- for (Iterator i = headers.entrySet().iterator(); i.hasNext();)
+ HttpHeaders headers = doGetCmd.getHeaders();
+ for (Iterator i = headers.headers();i.hasNext();)
{
- Map.Entry entry = (Map.Entry)i.next();
- String headerName = (String)entry.getKey();
- String headerValue = (String)entry.getValue();
- get.setRequestHeader(headerName, headerValue);
+ HttpHeader header = (HttpHeader)i.next();
+ Header _header = new Header(header.getName(), header.getValue());
+ get.addRequestHeader(_header);
}
get.setFollowRedirects(false);
executeMethod(get);
Modified: trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/DoGetCommand.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/DoGetCommand.java 2006-11-14 00:12:28 UTC (rev 5636)
+++ trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/DoGetCommand.java 2006-11-14 01:04:15 UTC (rev 5637)
@@ -22,8 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.framework.driver.http.command;
-import java.util.Collections;
-import java.util.Map;
+import org.jboss.portal.common.http.HttpHeaders;
/**
* Perform a get.
@@ -38,14 +37,14 @@
private String url;
/** . */
- private Map headers;
+ private HttpHeaders headers;
public DoGetCommand(String url)
{
- this(url, Collections.EMPTY_MAP);
+ this(url, new HttpHeaders());
}
- public DoGetCommand(String url, Map headers)
+ public DoGetCommand(String url, HttpHeaders headers)
{
if (url == null)
{
@@ -64,7 +63,7 @@
return url;
}
- public Map getHeaders()
+ public HttpHeaders getHeaders()
{
return headers;
}
Modified: trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/DoPostCommand.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/DoPostCommand.java 2006-11-14 00:12:28 UTC (rev 5636)
+++ trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/DoPostCommand.java 2006-11-14 01:04:15 UTC (rev 5637)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.framework.driver.http.command;
-import java.util.Map;
+import org.jboss.portal.common.http.HttpRequest;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -35,9 +35,9 @@
private String contentType;
- private Body body;
+ private HttpRequest.Body body;
- public DoPostCommand(String url, String contentType, Body body)
+ public DoPostCommand(String url, String contentType, HttpRequest.Body body)
{
if (url == null)
{
@@ -62,51 +62,8 @@
return contentType;
}
- public Body getBody()
+ public HttpRequest.Body getBody()
{
return body;
}
-
- public abstract static class Body
- {
- }
-
- public static class FormBody extends Body
- {
- private Map parameters;
-
- public FormBody(Map parameters)
- {
- if (parameters == null)
- {
- throw new IllegalArgumentException();
- }
- this.parameters = parameters;
- }
-
- public Map getParameters()
- {
- return parameters;
- }
- }
-
- public static class RawBody extends Body
- {
- private final byte[] bytes;
-
- public RawBody(byte[] bytes)
- {
- if (bytes == null)
- {
- throw new IllegalArgumentException();
- }
- this.bytes = bytes;
- }
-
- public byte[] getBytes()
- {
- return bytes;
- }
- }
-
}
Modified: trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/InvokeGetResponse.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/InvokeGetResponse.java 2006-11-14 00:12:28 UTC (rev 5636)
+++ trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/InvokeGetResponse.java 2006-11-14 01:04:15 UTC (rev 5637)
@@ -22,8 +22,8 @@
******************************************************************************/
package org.jboss.portal.test.framework.driver.http.response;
-import java.util.HashMap;
-import java.util.Map;
+import org.jboss.portal.common.http.HttpHeaders;
+import org.jboss.portal.common.http.HttpHeader;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -40,7 +40,7 @@
private String url;
/** . */
- private Map headers;
+ private HttpHeaders headers;
public InvokeGetResponse(String url)
{
@@ -49,7 +49,7 @@
throw new IllegalArgumentException("Cannot invoke against a null URL");
}
this.url = url;
- this.headers = new HashMap();
+ this.headers = new HttpHeaders();
}
public String getURL()
@@ -57,21 +57,16 @@
return url;
}
- public void setHeader(String headerName, String headerValue)
+ public HttpHeader addHeader(String headerName)
{
if (headerName == null)
{
throw new IllegalArgumentException("No null header name accepted");
}
- if (headerValue == null)
- {
- throw new IllegalArgumentException("No null header value accepted");
- }
- headers.put(headerName, headerValue);
+ return headers.addHeader(headerName);
}
-
- public Map getHeaders()
+ public HttpHeaders getHeaders()
{
return headers;
}
Modified: trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/InvokePostResponse.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/InvokePostResponse.java 2006-11-14 00:12:28 UTC (rev 5636)
+++ trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/InvokePostResponse.java 2006-11-14 01:04:15 UTC (rev 5637)
@@ -22,14 +22,8 @@
******************************************************************************/
package org.jboss.portal.test.framework.driver.http.response;
-import org.jboss.portal.test.framework.driver.http.command.DoPostCommand;
+import org.jboss.portal.common.http.HttpRequest;
-import java.io.Serializable;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
/**
* The portlet wants to invoke a post.
*
@@ -55,7 +49,7 @@
private String contentType;
/** The post body. */
- private Body body;
+ private HttpRequest.Body body;
public String getURL()
{
@@ -67,12 +61,12 @@
this.url = url;
}
- public Body getBody()
+ public HttpRequest.Body getBody()
{
return body;
}
- public void setBody(Body body)
+ public void setBody(HttpRequest.Body body)
{
this.body = body;
}
@@ -86,105 +80,4 @@
{
this.contentType = contentType;
}
-
-// public RunnerCommand createCommand()
-// {
-// if (url == null)
-// {
-// throw new IllegalStateException("No url");
-// }
-// if (body == null)
-// {
-// throw new IllegalStateException("No body");
-// }
-// DoPostCommand.Body dpcb = body.getBody();
-// return new DoPostCommand(url, contentType, dpcb);
-// }
-
- public abstract static class Body implements Serializable
- {
- public abstract DoPostCommand.Body getBody() throws IllegalStateException;
- }
-
- public static class RawBody extends Body
- {
-
- private byte[] bytes;
-
- public byte[] getBytes()
- {
- return bytes;
- }
-
- public void setBytes(byte[] bytes)
- {
- this.bytes = bytes;
- }
-
- public DoPostCommand.Body getBody()
- {
- if (bytes == null)
- {
- throw new IllegalStateException("No bytes");
- }
- DoPostCommand.RawBody dpcb = new DoPostCommand.RawBody(bytes);
- return dpcb;
- }
- }
-
- public static class FormBody extends Body
- {
-
- private Map parameters = new HashMap();
-
- public void addParameter(String name, String[] values)
- {
- if (name == null)
- {
- throw new IllegalStateException();
- }
- if (values == null)
- {
- throw new IllegalStateException();
- }
- for (int i = 0; i < values.length; i++)
- {
- String value = values[i];
- if (value == null)
- {
- throw new IllegalStateException();
- }
- }
- parameters.put(name, values.clone());
- }
-
- public void removeParameter(String name)
- {
- if (name == null)
- {
- throw new IllegalStateException();
- }
- parameters.remove(name);
- }
-
- public Set getParameterNames()
- {
- return Collections.unmodifiableSet(parameters.keySet());
- }
-
- public String[] getParameterValue(String name)
- {
- if (name == null)
- {
- throw new IllegalStateException();
- }
- String[] values = (String[])parameters.get(name);
- return (String[])values.clone();
- }
-
- public DoPostCommand.Body getBody()
- {
- return new DoPostCommand.FormBody(parameters);
- }
- }
}
More information about the jboss-svn-commits
mailing list