Merge pull request #8626 from mandy-chessell/oak2025

Add supply chain context to the solution component mermaid graph
odpi · Feb 6, 2025 · 2b6152b · 2b6152b
2 parents 0b402ea + e1257cd
commit 2b6152b
Show file tree

Hide file tree

Showing 74 changed files with 1,831 additions and 542 deletions.
diff --git a/EgeriaContentPacksGUIDMap.json b/EgeriaContentPacksGUIDMap.json
diff --git a/content-packs/APIsContentPack.omarchive b/content-packs/APIsContentPack.omarchive
diff --git a/content-packs/ApacheAtlasContentPack.omarchive b/content-packs/ApacheAtlasContentPack.omarchive
diff --git a/content-packs/ApacheKafkaContentPack.omarchive b/content-packs/ApacheKafkaContentPack.omarchive
diff --git a/content-packs/CocoBusinessSystemsArchive.omarchive b/content-packs/CocoBusinessSystemsArchive.omarchive
diff --git a/content-packs/CocoClinicalTrialsTemplatesArchive.omarchive b/content-packs/CocoClinicalTrialsTemplatesArchive.omarchive
diff --git a/content-packs/CocoComboArchive.omarchive b/content-packs/CocoComboArchive.omarchive
diff --git a/content-packs/CocoGovernanceEngineDefinitionsArchive.omarchive b/content-packs/CocoGovernanceEngineDefinitionsArchive.omarchive
diff --git a/content-packs/CocoGovernanceProgramArchive.omarchive b/content-packs/CocoGovernanceProgramArchive.omarchive
diff --git a/content-packs/CocoOrganizationArchive.omarchive b/content-packs/CocoOrganizationArchive.omarchive
diff --git a/content-packs/CocoSustainabilityArchive.omarchive b/content-packs/CocoSustainabilityArchive.omarchive
diff --git a/content-packs/CocoTypesArchive.omarchive b/content-packs/CocoTypesArchive.omarchive
diff --git a/content-packs/CoreContentPack.omarchive b/content-packs/CoreContentPack.omarchive
diff --git a/content-packs/ObservabilityContentPack.omarchive b/content-packs/ObservabilityContentPack.omarchive
diff --git a/content-packs/OpenMetadataTypes.omarchive b/content-packs/OpenMetadataTypes.omarchive
diff --git a/content-packs/PostgresContentPack.omarchive b/content-packs/PostgresContentPack.omarchive
diff --git a/content-packs/UnityCatalogContentPack.omarchive b/content-packs/UnityCatalogContentPack.omarchive
diff --git a/...rc/main/java/org/odpi/openmetadata/accessservices/assetconsumer/client/AssetConsumer.java b/...rc/main/java/org/odpi/openmetadata/accessservices/assetconsumer/client/AssetConsumer.java
@@ -25,6 +25,7 @@
 import org.odpi.openmetadata.frameworkservices.ocf.metadatamanagement.rest.TagRequestBody;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -365,6 +366,10 @@ public AssetGraph getAssetGraph(String userId,
     public AssetLineageGraph getAssetLineageGraph(String       userId,
                                                   String       assetGUID,
                                                   List<String> relationshipTypes,
+                                                  String       limitToISCQualifiedName,
+                                                  String       highlightISCQualifiedName,
+                                                  Date         asOfTime,
+                                                  Date         effectiveTime,
                                                   int          startFrom,
                                                   int          pageSize) throws InvalidParameterException,
                                                                                 PropertyServerException,
@@ -377,30 +382,22 @@ public AssetLineageGraph getAssetLineageGraph(String       userId,
         invalidParameterHandler.validateUserId(userId, methodName);
         invalidParameterHandler.validateGUID(assetGUID, guidParameter, methodName);
 
-        AssetLineageGraphResponse restResult;
-
-        if (relationshipTypes == null)
-        {
-            restResult = restClient.callAssetLineageGraphPostRESTCall(methodName,
-                                                                      urlTemplate,
-                                                                      new ArrayList<>(),
-                                                                      serverName,
-                                                                      userId,
-                                                                      assetGUID,
-                                                                      startFrom,
-                                                                      pageSize);
-        }
-        else
-        {
-            restResult = restClient.callAssetLineageGraphPostRESTCall(methodName,
-                                                                      urlTemplate,
-                                                                      relationshipTypes,
-                                                                      serverName,
-                                                                      userId,
-                                                                      assetGUID,
-                                                                      startFrom,
-                                                                      pageSize);
-        }
+        AssetLineageGraphRequestBody requestBody = new AssetLineageGraphRequestBody();
+
+        requestBody.setEffectiveTime(effectiveTime);
+        requestBody.setAsOfTime(asOfTime);
+        requestBody.setRelationshipTypes(relationshipTypes);
+        requestBody.setLimitToISCQualifiedName(limitToISCQualifiedName);
+        requestBody.setHighlightISCQualifiedName(highlightISCQualifiedName);
+
+        AssetLineageGraphResponse restResult = restClient.callAssetLineageGraphPostRESTCall(methodName,
+                                                                                            urlTemplate,
+                                                                                            requestBody,
+                                                                                            serverName,
+                                                                                            userId,
+                                                                                            assetGUID,
+                                                                                            startFrom,
+                                                                                            pageSize);
 
         return restResult.getAssetLineageGraph();
     }

diff --git a/.../org/odpi/openmetadata/accessservices/assetconsumer/server/AssetConsumerRESTServices.java b/.../org/odpi/openmetadata/accessservices/assetconsumer/server/AssetConsumerRESTServices.java
diff --git a/...g/odpi/openmetadata/accessservices/assetconsumer/server/spring/AssetConsumerResource.java b/...g/odpi/openmetadata/accessservices/assetconsumer/server/spring/AssetConsumerResource.java
@@ -411,7 +411,7 @@ public AssetGraphResponse getAssetGraph(@PathVariable String serverName,
      * @param serverName name of the server instances for this request
      * @param userId the userId of the requesting user
      * @param assetGUID  unique identifier for the asset
-     * @param relationshipTypes list of relationship type names to use in the search
+     * @param requestBody list of relationship type names to use in the search
      * @param startFrom starting element (used in paging through large result sets)
      * @param pageSize maximum number of results to return
      *
@@ -436,9 +436,9 @@ public AssetLineageGraphResponse getAssetLineageGraph(@PathVariable String serve
                                                           @RequestParam(required = false, defaultValue = "0")
                                                                         int   pageSize,
                                                           @RequestBody(required = false)
-                                                                        List<String> relationshipTypes)
+                                                                        AssetLineageGraphRequestBody requestBody)
     {
-        return restAPI.getAssetLineageGraph(serverName, userId, assetGUID, relationshipTypes, startFrom, pageSize);
+        return restAPI.getAssetLineageGraph(serverName, userId, assetGUID, requestBody, startFrom, pageSize);
     }
 
 

diff --git a/.../org/odpi/openmetadata/accessservices/assetmanager/handlers/DataAssetExchangeHandler.java b/.../org/odpi/openmetadata/accessservices/assetmanager/handlers/DataAssetExchangeHandler.java
@@ -855,8 +855,8 @@ public String setupRelatedDataAsset(String                 userId,
         {
             if (relationshipProperties instanceof DataContentForDataSetProperties dataContentForDataSetProperties)
             {
-                instanceProperties = repositoryHelper.addStringPropertyToInstance(serviceName, null, OpenMetadataType.QUERY_ID_PROPERTY_NAME, dataContentForDataSetProperties.getQueryId(), methodName);
-                instanceProperties = repositoryHelper.addStringPropertyToInstance(serviceName, instanceProperties, OpenMetadataType.QUERY_PROPERTY_NAME, dataContentForDataSetProperties.getQuery(), methodName);
+                instanceProperties = repositoryHelper.addStringPropertyToInstance(serviceName, null, OpenMetadataProperty.QUERY_ID.name, dataContentForDataSetProperties.getQueryId(), methodName);
+                instanceProperties = repositoryHelper.addStringPropertyToInstance(serviceName, instanceProperties, OpenMetadataProperty.QUERY.name, dataContentForDataSetProperties.getQuery(), methodName);
             }
         }
 
@@ -1002,8 +1002,8 @@ private RelationshipElement getRelationshipElement(Relationship relationship,
                 {
                     DataContentForDataSetProperties properties = new DataContentForDataSetProperties();
 
-                    properties.setQueryId(repositoryHelper.getStringProperty(serviceName, OpenMetadataType.QUERY_ID_PROPERTY_NAME, relationship.getProperties(), methodName));
-                    properties.setQuery(repositoryHelper.getStringProperty(serviceName, OpenMetadataType.QUERY_PROPERTY_NAME, relationship.getProperties(), methodName));
+                    properties.setQueryId(repositoryHelper.getStringProperty(serviceName, OpenMetadataProperty.QUERY_ID.name, relationship.getProperties(), methodName));
+                    properties.setQuery(repositoryHelper.getStringProperty(serviceName, OpenMetadataProperty.QUERY.name, relationship.getProperties(), methodName));
 
                     properties.setEffectiveFrom(relationship.getProperties().getEffectiveFromTime());
                     properties.setEffectiveTo(relationship.getProperties().getEffectiveFromTime());
@@ -1072,8 +1072,8 @@ public void   updateAssetRelationship(String                 userId,
         {
             if (relationshipProperties instanceof DataContentForDataSetProperties dataContentForDataSetProperties)
             {
-                instanceProperties = repositoryHelper.addStringPropertyToInstance(serviceName, null, OpenMetadataType.QUERY_ID_PROPERTY_NAME, dataContentForDataSetProperties.getQueryId(), methodName);
-                instanceProperties = repositoryHelper.addStringPropertyToInstance(serviceName, instanceProperties, OpenMetadataType.QUERY_PROPERTY_NAME, dataContentForDataSetProperties.getQuery(), methodName);
+                instanceProperties = repositoryHelper.addStringPropertyToInstance(serviceName, null, OpenMetadataProperty.QUERY_ID.name, dataContentForDataSetProperties.getQueryId(), methodName);
+                instanceProperties = repositoryHelper.addStringPropertyToInstance(serviceName, instanceProperties, OpenMetadataProperty.QUERY.name, dataContentForDataSetProperties.getQuery(), methodName);
             }
         }
 

diff --git a/...n/java/org/odpi/openmetadata/accessservices/assetowner/server/AssetOwnerRESTServices.java b/...n/java/org/odpi/openmetadata/accessservices/assetowner/server/AssetOwnerRESTServices.java
@@ -461,12 +461,12 @@ public GUIDResponse setupRelatedAsset(String                  serverName,
                 {
                     InstanceProperties instanceProperties = handler.getRepositoryHelper().addStringPropertyToInstance(handler.getServiceName(),
                                                                                                                       null,
-                                                                                                                      OpenMetadataType.QUERY_ID_PROPERTY_NAME,
+                                                                                                                      OpenMetadataProperty.QUERY_ID.name,
                                                                                                                       dataContentForDataSetProperties.getQueryId(),
                                                                                                                       methodName);
                     instanceProperties = handler.getRepositoryHelper().addStringPropertyToInstance(handler.getServiceName(),
                                                                                                    instanceProperties,
-                                                                                                   OpenMetadataType.QUERY_PROPERTY_NAME,
+                                                                                                   OpenMetadataProperty.QUERY.name,
                                                                                                    dataContentForDataSetProperties.getQuery(),
                                                                                                    methodName);
 
@@ -704,8 +704,8 @@ public VoidResponse updateAssetRelationship(String                  serverName,
                 {
                     if (requestBody.getProperties() instanceof DataContentForDataSetProperties dataContentForDataSetProperties)
                     {
-                        instanceProperties = handler.getRepositoryHelper().addStringPropertyToInstance(handler.getServiceName(), null, OpenMetadataType.QUERY_ID_PROPERTY_NAME, dataContentForDataSetProperties.getQueryId(), methodName);
-                        instanceProperties = handler.getRepositoryHelper().addStringPropertyToInstance(handler.getServiceName(), instanceProperties, OpenMetadataType.QUERY_PROPERTY_NAME, dataContentForDataSetProperties.getQuery(), methodName);
+                        instanceProperties = handler.getRepositoryHelper().addStringPropertyToInstance(handler.getServiceName(), null, OpenMetadataProperty.QUERY_ID.name, dataContentForDataSetProperties.getQueryId(), methodName);
+                        instanceProperties = handler.getRepositoryHelper().addStringPropertyToInstance(handler.getServiceName(), instanceProperties, OpenMetadataProperty.QUERY.name, dataContentForDataSetProperties.getQuery(), methodName);
                     }
                 }
 
@@ -1100,8 +1100,8 @@ private RelationshipElement getRelationshipElement(Relationship         relation
                 {
                     DataContentForDataSetProperties properties = new DataContentForDataSetProperties();
 
-                    properties.setQueryId(repositoryHelper.getStringProperty(instanceHandler.getServiceName(), OpenMetadataType.QUERY_ID_PROPERTY_NAME, relationship.getProperties(), methodName));
-                    properties.setQuery(repositoryHelper.getStringProperty(instanceHandler.getServiceName(), OpenMetadataType.QUERY_PROPERTY_NAME, relationship.getProperties(), methodName));
+                    properties.setQueryId(repositoryHelper.getStringProperty(instanceHandler.getServiceName(), OpenMetadataProperty.QUERY_ID.name, relationship.getProperties(), methodName));
+                    properties.setQuery(repositoryHelper.getStringProperty(instanceHandler.getServiceName(), OpenMetadataProperty.QUERY.name, relationship.getProperties(), methodName));
 
                     properties.setEffectiveFrom(relationship.getProperties().getEffectiveFromTime());
                     properties.setEffectiveTo(relationship.getProperties().getEffectiveFromTime());