Merge pull request #8658 from mandy-chessell/oak2025

Advanced lineage graphs
odpi · Mar 6, 2025 · a6d6f73 · a6d6f73
2 parents 431ae12 + 01e2134
commit a6d6f73
Show file tree

Hide file tree

Showing 38 changed files with 760 additions and 86 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/.../org/odpi/openmetadata/accessservices/assetconsumer/server/AssetConsumerRESTServices.java b/.../org/odpi/openmetadata/accessservices/assetconsumer/server/AssetConsumerRESTServices.java
diff --git a/...pi/openmetadata/accessservices/assetmanager/converters/GovernanceDefinitionConverter.java b/...pi/openmetadata/accessservices/assetmanager/converters/GovernanceDefinitionConverter.java
@@ -83,7 +83,7 @@ public B getNewBean(Class<B>     beanClass,
                     governanceDefinitionProperties.setTitle(this.removeTitle(instanceProperties));
                     governanceDefinitionProperties.setScope(this.removeScope(instanceProperties));
                     governanceDefinitionProperties.setDomainIdentifier(this.removeDomainIdentifier(instanceProperties));
-                    governanceDefinitionProperties.setPriority(this.removeImportance(instanceProperties));
+                    governanceDefinitionProperties.setImportance(this.removeImportance(instanceProperties));
                     governanceDefinitionProperties.setOutcomes(this.removeOutcomes(instanceProperties));
                     governanceDefinitionProperties.setResults(this.removeResults(instanceProperties));
 
@@ -191,7 +191,7 @@ public B getNewComplexBean(Class<B>           beanClass,
                     governanceDefinitionProperties.setTitle(this.removeTitle(instanceProperties));
                     governanceDefinitionProperties.setScope(this.removeScope(instanceProperties));
                     governanceDefinitionProperties.setDomainIdentifier(this.removeDomainIdentifier(instanceProperties));
-                    governanceDefinitionProperties.setPriority(this.removeImportance(instanceProperties));
+                    governanceDefinitionProperties.setImportance(this.removeImportance(instanceProperties));
                     governanceDefinitionProperties.setOutcomes(this.removeOutcomes(instanceProperties));
                     governanceDefinitionProperties.setResults(this.removeResults(instanceProperties));
 

diff --git a/...g/odpi/openmetadata/accessservices/communityprofile/server/SecurityGroupRESTServices.java b/...g/odpi/openmetadata/accessservices/communityprofile/server/SecurityGroupRESTServices.java
@@ -82,7 +82,7 @@ public GUIDResponse createSecurityGroup(String                  serverName,
                                                                       requestBody.getDescription(),
                                                                       requestBody.getScope(),
                                                                       requestBody.getDomainIdentifier(),
-                                                                      requestBody.getPriority(),
+                                                                      requestBody.getImportance(),
                                                                       requestBody.getImplications(),
                                                                       requestBody.getOutcomes(),
                                                                       requestBody.getResults(),
@@ -162,7 +162,7 @@ public VoidResponse  updateSecurityGroup(String                  serverName,
                                                    requestBody.getDescription(),
                                                    requestBody.getScope(),
                                                    requestBody.getDomainIdentifier(),
-                                                   requestBody.getPriority(),
+                                                   requestBody.getImportance(),
                                                    requestBody.getImplications(),
                                                    requestBody.getOutcomes(),
                                                    requestBody.getResults(),

diff --git a/...ata-implementation/access-services/governance-program/Egeria-governance-program-omas.http b/...ata-implementation/access-services/governance-program/Egeria-governance-program-omas.http
@@ -1,3 +1,15 @@
 # Egeria-governance-program-omas
 
-@guid = xxx
+@baseURL=https://localhost:9443
+@server=qs-metadata-store
+@userId=erinoverview
+
+@guid=334fc1df-692a-4960-bbff-343bf7c486d2
+
+
+###
+# @name getGovernanceDefinitionInContext
+# Return the governance definition associated with a unique identifier and the other governance definitions linked to it.
+GET {{baseURL}}/servers/{{server}}/open-metadata/access-services/governance-program/users/{{userId}}/review/governance-definitions/{{guid}}/in-context
+
+
diff --git a/.../odpi/openmetadata/accessservices/governanceprogram/server/CertificationRESTServices.java b/.../odpi/openmetadata/accessservices/governanceprogram/server/CertificationRESTServices.java
@@ -83,7 +83,7 @@ public GUIDResponse createCertificationType(String                          serv
                                                                         properties.getDescription(),
                                                                         properties.getScope(),
                                                                         properties.getDomainIdentifier(),
-                                                                        properties.getPriority(),
+                                                                        properties.getImportance(),
                                                                         properties.getImplications(),
                                                                         properties.getOutcomes(),
                                                                         properties.getResults(),
@@ -170,7 +170,7 @@ public VoidResponse updateCertificationType(String                          serv
                                                        properties.getDescription(),
                                                        properties.getScope(),
                                                        properties.getDomainIdentifier(),
-                                                       properties.getPriority(),
+                                                       properties.getImportance(),
                                                        properties.getImplications(),
                                                        properties.getOutcomes(),
                                                        properties.getResults(),

diff --git a/...penmetadata/accessservices/governanceprogram/server/GovernanceDefinitionRESTServices.java b/...penmetadata/accessservices/governanceprogram/server/GovernanceDefinitionRESTServices.java
@@ -135,7 +135,7 @@ public GUIDResponse createGovernanceDefinition(String                          s
                                                                         properties.getDescription(),
                                                                         properties.getScope(),
                                                                         properties.getDomainIdentifier(),
-                                                                        properties.getPriority(),
+                                                                        properties.getImportance(),
                                                                         properties.getImplications(),
                                                                         properties.getOutcomes(),
                                                                         properties.getResults(),
@@ -223,7 +223,7 @@ public VoidResponse  updateGovernanceDefinition(String
                                                        properties.getDescription(),
                                                        properties.getScope(),
                                                        properties.getDomainIdentifier(),
-                                                       properties.getPriority(),
+                                                       properties.getImportance(),
                                                        properties.getImplications(),
                                                        properties.getOutcomes(),
                                                        properties.getResults(),

diff --git a/...va/org/odpi/openmetadata/accessservices/governanceprogram/server/LicenseRESTServices.java b/...va/org/odpi/openmetadata/accessservices/governanceprogram/server/LicenseRESTServices.java
@@ -84,7 +84,7 @@ public GUIDResponse createLicenseType(String                          serverName
                                                                         properties.getDescription(),
                                                                         properties.getScope(),
                                                                         properties.getDomainIdentifier(),
-                                                                        properties.getPriority(),
+                                                                        properties.getImportance(),
                                                                         properties.getImplications(),
                                                                         properties.getOutcomes(),
                                                                         properties.getResults(),
@@ -171,7 +171,7 @@ public VoidResponse updateLicenseType(String                          serverName
                                                        properties.getDescription(),
                                                        properties.getScope(),
                                                        properties.getDomainIdentifier(),
-                                                       properties.getPriority(),
+                                                       properties.getImportance(),
                                                        properties.getImplications(),
                                                        properties.getOutcomes(),
                                                        properties.getResults(),

diff --git a/.../odpi/openmetadata/accessservices/securitymanager/server/SecurityManagerRESTServices.java b/.../odpi/openmetadata/accessservices/securitymanager/server/SecurityManagerRESTServices.java
@@ -258,7 +258,7 @@ public GUIDResponse createSecurityGroup(String                  serverName,
                                                                       requestBody.getDescription(),
                                                                       requestBody.getScope(),
                                                                       requestBody.getDomainIdentifier(),
-                                                                      requestBody.getPriority(),
+                                                                      requestBody.getImportance(),
                                                                       requestBody.getImplications(),
                                                                       requestBody.getOutcomes(),
                                                                       requestBody.getResults(),
@@ -338,7 +338,7 @@ public VoidResponse updateSecurityGroup(String                  serverName,
                                                    requestBody.getDescription(),
                                                    requestBody.getScope(),
                                                    requestBody.getDomainIdentifier(),
-                                                   requestBody.getPriority(),
+                                                   requestBody.getImportance(),
                                                    requestBody.getImplications(),
                                                    requestBody.getOutcomes(),
                                                    requestBody.getResults(),

diff --git a/open-metadata-implementation/common-services/generic-handlers/build.gradle b/open-metadata-implementation/common-services/generic-handlers/build.gradle
@@ -15,6 +15,7 @@ dependencies {
     implementation project(':open-metadata-implementation:common-services:repository-handler')
     implementation project(':open-metadata-implementation:common-services:ffdc-services')
     implementation project(':open-metadata-implementation:common-services:metadata-observability')
+    implementation project(':open-metadata-implementation:common-services:mermaid-services')
     implementation project(':open-metadata-implementation:common-services:metadata-security:metadata-security-apis')
     implementation project(':open-metadata-implementation:common-services:metadata-security:metadata-security-server')
     implementation project(':open-metadata-implementation:adapters:open-connectors:data-store-connectors:file-connectors:csv-file-connector')

diff --git a/...java/org/odpi/openmetadata/commonservices/generichandlers/CertificationTypeConverter.java b/...java/org/odpi/openmetadata/commonservices/generichandlers/CertificationTypeConverter.java
@@ -75,7 +75,7 @@ public B getNewBean(Class<B>     beanClass,
                     governanceDefinitionProperties.setTitle(this.removeTitle(instanceProperties));
                     governanceDefinitionProperties.setScope(this.removeScope(instanceProperties));
                     governanceDefinitionProperties.setDomainIdentifier(this.removeDomainIdentifier(instanceProperties));
-                    governanceDefinitionProperties.setPriority(this.removeImportance(instanceProperties));
+                    governanceDefinitionProperties.setImportance(this.removeImportance(instanceProperties));
                     governanceDefinitionProperties.setOutcomes(this.removeOutcomes(instanceProperties));
                     governanceDefinitionProperties.setResults(this.removeResults(instanceProperties));
                     governanceDefinitionProperties.setDetails(this.removeDetails(instanceProperties));

diff --git a/...a/org/odpi/openmetadata/commonservices/generichandlers/GovernanceDefinitionConverter.java b/...a/org/odpi/openmetadata/commonservices/generichandlers/GovernanceDefinitionConverter.java
@@ -113,7 +113,7 @@ else if (repositoryHelper.isTypeOf(serviceName, typeName, OpenMetadataType.DATA_
                     governanceDefinitionProperties.setTitle(this.removeTitle(instanceProperties));
                     governanceDefinitionProperties.setScope(this.removeScope(instanceProperties));
                     governanceDefinitionProperties.setDomainIdentifier(this.removeDomainIdentifier(instanceProperties));
-                    governanceDefinitionProperties.setPriority(this.removeImportance(instanceProperties));
+                    governanceDefinitionProperties.setImportance(this.removeImportance(instanceProperties));
                     governanceDefinitionProperties.setOutcomes(this.removeOutcomes(instanceProperties));
                     governanceDefinitionProperties.setResults(this.removeResults(instanceProperties));
 
@@ -240,7 +240,7 @@ else if (repositoryHelper.isTypeOf(serviceName, typeName, OpenMetadataType.SECUR
                     governanceDefinitionProperties.setTitle(this.removeTitle(instanceProperties));
                     governanceDefinitionProperties.setScope(this.removeScope(instanceProperties));
                     governanceDefinitionProperties.setDomainIdentifier(this.removeDomainIdentifier(instanceProperties));
-                    governanceDefinitionProperties.setPriority(this.removeImportance(instanceProperties));
+                    governanceDefinitionProperties.setImportance(this.removeImportance(instanceProperties));
                     governanceDefinitionProperties.setOutcomes(this.removeOutcomes(instanceProperties));
                     governanceDefinitionProperties.setResults(this.removeResults(instanceProperties));
 

diff --git a/.../odpi/openmetadata/commonservices/generichandlers/GovernanceDefinitionGraphConverter.java b/.../odpi/openmetadata/commonservices/generichandlers/GovernanceDefinitionGraphConverter.java
@@ -3,6 +3,7 @@
 package org.odpi.openmetadata.commonservices.generichandlers;
 
 
+import org.odpi.openmetadata.commonservices.mermaid.GovernanceDefinitionMermaidGraphBuilder;
 import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.GovernanceDefinitionGraph;
 import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.RelatedElement;
 import org.odpi.openmetadata.frameworks.openmetadata.properties.governance.CertificationTypeProperties;
@@ -110,9 +111,12 @@ else if (repositoryHelper.isTypeOf(serviceName, typeName, OpenMetadataType.SECUR
                     governanceDefinitionProperties.setDocumentIdentifier(this.removeQualifiedName(instanceProperties));
                     governanceDefinitionProperties.setAdditionalProperties(this.removeAdditionalProperties(instanceProperties));
                     governanceDefinitionProperties.setTitle(this.removeTitle(instanceProperties));
+                    governanceDefinitionProperties.setSummary(this.removeSummary(instanceProperties));
+                    governanceDefinitionProperties.setDescription(this.removeDescription(instanceProperties));
                     governanceDefinitionProperties.setScope(this.removeScope(instanceProperties));
                     governanceDefinitionProperties.setDomainIdentifier(this.removeDomainIdentifier(instanceProperties));
-                    governanceDefinitionProperties.setPriority(this.removeImportance(instanceProperties));
+                    governanceDefinitionProperties.setImportance(this.removeImportance(instanceProperties));
+                    governanceDefinitionProperties.setImplications(this.removeImplications(instanceProperties));
                     governanceDefinitionProperties.setOutcomes(this.removeOutcomes(instanceProperties));
                     governanceDefinitionProperties.setResults(this.removeResults(instanceProperties));
 
@@ -204,6 +208,10 @@ else if ((repositoryHelper.isTypeOf(serviceName, relationship.getType().getTypeD
                         {
                             bean.setOthers(others);
                         }
+
+                        GovernanceDefinitionMermaidGraphBuilder graphBuilder = new GovernanceDefinitionMermaidGraphBuilder(bean);
+
+                        bean.setMermaidGraph(graphBuilder.getMermaidGraph());
                     }
                 }
                 else

diff --git a/.../main/java/org/odpi/openmetadata/commonservices/generichandlers/LicenseTypeConverter.java b/.../main/java/org/odpi/openmetadata/commonservices/generichandlers/LicenseTypeConverter.java
@@ -75,7 +75,7 @@ public B getNewBean(Class<B>     beanClass,
                     licenseTypeProperties.setTitle(this.removeTitle(instanceProperties));
                     licenseTypeProperties.setScope(this.removeScope(instanceProperties));
                     licenseTypeProperties.setDomainIdentifier(this.removeDomainIdentifier(instanceProperties));
-                    licenseTypeProperties.setPriority(this.removeImportance(instanceProperties));
+                    licenseTypeProperties.setImportance(this.removeImportance(instanceProperties));
                     licenseTypeProperties.setOutcomes(this.removeOutcomes(instanceProperties));
                     licenseTypeProperties.setResults(this.removeResults(instanceProperties));
                     licenseTypeProperties.setDetails(this.removeDetails(instanceProperties));

diff --git a/...org/odpi/openmetadata/commonservices/generichandlers/OpenMetadataAPIGenericConverter.java b/...org/odpi/openmetadata/commonservices/generichandlers/OpenMetadataAPIGenericConverter.java
@@ -4507,6 +4507,28 @@ protected List<String> removeOutcomes(InstanceProperties instanceProperties)
     }
 
 
+    /**
+     * Extract and delete the "implications" property from the supplied instance properties.
+     *
+     * @param instanceProperties properties from entity
+     * @return string list or null
+     */
+    protected List<String> removeImplications(InstanceProperties instanceProperties)
+    {
+        final String methodName = "removeImplications";
+
+        if (instanceProperties != null)
+        {
+            return repositoryHelper.removeStringArrayProperty(serviceName,
+                                                              OpenMetadataProperty.IMPLICATIONS.name,
+                                                              instanceProperties,
+                                                              methodName);
+        }
+
+        return null;
+    }
+
+
     /**
      * Extract and delete the "results" property from the supplied instance properties.
      *

diff --git a/...ain/java/org/odpi/openmetadata/commonservices/generichandlers/SecurityGroupConverter.java b/...ain/java/org/odpi/openmetadata/commonservices/generichandlers/SecurityGroupConverter.java
@@ -82,7 +82,7 @@ public B getNewComplexBean(Class<B>           beanClass,
                     securityGroupProperties.setTitle(this.removeTitle(instanceProperties));
                     securityGroupProperties.setScope(this.removeScope(instanceProperties));
                     securityGroupProperties.setDomainIdentifier(this.removeDomainIdentifier(instanceProperties));
-                    securityGroupProperties.setPriority(this.removeImportance(instanceProperties));
+                    securityGroupProperties.setImportance(this.removeImportance(instanceProperties));
                     securityGroupProperties.setOutcomes(this.removeOutcomes(instanceProperties));
                     securityGroupProperties.setResults(this.removeResults(instanceProperties));
                     securityGroupProperties.setDistinguishedName(this.removeDistinguishedName(instanceProperties));