Skip to content

Commit 42c14aa

Browse files
mandy-chessellmandy-chessell
authored
Merge pull request #8660 from mandy-chessell/oak2025
Add new shapes to lineage graphs
2 parents 388dd1a + 7bc796b commit 42c14aa

File tree

17 files changed

+53
-39
lines changed

17 files changed

+53
-39
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/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ITInfrastructureHandler.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,8 @@ public void setupSoftwareServerDeployment(String userId,
245245
forLineage,
246246
forDuplicateProcessing,
247247
supportedZones,
248-
OpenMetadataType.DEPLOYED_ON.typeGUID,
249-
OpenMetadataType.DEPLOYED_ON.typeName,
248+
OpenMetadataType.DEPLOYED_ON_RELATIONSHIP.typeGUID,
249+
OpenMetadataType.DEPLOYED_ON_RELATIONSHIP.typeName,
250250
relationshipProperties,
251251
effectiveFrom,
252252
effectiveTo,
@@ -301,8 +301,8 @@ public void clearSoftwareServerDeployment(String userId,
301301
OpenMetadataType.SOFTWARE_SERVER.typeName,
302302
forLineage,
303303
forDuplicateProcessing,
304-
OpenMetadataType.DEPLOYED_ON.typeGUID,
305-
OpenMetadataType.DEPLOYED_ON.typeName,
304+
OpenMetadataType.DEPLOYED_ON_RELATIONSHIP.typeGUID,
305+
OpenMetadataType.DEPLOYED_ON_RELATIONSHIP.typeName,
306306
effectiveTime,
307307
methodName);
308308
}

‎open-metadata-implementation/common-services/mermaid-services/src/main/java/org/odpi/openmetadata/commonservices/mermaid/AssetGraphMermaidGraphBuilder.java

+21-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.*;
77
import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataProperty;
8+
import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataType;
89

