wow we scattered this logic around, huh

hms-dbmi · Dec 28, 2023 · 6bf6c60 · 6bf6c60
1 parent e589a3d
commit 6bf6c60
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
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
@@ -228,7 +228,8 @@ private QueryStatus convertToQueryStatus(AsyncResult entity) {
 		status.setStatus(entity.status.toPicSureStatus());
 
 		Map<String, Object> metadata = new HashMap<String, Object>();
-		metadata.put("picsureQueryId", UUIDv5.UUIDFromString(entity.query.toString()));
+		queryUUIDGen.setId(entity.query);
+		metadata.put("picsureQueryId", entity.query.getId());
 		status.setResultMetadata(metadata);
 		return status;
 	}
@@ -432,6 +433,7 @@ private Response _querySync(QueryRequest resultRequest) throws IOException {
 	}
 
 	private ResponseBuilder queryOkResponse(Object obj, Query incomingQuery) {
-		return Response.ok(obj).header(QUERY_METADATA_FIELD, UUIDv5.UUIDFromString(incomingQuery.toString()));
+		queryUUIDGen.setId(incomingQuery);
+		return Response.ok(obj).header(QUERY_METADATA_FIELD, incomingQuery.getId());
 	}
 }
diff --git a/service/src/main/java/edu/harvard/hms/dbmi/avillach/hpds/service/QueryService.java b/service/src/main/java/edu/harvard/hms/dbmi/avillach/hpds/service/QueryService.java
@@ -126,7 +126,8 @@ private AsyncResult initializeResult(Query query) throws ClassNotFoundException,
 		AsyncResult result = new AsyncResult(query, p.getHeaderRow(query));
 		result.status = AsyncResult.Status.PENDING;
 		result.queuedTime = System.currentTimeMillis();
-		result.id = UUIDv5.UUIDFromString(query.toString()).toString();
+		queryUUIDGen.setId(query);
+		result.id = query.getId();
 		result.processor = p;
 		queryUUIDGen.setId(query);
 		results.put(result.id, result);