Cleanup TODOs (#488)

Author: jimmyjames

src/main/java/com/auth0/client/mgmt/RequestBuilder.java

@@ -16,8 +16,6 @@ class RequestBuilder<T> {
     private final Auth0HttpClient client;
     private final TokenProvider tokenProvider;
     private final HttpMethod method;
-
-    // TODO decouple from OkHttp
     private final HttpUrl.Builder url;
     private final TypeReference<T> target;
 

src/main/java/com/auth0/net/MultipartRequest.java

@@ -32,8 +32,7 @@ public class MultipartRequest<T> extends BaseRequest<T> {
     private final ObjectMapper mapper;
     private int partsCount;
 
-    //TODO multipartBuilder is not used? Refactor it?
-    MultipartRequest(Auth0HttpClient client, TokenProvider tokenProvider, String url, HttpMethod method, ObjectMapper mapper, TypeReference<T> tType, Auth0MultipartRequestBody.Builder multipartBuilder) {
+    MultipartRequest(Auth0HttpClient client, TokenProvider tokenProvider, String url, HttpMethod method, ObjectMapper mapper, TypeReference<T> tType) {
         super(client, tokenProvider, url, method, mapper, tType);
         if (HttpMethod.GET.equals(method)) {
             throw new IllegalArgumentException("Multipart/form-data requests do not support the GET method.");
@@ -44,7 +43,7 @@ public class MultipartRequest<T> extends BaseRequest<T> {
     }
 
     public MultipartRequest(Auth0HttpClient client, TokenProvider tokenProvider, String url, HttpMethod method, TypeReference<T> tType) {
-        this(client, tokenProvider, url, method, ObjectMapperProvider.getMapper(), tType, Auth0MultipartRequestBody.newBuilder());
+        this(client, tokenProvider, url, method, ObjectMapperProvider.getMapper(), tType);
     }
 
     @Override

src/main/java/com/auth0/net/client/Auth0HttpResponse.java

@@ -41,12 +41,10 @@ public Map<String, String> getHeaders() {
     }
 
     public String getHeader(String header) {
-        // TODO null check?
         return headers.get(header);
     }
 
     public String getHeader(String header, String defaultValue) {
-        // TODO null check?
         return headers.get(header) != null ? headers.get(header) : defaultValue;
     }
     public static class Builder {

src/main/java/com/auth0/net/client/DefaultHttpClient.java

@@ -108,8 +108,6 @@ public void onResponse(@NotNull Call call, @NotNull Response response) {
     }
 
     private Request buildRequest(Auth0HttpRequest a0Request) {
-        // TODO only use body on request methods that support it
-        // TODO not use null?
         RequestBody okBody = addBody(a0Request);
 
         okhttp3.Request.Builder builder = new okhttp3.Request.Builder()
@@ -155,7 +153,8 @@ private Auth0HttpResponse buildResponse(Response okResponse) throws IOException
     @SuppressWarnings("deprecation")
     private RequestBody addBody(Auth0HttpRequest request) {
         // null body added to request results in request without body
-        if (Objects.isNull(request.getBody())) {
+        if (Objects.isNull(request.getBody()) ||
+                HttpMethod.GET.equals(request.getMethod())) {
             return null;
         }
 
@@ -262,7 +261,6 @@ private Dispatcher getDispatcher(int maxRequests, int maxRequestsPerHost) {
     /**
      * Builder for {@link DefaultHttpClient} instances.
      */
-    // TODO accept default headers
     public static class Builder {
         private int readTimeout = 10;
         private int connectTimeout = 10;

src/test/java/com/auth0/net/MultipartRequestTest.java

@@ -92,11 +92,8 @@ public void shouldCreatePOSTRequest() throws Exception {
 
     @Test
     public void shouldAddMultipleParts() throws Exception {
-//        String boundary = UUID.randomUUID().toString();
-//        MultipartBody.Builder bodyBuilder = new MultipartBody.Builder(boundary);
         Auth0MultipartRequestBody.Builder bodyBuilder = Auth0MultipartRequestBody.newBuilder();
-//        MultipartBody.Builder bodyBuilder = new MultipartBody.Builder(boundary);
-        MultipartRequest<TokenHolder> request = new MultipartRequest<>(client, tokenProvider, server.getBaseUrl(), HttpMethod.POST, new ObjectMapper(), tokenHolderType, bodyBuilder);
+        MultipartRequest<TokenHolder> request = new MultipartRequest<>(client, tokenProvider, server.getBaseUrl(), HttpMethod.POST, new ObjectMapper(), tokenHolderType);
 
         File fileValue = new File(MULTIPART_SAMPLE);
         request.addPart("keyName", "keyValue");
@@ -107,7 +104,6 @@ public void shouldAddMultipleParts() throws Exception {
         RecordedRequest recordedRequest = server.takeRequest();
         RecordedMultipartRequest recordedMultipartRequest = new RecordedMultipartRequest(recordedRequest);
         assertThat(recordedMultipartRequest.getPartsCount(), is(2));
-//        assertThat(recordedMultipartRequest.getBoundary(), is(boundary));
 
         KeyValuePart formParam = recordedMultipartRequest.getKeyValuePart("keyName");
         assertThat(formParam, is(notNullValue()));
@@ -123,8 +119,7 @@ public void shouldAddMultipleParts() throws Exception {
 
     @Test
     public void shouldNotOverrideContentTypeHeader() throws Exception {
-        Auth0MultipartRequestBody.Builder bodyBuilder = Auth0MultipartRequestBody.newBuilder();
-        MultipartRequest<TokenHolder> request = new MultipartRequest<>(client, tokenProvider, server.getBaseUrl(), HttpMethod.POST, new ObjectMapper(), tokenHolderType, bodyBuilder);
+        MultipartRequest<TokenHolder> request = new MultipartRequest<>(client, tokenProvider, server.getBaseUrl(), HttpMethod.POST, new ObjectMapper(), tokenHolderType);
         request.addPart("non_empty", "body");
         request.addHeader("Content-Type", "plaintext");