Add EdaDataService

Author: dmgaldi

Diff for: Jenkinsfile

@@ -10,4 +10,4 @@ node('centos8') {
   builder.gitClone()
   builder.buildContainers([[name: 'service-eda']])
 
-}
+}

Diff for: build.gradle.kts

@@ -91,7 +91,7 @@ repositories {
 //
 
 // versions
-val coreLib       = "7.0.1"                    // Container core lib version
+val coreLib       = "7.0.6"                    // Container core lib version
 val fgputil       = "2.12.11-jakarta"           // FgpUtil version
 val libSubsetting = "4.13.10-package-rename"    // lib-eda-subsetting version
 

Diff for: src/main/java/org/veupathdb/service/eda/data/core/AbstractPlugin.java

@@ -40,6 +40,8 @@
 import java.lang.reflect.Method;
 import java.util.*;
 import java.util.Map.Entry;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ForkJoinPool;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
@@ -365,12 +367,12 @@ protected Map<String, InputStream> getVocabByRootEntity(DynamicDataSpec dataSpec
   }
 
   protected Map<String, InputStream> getVocabByRootEntity(List<DynamicDataSpec> dataSpecs, List<APIFilter> subsetFilters) {
-    Map<String, InputStream> studyVocabStreams = new HashMap<String, InputStream>();
-    for (DynamicDataSpec dataSpec : dataSpecs) {
-      studyVocabStreams.putAll(getVocabByRootEntity(dataSpec));
-    }
-
-    return studyVocabStreams;
+    return dataSpecs.parallelStream()
+        .map(this::getVocabByRootEntity)
+        .collect(Collectors.toMap(
+            e -> e.keySet().stream().findFirst().orElseThrow(),
+            e -> e.values().stream().findFirst().orElseThrow())
+        );
   }
 
   protected Map<String, InputStream> getVocabByRootEntity(List<DynamicDataSpec> dataSpecs) {

Diff for: src/main/java/org/veupathdb/service/eda/generated/support/ResponseDelegate.java

@@ -104,23 +104,19 @@ public String getHeaderString(String p0) {
     return this.delegate.getHeaderString(p0);
   }
 
-  @Override
-  public Object getEntity() {
-    return this.entity;}
-
   @Override
   public int getStatus() {
     return this.delegate.getStatus();
   }
 
   @Override
-  public <T> T readEntity(Class<T> p0) {
+  public <T> T readEntity(GenericType<T> p0) {
     return this.delegate.readEntity(p0);
   }
 
   @Override
-  public <T> T readEntity(GenericType<T> p0, Annotation[] p1) {
-    return this.delegate.readEntity(p0,p1);
+  public <T> T readEntity(Class<T> p0) {
+    return this.delegate.readEntity(p0);
   }
 
   @Override
@@ -129,8 +125,8 @@ public <T> T readEntity(Class<T> p0, Annotation[] p1) {
   }
 
   @Override
-  public <T> T readEntity(GenericType<T> p0) {
-    return this.delegate.readEntity(p0);
+  public <T> T readEntity(GenericType<T> p0, Annotation[] p1) {
+    return this.delegate.readEntity(p0,p1);
   }
 
   @Override
@@ -158,6 +154,10 @@ public Link getLink(String p0) {
     return this.delegate.getLink(p0);
   }
 
+  @Override
+  public Object getEntity() {
+    return this.entity;}
+
   @Override
   public MultivaluedMap<String, Object> getHeaders() {
     return this.delegate.getHeaders();