Merge pull request #8657 from mandy-chessell/oak2025

Add backward compatibility properties to FindPropertyNameProperties
odpi · Mar 5, 2025 · 431ae12 · 431ae12
2 parents 4248ea6 + f5f12f5
commit 431ae12
Show file tree

Hide file tree

Showing 15 changed files with 150 additions and 16 deletions.
diff --git a/EgeriaContentPacksGUIDMap.json b/EgeriaContentPacksGUIDMap.json
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/...va/org/odpi/openmetadata/commonservices/mermaid/AssetLineageGraphMermaidGraphBuilder.java b/...va/org/odpi/openmetadata/commonservices/mermaid/AssetLineageGraphMermaidGraphBuilder.java
@@ -56,9 +56,9 @@ public AssetLineageGraphMermaidGraphBuilder(AssetLineageGraph assetLineageGraph,
                     }
 
                     appendNewMermaidNode(currentNodeName,
-                                             currentDisplayName,
-                                             node.getElementHeader().getType().getTypeName(),
-                                             VisualStyle.INFORMATION_SUPPLY_CHAIN_IMPL);
+                                         currentDisplayName,
+                                         node.getElementHeader().getType().getTypeName(),
+                                         VisualStyle.INFORMATION_SUPPLY_CHAIN_IMPL);
                 }
             }
 

diff --git a/.../org/odpi/openmetadata/frameworks/openmetadata/properties/FindPropertyNameProperties.java b/.../org/odpi/openmetadata/frameworks/openmetadata/properties/FindPropertyNameProperties.java
@@ -95,6 +95,57 @@ public void setPropertyName(String propertyName)
     }
 
 
