ALS-7014: Clean up some things

hms-dbmi · Aug 29, 2024 · e69e440 · e69e440
1 parent 2cb69bc
commit e69e440
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/...lach/hpds/data/upload/SignUrlService.java → ...pds/processing/upload/SignUrlService.java b/...lach/hpds/data/upload/SignUrlService.java → ...pds/processing/upload/SignUrlService.java
@@ -1,4 +1,4 @@
-package edu.harvard.hms.dbmi.avillach.hpds.data.upload;
+package edu.harvard.hms.dbmi.avillach.hpds.processing.upload;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/service/src/main/java/edu/harvard/hms/dbmi/avillach/hpds/service/PicSureService.java b/service/src/main/java/edu/harvard/hms/dbmi/avillach/hpds/service/PicSureService.java
@@ -1,16 +1,14 @@
 package edu.harvard.hms.dbmi.avillach.hpds.service;
 
-import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.stream.Collectors;
 
 import edu.harvard.hms.dbmi.avillach.hpds.data.genotype.InfoColumnMeta;
-import edu.harvard.hms.dbmi.avillach.hpds.data.upload.SignUrlService;
+import edu.harvard.hms.dbmi.avillach.hpds.processing.upload.SignUrlService;
 import edu.harvard.hms.dbmi.avillach.hpds.service.util.Paginator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -30,7 +28,6 @@
 import edu.harvard.dbmi.avillach.domain.*;
 import edu.harvard.dbmi.avillach.util.UUIDv5;
 import edu.harvard.hms.dbmi.avillach.hpds.crypto.Crypto;
-import edu.harvard.hms.dbmi.avillach.hpds.data.genotype.FileBackedByteIndexedInfoStore;
 import edu.harvard.hms.dbmi.avillach.hpds.data.phenotype.ColumnMeta;
 import edu.harvard.hms.dbmi.avillach.hpds.data.query.Query;
 import edu.harvard.hms.dbmi.avillach.hpds.processing.*;
@@ -267,8 +264,8 @@ public ResponseEntity querySignedURL(@PathVariable("resourceQueryId") UUID query
 			String presignedGetUrl = signUrlService.createPresignedGetUrl(file.getName());
 			log.info("Presigned url: " + presignedGetUrl);
 			return ResponseEntity.ok()
-					.contentType(MediaType.TEXT_PLAIN)
-					.body(presignedGetUrl);
+					.contentType(MediaType.APPLICATION_JSON)
+					.body(new SignedUrlResponse(presignedGetUrl));
 		} else {
 			return ResponseEntity.status(400).body("Status : " + result.getStatus().name());
 		}