refactor to use metadata request

Author: otter606

src/integration-test/java/com/researchspace/dataverse/http/DatasetOperationsTest.java

@@ -14,6 +14,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.URISyntaxException;
+import java.util.Arrays;
 import java.util.List;
 
 import static com.researchspace.dataverse.entities.facade.DatasetTestFactory.createFacade;
@@ -66,7 +67,9 @@ public void uploadFileToDataSetWithNativeApi() throws IOException, URISyntaxExce
 		DatasetFacade facade = createFacade();
 		Identifier datasetId = dataverseOps.createDataset(facade, dataverseAlias);
 		assertNotNull(datasetId.getId());
-		DatasetFileList datasetFileList = datasetOps.uploadNativeFile(datasetId, new byte[]{1, 2, 3, 4, 5}, "myFileName.dat");
+		FileUploadMetadata meta = FileUploadMetadata.builder().description("My description.").categories(Arrays.asList(new String[]{"Data"}))
+				.directoryLabel("test/x").build();
+		DatasetFileList datasetFileList = datasetOps.uploadNativeFile(meta, datasetId, new byte[]{1, 2, 3, 4, 5}, "myFileName.dat");
 		assertNotNull(datasetFileList);
 		assertEquals(1, datasetFileList.getFiles().size());
 		assertTrue(datasetFileList.getFiles().get(0).getCategories().contains("Data"));

src/main/java/com/researchspace/dataverse/api/v1/DatasetOperations.java

@@ -5,6 +5,7 @@
 
 import com.researchspace.dataverse.entities.*;
 import com.researchspace.dataverse.entities.facade.DatasetFacade;
+import com.researchspace.dataverse.http.FileUploadMetadata;
 
 import java.io.File;
 import java.io.InputStream;
@@ -56,7 +57,7 @@ public interface DatasetOperations {
 	 */
 	List<DatasetVersion> getDatasetVersions(Identifier dsIdentifier);
 
-    DatasetFileList uploadNativeFile(Identifier dsIdentifier, byte[] data, String fileName);
+    DatasetFileList uploadNativeFile(FileUploadMetadata metadata, Identifier dsIdentifier, byte[] data, String fileName);
 
     /**
 	 * Uploads a file to a dataset

src/main/java/com/researchspace/dataverse/http/DataverseOperationsImplV1.java

@@ -192,11 +192,11 @@ public List<DatasetVersion> getDatasetVersions (Identifier dsIdentifier) {
 	}
 
 	@Override
-	public DatasetFileList uploadNativeFile(Identifier dsIdentifier, byte[] data, String fileName){
+	public DatasetFileList uploadNativeFile( FileUploadMetadata metadata, Identifier dsIdentifier, byte[] data, String fileName){
 		String url = createV1Url("datasets", ":persistentId", "add") + "?persistentId=" + dsIdentifier.getPersistentId();
 		ParameterizedTypeReference<DataverseResponse<DatasetFileList>> type =
 				new ParameterizedTypeReference<DataverseResponse<DatasetFileList>>() {};
-		HttpEntity<MultiValueMap<String, Object>> entity = new NativeFileUploader().uploadFile(apiKey, data, fileName);
+		HttpEntity<MultiValueMap<String, Object>> entity = new NativeFileUploader().uploadFile(metadata, apiKey, data, fileName);
 		ResponseEntity<DataverseResponse<DatasetFileList>> resp = template.exchange(url, HttpMethod.POST, entity, type);
 		log.debug("{}", resp.getBody());
 		handleError(resp);

src/main/java/com/researchspace/dataverse/http/FileUploadMetadata.java

@@ -0,0 +1,21 @@
+package com.researchspace.dataverse.http;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Request object for metadata included with native file upload to an existing dataset
+ */
+@Data
+@Builder
+
+public class FileUploadMetadata {
+    private String description;
+    private String directoryLabel;
+    private List<String> categories;
+    private boolean restrict;
+    private boolean tabIngest;
+
+}

src/main/java/com/researchspace/dataverse/http/NativeFileUploader.java

@@ -8,7 +8,7 @@
 
 public class NativeFileUploader {
 
-    public HttpEntity<MultiValueMap<String, Object>> uploadFile(String apiKey, byte [] data, String fName){
+    public HttpEntity<MultiValueMap<String, Object>> uploadFile(FileUploadMetadata metadata, String apiKey, byte[] data, String fName){
         RestTemplate restTemplate = new RestTemplate();
         MultiValueMap<String,Object> multipartRequest = new LinkedMultiValueMap<>();
 
@@ -28,17 +28,12 @@ public String getFilename(){
 
         multipartRequest.set("file",attachmentPart);
 
-
         HttpHeaders requestHeadersJSON = new HttpHeaders();
-
         requestHeadersJSON.setContentType(MediaType.APPLICATION_JSON);
-        String requestBody = "{\"description\":\"My description.\",\"directoryLabel\":\"data/subdir1\",\"categories\":[\"Data\"], \"restrict\":\"false\", \"tabIngest\":\"false\"}";
-        HttpEntity<String> requestEntityJSON = new HttpEntity<>(requestBody, requestHeadersJSON);
-
+        HttpEntity<FileUploadMetadata> requestEntityJSON = new HttpEntity<>(metadata, requestHeadersJSON);
         multipartRequest.set("jsonData",requestEntityJSON);
 
         HttpEntity<MultiValueMap<String,Object>> requestEntity = new HttpEntity<>(multipartRequest,requestHeaders);//final request
-
         return requestEntity;
 
     }

src/test/java/com/researchspace/dataverse/http/DatasetFilePostMockServerTest.java

@@ -63,7 +63,7 @@ public void testNativeFilePost() throws MalformedURLException {
 		tss.configure(cfg);
 		Identifier id = new Identifier();
 		id.setId(1234L);
-		DatasetFileList resp = tss.uploadNativeFile(id, null, null);
+		DatasetFileList resp = tss.uploadNativeFile( FileUploadMetadata.builder().build(), id, null, null);
 		assertNotNull(resp.getFiles());
 		assertEquals(1, resp.getFiles().size());
 	}