+    /*
+     * Provided for backward compatibility with original request (used to use NameRequestBody which did not
+     * support all of the parameters needed.
+     */
+
+    /**
+     * Return the name for the query request.
+     *
+     * @return string name
+     */
+    public String getName()
+    {
+        return propertyValue;
+    }
+
+
+    /**
+     * Set up the name for the query request.
+     *
+     * @param name string
+     */
+    public void setName(String name)
+    {
+        this.propertyValue = name;
+    }
+
+
+
+    /**
+     * Return the property name from the open metadata types.
+     *
+     * @return string name
+     */
+    public String getNamePropertyName()
+    {
+        return propertyName;
+    }
+
+
+    /**
+     * Set up the property name from the open metadata types.
+     *
+     * @param namePropertyName string
+     */
+    public void setNamePropertyName(String namePropertyName)
+    {
+        this.propertyName = namePropertyName;
+    }
+
+
+
     /**
      * Standard toString method.
      *

diff --git a/open-metadata-implementation/view-services/asset-catalog/Egeria-asset-catalog-omvs.http b/open-metadata-implementation/view-services/asset-catalog/Egeria-asset-catalog-omvs.http
@@ -24,6 +24,7 @@ Content-Type: application/json
 
 @assetGUID=put guid here
 
+
 ###
 # @name=getAssetGraph
 # Return all the elements that are anchored to an asset plus relationships between these elements and to other elements.
@@ -46,7 +47,7 @@ Content-Type: application/json
 
 
 ###
-# @name=getAssetLineageGraph
+# @name=getAssetLineageGraph - all of the parameters
 # Return all the elements that are linked to an asset using lineage relationships.  The relationships are
 # retrieved both from the asset, and the anchored schema elements.
 #
@@ -55,7 +56,67 @@ POST {{baseURL}}/servers/{{viewServer}}/api/open-metadata/asset-catalog/assets/{
 Authorization: Bearer {{token}}
 Content-Type: application/json
 
-["DataContentForDataSet"]
+{
+  "effectiveTime" : "{{isoTimestamp}}",
+  "asOfTime": "{{isoTimestamp}}",
+  "relationshipTypes" : ["DataContentForDataSet"],
+  "limitToISCQualifiedName": "",
+  "highlightISCQualifiedName": ""
+}
+
+###
+# @name get the GUID for a named asset
+# Retrieve the metadata element using its unique identifier.
+POST {{baseURL}}/servers/{{viewServer}}/api/open-metadata/asset-catalog/metadata-elements/guid-by-unique-name
+Authorization: Bearer {{token}}
+Content-Type: application/json
+
+{
+  "class" : "NameRequestBody",
+  "name" : "System:coco-sus",
+  "namePropertyName" : "qualifiedName"
+}
+
+> {% client.global.set("cocoSusGUID", response.body.guid); %}
+
+###
+# @name=getAssetLineageGraph coco-sus - local supply chain
+# Return all the elements that are linked to an asset using lineage relationships.  The relationships are
+# retrieved both from the asset, and the anchored schema elements.
+#
+# Lineage: https://egeria-project.org/features/lineage-management/overview/
+POST {{baseURL}}/servers/{{viewServer}}/api/open-metadata/asset-catalog/assets/{{cocoSusGUID}}/as-lineage-graph?startFrom=0&pageSize=0
+Authorization: Bearer {{token}}
+Content-Type: application/json
+
+{
+  "limitToISCQualifiedName": "InformationSupplyChain:Sustainability Reporting"
+}
+
+###
+# @name=getAssetLineageGraph coco-sus - highlight sustainability
+# Return all the elements that are linked to an asset using lineage relationships.  The relationships are
+# retrieved both from the asset, and the anchored schema elements.
+#
+# Lineage: https://egeria-project.org/features/lineage-management/overview/
+POST {{baseURL}}/servers/{{viewServer}}/api/open-metadata/asset-catalog/assets/{{cocoSusGUID}}/as-lineage-graph?startFrom=0&pageSize=0
+Authorization: Bearer {{token}}
+Content-Type: application/json
+
+{
+  "highlightISCQualifiedName": "InformationSupplyChain:Sustainability Reporting"
+}
+
+###
+# @name=getAssetLineageGraph coco-sus - full graph
+# Return all the elements that are linked to an asset using lineage relationships.  The relationships are
+# retrieved both from the asset, and the anchored schema elements.
+#
+# Lineage: https://egeria-project.org/features/lineage-management/overview/
+POST {{baseURL}}/servers/{{viewServer}}/api/open-metadata/asset-catalog/assets/{{cocoSusGUID}}/as-lineage-graph?startFrom=0&pageSize=0
+Authorization: Bearer {{token}}
+Content-Type: application/json
+
 
 ###
 # @name=findAssetsInDomain

diff --git a/...adata-implementation/view-services/automated-curation/Egeria-automated-curation-omvs.http b/...adata-implementation/view-services/automated-curation/Egeria-automated-curation-omvs.http
@@ -1,7 +1,7 @@
 # Egeria-automated-curation-view-service
 
 @baseURL=https://localhost:9443
-@viewServer=qs-view-server
+@viewServer=view-server
 
 ###
 # =====================================================================================================================

diff --git a/...-metadata-implementation/view-services/glossary-browser/Egeria-glossary-browser-omvs.http b/...-metadata-implementation/view-services/glossary-browser/Egeria-glossary-browser-omvs.http
@@ -1,7 +1,7 @@
 # Egeria-glossary-browser-omvs
 
 @baseURL=https://localhost:9443
-@viewServer=qs-view-server
+@viewServer=view-server
 
 ###
 # =====================================================================================================================

diff --git a/...va/org/odpi/openmetadata/samples/archiveutilities/businesssystems/SystemLevelLineage.java b/...va/org/odpi/openmetadata/samples/archiveutilities/businesssystems/SystemLevelLineage.java
@@ -152,6 +152,13 @@ public enum SystemLevelLineage
                              "goods in",
                              InformationSupplyChain.PHYSICAL_INVENTORY_TRACKING.getQualifiedName(),
                              SystemDefinition.AUS_INVENTORY),
+
+    AUS_HAZ_MAT_DELIVERY(SystemDefinition.COCO_PROCUREMENT_AUS,
+                         OpenMetadataType.DATA_FLOW.typeName,
+                         "haz mat delivery",
+                         InformationSupplyChain.PHYSICAL_INVENTORY_TRACKING.getQualifiedName(),
+                         SystemDefinition.AUS_HAZ_MAT),
+
     WINCH_PROCUREMENT_REQUEST(SystemDefinition.COCO_INVENTORY,
                               OpenMetadataType.DATA_FLOW.typeName,
                               "procurement request",
@@ -167,6 +174,11 @@ public enum SystemLevelLineage
                                "goods in",
                                InformationSupplyChain.PHYSICAL_INVENTORY_TRACKING.getQualifiedName(),
                                SystemDefinition.COCO_INVENTORY),
+    WINCH_HAZ_MAT_DELIVERY(SystemDefinition.COCO_PROCUREMENT_WINCH,
+                           OpenMetadataType.DATA_FLOW.typeName,
+                           "haz mat delivery",
+                           InformationSupplyChain.PHYSICAL_INVENTORY_TRACKING.getQualifiedName(),
+                           SystemDefinition.HAZ_MAT),
     ED_PROCUREMENT_REQUEST(SystemDefinition.COCO_INVENTORY,
                            OpenMetadataType.DATA_FLOW.typeName,
                            "procurement request",
@@ -182,6 +194,11 @@ public enum SystemLevelLineage
                             "goods in",
                             InformationSupplyChain.PHYSICAL_INVENTORY_TRACKING.getQualifiedName(),
                             SystemDefinition.COCO_INVENTORY),
+    ED_HAZ_MAT_DELIVERY(SystemDefinition.COCO_PROCUREMENT_ED,
+                           OpenMetadataType.DATA_FLOW.typeName,
+                           "haz mat delivery",
+                           InformationSupplyChain.PHYSICAL_INVENTORY_TRACKING.getQualifiedName(),
+                           SystemDefinition.HAZ_MAT),
     AMS_PROCUREMENT_REQUEST(SystemDefinition.COCO_INVENTORY,
                             OpenMetadataType.DATA_FLOW.typeName,
                             "procurement request",
@@ -197,6 +214,11 @@ public enum SystemLevelLineage
                              "goods in",
                              InformationSupplyChain.PHYSICAL_INVENTORY_TRACKING.getQualifiedName(),
                              SystemDefinition.COCO_INVENTORY),
+    AMS_HAZ_MAT_DELIVERY(SystemDefinition.COCO_PROCUREMENT_AMS,
+                        OpenMetadataType.DATA_FLOW.typeName,
+                        "haz mat delivery",
+                        InformationSupplyChain.PHYSICAL_INVENTORY_TRACKING.getQualifiedName(),
+                        SystemDefinition.HAZ_MAT),
     PLANNED_MANUFACTURED_GOODS_INVENTORY(SystemDefinition.MANUFACTURING_PLANNING,
                                          OpenMetadataType.DATA_FLOW.typeName,
                                          "planned orders",