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

Remove redundant code block in HttpPostRequestEncoder and make some cleanup

Browse Source 
Motivation:

The class `HttpPostRequestEncoder` has minor issues:
- The `encodeNextChunkMultipart()` method contains two identical blocks of code with a difference only in the cast interfaces: `Attribute` vs `HttpData`. Because the `Attribute` is extended by `HttpData`, the block with the `Attribute` can be safely deleted.
- The `getNewMultipartDelimiter()` method contains a redundant `toLowerCase()`.
- The `addBodyFileUploads()` method throws `NPE` instead of `IllegalArgumentException`.

Modifications:

- Remove duplicated code block from `encodeNextChunkMultipart()`.
- Remove redundant `toLowerCase()` from `getNewMultipartDelimiter()`.
- Replace `NPE` with `IllegalArgumentException` in `addBodyFileUploads()`.
- Use `ObjectUtil#checkNotNull` where possible.

Result:

More correct and clean code.
This commit is contained in:
Nikolay Fedorovskikh 2017-06-14 02:35:41 +05:00 committed by Norman Maurer
parent aa38b6a769
commit b8a418d53d
1 changed files with 17 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
codec-http/src/main/java/io/netty/handler/codec/http/multipart/HttpPostRequestEncoder.java
View File

@ -49,6 +49,7 @@ import java.util.Map;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import static io.netty.buffer.Unpooled.wrappedBuffer; import static io.netty.buffer.Unpooled.wrappedBuffer;
import static io.netty.util.internal.ObjectUtil.checkNotNull;
import static java.util.AbstractMap.SimpleImmutableEntry; import static java.util.AbstractMap.SimpleImmutableEntry;
/** /**
@ -207,22 +208,12 @@ public class HttpPostRequestEncoder implements ChunkedInput<HttpContent> {
HttpDataFactory factory, HttpRequest request, boolean multipart, Charset charset, HttpDataFactory factory, HttpRequest request, boolean multipart, Charset charset,
EncoderMode encoderMode) EncoderMode encoderMode)
throws ErrorDataEncoderException { throws ErrorDataEncoderException {
if (factory == null) { this.request = checkNotNull(request, "request");
throw new NullPointerException("factory"); this.charset = checkNotNull(charset, "charset");
} this.factory = checkNotNull(factory, "factory");
if (request == null) { if (HttpMethod.TRACE.equals(request.method())) {
throw new NullPointerException("request");
}
if (charset == null) {
throw new NullPointerException("charset");
}
HttpMethod method = request.method();
if (method.equals(HttpMethod.TRACE)) {
throw new ErrorDataEncoderException("Cannot create a Encoder if request is a TRACE"); throw new ErrorDataEncoderException("Cannot create a Encoder if request is a TRACE");
} }
this.request = request;
this.charset = charset;
this.factory = factory;
// Fill default values // Fill default values
bodyListDatas = new ArrayList<InterfaceHttpData>(); bodyListDatas = new ArrayList<InterfaceHttpData>();
// default mode // default mode
@ -297,7 +288,7 @@ public class HttpPostRequestEncoder implements ChunkedInput<HttpContent> {
*/ */
private static String getNewMultipartDelimiter() { private static String getNewMultipartDelimiter() {
// construct a generated delimiter // construct a generated delimiter
return Long.toHexString(PlatformDependent.threadLocalRandom().nextLong()).toLowerCase(); return Long.toHexString(PlatformDependent.threadLocalRandom().nextLong());
} }
/** /**
@ -344,14 +335,8 @@ public class HttpPostRequestEncoder implements ChunkedInput<HttpContent> {
* if the encoding is in error or if the finalize were already done * if the encoding is in error or if the finalize were already done
*/ */
public void addBodyAttribute(String name, String value) throws ErrorDataEncoderException { public void addBodyAttribute(String name, String value) throws ErrorDataEncoderException {
if (name == null) { String svalue = value != null? value : StringUtil.EMPTY_STRING;
throw new NullPointerException("name"); Attribute data = factory.createAttribute(request, checkNotNull(name, "name"), svalue);
}
String svalue = value;
if (value == null) {
svalue = "";
}
Attribute data = factory.createAttribute(request, name, svalue);
addBodyHttpData(data); addBodyHttpData(data);
} }
@ -397,12 +382,8 @@ public class HttpPostRequestEncoder implements ChunkedInput<HttpContent> {
*/ */
public void addBodyFileUpload(String name, String filename, File file, String contentType, boolean isText) public void addBodyFileUpload(String name, String filename, File file, String contentType, boolean isText)
throws ErrorDataEncoderException { throws ErrorDataEncoderException {
if (name == null) { checkNotNull(name, "name");
throw new NullPointerException("name"); checkNotNull(file, "file");
}
if (file == null) {
throw new NullPointerException("file");
}
if (filename == null) { if (filename == null) {
filename = StringUtil.EMPTY_STRING; filename = StringUtil.EMPTY_STRING;
} }
@ -439,7 +420,7 @@ public class HttpPostRequestEncoder implements ChunkedInput<HttpContent> {
* the array of content Types associated with each file * the array of content Types associated with each file
* @param isText * @param isText
* the array of isText attribute (False meaning binary mode) for each file * the array of isText attribute (False meaning binary mode) for each file
* @throws NullPointerException * @throws IllegalArgumentException
* also throws if array have different sizes * also throws if array have different sizes
* @throws ErrorDataEncoderException * @throws ErrorDataEncoderException
* if the encoding is in error or if the finalize were already done * if the encoding is in error or if the finalize were already done
@ -447,7 +428,7 @@ public class HttpPostRequestEncoder implements ChunkedInput<HttpContent> {
public void addBodyFileUploads(String name, File[] file, String[] contentType, boolean[] isText) public void addBodyFileUploads(String name, File[] file, String[] contentType, boolean[] isText)
throws ErrorDataEncoderException { throws ErrorDataEncoderException {
if (file.length != contentType.length && file.length != isText.length) { if (file.length != contentType.length && file.length != isText.length) {
throw new NullPointerException("Different array length"); throw new IllegalArgumentException("Different array length");
} }
for (int i = 0; i < file.length; i++) { for (int i = 0; i < file.length; i++) {
addBodyFileUpload(name, file[i], contentType[i], isText[i]); addBodyFileUpload(name, file[i], contentType[i], isText[i]);
@ -466,10 +447,7 @@ public class HttpPostRequestEncoder implements ChunkedInput<HttpContent> {
if (headerFinalized) { if (headerFinalized) {
throw new ErrorDataEncoderException("Cannot add value once finalized"); throw new ErrorDataEncoderException("Cannot add value once finalized");
} }
if (data == null) { bodyListDatas.add(checkNotNull(data, "data"));
throw new NullPointerException("data");
}
bodyListDatas.add(data);
if (!isMultipart) { if (!isMultipart) {
if (data instanceof Attribute) { if (data instanceof Attribute) {
Attribute attribute = (Attribute) data; Attribute attribute = (Attribute) data;
@ -922,18 +900,10 @@ public class HttpPostRequestEncoder implements ChunkedInput<HttpContent> {
buffer = ((InternalAttribute) currentData).toByteBuf(); buffer = ((InternalAttribute) currentData).toByteBuf();
currentData = null; currentData = null;
} else { } else {
if (currentData instanceof Attribute) { try {
try { buffer = ((HttpData) currentData).getChunk(sizeleft);
buffer = ((Attribute) currentData).getChunk(sizeleft); } catch (IOException e) {
} catch (IOException e) { throw new ErrorDataEncoderException(e);
throw new ErrorDataEncoderException(e);
}
} else {
try {
buffer = ((HttpData) currentData).getChunk(sizeleft);
} catch (IOException e) {
throw new ErrorDataEncoderException(e);
}
} }
if (buffer.capacity() == 0) { if (buffer.capacity() == 0) {
// end for current InterfaceHttpData, need more data // end for current InterfaceHttpData, need more data