svn commit: r768023 - in /incubator/shindig/trunk/java/common/src: main/java/org/apache/shindig/protocol/ main/java/org/apache/shindig/protocol/multipart/ test/java/org/apache/shindig/protocol/

[aw...@apache.org]

Author: awiner
Date: Thu Apr 23 19:27:40 2009
New Revision: 768023

URL: http://svn.apache.org/viewvc?rev=768023&view=rev
Log:
SHINDIG-1021:  Support getAsText in FormDataItem (to avoid encoding/decoding from String <-> byte[]) 
- Checked in patch from Sachin Shenoy.  Changed getAsText() to getAsString().

Modified:
    incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java
    incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/multipart/CommonsFormDataItem.java
    incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/multipart/FormDataItem.java
    incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/JsonRpcServletTest.java

Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java?rev=768023&r1=768022&r2=768023&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java Thu Apr 23 19:27:40 2009
@@ -115,7 +115,7 @@
             if (!StringUtils.isEmpty(item.getContentType())) {
               checkContentTypes(ContentTypes.ALLOWED_JSON_CONTENT_TYPES, item.getContentType());
             }
-            content = IOUtils.toString(item.getInputStream());
+            content = item.getAsString();
           } else {
             formItems.put(item.getFieldName(), item);
           }

Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/multipart/CommonsFormDataItem.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/multipart/CommonsFormDataItem.java?rev=768023&r1=768022&r2=768023&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/multipart/CommonsFormDataItem.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/multipart/CommonsFormDataItem.java Thu Apr 23 19:27:40 2009
@@ -36,6 +36,10 @@
     return fileItem.get();
   }
 
+  public String getAsString() {
+    return fileItem.getString();
+  }
+
   public String getContentType() {
     return fileItem.getContentType();
   }

Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/multipart/FormDataItem.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/multipart/FormDataItem.java?rev=768023&r1=768022&r2=768023&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/multipart/FormDataItem.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/multipart/FormDataItem.java Thu Apr 23 19:27:40 2009
@@ -56,6 +56,13 @@
   byte[] get();
 
   /**
+   * Returns the content of the field item as text.
+   *
+   * @return content of the field item as text
+   */
+  String getAsString();
+
+  /**
    * Name of the uploaded file, if the item represents file upload.
    * This will be only valid when {@link #isFormField()} returns false.
    * 

Modified: incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/JsonRpcServletTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/JsonRpcServletTest.java?rev=768023&r1=768022&r2=768023&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/JsonRpcServletTest.java (original)
+++ incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/JsonRpcServletTest.java Thu Apr 23 19:27:40 2009
@@ -374,6 +374,7 @@
     expect(formDataItem.getContentType()).andStubReturn(contentType);
     expect(formDataItem.getSize()).andStubReturn((long) content.length);
     expect(formDataItem.get()).andStubReturn(content);
+    expect(formDataItem.getAsString()).andStubReturn(new String(content));
     expect(formDataItem.getFieldName()).andStubReturn(fieldName);
     expect(formDataItem.isFormField()).andStubReturn(isFormField);
     expect(formDataItem.getInputStream()).andStubReturn(in);