remove lazy loading

This commit is contained in:
Jeremie Panzer
2013-03-26 11:36:31 +01:00
parent 8f1061a8b2
commit e5e40dac23
6 changed files with 53 additions and 48 deletions

View File

@@ -1,5 +1,7 @@
package com.commafeed.frontend.rest;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -66,7 +68,9 @@ public class JSONMessageBodyReaderWriter implements MessageBodyWriter<Object>,
WebApplicationException {
httpHeaders.putSingle(HttpHeaders.CONTENT_TYPE, mediaType.toString()
+ ";charset=UTF-8");
OutputStreamWriter writer = new OutputStreamWriter(entityStream, UTF_8);
OutputStreamWriter writer = new OutputStreamWriter(
new BufferedOutputStream(entityStream), UTF_8);
try {
Type jsonType;
if (type.equals(genericType)) {
@@ -85,8 +89,8 @@ public class JSONMessageBodyReaderWriter implements MessageBodyWriter<Object>,
Annotation[] annotations, MediaType mediaType,
MultivaluedMap<String, String> httpHeaders, InputStream entityStream)
throws IOException, WebApplicationException {
InputStreamReader streamReader = new InputStreamReader(entityStream,
UTF_8);
InputStreamReader reader = new InputStreamReader(
new BufferedInputStream(entityStream), UTF_8);
try {
Type jsonType;
if (type.equals(genericType)) {
@@ -94,9 +98,9 @@ public class JSONMessageBodyReaderWriter implements MessageBodyWriter<Object>,
} else {
jsonType = genericType;
}
return getGson().fromJson(streamReader, jsonType);
return getGson().fromJson(reader, jsonType);
} finally {
streamReader.close();
reader.close();
}
}