Skip to content

Commit a6d6f73

Browse files
mandy-chessellmandy-chessell
authored
Merge pull request #8658 from mandy-chessell/oak2025
Advanced lineage graphs
2 parents 431ae12 + 01e2134 commit a6d6f73

File tree

38 files changed

+760
-86
lines changed

38 files changed

+760
-86
lines changed

‎EgeriaContentPacksGUIDMap.json

+1-1
Large diffs are not rendered by default.

‎content-packs/CocoBusinessSystemsArchive.omarchive

+1-1
Large diffs are not rendered by default.

‎content-packs/CocoClinicalTrialsTemplatesArchive.omarchive

+1-1
Large diffs are not rendered by default.

‎content-packs/CocoComboArchive.omarchive

+1-1
Large diffs are not rendered by default.

‎content-packs/CocoGovernanceEngineDefinitionsArchive.omarchive

+1-1
Large diffs are not rendered by default.

‎content-packs/CocoGovernanceProgramArchive.omarchive

+1-1
Large diffs are not rendered by default.

‎content-packs/CocoOrganizationArchive.omarchive

+1-1
Large diffs are not rendered by default.

‎content-packs/CocoSustainabilityArchive.omarchive

+1-1
Large diffs are not rendered by default.

‎content-packs/CocoTypesArchive.omarchive

+1-1
Large diffs are not rendered by default.

‎open-metadata-implementation/access-services/asset-consumer/asset-consumer-server/src/main/java/org/odpi/openmetadata/accessservices/assetconsumer/server/AssetConsumerRESTServices.java

+46-12
Large diffs are not rendered by default.

