AS-3064: Adapt the /import/bpu endpoint to work with Custom Connector.

Author: hwang-vividsolutions

farms-api/farms-api-rest-endpoints/src/main/java/ca/bc/gov/farms/api/rest/v1/endpoints/ImportEndpoints.java

@@ -1,24 +1,20 @@
 package ca.bc.gov.farms.api.rest.v1.endpoints;
 
-import java.io.InputStream;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
-import org.glassfish.jersey.media.multipart.FormDataParam;
-
 @Path("/import")
 public interface ImportEndpoints {
 
     @POST
-    @Path("/bpu")
+    @Path("/bpu/{fileName}")
     @Consumes(MediaType.MULTIPART_FORM_DATA)
-    @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-    Response importBPU(@FormDataParam("file") InputStream fileInputStream,
-            @FormDataParam("file") FormDataContentDisposition fileDetail) throws Exception;
+    @Produces({ MediaType.TEXT_PLAIN })
+    Response importBPU(@PathParam("fileName") String fileName,
+            String fileContent) throws Exception;
 }

farms-api/farms-api-rest-endpoints/src/main/java/ca/bc/gov/farms/api/rest/v1/endpoints/impl/ImportEndpointsImpl.java

@@ -1,13 +1,10 @@
 package ca.bc.gov.farms.api.rest.v1.endpoints.impl;
 
 import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
 import java.io.InputStream;
 
 import javax.ws.rs.core.Response;
 
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,24 +26,21 @@ public class ImportEndpointsImpl extends BaseEndpointsImpl implements ImportEndp
     private ImportBPUService importBPUService;
 
     @Override
-    public Response importBPU(InputStream fileInputStream, FormDataContentDisposition fileDetail) throws Exception {
+    public Response importBPU(String fileName, String fileContent) throws Exception {
         logger.debug("<importBPU");
 
         Response response = null;
 
         logRequest();
 
         try {
-            byte[] fileContent = readBytes(fileInputStream);
-            String fileName = fileDetail.getFileName();
-
             // Call the service layer to handle the import
             ImportVersionDto importVersionDto = importService.createImportVersion(
                     ImportClassCodes.BPU, ImportStateCodes.SCHEDULED_FOR_STAGING, ImportClassCodes.BPU_DESCRIPTION,
-                    fileName, fileContent, "UserId");
+                    fileName, fileContent.getBytes(), "UserId");
 
             Long importVersionId = importVersionDto.getImportVersionId();
-            InputStream inputStream = new ByteArrayInputStream(fileContent);
+            InputStream inputStream = new ByteArrayInputStream(fileContent.getBytes());
             String userId = "UserId";
             importBPUService.importCSV(importVersionId, inputStream, userId);
 
@@ -63,15 +57,4 @@ public Response importBPU(InputStream fileInputStream, FormDataContentDispositio
         return response;
     }
 
-    private byte[] readBytes(InputStream inputStream) throws IOException {
-        try (ByteArrayOutputStream buffer = new ByteArrayOutputStream()) {
-            int nRead;
-            byte[] data = new byte[4096];
-            while ((nRead = inputStream.read(data, 0, data.length)) != -1) {
-                buffer.write(data, 0, nRead);
-            }
-            return buffer.toByteArray();
-        }
-    }
-
 }