910
public class AssetGraphMermaidGraphBuilder extends MermaidGraphBuilderBase
1011
{
@@ -63,6 +64,24 @@ public AssetGraphMermaidGraphBuilder(AssetGraph assetGraph)
6364
{
6465
if (line != null)
6566
{
67+
VisualStyle visualStyle = VisualStyle.LINKED_ELEMENT;
68+
69+
if (propertyHelper.isTypeOf(line, OpenMetadataType.IMPLEMENTED_BY_RELATIONSHIP.typeName))
70+
{
71+
visualStyle = VisualStyle.DEFAULT_SOLUTION_COMPONENT;
72+
}
73+
else if (propertyHelper.isTypeOf(line, OpenMetadataType.DEPLOYED_ON_RELATIONSHIP.typeName))
74+
{
75+
visualStyle = VisualStyle.HOST;
76+
}
77+
else if ((propertyHelper.isTypeOf(line, OpenMetadataType.DATA_FLOW.typeName)) ||
78+
(propertyHelper.isTypeOf(line, OpenMetadataType.PROCESS_CALL.typeName)) ||
79+
(propertyHelper.isTypeOf(line, OpenMetadataType.LINEAGE_MAPPING.typeName)) ||
80+
(propertyHelper.isTypeOf(line, OpenMetadataType.DATA_CONTENT_FOR_DATA_SET_RELATIONSHIP.typeName)))
81+
{
82+
visualStyle = VisualStyle.LINEAGE_ELEMENT;
83+
}
84+
6685
String endName = line.getEnd1().getGUID();
6786
if (line.getEnd1().getUniqueName() != null)
6887
{
@@ -72,7 +91,7 @@ public AssetGraphMermaidGraphBuilder(AssetGraph assetGraph)
7291
appendNewMermaidNode(line.getEnd1().getGUID(),
7392
endName,
7493
line.getEnd1().getType().getTypeName(),
75-
VisualStyle.LINKED_ELEMENT);
94+
visualStyle);
7695

7796
endName = line.getEnd2().getGUID();
7897
if (line.getEnd2().getUniqueName() != null)
@@ -83,7 +102,7 @@ public AssetGraphMermaidGraphBuilder(AssetGraph assetGraph)
83102
appendNewMermaidNode(line.getEnd2().getGUID(),
84103
endName,
85104
line.getEnd2().getType().getTypeName(),
86-
VisualStyle.LINKED_ELEMENT);
105+
visualStyle);
87106

88107
super.appendMermaidLine(this.removeSpaces(line.getEnd1().getGUID()),
89108
super.addSpacesToTypeName(line.getType().getTypeName()),

‎open-metadata-implementation/common-services/mermaid-services/src/main/java/org/odpi/openmetadata/commonservices/mermaid/Colour.java

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ public enum Colour
1616
BLUE_SKY ("#A8C2FF"),
1717
LIGHT_BLUE ("#CCE5FF"),
1818
LIGHT_AQUA ("#CCFFFF"),
19+
LIGHT_YELLOW("#FFFFCC"),
1920
PINKY ("#E1D5E7"),
2021
MAUVE ("#EFEFFF"),
2122
RED ("#e15258"),

‎open-metadata-implementation/common-services/mermaid-services/src/main/java/org/odpi/openmetadata/commonservices/mermaid/VisualStyle.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@ public enum VisualStyle
1212

1313
PRINCIPAL_ASSET(Colour.BLACK.getColourNumber(), Colour.MUSTARD.getColourNumber(), Colour.SLATE.getColourNumber(), "hex"),
1414
ANCHOR_ASSET(Colour.BLACK.getColourNumber(), Colour.MUSTARD.getColourNumber(), Colour.SLATE.getColourNumber(), "rounded"),
15-
ANCHORED_ELEMENT(Colour.WHITE.getColourNumber(), Colour.EGERIA_BLUE.getColourNumber(), Colour.SLATE.getColourNumber(), "rounded"),
16-
LINKED_ELEMENT(Colour.BLACK.getColourNumber(), Colour.LIGHT_AQUA.getColourNumber(), Colour.SLATE.getColourNumber(), "rounded"),
15+
ANCHORED_ELEMENT(Colour.BLACK.getColourNumber(), Colour.LIGHT_YELLOW.getColourNumber(), Colour.SLATE.getColourNumber(), "rounded"),
16+
LINKED_ELEMENT(Colour.BLACK.getColourNumber(), Colour.EGERIA_BLUE.getColourNumber(), Colour.SLATE.getColourNumber(), "rounded"),
1717
LINEAGE_ELEMENT(Colour.BLACK.getColourNumber(), Colour.LIGHT_AQUA.getColourNumber(), Colour.SLATE.getColourNumber(), "rounded"),
1818

19+
HOST(Colour.WHITE.getColourNumber(), Colour.DARK_GRAY.getColourNumber(), Colour.YELLOW.getColourNumber(), "rect"),
1920

2021
INFORMATION_SUPPLY_CHAIN(Colour.WHITE.getColourNumber(), Colour.SLATE.getColourNumber(), Colour.LIGHT_GRAY.getColourNumber(), "flip-tri"),
2122
INFORMATION_SUPPLY_CHAIN_SEG(Colour.SLATE.getColourNumber(), Colour.LIGHT_GRAY.getColourNumber(), Colour.SLATE.getColourNumber(), "hex"),

‎open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/types/OpenMetadataType.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -571,11 +571,11 @@ public enum OpenMetadataType
571571
/**
572572
* Identifies an IT Infrastructure asset that is deployed to a specific destination.
573573
*/
574-
DEPLOYED_ON("6932ba75-9522-4a06-a4a4-ee60a4df6aab",
575-
"DeployedOn",
576-
OpenMetadataWikiPages.MODEL_0042_SOFTWARE_CAPABILITIES,
577-
"d727b3ce-d58b-45d5-8abc-55b1394e030a",
578-
"Identifies an IT Infrastructure asset that is deployed to a specific destination."),
574+
DEPLOYED_ON_RELATIONSHIP("6932ba75-9522-4a06-a4a4-ee60a4df6aab",
575+
"DeployedOn",
576+
OpenMetadataWikiPages.MODEL_0042_SOFTWARE_CAPABILITIES,
577+
"d727b3ce-d58b-45d5-8abc-55b1394e030a",
578+
"Identifies an IT Infrastructure asset that is deployed to a specific destination."),
579579

580580
/**
581581
* Software services packaged as an operating system process to support a runtime environment for a virtual software server.

‎open-metadata-resources/open-metadata-archives/content-pack-helpers/src/main/java/org/odpi/openmetadata/samples/archiveutilities/SimpleCatalogArchiveHelper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ public void addDeployedOnRelationship(String deployedElementQName,
645645
properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.DEPLOYER.name, deployer, methodName);
646646
properties = archiveHelper.addEnumPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.OPERATIONAL_STATUS.name, OperationalStatus.getOpenTypeGUID(), OperationalStatus.getOpenTypeName(), statusEnumElement.getOrdinal(), statusEnumElement.getValue(), statusEnumElement.getDescription(), methodName);
647647

648-
this.archiveBuilder.addRelationship(this.archiveHelper.getRelationship(OpenMetadataType.DEPLOYED_ON.typeName, this.idToGUIDMap.getGUID(deployedElementId + "_to_" + deployedOnId + "_deployed_on_relationship"), properties, InstanceStatus.ACTIVE, end1, end2));
648+
this.archiveBuilder.addRelationship(this.archiveHelper.getRelationship(OpenMetadataType.DEPLOYED_ON_RELATIONSHIP.typeName, this.idToGUIDMap.getGUID(deployedElementId + "_to_" + deployedOnId + "_deployed_on_relationship"), properties, InstanceStatus.ACTIVE, end1, end2));
649649
}
650650

651651

‎open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive3_7.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.typedefs.RelationshipEndDef;
1616
import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.typedefs.TypeDefAttribute;
1717
import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.typedefs.TypeDefPatch;
18-
import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.typedefs.TypeDefStatus;
1918
import org.odpi.openmetadata.repositoryservices.ffdc.OMRSErrorCode;
2019
import org.odpi.openmetadata.repositoryservices.ffdc.exception.OMRSLogicErrorException;
2120

@@ -185,7 +184,7 @@ private void update003040ITAssetDeployments()
185184

186185
private RelationshipDef getDeployedOnRelationship()
187186
{
188-
RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.DEPLOYED_ON,
187+
RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.DEPLOYED_ON_RELATIONSHIP,
189188
null,
190189
ClassificationPropagationRule.NONE);
191190

‎open-metadata-resources/open-metadata-samples/sample-metadata/coco-metadata-archives/src/main/java/org/odpi/openmetadata/samples/archiveutilities/businesssystems/SystemLevelLineage.java

+8-14
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,15 @@ public enum SystemLevelLineage
3535
InformationSupplyChain.PERSONALIZED_TREATMENT_ORDER.getQualifiedName(),
3636
SystemDefinition.MANUFACTURING_PLANNING),
3737

38-
NEW_SALES(SystemDefinition.COCO_CRM,
38+
PERSONALIZED_TREATMENT_NEW_SALES(SystemDefinition.COCO_CRM,
39+
OpenMetadataType.DATA_FLOW.typeName,
40+
"new sales",
41+
InformationSupplyChain.PERSONALIZED_TREATMENT_ORDER.getQualifiedName(),
42+
SystemDefinition.COCO_LEDGERS),
43+
44+
PERSONALIZED_MEDICINE_PAYMENT(SystemDefinition.COCO_CRM,
3945
OpenMetadataType.DATA_FLOW.typeName,
40-
"new sales",
46+
"payment",
4147
InformationSupplyChain.PERSONALIZED_TREATMENT_ORDER.getQualifiedName(),
4248
SystemDefinition.COCO_LEDGERS),
4349

@@ -107,12 +113,6 @@ public enum SystemLevelLineage
107113
InformationSupplyChain.PHYSICAL_INVENTORY_TRACKING.getQualifiedName(),
108114
SystemDefinition.COCO_INVENTORY),
109115

110-
WINCH_MANUFACTURING_COMPLETE(SystemDefinition.WINCH_MANUFACTURING_CONTROL,
111-
OpenMetadataType.DATA_FLOW.typeName,
112-
"manufacturing complete",
113-
InformationSupplyChain.PERSONALIZED_TREATMENT_ORDER.getQualifiedName(),
114-
SystemDefinition.MANUFACTURING_PLANNING),
115-
116116
ED_MANUFACTURING_GOODS_REQUEST(SystemDefinition.ED_MANUFACTURING_CONTROL,
117117
OpenMetadataType.DATA_FLOW.typeName,
118118
"goods request",
@@ -131,12 +131,6 @@ public enum SystemLevelLineage
131131
InformationSupplyChain.PHYSICAL_INVENTORY_TRACKING.getQualifiedName(),
132132
SystemDefinition.COCO_INVENTORY),
133133

134-
ED_MANUFACTURING_COMPLETE(SystemDefinition.ED_MANUFACTURING_CONTROL,
135-
OpenMetadataType.DATA_FLOW.typeName,
136-
"manufacturing complete",
137-
InformationSupplyChain.PERSONALIZED_TREATMENT_ORDER.getQualifiedName(),
138-
SystemDefinition.MANUFACTURING_PLANNING),
139-
140134
AUS_PROCUREMENT_REQUEST(SystemDefinition.AUS_INVENTORY,
141135
OpenMetadataType.DATA_FLOW.typeName,
142136
"procurement request",

0 commit comments

Comments
 (0)