Add more information supply chain support

Signed-off-by: Mandy Chessell <[email protected]>
odpi · Feb 3, 2025 · 1f7bd22 · 1f7bd22
1 parent ab9a54e
commit 1f7bd22
Show file tree

Hide file tree

Showing 87 changed files with 3,330 additions and 1,641 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/...va/org/odpi/openmetadata/accessservices/assetmanager/converters/ControlFlowConverter.java b/...va/org/odpi/openmetadata/accessservices/assetmanager/converters/ControlFlowConverter.java
@@ -82,7 +82,7 @@ public B getNewRelationshipBean(Class<B>     beanClass,
                      */
                     InstanceProperties instanceProperties = new InstanceProperties(relationship.getProperties());
 
-                    controlFlowProperties.setQualifiedName(this.getQualifiedName(instanceProperties));
+                    controlFlowProperties.setQualifiedName(this.getISCQualifiedName(instanceProperties));
                     controlFlowProperties.setLabel(this.getLabel(instanceProperties));
                     controlFlowProperties.setDescription(this.getDescription(instanceProperties));
                     controlFlowProperties.setGuard(this.getGuard(instanceProperties));

diff --git a/.../java/org/odpi/openmetadata/accessservices/assetmanager/converters/DataFlowConverter.java b/.../java/org/odpi/openmetadata/accessservices/assetmanager/converters/DataFlowConverter.java
@@ -82,7 +82,7 @@ public B getNewRelationshipBean(Class<B>     beanClass,
                      */
                     InstanceProperties instanceProperties = new InstanceProperties(relationship.getProperties());
 
-                    dataFlowProperties.setQualifiedName(this.getQualifiedName(instanceProperties));
+                    dataFlowProperties.setQualifiedName(this.getISCQualifiedName(instanceProperties));
                     dataFlowProperties.setLabel(this.getLabel(instanceProperties));
                     dataFlowProperties.setDescription(this.getDescription(instanceProperties));
                     dataFlowProperties.setFormula(this.getFormula(instanceProperties));

diff --git a/...org/odpi/openmetadata/accessservices/assetmanager/converters/LineageMappingConverter.java b/...org/odpi/openmetadata/accessservices/assetmanager/converters/LineageMappingConverter.java
@@ -82,7 +82,7 @@ public B getNewRelationshipBean(Class<B>     beanClass,
                      */
                     InstanceProperties instanceProperties = new InstanceProperties(relationship.getProperties());
 
-                    lineageMappingProperties.setQualifiedName(this.getQualifiedName(instanceProperties));
+                    lineageMappingProperties.setQualifiedName(this.getISCQualifiedName(instanceProperties));
                     lineageMappingProperties.setLabel(this.getLabel(instanceProperties));
                     lineageMappingProperties.setDescription(this.getDescription(instanceProperties));
 

diff --git a/...va/org/odpi/openmetadata/accessservices/assetmanager/converters/ProcessCallConverter.java b/...va/org/odpi/openmetadata/accessservices/assetmanager/converters/ProcessCallConverter.java
@@ -82,7 +82,7 @@ public B getNewRelationshipBean(Class<B>     beanClass,
                      */
                     InstanceProperties instanceProperties = new InstanceProperties(relationship.getProperties());
 
-                    processCallProperties.setQualifiedName(this.getQualifiedName(instanceProperties));
+                    processCallProperties.setQualifiedName(this.getISCQualifiedName(instanceProperties));
                     processCallProperties.setLabel(this.getLabel(instanceProperties));
                     processCallProperties.setDescription(this.getDescription(instanceProperties));
                     processCallProperties.setFormula(this.getFormula(instanceProperties));

diff --git a/.../org/odpi/openmetadata/accessservices/assetmanager/handlers/DataAssetExchangeHandler.java b/.../org/odpi/openmetadata/accessservices/assetmanager/handlers/DataAssetExchangeHandler.java
@@ -993,8 +993,8 @@ private RelationshipElement getRelationshipElement(Relationship relationship,
             relationshipElement = new RelationshipElement();
 
             relationshipElement.setRelationshipHeader(elementHeaderConverter.getNewBean(ElementHeader.class, relationship, methodName));
-            relationshipElement.setEnd1GUID(elementHeaderConverter.getNewBean(ElementHeader.class, relationship.getEntityOneProxy(), methodName));
-            relationshipElement.setEnd2GUID(elementHeaderConverter.getNewBean(ElementHeader.class, relationship.getEntityTwoProxy(), methodName));
+            relationshipElement.setEnd1(elementHeaderConverter.getElementStub(ElementHeader.class, relationship.getEntityOneProxy(), methodName));
+            relationshipElement.setEnd2(elementHeaderConverter.getElementStub(ElementHeader.class, relationship.getEntityTwoProxy(), methodName));
 
             if (relationship.getProperties() != null)
             {

diff --git a/...n/java/org/odpi/openmetadata/accessservices/assetowner/server/AssetOwnerRESTServices.java b/...n/java/org/odpi/openmetadata/accessservices/assetowner/server/AssetOwnerRESTServices.java
@@ -1091,8 +1091,8 @@ private RelationshipElement getRelationshipElement(Relationship         relation
             relationshipElement = new RelationshipElement();
 
             relationshipElement.setRelationshipHeader(elementHeaderConverter.getNewBean(ElementHeader.class, relationship, methodName));
-            relationshipElement.setEnd1GUID(elementHeaderConverter.getNewBean(ElementHeader.class, relationship.getEntityOneProxy(), methodName));
-            relationshipElement.setEnd2GUID(elementHeaderConverter.getNewBean(ElementHeader.class, relationship.getEntityTwoProxy(), methodName));
+            relationshipElement.setEnd1(elementHeaderConverter.getElementStub(ElementHeader.class, relationship.getEntityOneProxy(), methodName));
+            relationshipElement.setEnd2(elementHeaderConverter.getElementStub(ElementHeader.class, relationship.getEntityTwoProxy(), methodName));
 
             if (relationship.getProperties() != null)
             {

diff --git a/...in/java/org/odpi/openmetadata/accessservices/digitalarchitecture/api/ManageSolutions.java b/...in/java/org/odpi/openmetadata/accessservices/digitalarchitecture/api/ManageSolutions.java
@@ -34,6 +34,7 @@ public interface ManageSolutions
      *
      * @param userId calling user
      * @param searchString string to find in the properties
+     * @param addImplementation should details of the implementation of the information supply chain be extracted too?
      * @param limitResultsByStatus control the status of the elements to retrieve - default is everything but Deleted
      * @param asOfTime repository time to use
      * @param sequencingProperty property to use for sequencing order
@@ -50,6 +51,7 @@ public interface ManageSolutions
      */
     List<InformationSupplyChainElement> findInformationSupplyChains(String              userId,
                                                                     String              searchString,
+                                                                    boolean             addImplementation,
                                                                     List<ElementStatus> limitResultsByStatus,
                                                                     Date                asOfTime,
                                                                     SequencingOrder     sequencingOrder,