‎open-metadata-implementation/access-services/asset-manager/asset-manager-server/src/main/java/org/odpi/openmetadata/accessservices/assetmanager/converters/GovernanceDefinitionConverter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public B getNewBean(Class<B> beanClass,
8383
governanceDefinitionProperties.setTitle(this.removeTitle(instanceProperties));
8484
governanceDefinitionProperties.setScope(this.removeScope(instanceProperties));
8585
governanceDefinitionProperties.setDomainIdentifier(this.removeDomainIdentifier(instanceProperties));
86-
governanceDefinitionProperties.setPriority(this.removeImportance(instanceProperties));
86+
governanceDefinitionProperties.setImportance(this.removeImportance(instanceProperties));
8787
governanceDefinitionProperties.setOutcomes(this.removeOutcomes(instanceProperties));
8888
governanceDefinitionProperties.setResults(this.removeResults(instanceProperties));
8989

@@ -191,7 +191,7 @@ public B getNewComplexBean(Class<B> beanClass,
191191
governanceDefinitionProperties.setTitle(this.removeTitle(instanceProperties));
192192
governanceDefinitionProperties.setScope(this.removeScope(instanceProperties));
193193
governanceDefinitionProperties.setDomainIdentifier(this.removeDomainIdentifier(instanceProperties));
194-
governanceDefinitionProperties.setPriority(this.removeImportance(instanceProperties));
194+
governanceDefinitionProperties.setImportance(this.removeImportance(instanceProperties));
195195
governanceDefinitionProperties.setOutcomes(this.removeOutcomes(instanceProperties));
196196
governanceDefinitionProperties.setResults(this.removeResults(instanceProperties));
197197

‎open-metadata-implementation/access-services/community-profile/community-profile-server/src/main/java/org/odpi/openmetadata/accessservices/communityprofile/server/SecurityGroupRESTServices.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public GUIDResponse createSecurityGroup(String serverName,
8282
requestBody.getDescription(),
8383
requestBody.getScope(),
8484
requestBody.getDomainIdentifier(),
85-
requestBody.getPriority(),
85+
requestBody.getImportance(),
8686
requestBody.getImplications(),
8787
requestBody.getOutcomes(),
8888
requestBody.getResults(),
@@ -162,7 +162,7 @@ public VoidResponse updateSecurityGroup(String serverName,
162162
requestBody.getDescription(),
163163
requestBody.getScope(),
164164
requestBody.getDomainIdentifier(),
165-
requestBody.getPriority(),
165+
requestBody.getImportance(),
166166
requestBody.getImplications(),
167167
requestBody.getOutcomes(),
168168
requestBody.getResults(),

‎open-metadata-implementation/access-services/governance-program/Egeria-governance-program-omas.http

+13-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
11
# Egeria-governance-program-omas
22

3-
@guid = xxx
3+
@baseURL=https://localhost:9443
4+
@server=qs-metadata-store
5+
@userId=erinoverview
6+
7+
@guid=334fc1df-692a-4960-bbff-343bf7c486d2
8+
9+
10+
###
11+
# @name getGovernanceDefinitionInContext
12+
# Return the governance definition associated with a unique identifier and the other governance definitions linked to it.
13+
GET {{baseURL}}/servers/{{server}}/open-metadata/access-services/governance-program/users/{{userId}}/review/governance-definitions/{{guid}}/in-context
14+
15+

‎open-metadata-implementation/access-services/governance-program/governance-program-server/src/main/java/org/odpi/openmetadata/accessservices/governanceprogram/server/CertificationRESTServices.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public GUIDResponse createCertificationType(String serv
8383
properties.getDescription(),
8484
properties.getScope(),
8585
properties.getDomainIdentifier(),
86-
properties.getPriority(),
86+
properties.getImportance(),
8787
properties.getImplications(),
8888
properties.getOutcomes(),
8989
properties.getResults(),
@@ -170,7 +170,7 @@ public VoidResponse updateCertificationType(String serv
170170
properties.getDescription(),
171171
properties.getScope(),
172172
properties.getDomainIdentifier(),
173-
properties.getPriority(),
173+
properties.getImportance(),
174174
properties.getImplications(),
175175
properties.getOutcomes(),
176176
properties.getResults(),

‎open-metadata-implementation/access-services/governance-program/governance-program-server/src/main/java/org/odpi/openmetadata/accessservices/governanceprogram/server/GovernanceDefinitionRESTServices.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public GUIDResponse createGovernanceDefinition(String s
135135
properties.getDescription(),
136136
properties.getScope(),
137137
properties.getDomainIdentifier(),
138-
properties.getPriority(),
138+
properties.getImportance(),
139139
properties.getImplications(),
140140
properties.getOutcomes(),
141141
properties.getResults(),
@@ -223,7 +223,7 @@ public VoidResponse updateGovernanceDefinition(String
223223
properties.getDescription(),
224224
properties.getScope(),
225225
properties.getDomainIdentifier(),
226-
properties.getPriority(),
226+
properties.getImportance(),
227227
properties.getImplications(),
228228
properties.getOutcomes(),
229229
properties.getResults(),

‎open-metadata-implementation/access-services/governance-program/governance-program-server/src/main/java/org/odpi/openmetadata/accessservices/governanceprogram/server/LicenseRESTServices.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public GUIDResponse createLicenseType(String serverName
8484
properties.getDescription(),
8585
properties.getScope(),
8686
properties.getDomainIdentifier(),
87-
properties.getPriority(),
87+
properties.getImportance(),
8888
properties.getImplications(),
8989
properties.getOutcomes(),
9090
properties.getResults(),
@@ -171,7 +171,7 @@ public VoidResponse updateLicenseType(String serverName
171171
properties.getDescription(),
172172
properties.getScope(),
173173
properties.getDomainIdentifier(),
174-
properties.getPriority(),
174+
properties.getImportance(),
175175
properties.getImplications(),
176176
properties.getOutcomes(),
177177
properties.getResults(),

‎open-metadata-implementation/access-services/security-manager/security-manager-server/src/main/java/org/odpi/openmetadata/accessservices/securitymanager/server/SecurityManagerRESTServices.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ public GUIDResponse createSecurityGroup(String serverName,
258258
requestBody.getDescription(),
259259
requestBody.getScope(),
260260
requestBody.getDomainIdentifier(),
261-
requestBody.getPriority(),
261+
requestBody.getImportance(),
262262
requestBody.getImplications(),
263263
requestBody.getOutcomes(),
264264
requestBody.getResults(),
@@ -338,7 +338,7 @@ public VoidResponse updateSecurityGroup(String serverName,
338338
requestBody.getDescription(),
339339
requestBody.getScope(),
340340
requestBody.getDomainIdentifier(),
341-
requestBody.getPriority(),
341+
requestBody.getImportance(),
342342
requestBody.getImplications(),
343343
requestBody.getOutcomes(),
344344
requestBody.getResults(),

‎open-metadata-implementation/common-services/generic-handlers/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ dependencies {
1515
implementation project(':open-metadata-implementation:common-services:repository-handler')
1616
implementation project(':open-metadata-implementation:common-services:ffdc-services')
1717
implementation project(':open-metadata-implementation:common-services:metadata-observability')
18+
implementation project(':open-metadata-implementation:common-services:mermaid-services')
1819
implementation project(':open-metadata-implementation:common-services:metadata-security:metadata-security-apis')
1920
implementation project(':open-metadata-implementation:common-services:metadata-security:metadata-security-server')
2021
implementation project(':open-metadata-implementation:adapters:open-connectors:data-store-connectors:file-connectors:csv-file-connector')

‎open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/CertificationTypeConverter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public B getNewBean(Class<B> beanClass,
7575
governanceDefinitionProperties.setTitle(this.removeTitle(instanceProperties));
7676
governanceDefinitionProperties.setScope(this.removeScope(instanceProperties));
7777
governanceDefinitionProperties.setDomainIdentifier(this.removeDomainIdentifier(instanceProperties));
78-
governanceDefinitionProperties.setPriority(this.removeImportance(instanceProperties));
78+
governanceDefinitionProperties.setImportance(this.removeImportance(instanceProperties));
7979
governanceDefinitionProperties.setOutcomes(this.removeOutcomes(instanceProperties));
8080
governanceDefinitionProperties.setResults(this.removeResults(instanceProperties));
8181
governanceDefinitionProperties.setDetails(this.removeDetails(instanceProperties));

‎open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/GovernanceDefinitionConverter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ else if (repositoryHelper.isTypeOf(serviceName, typeName, OpenMetadataType.DATA_
113113
governanceDefinitionProperties.setTitle(this.removeTitle(instanceProperties));
114114
governanceDefinitionProperties.setScope(this.removeScope(instanceProperties));
115115
governanceDefinitionProperties.setDomainIdentifier(this.removeDomainIdentifier(instanceProperties));
116-
governanceDefinitionProperties.setPriority(this.removeImportance(instanceProperties));
116+
governanceDefinitionProperties.setImportance(this.removeImportance(instanceProperties));
117117
governanceDefinitionProperties.setOutcomes(this.removeOutcomes(instanceProperties));
118118
governanceDefinitionProperties.setResults(this.removeResults(instanceProperties));
119119

@@ -240,7 +240,7 @@ else if (repositoryHelper.isTypeOf(serviceName, typeName, OpenMetadataType.SECUR
240240
governanceDefinitionProperties.setTitle(this.removeTitle(instanceProperties));
241241
governanceDefinitionProperties.setScope(this.removeScope(instanceProperties));
242242
governanceDefinitionProperties.setDomainIdentifier(this.removeDomainIdentifier(instanceProperties));
243-
governanceDefinitionProperties.setPriority(this.removeImportance(instanceProperties));
243+
governanceDefinitionProperties.setImportance(this.removeImportance(instanceProperties));
244244
governanceDefinitionProperties.setOutcomes(this.removeOutcomes(instanceProperties));
245245
governanceDefinitionProperties.setResults(this.removeResults(instanceProperties));
246246

‎open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/GovernanceDefinitionGraphConverter.java

+9-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
package org.odpi.openmetadata.commonservices.generichandlers;
44

55

6+
import org.odpi.openmetadata.commonservices.mermaid.GovernanceDefinitionMermaidGraphBuilder;
67
import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.GovernanceDefinitionGraph;
78
import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.RelatedElement;
89
import org.odpi.openmetadata.frameworks.openmetadata.properties.governance.CertificationTypeProperties;
@@ -110,9 +111,12 @@ else if (repositoryHelper.isTypeOf(serviceName, typeName, OpenMetadataType.SECUR
110111
governanceDefinitionProperties.setDocumentIdentifier(this.removeQualifiedName(instanceProperties));
111112
governanceDefinitionProperties.setAdditionalProperties(this.removeAdditionalProperties(instanceProperties));
112113
governanceDefinitionProperties.setTitle(this.removeTitle(instanceProperties));
114+
governanceDefinitionProperties.setSummary(this.removeSummary(instanceProperties));
115+
governanceDefinitionProperties.setDescription(this.removeDescription(instanceProperties));
113116
governanceDefinitionProperties.setScope(this.removeScope(instanceProperties));
114117
governanceDefinitionProperties.setDomainIdentifier(this.removeDomainIdentifier(instanceProperties));
115-
governanceDefinitionProperties.setPriority(this.removeImportance(instanceProperties));
118+
governanceDefinitionProperties.setImportance(this.removeImportance(instanceProperties));
119+
governanceDefinitionProperties.setImplications(this.removeImplications(instanceProperties));
116120
governanceDefinitionProperties.setOutcomes(this.removeOutcomes(instanceProperties));
117121
governanceDefinitionProperties.setResults(this.removeResults(instanceProperties));
118122

@@ -204,6 +208,10 @@ else if ((repositoryHelper.isTypeOf(serviceName, relationship.getType().getTypeD
204208
{
205209
bean.setOthers(others);
206210
}
211+
212+
GovernanceDefinitionMermaidGraphBuilder graphBuilder = new GovernanceDefinitionMermaidGraphBuilder(bean);
213+
214+
bean.setMermaidGraph(graphBuilder.getMermaidGraph());
207215
}
208216
}
209217
else

‎open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/LicenseTypeConverter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public B getNewBean(Class<B> beanClass,
7575
licenseTypeProperties.setTitle(this.removeTitle(instanceProperties));
7676
licenseTypeProperties.setScope(this.removeScope(instanceProperties));
7777
licenseTypeProperties.setDomainIdentifier(this.removeDomainIdentifier(instanceProperties));
78-
licenseTypeProperties.setPriority(this.removeImportance(instanceProperties));
78+
licenseTypeProperties.setImportance(this.removeImportance(instanceProperties));
7979
licenseTypeProperties.setOutcomes(this.removeOutcomes(instanceProperties));
8080
licenseTypeProperties.setResults(this.removeResults(instanceProperties));
8181
licenseTypeProperties.setDetails(this.removeDetails(instanceProperties));

‎open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/OpenMetadataAPIGenericConverter.java

+22
Original file line numberDiff line numberDiff line change
@@ -4507,6 +4507,28 @@ protected List<String> removeOutcomes(InstanceProperties instanceProperties)
45074507
}
45084508

45094509

4510+
/**
4511+
* Extract and delete the "implications" property from the supplied instance properties.
4512+
*
4513+
* @param instanceProperties properties from entity
4514+
* @return string list or null
4515+
*/
4516+
protected List<String> removeImplications(InstanceProperties instanceProperties)
4517+
{
4518+
final String methodName = "removeImplications";
4519+
4520+
if (instanceProperties != null)
4521+
{
4522+
return repositoryHelper.removeStringArrayProperty(serviceName,
4523+
OpenMetadataProperty.IMPLICATIONS.name,
4524+
instanceProperties,
4525+
methodName);
4526+
}
4527+
4528+
return null;
4529+
}
4530+
4531+
45104532
/**
45114533
* Extract and delete the "results" property from the supplied instance properties.
45124534
*

‎open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/SecurityGroupConverter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public B getNewComplexBean(Class<B> beanClass,
8282
securityGroupProperties.setTitle(this.removeTitle(instanceProperties));
8383
securityGroupProperties.setScope(this.removeScope(instanceProperties));
8484
securityGroupProperties.setDomainIdentifier(this.removeDomainIdentifier(instanceProperties));
85-
securityGroupProperties.setPriority(this.removeImportance(instanceProperties));
85+
securityGroupProperties.setImportance(this.removeImportance(instanceProperties));
8686
securityGroupProperties.setOutcomes(this.removeOutcomes(instanceProperties));
8787
securityGroupProperties.setResults(this.removeResults(instanceProperties));
8888
securityGroupProperties.setDistinguishedName(this.removeDistinguishedName(instanceProperties));

0 commit comments

Comments
 (0)