andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix up code to work with java5. See #286

Browse Source
This commit is contained in:
Norman Maurer 2012-04-29 13:38:56 +02:00
parent ced80f3ae2
commit 5219a59597
15 changed files with 143 additions and 260 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/org/jboss/netty/handler/codec/http/AbstractDiskHttpData.java
View File

@ -93,7 +93,6 @@ public abstract class AbstractDiskHttpData extends AbstractHttpData {
return tmpFile;
}
@Override
public void setContent(ChannelBuffer buffer) throws IOException {
if (buffer == null) {
throw new NullPointerException("buffer");
@ -123,7 +122,6 @@ public abstract class AbstractDiskHttpData extends AbstractHttpData {
completed = true;
}
@Override
public void addContent(ChannelBuffer buffer, boolean last)
throws IOException {
if (buffer != null) {
@ -166,7 +164,6 @@ public abstract class AbstractDiskHttpData extends AbstractHttpData {
}
}
@Override
public void setContent(File file) throws IOException {
if (this.file != null) {
delete();
@ -177,7 +174,6 @@ public abstract class AbstractDiskHttpData extends AbstractHttpData {
completed = true;
}
@Override
public void setContent(InputStream inputStream) throws IOException {
if (inputStream == null) {
throw new NullPointerException("inputStream");
@ -208,7 +204,6 @@ public abstract class AbstractDiskHttpData extends AbstractHttpData {
completed = true;
}
@Override
public void delete() {
if (! isRenamed) {
if (file != null) {
@ -217,7 +212,6 @@ public abstract class AbstractDiskHttpData extends AbstractHttpData {
}
}
@Override
public byte[] get() throws IOException {
if (file == null) {
return new byte[0];
@ -225,7 +219,6 @@ public abstract class AbstractDiskHttpData extends AbstractHttpData {
return readFrom(file);
}
@Override
public ChannelBuffer getChannelBuffer() throws IOException {
if (file == null) {
return ChannelBuffers.EMPTY_BUFFER;
@ -234,7 +227,6 @@ public abstract class AbstractDiskHttpData extends AbstractHttpData {
return ChannelBuffers.wrappedBuffer(array);
}
@Override
public ChannelBuffer getChunk(int length) throws IOException {
if (file == null || length == 0) {
return ChannelBuffers.EMPTY_BUFFER;
@ -265,30 +257,26 @@ public abstract class AbstractDiskHttpData extends AbstractHttpData {
return buffer;
}
@Override
public String getString() throws IOException {
return getString(HttpCodecUtil.DEFAULT_CHARSET);
}
@Override
public String getString(Charset encoding) throws IOException {
if (file == null) {
return "";
}
if (encoding == null) {
byte[] array = readFrom(file);
return new String(array, HttpCodecUtil.DEFAULT_CHARSET);
return new String(array, HttpCodecUtil.DEFAULT_CHARSET.name());
}
byte[] array = readFrom(file);
return new String(array, encoding);
return new String(array, encoding.name());
}
@Override
public boolean isInMemory() {
return false;
}
@Override
public boolean renameTo(File dest) throws IOException {
if (dest == null) {
throw new NullPointerException("dest");
@ -339,7 +327,6 @@ public abstract class AbstractDiskHttpData extends AbstractHttpData {
return array;
}
@Override
public File getFile() throws IOException {
return file;
}

5
src/main/java/org/jboss/netty/handler/codec/http/AbstractHttpData.java
View File

@ -67,22 +67,18 @@ public abstract class AbstractHttpData implements HttpData {
definedSize = size;
}
@Override
public String getName() {
return name;
}
@Override
public boolean isCompleted() {
return completed;
}
@Override
public Charset getCharset() {
return charset;
}
@Override
public void setCharset(Charset charset) {
if (charset == null) {
throw new NullPointerException("charset");
@ -90,7 +86,6 @@ public abstract class AbstractHttpData implements HttpData {
this.charset = charset;
}
@Override
public long length() {
return size;
}

13
src/main/java/org/jboss/netty/handler/codec/http/AbstractMemoryHttpData.java
View File

@ -40,7 +40,6 @@ public abstract class AbstractMemoryHttpData extends AbstractHttpData {
super(name, charset, size);
}
@Override
public void setContent(ChannelBuffer buffer) throws IOException {
if (buffer == null) {
throw new NullPointerException("buffer");
@ -55,7 +54,6 @@ public abstract class AbstractMemoryHttpData extends AbstractHttpData {
completed = true;
}
@Override
public void setContent(InputStream inputStream) throws IOException {
if (inputStream == null) {
throw new NullPointerException("inputStream");
@ -77,7 +75,6 @@ public abstract class AbstractMemoryHttpData extends AbstractHttpData {
completed = true;
}
@Override
public void addContent(ChannelBuffer buffer, boolean last)
throws IOException {
if (buffer != null) {
@ -103,7 +100,6 @@ public abstract class AbstractMemoryHttpData extends AbstractHttpData {
}
}
@Override
public void setContent(File file) throws IOException {
if (file == null) {
throw new NullPointerException("file");
@ -128,12 +124,10 @@ public abstract class AbstractMemoryHttpData extends AbstractHttpData {
completed = true;
}
@Override
public void delete() {
// nothing to do
}
@Override
public byte[] get() {
if (channelBuffer == null) {
return new byte[0];
@ -143,12 +137,10 @@ public abstract class AbstractMemoryHttpData extends AbstractHttpData {
return array;
}
@Override
public String getString() {
return getString(HttpCodecUtil.DEFAULT_CHARSET);
}
@Override
public String getString(Charset encoding) {
if (channelBuffer == null) {
return "";
@ -164,12 +156,10 @@ public abstract class AbstractMemoryHttpData extends AbstractHttpData {
* to a Disk (or another implementation) FileUpload
* @return the attached ChannelBuffer containing the actual bytes
*/
@Override
public ChannelBuffer getChannelBuffer() {
return channelBuffer;
}
@Override
public ChannelBuffer getChunk(int length) throws IOException {
if (channelBuffer == null || length == 0 || channelBuffer.readableBytes() == 0) {
chunkPosition = 0;
@ -189,12 +179,10 @@ public abstract class AbstractMemoryHttpData extends AbstractHttpData {
return chunk;
}
@Override
public boolean isInMemory() {
return true;
}
@Override
public boolean renameTo(File dest) throws IOException {
if (dest == null) {
throw new NullPointerException("dest");
@ -219,7 +207,6 @@ public abstract class AbstractMemoryHttpData extends AbstractHttpData {
return written == length;
}
@Override
public File getFile() throws IOException {
throw new IOException("Not represented by a file");
}

6
src/main/java/org/jboss/netty/handler/codec/http/DefaultHttpDataFactory.java
View File

@ -90,7 +90,6 @@ public class DefaultHttpDataFactory implements HttpDataFactory {
return list;
}
@Override
public Attribute createAttribute(HttpRequest request, String name) {
if (useDisk) {
Attribute attribute = new DiskAttribute(name);
@ -106,7 +105,6 @@ public class DefaultHttpDataFactory implements HttpDataFactory {
return new MemoryAttribute(name);
}
@Override
public Attribute createAttribute(HttpRequest request, String name, String value) {
if (useDisk) {
Attribute attribute;
@ -132,7 +130,6 @@ public class DefaultHttpDataFactory implements HttpDataFactory {
}
}
@Override
public FileUpload createFileUpload(HttpRequest request, String name, String filename,
String contentType, String contentTransferEncoding, Charset charset,
long size) {
@ -153,7 +150,6 @@ public class DefaultHttpDataFactory implements HttpDataFactory {
contentTransferEncoding, charset, size);
}
@Override
public void removeHttpDataFromClean(HttpRequest request, InterfaceHttpData data) {
if (data instanceof HttpData) {
List<HttpData> fileToDelete = getList(request);
@ -161,7 +157,6 @@ public class DefaultHttpDataFactory implements HttpDataFactory {
}
}
@Override
public void cleanRequestHttpDatas(HttpRequest request) {
List<HttpData> fileToDelete = requestFileDeleteMap.remove(request);
if (fileToDelete != null) {
@ -172,7 +167,6 @@ public class DefaultHttpDataFactory implements HttpDataFactory {
}
}
@Override
public void cleanAllHttpDatas() {
for (HttpRequest request : requestFileDeleteMap.keySet()) {
List<HttpData> fileToDelete = requestFileDeleteMap.get(request);

8
src/main/java/org/jboss/netty/handler/codec/http/DiskAttribute.java
View File

@ -52,23 +52,20 @@ public class DiskAttribute extends AbstractDiskHttpData implements Attribute {
setValue(value);
}
@Override
public HttpDataType getHttpDataType() {
return HttpDataType.Attribute;
}
@Override
public String getValue() throws IOException {
byte [] bytes = get();
return new String(bytes, charset);
return new String(bytes, charset.name());
}
@Override
public void setValue(String value) throws IOException {
if (value == null) {
throw new NullPointerException("value");
}
byte [] bytes = value.getBytes(charset);
byte [] bytes = value.getBytes(charset.name());
ChannelBuffer buffer = ChannelBuffers.wrappedBuffer(bytes);
if (definedSize > 0) {
definedSize = buffer.readableBytes();
@ -98,7 +95,6 @@ public class DiskAttribute extends AbstractDiskHttpData implements Attribute {
return getName().equalsIgnoreCase(attribute.getName());
}
@Override
public int compareTo(InterfaceHttpData arg0) {
if (!(arg0 instanceof Attribute)) {
throw new ClassCastException("Cannot compare " + getHttpDataType() +

8
src/main/java/org/jboss/netty/handler/codec/http/DiskFileUpload.java
View File

@ -44,17 +44,14 @@ public class DiskFileUpload extends AbstractDiskHttpData implements FileUpload {
setContentTransferEncoding(contentTransferEncoding);
}
@Override
public HttpDataType getHttpDataType() {
return HttpDataType.FileUpload;
}
@Override
public String getFilename() {
return filename;
}
@Override
public void setFilename(String filename) {
if (filename == null) {
throw new NullPointerException("filename");
@ -76,7 +73,6 @@ public class DiskFileUpload extends AbstractDiskHttpData implements FileUpload {
return getName().equalsIgnoreCase(attribute.getName());
}
@Override
public int compareTo(InterfaceHttpData arg0) {
if (!(arg0 instanceof FileUpload)) {
throw new ClassCastException("Cannot compare " + getHttpDataType() +
@ -95,7 +91,6 @@ public class DiskFileUpload extends AbstractDiskHttpData implements FileUpload {
return v;
}
@Override
public void setContentType(String contentType) {
if (contentType == null) {
throw new NullPointerException("contentType");
@ -103,17 +98,14 @@ public class DiskFileUpload extends AbstractDiskHttpData implements FileUpload {
this.contentType = contentType;
}
@Override
public String getContentType() {
return contentType;
}
@Override
public String getContentTransferEncoding() {
return contentTransferEncoding;
}
@Override
public void setContentTransferEncoding(String contentTransferEncoding) {
this.contentTransferEncoding = contentTransferEncoding;
}

2
src/main/java/org/jboss/netty/handler/codec/http/FileUpload.java
View File

@ -57,4 +57,4 @@ public interface FileUpload extends HttpData {
* @return the Content-Transfer-Encoding
*/
String getContentTransferEncoding();
}
}

272
src/main/java/org/jboss/netty/handler/codec/http/HttpData.java
View File

@ -26,156 +26,156 @@ import org.jboss.netty.buffer.ChannelBuffer;
* Extended interface for InterfaceHttpData
*/
public interface HttpData extends InterfaceHttpData {
/**
* Set the content from the ChannelBuffer (erase any previous data)
*
* @param buffer
* must be not null
* @exception IOException
*/
void setContent(ChannelBuffer buffer) throws IOException;
/**
* Set the content from the ChannelBuffer (erase any previous data)
*
* @param buffer
* must be not null
* @exception IOException
*/
void setContent(ChannelBuffer buffer) throws IOException;
/**
* Add the content from the ChannelBuffer
*
* @param buffer
* must be not null except if last is set to False
* @param last
* True of the buffer is the last one
* @exception IOException
*/
void addContent(ChannelBuffer buffer, boolean last) throws IOException;
/**
* Add the content from the ChannelBuffer
*
* @param buffer
* must be not null except if last is set to False
* @param last
* True of the buffer is the last one
* @exception IOException
*/
void addContent(ChannelBuffer buffer, boolean last) throws IOException;
/**
* Set the content from the file (erase any previous data)
*
* @param file
* must be not null
* @exception IOException
*/
void setContent(File file) throws IOException;
/**
* Set the content from the file (erase any previous data)
*
* @param file
* must be not null
* @exception IOException
*/
void setContent(File file) throws IOException;
/**
* Set the content from the inputStream (erase any previous data)
*
* @param inputStream
* must be not null
* @exception IOException
*/
void setContent(InputStream inputStream) throws IOException;
/**
* Set the content from the inputStream (erase any previous data)
*
* @param inputStream
* must be not null
* @exception IOException
*/
void setContent(InputStream inputStream) throws IOException;
/**
*
* @return True if the InterfaceHttpData is completed (all data are stored)
*/
boolean isCompleted();
/**
*
* @return True if the InterfaceHttpData is completed (all data are stored)
*/
boolean isCompleted();
/**
* Returns the size in byte of the InterfaceHttpData
*
* @return the size of the InterfaceHttpData
*/
long length();
/**
* Returns the size in byte of the InterfaceHttpData
*
* @return the size of the InterfaceHttpData
*/
long length();
/**
* Deletes the underlying storage for a file item, including deleting any
* associated temporary disk file.
*/
void delete();
/**
* Deletes the underlying storage for a file item, including deleting any
* associated temporary disk file.
*/
void delete();
/**
* Returns the contents of the file item as an array of bytes.
*
* @return the contents of the file item as an array of bytes.
* @exception IOException
*/
byte[] get() throws IOException;
/**
* Returns the contents of the file item as an array of bytes.
*
* @return the contents of the file item as an array of bytes.
* @exception IOException
*/
byte[] get() throws IOException;
/**
* Returns the content of the file item as a ChannelBuffer
*
* @return the content of the file item as a ChannelBuffer
* @throws IOException
*/
ChannelBuffer getChannelBuffer() throws IOException;
/**
* Returns the content of the file item as a ChannelBuffer
*
* @return the content of the file item as a ChannelBuffer
* @throws IOException
*/
ChannelBuffer getChannelBuffer() throws IOException;
/**
* Returns a ChannelBuffer for the content from the current position with at
* most length read bytes, increasing the current position of the Bytes
* read. Once it arrives at the end, it returns an EMPTY_BUFFER and it
* resets the current position to 0.
*
* @param length
* @return a ChannelBuffer for the content from the current position or an
* EMPTY_BUFFER if there is no more data to return
* @throws IOException
*/
ChannelBuffer getChunk(int length) throws IOException;
/**
* Returns a ChannelBuffer for the content from the current position with at
* most length read bytes, increasing the current position of the Bytes
* read. Once it arrives at the end, it returns an EMPTY_BUFFER and it
* resets the current position to 0.
*
* @param length
* @return a ChannelBuffer for the content from the current position or an
* EMPTY_BUFFER if there is no more data to return
* @throws IOException
*/
ChannelBuffer getChunk(int length) throws IOException;
/**
* Returns the contents of the file item as a String, using the default
* character encoding.
*
* @return the contents of the file item as a String, using the default
* character encoding.
* @exception IOException
*/
String getString() throws IOException;
/**
* Returns the contents of the file item as a String, using the default
* character encoding.
*
* @return the contents of the file item as a String, using the default
* character encoding.
* @exception IOException
*/
String getString() throws IOException;
/**
* Returns the contents of the file item as a String, using the specified
* charset.
*
* @param encoding
* the charset to use
* @return the contents of the file item as a String, using the specified
* charset.
* @exception IOException
*/
String getString(Charset encoding) throws IOException;
/**
* Returns the contents of the file item as a String, using the specified
* charset.
*
* @param encoding
* the charset to use
* @return the contents of the file item as a String, using the specified
* charset.
* @exception IOException
*/
String getString(Charset encoding) throws IOException;
/**
* Set the Charset passed by the browser if defined
*
* @param charset
* Charset to set - must be not null
*/
void setCharset(Charset charset);
/**
* Set the Charset passed by the browser if defined
*
* @param charset
* Charset to set - must be not null
*/
void setCharset(Charset charset);
/**
* Returns the Charset passed by the browser or null if not defined.
*
* @return the Charset passed by the browser or null if not defined.
*/
Charset getCharset();
/**
* Returns the Charset passed by the browser or null if not defined.
*
* @return the Charset passed by the browser or null if not defined.
*/
Charset getCharset();
/**
* A convenience method to write an uploaded item to disk. If a previous one
* exists, it will be deleted. Once this method is called, if successful,
* the new file will be out of the cleaner of the factory that creates the
* original InterfaceHttpData object.
*
* @param dest
* destination file - must be not null
* @return True if the write is successful
* @exception IOException
*/
boolean renameTo(File dest) throws IOException;
/**
* A convenience method to write an uploaded item to disk. If a previous one
* exists, it will be deleted. Once this method is called, if successful,
* the new file will be out of the cleaner of the factory that creates the
* original InterfaceHttpData object.
*
* @param dest
* destination file - must be not null
* @return True if the write is successful
* @exception IOException
*/
boolean renameTo(File dest) throws IOException;
/**
* Provides a hint as to whether or not the file contents will be read from
* memory.
*
* @return True if the file contents is in memory.
*/
boolean isInMemory();
/**
* Provides a hint as to whether or not the file contents will be read from
* memory.
*
* @return True if the file contents is in memory.
*/
boolean isInMemory();
/**
*
* @return the associated File if this data is represented in a file
* @exception IOException
* if this data is not represented by a file
*/
File getFile() throws IOException;
/**
*
* @return the associated File if this data is represented in a file
* @exception IOException
* if this data is not represented by a file
*/
File getFile() throws IOException;
}
}

4
src/main/java/org/jboss/netty/handler/codec/http/HttpDataFactory.java
View File

@ -17,8 +17,6 @@ package org.jboss.netty.handler.codec.http;
import java.nio.charset.Charset;
import org.jboss.netty.handler.codec.http.HttpRequest;
/**
* Interface to enable creation of InterfaceHttpData objects
*/
@ -77,4 +75,4 @@ public interface HttpDataFactory {
* Remove all InterfaceHttpData from virtual File storage from clean list for all requests
*/
void cleanAllHttpDatas();
}
}

3
src/main/java/org/jboss/netty/handler/codec/http/HttpPostRequestEncoder.java
View File

@ -855,7 +855,6 @@ public class HttpPostRequestEncoder implements ChunkedInput {
return new DefaultHttpChunk(buffer);
}
@Override
public void close() throws Exception {
//NO since the user can want to reuse (broadcast for instance) cleanFiles();
}
@ -867,7 +866,6 @@ public class HttpPostRequestEncoder implements ChunkedInput {
* @return the next available HttpChunk
* @throws ErrorDataEncoderException if the encoding is in error
*/
@Override
public HttpChunk nextChunk() throws ErrorDataEncoderException {
if (isLastChunk) {
isLastChunkSent = true;
@ -937,7 +935,6 @@ public class HttpPostRequestEncoder implements ChunkedInput {
return new DefaultHttpChunk(buffer);
}
@Override
public boolean isEndOfInput() throws Exception {
return isLastChunkSent;
}

3
src/main/java/org/jboss/netty/handler/codec/http/InternalAttribute.java
View File

@ -25,7 +25,6 @@ import java.util.List;
public class InternalAttribute implements InterfaceHttpData {
protected List<String> value = new ArrayList<String>();
@Override
public HttpDataType getHttpDataType() {
return HttpDataType.InternalAttribute;
}
@ -69,7 +68,6 @@ public class InternalAttribute implements InterfaceHttpData {
return getName().equalsIgnoreCase(attribute.getName());
}
@Override
public int compareTo(InterfaceHttpData arg0) {
if (!(arg0 instanceof InternalAttribute)) {
throw new ClassCastException("Cannot compare " + getHttpDataType() +
@ -98,7 +96,6 @@ public class InternalAttribute implements InterfaceHttpData {
return result.toString();
}
@Override
public String getName() {
return "InternalAttribute";
}

6
src/main/java/org/jboss/netty/handler/codec/http/MemoryAttribute.java
View File

@ -41,22 +41,19 @@ public class MemoryAttribute extends AbstractMemoryHttpData implements Attribute
setValue(value);
}
@Override
public HttpDataType getHttpDataType() {
return HttpDataType.Attribute;
}
@Override
public String getValue() {
return getChannelBuffer().toString(charset);
}
@Override
public void setValue(String value) throws IOException {
if (value == null) {
throw new NullPointerException("value");
}
byte [] bytes = value.getBytes(charset);
byte [] bytes = value.getBytes(charset.name());
ChannelBuffer buffer = ChannelBuffers.wrappedBuffer(bytes);
if (definedSize > 0) {
definedSize = buffer.readableBytes();
@ -87,7 +84,6 @@ public class MemoryAttribute extends AbstractMemoryHttpData implements Attribute
return getName().equalsIgnoreCase(attribute.getName());
}
@Override
public int compareTo(InterfaceHttpData arg0) {
if (!(arg0 instanceof Attribute)) {
throw new ClassCastException("Cannot compare " + getHttpDataType() +

8
src/main/java/org/jboss/netty/handler/codec/http/MemoryFileUpload.java
View File

@ -38,17 +38,14 @@ public class MemoryFileUpload extends AbstractMemoryHttpData implements FileUplo
setContentTransferEncoding(contentTransferEncoding);
}
@Override
public HttpDataType getHttpDataType() {
return HttpDataType.FileUpload;
}
@Override
public String getFilename() {
return filename;
}
@Override
public void setFilename(String filename) {
if (filename == null) {
throw new NullPointerException("filename");
@ -70,7 +67,6 @@ public class MemoryFileUpload extends AbstractMemoryHttpData implements FileUplo
return getName().equalsIgnoreCase(attribute.getName());
}
@Override
public int compareTo(InterfaceHttpData arg0) {
if (!(arg0 instanceof FileUpload)) {
throw new ClassCastException("Cannot compare " + getHttpDataType() +
@ -89,7 +85,6 @@ public class MemoryFileUpload extends AbstractMemoryHttpData implements FileUplo
return v;
}
@Override
public void setContentType(String contentType) {
if (contentType == null) {
throw new NullPointerException("contentType");
@ -97,17 +92,14 @@ public class MemoryFileUpload extends AbstractMemoryHttpData implements FileUplo
this.contentType = contentType;
}
@Override
public String getContentType() {
return contentType;
}
@Override
public String getContentTransferEncoding() {
return contentTransferEncoding;
}
@Override
public void setContentTransferEncoding(String contentTransferEncoding) {
this.contentTransferEncoding = contentTransferEncoding;
}

22
src/main/java/org/jboss/netty/handler/codec/http/MixedAttribute.java
View File

@ -57,7 +57,6 @@ public class MixedAttribute implements Attribute {
}
}
@Override
public void addContent(ChannelBuffer buffer, boolean last) throws IOException {
if (attribute instanceof MemoryAttribute) {
if (attribute.length() + buffer.readableBytes() > limitSize) {
@ -73,62 +72,50 @@ public class MixedAttribute implements Attribute {
attribute.addContent(buffer, last);
}
@Override
public void delete() {
attribute.delete();
}
@Override
public byte[] get() throws IOException {
return attribute.get();
}
@Override
public ChannelBuffer getChannelBuffer() throws IOException {
return attribute.getChannelBuffer();
}
@Override
public Charset getCharset() {
return attribute.getCharset();
}
@Override
public String getString() throws IOException {
return attribute.getString();
}
@Override
public String getString(Charset encoding) throws IOException {
return attribute.getString(encoding);
}
@Override
public boolean isCompleted() {
return attribute.isCompleted();
}
@Override
public boolean isInMemory() {
return attribute.isInMemory();
}
@Override
public long length() {
return attribute.length();
}
@Override
public boolean renameTo(File dest) throws IOException {
return attribute.renameTo(dest);
}
@Override
public void setCharset(Charset charset) {
attribute.setCharset(charset);
}
@Override
public void setContent(ChannelBuffer buffer) throws IOException {
if (buffer.readableBytes() > limitSize) {
if (attribute instanceof MemoryAttribute) {
@ -139,7 +126,6 @@ public class MixedAttribute implements Attribute {
attribute.setContent(buffer);
}
@Override
public void setContent(File file) throws IOException {
if (file.length() > limitSize) {
if (attribute instanceof MemoryAttribute) {
@ -150,7 +136,6 @@ public class MixedAttribute implements Attribute {
attribute.setContent(file);
}
@Override
public void setContent(InputStream inputStream) throws IOException {
if (attribute instanceof MemoryAttribute) {
// change to Disk even if we don't know the size
@ -159,17 +144,14 @@ public class MixedAttribute implements Attribute {
attribute.setContent(inputStream);
}
@Override
public HttpDataType getHttpDataType() {
return attribute.getHttpDataType();
}
@Override
public String getName() {
return attribute.getName();
}
@Override
public int compareTo(InterfaceHttpData o) {
return attribute.compareTo(o);
}
@ -179,22 +161,18 @@ public class MixedAttribute implements Attribute {
return "Mixed: " + attribute.toString();
}
@Override
public String getValue() throws IOException {
return attribute.getValue();
}
@Override
public void setValue(String value) throws IOException {
attribute.setValue(value);
}
@Override
public ChannelBuffer getChunk(int length) throws IOException {
return attribute.getChunk(length);
}
@Override
public File getFile() throws IOException {
return attribute.getFile();
}

26
src/main/java/org/jboss/netty/handler/codec/http/MixedFileUpload.java
View File

@ -46,7 +46,6 @@ public class MixedFileUpload implements FileUpload {
definedSize = size;
}
@Override
public void addContent(ChannelBuffer buffer, boolean last)
throws IOException {
if (fileUpload instanceof MemoryFileUpload) {
@ -66,77 +65,62 @@ public class MixedFileUpload implements FileUpload {
fileUpload.addContent(buffer, last);
}
@Override
public void delete() {
fileUpload.delete();
}
@Override
public byte[] get() throws IOException {
return fileUpload.get();
}
@Override
public ChannelBuffer getChannelBuffer() throws IOException {
return fileUpload.getChannelBuffer();
}
@Override
public Charset getCharset() {
return fileUpload.getCharset();
}
@Override
public String getContentType() {
return fileUpload.getContentType();
}
@Override
public String getContentTransferEncoding() {
return fileUpload.getContentTransferEncoding();
}
@Override
public String getFilename() {
return fileUpload.getFilename();
}
@Override
public String getString() throws IOException {
return fileUpload.getString();
}
@Override
public String getString(Charset encoding) throws IOException {
return fileUpload.getString(encoding);
}
@Override
public boolean isCompleted() {
return fileUpload.isCompleted();
}
@Override
public boolean isInMemory() {
return fileUpload.isInMemory();
}
@Override
public long length() {
return fileUpload.length();
}
@Override
public boolean renameTo(File dest) throws IOException {
return fileUpload.renameTo(dest);
}
@Override
public void setCharset(Charset charset) {
fileUpload.setCharset(charset);
}
@Override
public void setContent(ChannelBuffer buffer) throws IOException {
if (buffer.readableBytes() > limitSize) {
if (fileUpload instanceof MemoryFileUpload) {
@ -151,7 +135,6 @@ public class MixedFileUpload implements FileUpload {
fileUpload.setContent(buffer);
}
@Override
public void setContent(File file) throws IOException {
if (file.length() > limitSize) {
if (fileUpload instanceof MemoryFileUpload) {
@ -166,7 +149,6 @@ public class MixedFileUpload implements FileUpload {
fileUpload.setContent(file);
}
@Override
public void setContent(InputStream inputStream) throws IOException {
if (fileUpload instanceof MemoryFileUpload) {
// change to Disk
@ -179,32 +161,26 @@ public class MixedFileUpload implements FileUpload {
fileUpload.setContent(inputStream);
}
@Override
public void setContentType(String contentType) {
fileUpload.setContentType(contentType);
}
@Override
public void setContentTransferEncoding(String contentTransferEncoding) {
fileUpload.setContentTransferEncoding(contentTransferEncoding);
}
@Override
public void setFilename(String filename) {
fileUpload.setFilename(filename);
}
@Override
public HttpDataType getHttpDataType() {
return fileUpload.getHttpDataType();
}
@Override
public String getName() {
return fileUpload.getName();
}
@Override
public int compareTo(InterfaceHttpData o) {
return fileUpload.compareTo(o);
}
@ -214,12 +190,10 @@ public class MixedFileUpload implements FileUpload {
return "Mixed: " + fileUpload.toString();
}
@Override
public ChannelBuffer getChunk(int length) throws IOException {
return fileUpload.getChunk(length);
}
@Override
public File getFile() throws IOException {
return fileUpload.getFile();
}