Merge pull request #8486 from mandy-chessell/oak2024

Add label to lineage relationships
odpi · Nov 12, 2024 · f623918 · f623918
2 parents 7df6196 + 8e926f7
commit f623918
Show file tree

Hide file tree

Showing 50 changed files with 1,148 additions and 576 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/.../org/odpi/openmetadata/accessservices/assetconsumer/server/AssetConsumerRESTServices.java b/.../org/odpi/openmetadata/accessservices/assetconsumer/server/AssetConsumerRESTServices.java
@@ -663,10 +663,10 @@ private List<String> getLineageRelationshipTypeNames(List<String> relationshipTy
         {
             lineageRelationshipTypeNames = new ArrayList<>();
 
-            lineageRelationshipTypeNames.add(OpenMetadataType.DATA_FLOW_TYPE_NAME);
-            lineageRelationshipTypeNames.add(OpenMetadataType.CONTROL_FLOW_TYPE_NAME);
-            lineageRelationshipTypeNames.add(OpenMetadataType.LINEAGE_MAPPING_TYPE_NAME);
-            lineageRelationshipTypeNames.add(OpenMetadataType.PROCESS_CALL_TYPE_NAME);
+            lineageRelationshipTypeNames.add(OpenMetadataType.DATA_FLOW.typeName);
+            lineageRelationshipTypeNames.add(OpenMetadataType.CONTROL_FLOW.typeName);
+            lineageRelationshipTypeNames.add(OpenMetadataType.LINEAGE_MAPPING.typeName);
+            lineageRelationshipTypeNames.add(OpenMetadataType.PROCESS_CALL.typeName);
             lineageRelationshipTypeNames.add(OpenMetadataType.SCHEMA_QUERY_TARGET_RELATIONSHIP_TYPE_NAME);
             lineageRelationshipTypeNames.add(OpenMetadataType.DATA_CONTENT_FOR_DATA_SET_RELATIONSHIP.typeName);
         }

diff --git a/...va/org/odpi/openmetadata/accessservices/assetmanager/converters/ControlFlowConverter.java b/...va/org/odpi/openmetadata/accessservices/assetmanager/converters/ControlFlowConverter.java
@@ -83,6 +83,7 @@ public B getNewRelationshipBean(Class<B>     beanClass,
                     InstanceProperties instanceProperties = new InstanceProperties(relationship.getProperties());
 
                     controlFlowProperties.setQualifiedName(this.getQualifiedName(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
@@ -78,11 +78,12 @@ public B getNewRelationshipBean(Class<B>     beanClass,
                     }
 
                     /*
-                     * The rest of the properties coem from the relationship.
+                     * The rest of the properties come from the relationship.
                      */
                     InstanceProperties instanceProperties = new InstanceProperties(relationship.getProperties());
 
                     dataFlowProperties.setQualifiedName(this.getQualifiedName(instanceProperties));
+                    dataFlowProperties.setLabel(this.getLabel(instanceProperties));
                     dataFlowProperties.setDescription(this.getDescription(instanceProperties));
                     dataFlowProperties.setFormula(this.getFormula(instanceProperties));
                     dataFlowProperties.setFormulaType(this.getFormulaType(instanceProperties));

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

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

diff --git a/...va/org/odpi/openmetadata/accessservices/assetmanager/handlers/ProcessExchangeHandler.java b/...va/org/odpi/openmetadata/accessservices/assetmanager/handlers/ProcessExchangeHandler.java
@@ -2228,7 +2228,8 @@ public void clearBusinessSignificant(String                        userId,
      * @param assetManagerIsHome ensure that only the process manager can update this process
      * @param dataSupplierGUID unique identifier of the data supplier
      * @param dataConsumerGUID unique identifier of the data consumer
-     * @param qualifiedName unique identifier for this relationship
+     * @param qualifiedName unique identifier for the information supply chain
+     * @param label label for the visualization of the relationship
      * @param description description and/or purpose of the data flow
      * @param formula function that determines the subset of the data that flows
      * @param effectiveFrom the date when this element is active - null for active now
@@ -2251,6 +2252,7 @@ public String setupDataFlow(String  userId,
                                 String  dataSupplierGUID,
                                 String  dataConsumerGUID,
                                 String  qualifiedName,
+                                String  label,
                                 String  description,
                                 String  formula,
                                 Date    effectiveFrom,
@@ -2284,6 +2286,7 @@ public String setupDataFlow(String  userId,
                                             effectiveFrom,
                                             effectiveTo,
                                             qualifiedName,
+                                            label,
                                             description,
                                             formula,
                                             forLineage,
@@ -2347,7 +2350,8 @@ public DataFlowElement getDataFlow(String  userId,
      * @param assetManagerGUID unique identifier of software server capability representing the caller
      * @param assetManagerName unique name of software server capability representing the caller
      * @param dataFlowGUID unique identifier of the data flow relationship
-     * @param qualifiedName unique identifier for this relationship
+     * @param qualifiedName unique identifier for the information supply chain
+     * @param label label for the visualization of the relationship
      * @param description description and/or purpose of the data flow
      * @param formula function that determines the subset of the data that flows
      * @param effectiveFrom the date when this element is active - null for active now
@@ -2366,6 +2370,7 @@ public void   updateDataFlow(String  userId,
                                  String  assetManagerName,
                                  String  dataFlowGUID,
                                  String  qualifiedName,
+                                 String  label,
                                  String  description,
                                  String  formula,
                                  Date    effectiveFrom,
@@ -2387,6 +2392,7 @@ public void   updateDataFlow(String  userId,
                                       effectiveFrom,
                                       effectiveTo,
                                       qualifiedName,
+                                      label,
                                       description,
                                       formula,
                                       forLineage,
@@ -2532,7 +2538,8 @@ public List<DataFlowElement> getDataFlowSuppliers(String  userId,
      * @param assetManagerIsHome ensure that only the process manager can update this process
      * @param currentStepGUID unique identifier of the previous step
      * @param nextStepGUID unique identifier of the next step
-     * @param qualifiedName unique identifier for this relationship
+     * @param qualifiedName unique identifier for the information supply chain
+     * @param label label for the visualization of the relationship
      * @param description description and/or purpose of the control flow
      * @param guard function that must be true to travel down this control flow
      * @param effectiveFrom the date when this element is active - null for active now
@@ -2555,6 +2562,7 @@ public String setupControlFlow(String  userId,
                                    String  currentStepGUID,
                                    String  nextStepGUID,
                                    String  qualifiedName,
+                                   String  label,
                                    String  description,
                                    String  guard,
                                    Date    effectiveFrom,
@@ -2588,6 +2596,7 @@ public String setupControlFlow(String  userId,
                                                effectiveFrom,
                                                effectiveTo,
                                                qualifiedName,
+                                               label,
                                                description,
                                                guard,
                                                forLineage,
@@ -2651,7 +2660,8 @@ public ControlFlowElement getControlFlow(String  userId,
      * @param assetManagerGUID unique identifier of software server capability representing the caller
      * @param assetManagerName unique name of software server capability representing the caller
      * @param controlFlowGUID unique identifier of the  control flow relationship
-     * @param qualifiedName unique identifier for this relationship
+     * @param qualifiedName unique identifier for the information supply chain
+     * @param label label for the visualization of the relationship
      * @param description description and/or purpose of the control flow
      * @param guard function that must be true to travel down this control flow
      * @param effectiveFrom the date when this element is active - null for active now
@@ -2670,6 +2680,7 @@ public void updateControlFlow(String  userId,
                                   String  assetManagerName,
                                   String  controlFlowGUID,
                                   String  qualifiedName,
+                                  String  label,
                                   String  description,
                                   String  guard,
                                   Date    effectiveFrom,
@@ -2691,6 +2702,7 @@ public void updateControlFlow(String  userId,
                                          effectiveFrom,
                                          effectiveTo,
                                          qualifiedName,
+                                         label,
                                          description,
                                          guard,
                                          forLineage,
@@ -2836,7 +2848,8 @@ public List<ControlFlowElement> getControlFlowPreviousSteps(String  userId,
      * @param assetManagerIsHome ensure that only the process manager can update this process
      * @param callerGUID unique identifier of the element that is making the call
      * @param calledGUID unique identifier of the element that is processing the call
-     * @param qualifiedName unique identifier for this relationship
+     * @param qualifiedName unique identifier for the information supply chain
+     * @param label label for the visualization of the relationship
      * @param description description and/or purpose of the process call
      * @param formula function that describes the function performed
      * @param effectiveFrom the date when this element is active - null for active now
@@ -2859,6 +2872,7 @@ public String setupProcessCall(String  userId,
                                    String  callerGUID,
                                    String  calledGUID,
                                    String  qualifiedName,
+                                   String  label,
                                    String  description,
                                    String  formula,
                                    Date    effectiveFrom,
@@ -2892,6 +2906,7 @@ public String setupProcessCall(String  userId,
                                                effectiveFrom,
                                                effectiveTo,
                                                qualifiedName,
+                                               label,
                                                description,
                                                formula,
                                                forLineage,
@@ -2955,7 +2970,8 @@ public ProcessCallElement getProcessCall(String  userId,
      * @param assetManagerGUID unique identifier of software server capability representing the caller
      * @param assetManagerName unique name of software server capability representing the caller
      * @param processCallGUID unique identifier of the process call relationship
-     * @param qualifiedName unique identifier for this relationship
+     * @param qualifiedName unique identifier for the information supply chain
+     * @param label label for the visualization of the relationship
      * @param description description and/or purpose of the data flow
      * @param formula function that describes the function performed
      * @param effectiveFrom the date when this element is active - null for active now
@@ -2974,6 +2990,7 @@ public void updateProcessCall(String  userId,
                                   String  assetManagerName,
                                   String  processCallGUID,
                                   String  qualifiedName,
+                                  String  label,
                                   String  description,
                                   String  formula,
                                   Date    effectiveFrom,
@@ -2995,6 +3012,7 @@ public void updateProcessCall(String  userId,
                                          effectiveFrom,
                                          effectiveTo,
                                          qualifiedName,
+                                         label,
                                          description,
                                          formula,
                                          forLineage,
@@ -3141,7 +3159,8 @@ public List<ProcessCallElement> getProcessCallers(String  userId,
      * @param assetManagerName unique name of software server capability representing the caller
      * @param sourceElementGUID unique identifier of the source
      * @param destinationElementGUID unique identifier of the destination
-     * @param qualifiedName unique identifier for this relationship
+     * @param qualifiedName unique identifier for associated information supply chain
+     * @param label label for the visualization of the relationship
      * @param description description and/or purpose of the mapping
      * @param effectiveFrom the date when this element is active - null for active now
      * @param effectiveTo the date when this element becomes inactive - null for active until deleted
@@ -3161,6 +3180,7 @@ public String setupLineageMapping(String  userId,
                                       String  sourceElementGUID,
                                       String  destinationElementGUID,
                                       String  qualifiedName,
+                                      String  label,
                                       String  description,
                                       Date    effectiveFrom,
                                       Date    effectiveTo,
@@ -3180,6 +3200,7 @@ public String setupLineageMapping(String  userId,
                                                          destinationElementGUID,
                                                          destinationElementGUIDParameterName,
                                                          qualifiedName,
+                                                         label,
                                                          description,
                                                          effectiveFrom,
                                                          effectiveTo,
@@ -3190,7 +3211,7 @@ public String setupLineageMapping(String  userId,
 
         externalIdentifierHandler.logRelationshipCreation(assetManagerGUID,
                                                           assetManagerName,
-                                                          OpenMetadataType.LINEAGE_MAPPING_TYPE_NAME,
+                                                          OpenMetadataType.LINEAGE_MAPPING.typeName,
                                                           sourceElementGUID,
                                                           OpenMetadataType.REFERENCEABLE.typeName,
                                                           destinationElementGUID,
@@ -3257,6 +3278,7 @@ public LineageMappingElement getLineageMapping(String  userId,
      * @param assetManagerName unique name of software server capability representing the caller
      * @param lineageMappingGUID unique identifier of the process call relationship
      * @param qualifiedName unique identifier for this relationship
+     * @param label label for the visualization of the relationship
      * @param description description and/or purpose of the mapping
      * @param effectiveFrom the date when this element is active - null for active now
      * @param effectiveTo the date when this element becomes inactive - null for active until deleted
@@ -3275,6 +3297,7 @@ public void updateLineageMapping(String  userId,
                                      String  assetManagerName,
                                      String  lineageMappingGUID,
                                      String  qualifiedName,
+                                     String  label,
                                      String  description,
                                      Date    effectiveFrom,
                                      Date    effectiveTo,
@@ -3291,6 +3314,7 @@ public void updateLineageMapping(String  userId,
                                            lineageMappingGUID,
                                            lineageMappingGUIDParameterName,
                                            qualifiedName,
+                                           label,
                                            description,
                                            effectiveFrom,
                                            effectiveTo,