fixing where methods go

blackducksoftware · Dec 10, 2017 · d7c1189 · d7c1189
1 parent bcd4e31
commit d7c1189
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 22 deletions.
diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
   </parent>
 
   <artifactId>hub-common-rest</artifactId>
-  <version>3.3.1-SNAPSHOT</version>
+  <version>3.4.0</version>
 
   <name>Hub Common Rest</name>
   <description>General Code for Rest Connections to the Hub</description>

diff --git a/src/main/java/com/blackducksoftware/integration/hub/request/HubRequest.java b/src/main/java/com/blackducksoftware/integration/hub/request/HubRequest.java
@@ -25,6 +25,7 @@
 
 import static com.blackducksoftware.integration.hub.RestConstants.QUERY_Q;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -58,55 +59,61 @@ public HubRequest(final RestConnection restConnection) {
     public Response executeGet() throws IntegrationException {
         final HttpUrl httpUrl = buildHttpUrl();
         final Request request = restConnection.createGetRequest(httpUrl);
-        return restConnection.handleExecuteClientCall(request);
+        return restConnection.createResponse(request);
     }
 
     public Response executeGet(final String mediaType) throws IntegrationException {
         final HttpUrl httpUrl = buildHttpUrl();
         final Request request = restConnection.createGetRequest(httpUrl, mediaType);
-        return restConnection.handleExecuteClientCall(request);
+        return restConnection.createResponse(request);
     }
 
     public Response executeEncodedFormPost(final Map<String, String> contentMap) throws IntegrationException {
         final HttpUrl httpUrl = buildHttpUrl();
         final Request request = restConnection.createPostRequest(httpUrl, restConnection.createEncodedFormBody(contentMap));
-        return restConnection.handleExecuteClientCall(request);
+        return restConnection.createResponse(request);
     }
 
     public Response executePost(final String content) throws IntegrationException {
         final HttpUrl httpUrl = buildHttpUrl();
         final Request request = restConnection.createPostRequest(httpUrl, restConnection.createJsonRequestBody(content));
-        return restConnection.handleExecuteClientCall(request);
+        return restConnection.createResponse(request);
     }
 
     public Response executePost(final String mediaType, final String content) throws IntegrationException {
         final HttpUrl httpUrl = buildHttpUrl();
         final Request request = restConnection.createPostRequest(httpUrl, restConnection.createJsonRequestBody(mediaType, content));
-        return restConnection.handleExecuteClientCall(request);
+        return restConnection.createResponse(request);
+    }
+
+    public Response executePost(final String mediaType, final File file) throws IntegrationException {
+        final HttpUrl httpUrl = buildHttpUrl();
+        final Request request = restConnection.createPostRequest(httpUrl, restConnection.createFileRequestBody(mediaType, file));
+        return restConnection.createResponse(request);
     }
 
     public Response executeEncodedFormPut(final Map<String, String> contentMap) throws IntegrationException {
         final HttpUrl httpUrl = buildHttpUrl();
         final Request request = restConnection.createPutRequest(httpUrl, restConnection.createEncodedFormBody(contentMap));
-        return restConnection.handleExecuteClientCall(request);
+        return restConnection.createResponse(request);
     }
 
     public Response executePut(final String content) throws IntegrationException {
         final HttpUrl httpUrl = buildHttpUrl();
         final Request request = restConnection.createPutRequest(httpUrl, restConnection.createJsonRequestBody(content));
-        return restConnection.handleExecuteClientCall(request);
+        return restConnection.createResponse(request);
     }
 
     public Response executePut(final String mediaType, final String content) throws IntegrationException {
         final HttpUrl httpUrl = buildHttpUrl();
         final Request request = restConnection.createPutRequest(httpUrl, restConnection.createJsonRequestBody(mediaType, content));
-        return restConnection.handleExecuteClientCall(request);
+        return restConnection.createResponse(request);
     }
 
     public void executeDelete() throws IntegrationException {
         final HttpUrl httpUrl = buildHttpUrl();
         final Request request = restConnection.createDeleteRequest(httpUrl);
-        try (Response response = restConnection.handleExecuteClientCall(request)) {
+        try (Response response = restConnection.createResponse(request)) {
 
         }
     }

diff --git a/src/main/java/com/blackducksoftware/integration/hub/rest/CredentialsRestConnection.java b/src/main/java/com/blackducksoftware/integration/hub/rest/CredentialsRestConnection.java
@@ -31,6 +31,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import com.blackducksoftware.integration.exception.IntegrationException;
@@ -75,7 +76,6 @@ public void clientAuthenticate() throws IntegrationException {
 
         final Map<String, String> content = new HashMap<>();
         if (StringUtils.isNotBlank(hubUsername) && StringUtils.isNotBlank(hubPassword)) {
-
             content.put("j_username", hubUsername);
             content.put("j_password", hubPassword);
             final Request request = createPostRequest(httpUrl, createEncodedFormBody(content));
@@ -96,9 +96,7 @@ public void clientAuthenticate() throws IntegrationException {
             } catch (final IOException e) {
                 throw new IntegrationException(e.getMessage(), e);
             } finally {
-                if (response != null) {
-                    response.close();
-                }
+                IOUtils.closeQuietly(response);
             }
         }
     }

diff --git a/src/main/java/com/blackducksoftware/integration/hub/rest/RestConnection.java b/src/main/java/com/blackducksoftware/integration/hub/rest/RestConnection.java
@@ -23,6 +23,7 @@
  */
 package com.blackducksoftware.integration.hub.rest;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.InetSocketAddress;
@@ -260,6 +261,10 @@ public RequestBody createJsonRequestBody(final String mediaType, final String co
         return RequestBody.create(MediaType.parse(mediaType), content);
     }
 
+    public RequestBody createFileRequestBody(final String mediaType, final File file) {
+        return RequestBody.create(MediaType.parse(mediaType), file);
+    }
+
     public RequestBody createEncodedFormBody(final Map<String, String> content) {
         final FormBody.Builder builder = new FormBody.Builder();
         for (final Entry<String, String> contentEntry : content.entrySet()) {
@@ -328,14 +333,6 @@ public Response createResponse(final Request request) throws IntegrationExceptio
         return handleExecuteClientCall(request);
     }
 
-    public String readResponseString(final Response response) throws IntegrationException {
-        try {
-            return response.body().string();
-        } catch (final IOException e) {
-            throw new IntegrationException(e);
-        }
-    }
-
     @Deprecated
     /**
      * @deprecated Please use createResponse(Request request) instead.