include executables in dataspaceCoverageAPI (#3080)

finos · Sep 18, 2024 · e9118fa · e9118fa
1 parent 94ff3d5
commit e9118fa
Show file tree

Hide file tree

Showing 10 changed files with 209 additions and 194 deletions.
diff --git a/legend-engine-config/legend-engine-extensions-collection-generation/pom.xml b/legend-engine-config/legend-engine-extensions-collection-generation/pom.xml
@@ -120,6 +120,11 @@
             <groupId>org.finos.legend.engine</groupId>
             <artifactId>legend-engine-xt-javaPlatformBinding-pure</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.finos.legend.engine</groupId>
+            <artifactId>legend-engine-xt-analytics-function-pure</artifactId>
+            <scope>runtime</scope>
+        </dependency>
         <dependency>
             <groupId>org.finos.legend.engine</groupId>
             <artifactId>legend-engine-xt-javaPlatformBinding-externalFormat-pure</artifactId>

diff --git a/legend-engine-xts-data-space/legend-engine-xt-data-space-generation/pom.xml b/legend-engine-xts-data-space/legend-engine-xt-data-space-generation/pom.xml
@@ -124,10 +124,6 @@
             <groupId>org.finos.legend.engine</groupId>
             <artifactId>legend-engine-xt-analytics-store-entitlement</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.finos.legend.engine</groupId>
-            <artifactId>legend-engine-xt-analytics-function-pure</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.finos.legend.engine</groupId>
             <artifactId>legend-engine-xt-analytics-binding-pure</artifactId>

diff --git a/.../src/main/java/org/finos/legend/engine/generation/analytics/DataSpaceAnalyticsHelper.java b/.../src/main/java/org/finos/legend/engine/generation/analytics/DataSpaceAnalyticsHelper.java
diff --git a/...main/java/org/finos/legend/engine/generation/analytics/model/DataSpaceAnalysisResult.java b/...main/java/org/finos/legend/engine/generation/analytics/model/DataSpaceAnalysisResult.java
@@ -15,11 +15,13 @@
 package org.finos.legend.engine.generation.analytics.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.finos.legend.engine.protocol.analytics.model.MappingModelCoverageAnalysisResult;
 import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData;
 import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.dataSpace.DataSpaceSupportInfo;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 public class DataSpaceAnalysisResult
 {
@@ -44,4 +46,6 @@ public class DataSpaceAnalysisResult
     public List<DataSpaceExecutableAnalysisResult> executables = Collections.emptyList();
     public List<DataSpaceDiagramAnalysisResult> diagrams = Collections.emptyList();
     public List<DataSpaceModelDocumentationEntry> elementDocs = Collections.emptyList();
+
+    public Map<String, MappingModelCoverageAnalysisResult> mappingToMappingCoverageResult;
 }
diff --git a/...main/java/org/finos/legend/engine/generation/analytics/model/DataSpaceExecutableInfo.java b/...main/java/org/finos/legend/engine/generation/analytics/model/DataSpaceExecutableInfo.java
@@ -26,5 +26,7 @@
 })
 public abstract class DataSpaceExecutableInfo
 {
+    public String id;
+    public String executionContextKey;
     public String query;
 }
diff --git a/...nos/legend/engine/generation/analytics/model/DataSpaceExecutionContextAnalysisResult.java b/...nos/legend/engine/generation/analytics/model/DataSpaceExecutionContextAnalysisResult.java
@@ -28,6 +28,7 @@ public class DataSpaceExecutionContextAnalysisResult
     public List<String> compatibleRuntimes;
     public String defaultRuntime;
     public DataSpaceExecutionContextRuntimeMetadata runtimeMetadata;
+    @Deprecated
     public MappingModelCoverageAnalysisResult mappingModelCoverageAnalysisResult;
     public List<DatasetSpecification> datasets;
 }
diff --git a/...inos/legend/engine/generation/analytics/model/DataSpaceFunctionPointerExecutableInfo.java b/...inos/legend/engine/generation/analytics/model/DataSpaceFunctionPointerExecutableInfo.java
@@ -16,7 +16,5 @@
 
 public class DataSpaceFunctionPointerExecutableInfo extends DataSpaceExecutableInfo
 {
-    public String id;
-    public String executionContextKey;
     public String function;
 }
diff --git a/...a/org/finos/legend/engine/generation/analytics/model/DataSpaceTemplateExecutableInfo.java b/...a/org/finos/legend/engine/generation/analytics/model/DataSpaceTemplateExecutableInfo.java
@@ -16,6 +16,4 @@
 
 public class DataSpaceTemplateExecutableInfo extends DataSpaceExecutableInfo
 {
-    public String id;
-    public String executionContextKey;
 }
