use legacy entities endpoint to get objectids (#318)

* use legacy entities endpoint to get analysis files

* better naming

score-client/src/main/java/bio/overture/score/client/metadata/legacy/LegacyMetadataClient.java

@@ -20,9 +20,7 @@
 import bio.overture.score.client.metadata.Entity;
 import bio.overture.score.client.metadata.EntityNotFoundException;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.collect.Lists;
 import lombok.Getter;
@@ -83,15 +81,15 @@ public Entity findEntity(@NonNull String objectId) throws EntityNotFoundExceptio
   }
 
   public List<Entity> findEntities(String... fields) throws EntityNotFoundException {
-    return readAll("/" + (fields.length > 0 ? "?" + resolveFields(fields) : ""));
+    return readAllEntities("/" + (fields.length > 0 ? "?" + resolveFields(fields) : ""));
   }
 
   public List<Entity> findEntitiesByGnosId(@NonNull String gnosId) throws EntityNotFoundException {
     return findEntitiesByGnosId(gnosId, new String[] {});
   }
 
   public List<Entity> findEntitiesByGnosId(@NonNull String gnosId, String... fields) throws EntityNotFoundException {
-    return readAll("?gnosId=" + gnosId + (fields.length > 0 ? "&" + resolveFields(fields) : ""));
+    return readAllEntities("?gnosId=" + gnosId + (fields.length > 0 ? "&" + resolveFields(fields) : ""));
   }
 
   @SneakyThrows
@@ -104,7 +102,7 @@ private Entity read(@NonNull String path) {
   }
 
   @SneakyThrows
-  private List<Entity> readAll(@NonNull String path) {
+  private List<Entity> readAllEntities(@NonNull String path) {
     val results = Lists.<Entity>newArrayList();
     boolean last = false;
     int pageNumber = 0;
@@ -133,15 +131,14 @@ private List<Entity> readAll(@NonNull String path) {
 
   @SneakyThrows
   public List<String> getObjectIdsByAnalysisId(@NonNull String programId, @NonNull String analysisId) {
-    val url = new URL(serverUrl + "/studies/" + programId + "/analysis/" + analysisId + "/files");
+    val path = "?gnosId=" + analysisId + "&projectCode=" + programId;
 
-    log.debug("Fetching analysis files from url '{}'", url);
+    log.debug("Fetching analysis files via entities endpoint with path '{}'", path);
 
-    return stream(MAPPER.readValue(url, ArrayNode.class).spliterator(), false).
-      peek(r -> log.debug("Got result {}", r)).
-      map(x -> x.path("objectId")).
-      map(JsonNode::textValue).
-      collect(toImmutableList());
+    return readAllEntities(path).stream()
+      .peek(r -> log.debug("Got result {}", r))
+      .map(Entity::getId)
+      .collect(toImmutableList());
   }
 
   @SneakyThrows
@@ -152,5 +149,4 @@ private URL resolveEntitiesUrl(String path) {
   private static String resolveFields(String[] fields) {
     return Stream.of(fields).map(f -> "fields=" + f).collect(joining("&"));
   }
-
 }