Fix some statically detected code issues

This includes: unnecessary semicolons, suppress warnings, switch statements, final/private qualifiers, Optional wrapping, conditionals, both inline and non-inline variables, ternaries, Collection putAll() calls, StringBuilders, and throws declarations.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=244182539
This commit is contained in:
mcilwain 2019-04-18 07:34:10 -07:00 committed by jianglai
parent 9f360587ff
commit 24bb78bd16
54 changed files with 107 additions and 158 deletions

View file

@ -20,7 +20,6 @@ import static com.google.common.net.HttpHeaders.AUTHORIZATION;
import static com.google.common.net.HttpHeaders.CONTENT_DISPOSITION;
import static com.google.common.net.HttpHeaders.CONTENT_LENGTH;
import static com.google.common.net.HttpHeaders.CONTENT_TYPE;
import static java.lang.String.format;
import static java.nio.charset.StandardCharsets.UTF_8;
import com.google.appengine.api.urlfetch.HTTPHeader;
@ -73,18 +72,20 @@ public final class UrlFetchUtils {
checkState(
!data.contains(boundary),
"Multipart data contains autogenerated boundary: %s", boundary);
StringBuilder multipart = new StringBuilder();
multipart.append(format("--%s\r\n", boundary));
multipart.append(format("%s: form-data; name=\"%s\"; filename=\"%s\"\r\n",
CONTENT_DISPOSITION, name, filename));
multipart.append(format("%s: %s\r\n", CONTENT_TYPE, contentType.toString()));
multipart.append("\r\n");
multipart.append(data);
multipart.append("\r\n");
multipart.append(format("--%s--\r\n", boundary));
byte[] payload = multipart.toString().getBytes(UTF_8);
String multipart =
String.format("--%s\r\n", boundary)
+ String.format(
"%s: form-data; name=\"%s\"; filename=\"%s\"\r\n",
CONTENT_DISPOSITION, name, filename)
+ String.format("%s: %s\r\n", CONTENT_TYPE, contentType)
+ "\r\n"
+ data
+ "\r\n"
+ String.format("--%s--\r\n", boundary);
byte[] payload = multipart.getBytes(UTF_8);
request.addHeader(
new HTTPHeader(CONTENT_TYPE, format("multipart/form-data; boundary=\"%s\"", boundary)));
new HTTPHeader(
CONTENT_TYPE, String.format("multipart/form-data;" + " boundary=\"%s\"", boundary)));
request.addHeader(new HTTPHeader(CONTENT_LENGTH, Integer.toString(payload.length)));
request.setPayload(payload);
}