Author: etnu
Date: Sat May 24 20:51:39 2008
New Revision: 659906
URL: http://svn.apache.org/viewvc?rev=659906&view=rev
Log:
Removed all references to org.apache.shindig.common.util.InputStreamConsumer.
Class will be removed entirely before our first release.
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/InputStreamConsumer.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/ResourceLoader.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SigningFetcherFactory.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpRequestTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseTest.java
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/InputStreamConsumer.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/InputStreamConsumer.java?rev=659906&r1=659905&r2=659906&view=diff
==============================================================================
---
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/InputStreamConsumer.java
(original)
+++
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/InputStreamConsumer.java
Sat May 24 20:51:39 2008
@@ -28,6 +28,9 @@
* Used to consume entire input streams and transform them into data buffers.
* These are all blocking routines and should never be called from a thread
* that will cause deadlock.
+ *
+ * @deprecated Use org.apache.commons.io.IOUtils instead.
+ * This will be removed some time before the Shindig 1.0 release.
*/
@Deprecated
public class InputStreamConsumer {
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/ResourceLoader.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/ResourceLoader.java?rev=659906&r1=659905&r2=659906&view=diff
==============================================================================
---
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/ResourceLoader.java
(original)
+++
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/ResourceLoader.java
Sat May 24 20:51:39 2008
@@ -19,6 +19,8 @@
package org.apache.shindig.common.util;
+import org.apache.commons.io.IOUtils;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@@ -69,7 +71,7 @@
* @throws IOException
*/
public static String getContent(String resource) throws IOException {
- return InputStreamConsumer.readToString(openResource(resource));
+ return IOUtils.toString(openResource(resource), "UTF-8");
}
/**
@@ -78,6 +80,6 @@
* @throws IOException
*/
public static String getContent(File file) throws IOException {
- return InputStreamConsumer.readToString(new FileInputStream(file));
+ return IOUtils.toString(new FileInputStream(file), "UTF-8");
}
}
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SigningFetcherFactory.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SigningFetcherFactory.java?rev=659906&r1=659905&r2=659906&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SigningFetcherFactory.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SigningFetcherFactory.java
Sat May 24 20:51:39 2008
@@ -19,7 +19,6 @@
package org.apache.shindig.gadgets;
import org.apache.shindig.common.SecurityToken;
-import org.apache.shindig.common.util.InputStreamConsumer;
import org.apache.shindig.common.util.ResourceLoader;
import org.apache.shindig.gadgets.http.HttpCache;
import org.apache.shindig.gadgets.http.HttpFetcher;
@@ -27,6 +26,8 @@
import com.google.inject.Inject;
import com.google.inject.name.Named;
+import org.apache.commons.io.IOUtils;
+
import java.io.IOException;
/**
@@ -80,8 +81,7 @@
}
String privateKey = null;
try {
- privateKey
- = InputStreamConsumer.readToString(ResourceLoader.open(keyFile));
+ privateKey = IOUtils.toString(ResourceLoader.open(keyFile), "UTF-8");
} catch (IOException e) {
privateKey = "";
}
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java?rev=659906&r1=659905&r2=659906&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java
Sat May 24 20:51:39 2008
@@ -20,7 +20,7 @@
import com.google.inject.Inject;
import com.google.inject.Singleton;
-import org.apache.shindig.common.util.InputStreamConsumer;
+import org.apache.commons.io.IOUtils;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -130,7 +130,7 @@
is = new InflaterInputStream(fetcher.getInputStream(), inflater);
}
- byte[] body = InputStreamConsumer.readToByteArray(is, maxObjSize);
+ byte[] body = IOUtils.toByteArray(is);
return new HttpResponse(responseCode, body, headers);
}
@@ -150,8 +150,7 @@
fetcher.setUseCaches(false);
fetcher.setDoInput(true);
fetcher.setDoOutput(true);
- InputStreamConsumer.pipe(request.getPostBody(),
- fetcher.getOutputStream());
+ IOUtils.copy(request.getPostBody(), fetcher.getOutputStream());
}
response = makeResponse(fetcher);
return cache.addResponse(request, response);
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java?rev=659906&r1=659905&r2=659906&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java
Sat May 24 20:51:39 2008
@@ -18,12 +18,9 @@
*/
package org.apache.shindig.gadgets.servlet;
-import com.google.inject.Inject;
-
import org.apache.shindig.common.SecurityToken;
import org.apache.shindig.common.SecurityTokenDecoder;
import org.apache.shindig.common.SecurityTokenException;
-import org.apache.shindig.common.util.InputStreamConsumer;
import org.apache.shindig.gadgets.GadgetException;
import org.apache.shindig.gadgets.LockedDomainService;
import org.apache.shindig.gadgets.http.ContentFetcherFactory;
@@ -34,6 +31,10 @@
import org.apache.shindig.gadgets.rewrite.ContentRewriter;
import org.apache.shindig.gadgets.spec.Auth;
import org.apache.shindig.gadgets.spec.Preload;
+
+import com.google.inject.Inject;
+
+import org.apache.commons.io.IOUtils;
import org.json.JSONException;
import org.json.JSONObject;
@@ -335,7 +336,7 @@
}
}
response.getOutputStream().write(
- InputStreamConsumer.readToByteArray(results.getResponse()));
+ IOUtils.toByteArray(results.getResponse()));
}
}
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java?rev=659906&r1=659905&r2=659906&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java
Sat May 24 20:51:39 2008
@@ -19,10 +19,10 @@
package org.apache.shindig.gadgets.servlet;
import org.apache.shindig.common.servlet.InjectedServlet;
-import org.apache.shindig.common.util.InputStreamConsumer;
import com.google.inject.Inject;
+import org.apache.commons.io.IOUtils;
import org.json.JSONException;
import org.json.JSONObject;
@@ -66,7 +66,7 @@
}
ServletInputStream is = request.getInputStream();
- byte[] body = InputStreamConsumer.readToByteArray(is, length);
+ byte[] body = IOUtils.toByteArray(is);
if (body.length != length) {
logger.info("Wrong size. Length: " + length + " real: " + body.length);
response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpRequestTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpRequestTest.java?rev=659906&r1=659905&r2=659906&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpRequestTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpRequestTest.java
Sat May 24 20:51:39 2008
@@ -18,7 +18,7 @@
*/
package org.apache.shindig.gadgets.http;
-import org.apache.shindig.common.util.InputStreamConsumer;
+import org.apache.commons.io.IOUtils;
import junit.framework.TestCase;
@@ -39,8 +39,7 @@
HttpRequest request
= new HttpRequest(DEFAULT_URI, POST_BODY.getBytes());
assertEquals(POST_BODY.length(), request.getPostBodyLength());
- assertEquals(POST_BODY,
- InputStreamConsumer.readToString(request.getPostBody()));
+ assertEquals(POST_BODY, IOUtils.toString(request.getPostBody(), "UTF-8"));
}
public void testContentTypeExtraction() throws Exception {
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseTest.java?rev=659906&r1=659905&r2=659906&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseTest.java
Sat May 24 20:51:39 2008
@@ -17,9 +17,9 @@
*/
package org.apache.shindig.gadgets.http;
-import junit.framework.TestCase;
+import org.apache.commons.io.IOUtils;
-import org.apache.shindig.common.util.InputStreamConsumer;
+import junit.framework.TestCase;
import java.util.Arrays;
import java.util.HashMap;
@@ -87,7 +87,7 @@
};
addHeader("Content-Type", "application/octet-stream");
HttpResponse response = new HttpResponse(200, data, headers);
- byte[] out = InputStreamConsumer.readToByteArray(response.getResponse());
+ byte[] out = IOUtils.toByteArray(response.getResponse());
assertTrue(Arrays.equals(data, out));
}