diff --git a/...org/finos/legend/engine/generation/TestDataSpaceAnalyticsArtifactGenerationExtension.java b/...org/finos/legend/engine/generation/TestDataSpaceAnalyticsArtifactGenerationExtension.java
diff --git a/...i/src/test/java/org/finos/legend/engine/api/analytics/test/TestDataSpaceAnalyticsApi.java b/...i/src/test/java/org/finos/legend/engine/api/analytics/test/TestDataSpaceAnalyticsApi.java
@@ -56,15 +56,15 @@ public void testDataSpaceAnalysisWithNotFoundDataSpace() throws IOException
     public void testDataSpaceAnalysis() throws IOException
     {
         PureModelContextData modelContextData = objectMapper.readValue(Objects.requireNonNull(getClass().getClassLoader().getResource("dataSpaceAnalyticsTestData.json")), PureModelContextData.class);
-        String expected = "{\"defaultExecutionContext\":\"dummyContext\",\"diagrams\":[],\"elementDocs\":[],\"elements\":[],\"executables\":[],\"executionContexts\":[{\"compatibleRuntimes\":[\"model::dummyRuntime\"],\"datasets\":[],\"defaultRuntime\":\"model::dummyRuntime\",\"mapping\":\"model::dummyMapping\",\"mappingModelCoverageAnalysisResult\":{\"mappedEntities\":[]},\"name\":\"dummyContext\"}],\"model\":{\"_type\":\"data\",\"elements\":[]},\"name\":\"AnimalDS\",\"package\":\"model::animal\",\"path\":\"model::animal::AnimalDS\",\"stereotypes\":[],\"taggedValues\":[]}";
+        String expected = "{\"defaultExecutionContext\":\"dummyContext\",\"diagrams\":[],\"elementDocs\":[],\"elements\":[],\"executables\":[],\"executionContexts\":[{\"compatibleRuntimes\":[\"model::dummyRuntime\"],\"datasets\":[],\"defaultRuntime\":\"model::dummyRuntime\",\"mapping\":\"model::dummyMapping\",\"name\":\"dummyContext\"}],\"mappingToMappingCoverageResult\":{\"model::dummyMapping\":{\"mappedEntities\":[]}},\"model\":{\"_type\":\"data\",\"elements\":[]},\"name\":\"AnimalDS\",\"package\":\"model::animal\",\"path\":\"model::animal::AnimalDS\",\"stereotypes\":[],\"taggedValues\":[]}";
         testAnalyticsWithVersions(expected, modelContextData, "model::animal::AnimalDS");
     }
 
     @Test
     public void testDataSpaceCoverageAnalysis() throws IOException
     {
         PureModelContextData modelContextData = objectMapper.readValue(Objects.requireNonNull(getClass().getClassLoader().getResource("dataSpaceAnalyticsTestData.json")), PureModelContextData.class);
-        String expected = "{\"defaultExecutionContext\":\"dummyContext\",\"diagrams\":[],\"elementDocs\":[],\"elements\":[],\"executables\":[],\"executionContexts\":[{\"compatibleRuntimes\":[\"model::dummyRuntime\"],\"defaultRuntime\":\"model::dummyRuntime\",\"mapping\":\"model::dummyMapping\",\"mappingModelCoverageAnalysisResult\":{\"mappedEntities\":[],\"model\":{\"_type\":\"data\",\"elements\":[{\"_type\":\"dataSpace\",\"defaultExecutionContext\":\"dummyContext\",\"executionContexts\":[{\"defaultRuntime\":{\"path\":\"model::dummyRuntime\",\"type\":\"RUNTIME\"},\"mapping\":{\"path\":\"model::dummyMapping\",\"type\":\"MAPPING\"},\"name\":\"dummyContext\"}],\"name\":\"AnimalDS\",\"package\":\"model::animal\",\"stereotypes\":[],\"taggedValues\":[]}]}},\"name\":\"dummyContext\"}],\"name\":\"AnimalDS\",\"package\":\"model::animal\",\"path\":\"model::animal::AnimalDS\",\"stereotypes\":[],\"taggedValues\":[]}";
+        String expected = "{\"defaultExecutionContext\":\"dummyContext\",\"diagrams\":[],\"elementDocs\":[],\"elements\":[],\"executables\":[],\"executionContexts\":[{\"compatibleRuntimes\":[\"model::dummyRuntime\"],\"defaultRuntime\":\"model::dummyRuntime\",\"mapping\":\"model::dummyMapping\",\"name\":\"dummyContext\"}],\"mappingToMappingCoverageResult\":{\"model::dummyMapping\":{\"mappedEntities\":[],\"model\":{\"_type\":\"data\",\"elements\":[]}}},\"name\":\"AnimalDS\",\"package\":\"model::animal\",\"path\":\"model::animal::AnimalDS\",\"stereotypes\":[],\"taggedValues\":[]}";
         testCoverageAnalyticsWithVersions(expected, modelContextData, "model::animal::AnimalDS");
     }