From cf1074309ad37ace428e5623ea7119b0faa3e062 Mon Sep 17 00:00:00 2001 From: Mandy Chessell Date: Mon, 30 Sep 2024 09:55:28 +0100 Subject: [PATCH] Further restructure of OpenMetadata Types management Signed-off-by: Mandy Chessell --- .../converters/ConnectionConverter.java | 6 +- .../handlers/CommentExchangeHandler.java | 4 +- .../handlers/ConnectionExchangeHandler.java | 28 +- .../handlers/NoteLogExchangeHandler.java | 26 +- .../CollaborationExchangeRESTServices.java | 2 +- .../client/ToDoActionManagement.java | 26 +- .../CommunityProfileOMRSTopicListener.java | 18 +- .../server/OrganizationRESTServices.java | 10 +- .../DataManagerOMRSTopicListener.java | 6 +- .../converters/CatalogTargetConverter.java | 2 +- .../GovernanceServiceConverter.java | 2 +- .../IntegrationConnectorConverter.java | 2 +- .../GovernanceConfigurationHandler.java | 8 +- .../handlers/AppointmentHandler.java | 18 +- .../server/GovernanceRolesRESTServices.java | 16 +- .../server/ITInfrastructureRESTServices.java | 6 +- .../server/ITProfileRESTServices.java | 16 +- .../server/SecurityManagerRESTServices.java | 10 +- .../PostgresServerIntegrationConnector.java | 8 +- ...atalogServerGovernanceActionConnector.java | 2 +- .../OpenLineageLogStoreConnectorBase.java | 8 +- ...estOpenMetadataCatalogTargetProcessor.java | 36 +- .../generichandlers/ActorProfileBuilder.java | 2 +- .../ActorProfileConverter.java | 14 +- .../generichandlers/ActorProfileHandler.java | 32 +- .../generichandlers/AssetHandler.java | 66 +- .../generichandlers/CommentBuilder.java | 2 +- .../generichandlers/CommentHandler.java | 28 +- .../generichandlers/CommunityBuilder.java | 10 +- .../generichandlers/CommunityHandler.java | 61 +- .../generichandlers/ConnectionBuilder.java | 14 +- .../generichandlers/ConnectionConverter.java | 6 +- .../generichandlers/ConnectionHandler.java | 206 +- .../generichandlers/ConnectorTypeBuilder.java | 12 +- .../generichandlers/ConnectorTypeHandler.java | 56 +- .../ContributionRecordBuilder.java | 2 +- .../ContributionRecordHandler.java | 34 +- .../EmbeddedConnectionBuilder.java | 8 +- .../generichandlers/EndpointHandler.java | 8 +- .../FilesAndFoldersHandler.java | 24 +- .../generichandlers/GlossaryTermBuilder.java | 2 +- .../GovernanceDefinitionBuilder.java | 4 +- .../GovernanceDefinitionHandler.java | 4 +- .../GovernanceRoleConverter.java | 3 +- .../generichandlers/ITProfileConverter.java | 2 +- .../generichandlers/InformalTagBuilder.java | 11 +- .../generichandlers/InformalTagHandler.java | 68 +- .../generichandlers/LikeBuilder.java | 4 +- .../generichandlers/LikeHandler.java | 26 +- .../generichandlers/NoteBuilder.java | 9 +- .../generichandlers/NoteHandler.java | 36 +- .../generichandlers/NoteLogBuilder.java | 4 +- .../generichandlers/NoteLogHandler.java | 54 +- .../generichandlers/OMFConverter.java | 16 +- .../OpenMetadataAPIGenericConverter.java | 50 +- .../OpenMetadataAPIGenericHandler.java | 54 +- .../generichandlers/PersonRoleBuilder.java | 10 +- .../generichandlers/PersonRoleConverter.java | 3 +- .../generichandlers/PersonRoleHandler.java | 124 +- .../generichandlers/ProjectHandler.java | 12 +- .../generichandlers/RatingBuilder.java | 15 +- .../generichandlers/RatingConverter.java | 5 +- .../generichandlers/RatingHandler.java | 26 +- .../generichandlers/ReferenceableHandler.java | 36 +- .../generichandlers/UserIdentityBuilder.java | 2 +- .../generichandlers/UserIdentityHandler.java | 2 +- .../gaf/client/OpenMetadataClientBase.java | 12 +- .../converters/CatalogTargetConverter.java | 2 +- .../GovernanceServiceConverter.java | 2 +- .../IntegrationConnectorConverter.java | 5 +- .../GovernanceEngineConfigurationHandler.java | 4 +- .../IntegrationGroupConfigurationHandler.java | 4 +- .../converters/ConnectorTypeConverter.java | 2 +- .../converters/InformalTagConverter.java | 2 +- .../converters/LikeConverter.java | 2 +- .../converters/NoteConverter.java | 2 +- .../converters/NoteLogConverter.java | 2 +- .../converters/RatingConverter.java | 7 +- .../server/OCFMetadataRESTServices.java | 6 +- .../converters/OpenMetadataConverterBase.java | 82 +- .../converters/ToDoConverter.java | 6 +- .../SecretsStoreCollectionProperty.java | 2 +- .../SecretsStoreConfigurationProperty.java | 2 +- .../controls/SecretsStorePurpose.java | 2 - .../enums/CommunityMembershipType.java | 146 +- .../openmetadata/enums/CrowdSourcingRole.java | 214 + .../openmetadata/enums/DataItemSortOrder.java | 4 +- .../openmetadata/enums/GovernanceDomain.java | 156 +- .../openmetadata/enums/OperationalStatus.java | 131 +- .../enums/ServerAssetUseType.java | 159 +- .../infrastructure/DeploymentProperties.java | 2 +- .../PlatformDeploymentProperties.java | 2 +- .../CapabilityDeploymentProperties.java | 2 +- .../{enums => types}/DataType.java | 124 +- .../types/OpenMetadataProperty.java | 755 ++- .../openmetadata/types/OpenMetadataType.java | 1006 +-- .../types/OpenMetadataWikiPages.java | 5 + .../ffdc/OMRSErrorCode.java | 8 + .../archiveutilities/OMRSArchiveHelper.java | 231 +- .../user-security/token-controller/README.md | 2 +- .../http/HTTPHeadersThreadLocal.java | 2 +- .../handler/CollaborationManagerHandler.java | 2 +- .../GovernanceArchiveHelper.java | 2 +- .../SimpleCatalogArchiveHelper.java | 139 +- .../base/ContentPackBaseArchiveWriter.java | 4 +- .../core/CorePackArchiveWriter.java | 20 +- .../opentypes/OpenMetadataTypesArchive.java | 11 +- .../OpenMetadataTypesArchive1_2.java | 5458 ++++------------- .../OpenMetadataTypesArchive1_7.java | 10 +- .../OpenMetadataTypesArchive2_4.java | 4 +- .../OpenMetadataTypesArchive3_11.java | 47 +- .../OpenMetadataTypesArchive3_13.java | 47 +- .../OpenMetadataTypesArchive3_4.java | 26 +- .../OpenMetadataTypesArchive3_5.java | 71 +- .../OpenMetadataTypesArchive4_0.java | 16 +- .../OpenMetadataTypesArchive5_0.java | 20 +- .../CocoClinicalTrialQualityDimension.java | 2 +- .../CocoBusinessSystemsArchiveWriter.java | 2 +- .../CocoGovernanceProgramArchiveWriter.java | 9 +- .../CocoOrganizationArchiveWriter.java | 4 +- 120 files changed, 4072 insertions(+), 6344 deletions(-) create mode 100644 open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/enums/CrowdSourcingRole.java rename open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/{enums => types}/DataType.java (68%) diff --git a/open-metadata-implementation/access-services/asset-manager/asset-manager-server/src/main/java/org/odpi/openmetadata/accessservices/assetmanager/converters/ConnectionConverter.java b/open-metadata-implementation/access-services/asset-manager/asset-manager-server/src/main/java/org/odpi/openmetadata/accessservices/assetmanager/converters/ConnectionConverter.java index ab75bf730e2..2280d767c37 100644 --- a/open-metadata-implementation/access-services/asset-manager/asset-manager-server/src/main/java/org/odpi/openmetadata/accessservices/assetmanager/converters/ConnectionConverter.java +++ b/open-metadata-implementation/access-services/asset-manager/asset-manager-server/src/main/java/org/odpi/openmetadata/accessservices/assetmanager/converters/ConnectionConverter.java @@ -110,7 +110,7 @@ public B getNewComplexBean(Class beanClass, { if ((relationship != null) && (relationship.getType() != null)) { - if (repositoryHelper.isTypeOf(serviceName, relationship.getType().getTypeDefName(), OpenMetadataType.EMBEDDED_CONNECTION_TYPE_NAME)) + if (repositoryHelper.isTypeOf(serviceName, relationship.getType().getTypeDefName(), OpenMetadataType.EMBEDDED_CONNECTION_RELATIONSHIP.typeName)) { EmbeddedConnection embeddedConnection = new EmbeddedConnection(); @@ -124,11 +124,11 @@ public B getNewComplexBean(Class beanClass, embeddedConnections.add(embeddedConnection); } - else if (repositoryHelper.isTypeOf(serviceName, relationship.getType().getTypeDefName(), OpenMetadataType.CONNECTION_CONNECTOR_TYPE_TYPE_NAME)) + else if (repositoryHelper.isTypeOf(serviceName, relationship.getType().getTypeDefName(), OpenMetadataType.CONNECTION_CONNECTOR_TYPE_RELATIONSHIP.typeName)) { bean.setConnectorType(getElementStub(beanClass, relationship.getEntityTwoProxy(), methodName)); } - else if (repositoryHelper.isTypeOf(serviceName, relationship.getType().getTypeDefName(), OpenMetadataType.CONNECTION_ENDPOINT_TYPE_NAME)) + else if (repositoryHelper.isTypeOf(serviceName, relationship.getType().getTypeDefName(), OpenMetadataType.CONNECTION_ENDPOINT_RELATIONSHIP.typeName)) { bean.setEndpoint(getElementStub(beanClass, relationship.getEntityOneProxy(), methodName)); } diff --git a/open-metadata-implementation/access-services/asset-manager/asset-manager-server/src/main/java/org/odpi/openmetadata/accessservices/assetmanager/handlers/CommentExchangeHandler.java b/open-metadata-implementation/access-services/asset-manager/asset-manager-server/src/main/java/org/odpi/openmetadata/accessservices/assetmanager/handlers/CommentExchangeHandler.java index e23ef4feaf3..80a364c8a91 100644 --- a/open-metadata-implementation/access-services/asset-manager/asset-manager-server/src/main/java/org/odpi/openmetadata/accessservices/assetmanager/handlers/CommentExchangeHandler.java +++ b/open-metadata-implementation/access-services/asset-manager/asset-manager-server/src/main/java/org/odpi/openmetadata/accessservices/assetmanager/handlers/CommentExchangeHandler.java @@ -416,7 +416,7 @@ public void setupAcceptedAnswer(String userId, externalIdentifierHandler.logRelationshipCreation(assetManagerGUID, assetManagerName, - OpenMetadataType.ANSWER_RELATIONSHIP_TYPE_GUID, + OpenMetadataType.ACCEPTED_ANSWER_RELATIONSHIP.typeName, questionCommentGUID, OpenMetadataType.COMMENT.typeName, answerCommentGUID, @@ -471,7 +471,7 @@ public void clearAcceptedAnswer(String userId, externalIdentifierHandler.logRelationshipRemoval(assetManagerGUID, assetManagerName, - OpenMetadataType.ANSWER_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.ACCEPTED_ANSWER_RELATIONSHIP.typeName, questionCommentGUID, OpenMetadataType.COMMENT.typeName, answerCommentGUID, diff --git a/open-metadata-implementation/access-services/asset-manager/asset-manager-server/src/main/java/org/odpi/openmetadata/accessservices/assetmanager/handlers/ConnectionExchangeHandler.java b/open-metadata-implementation/access-services/asset-manager/asset-manager-server/src/main/java/org/odpi/openmetadata/accessservices/assetmanager/handlers/ConnectionExchangeHandler.java index 914396773ea..50ede9b1d3b 100644 --- a/open-metadata-implementation/access-services/asset-manager/asset-manager-server/src/main/java/org/odpi/openmetadata/accessservices/assetmanager/handlers/ConnectionExchangeHandler.java +++ b/open-metadata-implementation/access-services/asset-manager/asset-manager-server/src/main/java/org/odpi/openmetadata/accessservices/assetmanager/handlers/ConnectionExchangeHandler.java @@ -181,7 +181,7 @@ private void addCorrelationPropertiesToConnections(String userI element.setCorrelationHeaders(this.getCorrelationProperties(userId, element.getElementHeader().getGUID(), connectionGUIDParameterName, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeName, assetManagerGUID, assetManagerName, forLineage, @@ -230,7 +230,7 @@ private void addCorrelationPropertiesToConnectorTypes(String element.setCorrelationHeaders(this.getCorrelationProperties(userId, element.getElementHeader().getGUID(), connectorTypeGUIDParameterName, - OpenMetadataType.CONNECTOR_TYPE_TYPE_NAME, + OpenMetadataType.CONNECTOR_TYPE.typeName, assetManagerGUID, assetManagerName, forLineage, @@ -490,7 +490,7 @@ public void updateConnection(String userId, this.validateExternalIdentifier(userId, connectionGUID, connectionGUIDParameterName, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeName, correlationProperties, forLineage, forDuplicateProcessing, @@ -1070,7 +1070,7 @@ public void removeConnection(String userId, this.validateExternalIdentifier(userId, connectionGUID, connectionGUIDParameterName, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeName, correlationProperties, forLineage, forDuplicateProcessing, @@ -1247,7 +1247,7 @@ public List getConnectionsForAssetManager(String userId, assetManagerGUID, assetManagerGUIDParameterName, OpenMetadataType.SOFTWARE_CAPABILITY.typeName, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeName, startFrom, validatedPageSize, effectiveTime, @@ -1268,7 +1268,7 @@ public List getConnectionsForAssetManager(String userId, element.setCorrelationHeaders(this.getCorrelationProperties(userId, entity.getGUID(), entityGUIDParameterName, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeName, assetManagerGUID, assetManagerName, forLineage, @@ -1340,7 +1340,7 @@ public ConnectionElement getConnectionByGUID(String userId, element.setCorrelationHeaders(this.getCorrelationProperties(userId, element.getElementHeader().getGUID(), connectionGUIDParameterName, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeName, assetManagerGUID, assetManagerName, forLineage, @@ -1963,7 +1963,7 @@ public String createConnectorType(String userId, this.createExternalIdentifier(userId, connectorTypeGUID, connectorTypeGUIDParameterName, - OpenMetadataType.CONNECTOR_TYPE_TYPE_NAME, + OpenMetadataType.CONNECTOR_TYPE.typeName, correlationProperties, false, false, @@ -2023,7 +2023,7 @@ public String createConnectorTypeFromTemplate(String user this.createExternalIdentifier(userId, connectorTypeGUID, connectorTypeGUIDParameterName, - OpenMetadataType.CONNECTOR_TYPE_TYPE_NAME, + OpenMetadataType.CONNECTOR_TYPE.typeName, correlationProperties, false, false, @@ -2079,7 +2079,7 @@ public void updateConnectorType(String userId, this.validateExternalIdentifier(userId, connectorTypeGUID, connectorTypeGUIDParameterName, - OpenMetadataType.CONNECTOR_TYPE_TYPE_NAME, + OpenMetadataType.CONNECTOR_TYPE.typeName, correlationProperties, forLineage, forDuplicateProcessing, @@ -2153,7 +2153,7 @@ public void removeConnectorType(String userId, this.validateExternalIdentifier(userId, connectorTypeGUID, connectorTypeGUIDParameterName, - OpenMetadataType.CONNECTOR_TYPE_TYPE_NAME, + OpenMetadataType.CONNECTOR_TYPE.typeName, correlationProperties, forLineage, forDuplicateProcessing, @@ -2329,7 +2329,7 @@ public List getConnectorTypesForAssetManager(String userI assetManagerGUID, assetManagerGUIDParameterName, OpenMetadataType.SOFTWARE_CAPABILITY.typeName, - OpenMetadataType.CONNECTOR_TYPE_TYPE_NAME, + OpenMetadataType.CONNECTOR_TYPE.typeName, startFrom, validatedPageSize, effectiveTime, @@ -2350,7 +2350,7 @@ public List getConnectorTypesForAssetManager(String userI element.setCorrelationHeaders(this.getCorrelationProperties(userId, entity.getGUID(), entityGUIDParameterName, - OpenMetadataType.CONNECTOR_TYPE_TYPE_NAME, + OpenMetadataType.CONNECTOR_TYPE.typeName, assetManagerGUID, assetManagerName, forLineage, @@ -2422,7 +2422,7 @@ public ConnectorTypeElement getConnectorTypeByGUID(String userId, element.setCorrelationHeaders(this.getCorrelationProperties(userId, element.getElementHeader().getGUID(), connectorTypeGUIDParameterName, - OpenMetadataType.CONNECTOR_TYPE_TYPE_NAME, + OpenMetadataType.CONNECTOR_TYPE.typeName, assetManagerGUID, assetManagerName, forLineage, diff --git a/open-metadata-implementation/access-services/asset-manager/asset-manager-server/src/main/java/org/odpi/openmetadata/accessservices/assetmanager/handlers/NoteLogExchangeHandler.java b/open-metadata-implementation/access-services/asset-manager/asset-manager-server/src/main/java/org/odpi/openmetadata/accessservices/assetmanager/handlers/NoteLogExchangeHandler.java index 262d607fd26..bf7e38202c4 100644 --- a/open-metadata-implementation/access-services/asset-manager/asset-manager-server/src/main/java/org/odpi/openmetadata/accessservices/assetmanager/handlers/NoteLogExchangeHandler.java +++ b/open-metadata-implementation/access-services/asset-manager/asset-manager-server/src/main/java/org/odpi/openmetadata/accessservices/assetmanager/handlers/NoteLogExchangeHandler.java @@ -149,7 +149,7 @@ private void addCorrelationPropertiesToNoteLogs(String us noteLog.setCorrelationHeaders(this.getCorrelationProperties(userId, noteLog.getElementHeader().getGUID(), noteLogGUIDParameterName, - OpenMetadataType.NOTE_LOG_TYPE_NAME, + OpenMetadataType.NOTE_LOG.typeName, assetManagerGUID, assetManagerName, forLineage, @@ -200,7 +200,7 @@ private void addCorrelationPropertiesToNotes(String userId, note.setCorrelationHeaders(this.getCorrelationProperties(userId, note.getElementHeader().getGUID(), noteGUIDParameterName, - OpenMetadataType.NOTE_TYPE_NAME, + OpenMetadataType.NOTE_ENTRY.typeName, assetManagerGUID, assetManagerName, forLineage, @@ -279,7 +279,7 @@ public String createNoteLog(String userId, this.createExternalIdentifier(userId, noteLogGUID, noteLogGUIDParameterName, - OpenMetadataType.NOTE_LOG_TYPE_NAME, + OpenMetadataType.NOTE_LOG.typeName, correlationProperties, forLineage, forDuplicateProcessing, @@ -336,7 +336,7 @@ public void updateNoteLog(String userId, this.validateExternalIdentifier(userId, noteLogGUID, noteLogGUIDParameterName, - OpenMetadataType.NOTE_LOG_TYPE_NAME, + OpenMetadataType.NOTE_LOG.typeName, correlationProperties, forLineage, forDuplicateProcessing, @@ -390,7 +390,7 @@ public void removeNoteLog(String userId, this.validateExternalIdentifier(userId, noteLogGUID, noteLogGUIDParameterName, - OpenMetadataType.NOTE_LOG_TYPE_NAME, + OpenMetadataType.NOTE_LOG.typeName, correlationProperties, forLineage, forDuplicateProcessing, @@ -621,7 +621,7 @@ public NoteLogElement getNoteLogByGUID(String userId, NoteLogElement noteLog = noteLogHandler.getBeanFromRepository(userId, openMetadataGUID, guidParameterName, - OpenMetadataType.NOTE_LOG_TYPE_NAME, + OpenMetadataType.NOTE_LOG.typeName, forLineage, forDuplicateProcessing, effectiveTime, @@ -632,7 +632,7 @@ public NoteLogElement getNoteLogByGUID(String userId, noteLog.setCorrelationHeaders(this.getCorrelationProperties(userId, openMetadataGUID, guidParameterName, - OpenMetadataType.NOTE_LOG_TYPE_NAME, + OpenMetadataType.NOTE_LOG.typeName, assetManagerGUID, assetManagerName, forLineage, @@ -708,7 +708,7 @@ public String createNote(String userId, this.createExternalIdentifier(userId, noteGUID, noteGUIDParameterName, - OpenMetadataType.NOTE_TYPE_NAME, + OpenMetadataType.NOTE_ENTRY.typeName, correlationProperties, forLineage, forDuplicateProcessing, @@ -764,7 +764,7 @@ public void updateNote(String userId, this.validateExternalIdentifier(userId, noteGUID, noteGUIDParameterName, - OpenMetadataType.NOTE_TYPE_NAME, + OpenMetadataType.NOTE_ENTRY.typeName, correlationProperties, forLineage, forDuplicateProcessing, @@ -820,7 +820,7 @@ public void removeNote(String userId, this.validateExternalIdentifier(userId, noteGUID, noteGUIDParameterName, - OpenMetadataType.NOTE_TYPE_NAME, + OpenMetadataType.NOTE_ENTRY.typeName, correlationProperties, forLineage, forDuplicateProcessing, @@ -934,7 +934,7 @@ public List getNotesForNoteLog(String userId, List results = noteHandler.getNotes(userId, noteLogGUID, noteLogGUIDParameterName, - OpenMetadataType.NOTE_LOG_TYPE_NAME, + OpenMetadataType.NOTE_LOG.typeName, startFrom, pageSize, forLineage, @@ -989,7 +989,7 @@ public NoteElement getNoteByGUID(String userId, NoteElement note = noteHandler.getBeanFromRepository(userId, guid, guidParameterName, - OpenMetadataType.NOTE_TYPE_NAME, + OpenMetadataType.NOTE_ENTRY.typeName, forLineage, forDuplicateProcessing, effectiveTime, @@ -1000,7 +1000,7 @@ public NoteElement getNoteByGUID(String userId, note.setCorrelationHeaders(this.getCorrelationProperties(userId, guid, guidParameterName, - OpenMetadataType.NOTE_TYPE_NAME, + OpenMetadataType.NOTE_ENTRY.typeName, assetManagerGUID, assetManagerName, forLineage, diff --git a/open-metadata-implementation/access-services/asset-manager/asset-manager-server/src/main/java/org/odpi/openmetadata/accessservices/assetmanager/server/CollaborationExchangeRESTServices.java b/open-metadata-implementation/access-services/asset-manager/asset-manager-server/src/main/java/org/odpi/openmetadata/accessservices/assetmanager/server/CollaborationExchangeRESTServices.java index 355210a7ad5..e1dbd7bdafe 100644 --- a/open-metadata-implementation/access-services/asset-manager/asset-manager-server/src/main/java/org/odpi/openmetadata/accessservices/assetmanager/server/CollaborationExchangeRESTServices.java +++ b/open-metadata-implementation/access-services/asset-manager/asset-manager-server/src/main/java/org/odpi/openmetadata/accessservices/assetmanager/server/CollaborationExchangeRESTServices.java @@ -1508,7 +1508,7 @@ public GUIDListResponse getElementsByTag(String serverName, response.setGUIDs(handler.getAttachedElementGUIDs(userId, tagGUID, tagGUIDParameterName, - OpenMetadataType.INFORMAL_TAG_TYPE_NAME, + OpenMetadataType.INFORMAL_TAG.typeName, null, null, OpenMetadataType.REFERENCEABLE.typeName, diff --git a/open-metadata-implementation/access-services/community-profile/community-profile-client/src/main/java/org/odpi/openmetadata/accessservices/communityprofile/client/ToDoActionManagement.java b/open-metadata-implementation/access-services/community-profile/community-profile-client/src/main/java/org/odpi/openmetadata/accessservices/communityprofile/client/ToDoActionManagement.java index ca7db74494a..ac341843805 100644 --- a/open-metadata-implementation/access-services/community-profile/community-profile-client/src/main/java/org/odpi/openmetadata/accessservices/communityprofile/client/ToDoActionManagement.java +++ b/open-metadata-implementation/access-services/community-profile/community-profile-client/src/main/java/org/odpi/openmetadata/accessservices/communityprofile/client/ToDoActionManagement.java @@ -184,7 +184,7 @@ public String createToDo(String userId, properties.getEffectiveTo(), this.getToDoProperties(properties), originatorGUID, - OpenMetadataType.TO_DO_SOURCE_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.TO_DO_SOURCE_RELATIONSHIP.typeName, null, true); @@ -195,7 +195,7 @@ public String createToDo(String userId, openMetadataStoreClient.createRelatedElementsInStore(userId, null, null, - OpenMetadataType.ACTION_ASSIGNMENT_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.ACTION_ASSIGNMENT_RELATIONSHIP.typeName, assignToActorGUID, toDoGUID, false, @@ -211,7 +211,7 @@ public String createToDo(String userId, openMetadataStoreClient.createRelatedElementsInStore(userId, null, null, - OpenMetadataType.ACTION_SPONSOR_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.ACTION_SPONSOR_RELATIONSHIP.typeName, actionSponsorGUID, toDoGUID, false, @@ -360,7 +360,7 @@ public void reassignToDo(String userId, List assignedActors = openMetadataStoreClient.getRelatedMetadataElements(userId, toDoGUID, 2, - OpenMetadataType.ACTION_ASSIGNMENT_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.ACTION_ASSIGNMENT_RELATIONSHIP.typeName, false, false, new Date(), @@ -384,7 +384,7 @@ public void reassignToDo(String userId, openMetadataStoreClient.createRelatedElementsInStore(userId, null, null, - OpenMetadataType.ACTION_ASSIGNMENT_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.ACTION_ASSIGNMENT_RELATIONSHIP.typeName, actorGUID, toDoGUID, false, @@ -546,7 +546,7 @@ public List getActionsForSponsor(String userId, List relatedMetadataElements = openMetadataStoreClient.getRelatedMetadataElements(userId, elementGUID, 1, - OpenMetadataType.ACTION_SPONSOR_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.ACTION_SPONSOR_RELATIONSHIP.typeName, false, false, new Date(), @@ -587,7 +587,7 @@ public List getAssignedActions(String userId, List relatedMetadataElements = openMetadataStoreClient.getRelatedMetadataElements(userId, actorGUID, 1, - OpenMetadataType.ACTION_ASSIGNMENT_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.ACTION_ASSIGNMENT_RELATIONSHIP.typeName, false, false, new Date(), @@ -670,7 +670,7 @@ public List getToDosByType(String userId, List openMetadataElements = openMetadataStoreClient.getMetadataElementsByPropertyValue(userId, OpenMetadataType.TO_DO.typeName, null, - OpenMetadataType.TO_DO_TYPE_PROPERTY_NAME, + OpenMetadataProperty.TO_DO_TYPE.name, toDoType, null, null, @@ -825,15 +825,15 @@ private ElementProperties getToDoProperties(ToDoProperties toDoProperties) toDoProperties.getDescription()); elementProperties = propertyHelper.addStringProperty(elementProperties, - OpenMetadataType.TO_DO_TYPE_PROPERTY_NAME, + OpenMetadataProperty.TO_DO_TYPE.name, toDoProperties.getToDoType()); elementProperties = propertyHelper.addIntProperty(elementProperties, - OpenMetadataType.PRIORITY_PROPERTY_NAME, + OpenMetadataProperty.PRIORITY.name, toDoProperties.getPriority()); elementProperties = propertyHelper.addDateProperty(elementProperties, - OpenMetadataType.CREATION_TIME_PROPERTY_NAME, + OpenMetadataProperty.CREATION_TIME.name, toDoProperties.getCreationTime()); elementProperties = propertyHelper.addDateProperty(elementProperties, @@ -841,11 +841,11 @@ private ElementProperties getToDoProperties(ToDoProperties toDoProperties) toDoProperties.getLastReviewTime()); elementProperties = propertyHelper.addDateProperty(elementProperties, - OpenMetadataType.DUE_TIME_PROPERTY_NAME, + OpenMetadataProperty.DUE_TIME.name, toDoProperties.getDueTime()); elementProperties = propertyHelper.addDateProperty(elementProperties, - OpenMetadataType.COMPLETION_TIME_PROPERTY_NAME, + OpenMetadataProperty.COMPLETION_TIME.name, toDoProperties.getCompletionTime()); elementProperties = propertyHelper.addStringMapProperty(elementProperties, diff --git a/open-metadata-implementation/access-services/community-profile/community-profile-server/src/main/java/org/odpi/openmetadata/accessservices/communityprofile/omrstopic/CommunityProfileOMRSTopicListener.java b/open-metadata-implementation/access-services/community-profile/community-profile-server/src/main/java/org/odpi/openmetadata/accessservices/communityprofile/omrstopic/CommunityProfileOMRSTopicListener.java index 76bf529abe7..6ca309b34a7 100644 --- a/open-metadata-implementation/access-services/community-profile/community-profile-server/src/main/java/org/odpi/openmetadata/accessservices/communityprofile/omrstopic/CommunityProfileOMRSTopicListener.java +++ b/open-metadata-implementation/access-services/community-profile/community-profile-server/src/main/java/org/odpi/openmetadata/accessservices/communityprofile/omrstopic/CommunityProfileOMRSTopicListener.java @@ -230,9 +230,9 @@ private void processEntityEvent(CommunityProfileOutboundEventType eventType, if ((repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.ACTOR_PROFILE.typeName)) || (repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.USER_IDENTITY.typeName)) || - (repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.PERSON_ROLE_TYPE_NAME)) || + (repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.PERSON_ROLE.typeName)) || (repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.CONTACT_DETAILS.typeName)) || - (repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.COMMUNITY_TYPE_NAME))) + (repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.COMMUNITY.typeName))) { publisher.sendEntityEvent(eventType, entity.getGUID(), instanceTypeName, classificationName, elementStub); @@ -296,9 +296,9 @@ private void processEntityEvent(CommunityProfileOutboundEventType eventType, if ((repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.ACTOR_PROFILE.typeName)) || (repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.USER_IDENTITY.typeName)) || - (repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.PERSON_ROLE_TYPE_NAME)) || + (repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.PERSON_ROLE.typeName)) || (repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.CONTACT_DETAILS.typeName)) || - (repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.COMMUNITY_TYPE_NAME))) + (repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.COMMUNITY.typeName))) { publisher.sendEntityEvent(eventType, entity.getGUID(), instanceTypeName, classificationName, elementStub); @@ -358,12 +358,12 @@ private void processRelationshipEvent(CommunityProfileOutboundEventType eventTyp ElementStub endOneElementStub = converter.getElementStub(ElementStub.class, relationship.getEntityOneProxy(), methodName); ElementStub endTwoElementStub = converter.getElementStub(ElementStub.class, relationship.getEntityTwoProxy(), methodName); - if ((repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP_TYPE_NAME)) || - (repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.PEER_RELATIONSHIP_TYPE_NAME)) || + if ((repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP.typeName)) || + (repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.PEER_RELATIONSHIP.typeName)) || (repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.PROFILE_IDENTITY_RELATIONSHIP.typeName)) || - (repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.TEAM_LEADER_TYPE_NAME)) || - (repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.TEAM_MEMBER_TYPE_NAME)) || - (repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.COMMUNITY_MEMBERSHIP_TYPE_NAME))) + (repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.TEAM_LEADER.typeName)) || + (repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.TEAM_MEMBER.typeName)) || + (repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.COMMUNITY_MEMBERSHIP_RELATIONSHIP.typeName))) { publisher.sendRelationshipEvent(eventType, relationship.getGUID(), instanceTypeName, relationshipElementStub, endOneElementStub, endTwoElementStub); } diff --git a/open-metadata-implementation/access-services/community-profile/community-profile-server/src/main/java/org/odpi/openmetadata/accessservices/communityprofile/server/OrganizationRESTServices.java b/open-metadata-implementation/access-services/community-profile/community-profile-server/src/main/java/org/odpi/openmetadata/accessservices/communityprofile/server/OrganizationRESTServices.java index ba57b2f1de3..b734be2a15f 100644 --- a/open-metadata-implementation/access-services/community-profile/community-profile-server/src/main/java/org/odpi/openmetadata/accessservices/communityprofile/server/OrganizationRESTServices.java +++ b/open-metadata-implementation/access-services/community-profile/community-profile-server/src/main/java/org/odpi/openmetadata/accessservices/communityprofile/server/OrganizationRESTServices.java @@ -1221,9 +1221,9 @@ public AppointeesResponse getAppointees(String serverName, List appointmentRelationships = roleHandler.getAttachmentLinks(userId, personRoleGUID, personRoleGUIDParameterName, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, - OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP_TYPE_GUID, - OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.PERSON_ROLE.typeName, + OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP.typeGUID, + OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP.typeName, null, OpenMetadataType.ACTOR_PROFILE.typeName, 1, @@ -1284,7 +1284,7 @@ public AppointeesResponse getAppointees(String serverName, } else { - errorHandler.logBadRelationship(OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP_TYPE_NAME, + errorHandler.logBadRelationship(OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP.typeName, relationship, methodName); } @@ -1372,7 +1372,7 @@ private Appointee getAppointeeFromRelationship(String } else { - errorHandler.logBadRelationship(OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP_TYPE_NAME, + errorHandler.logBadRelationship(OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP.typeName, relationship, methodName); } diff --git a/open-metadata-implementation/access-services/data-manager/data-manager-server/src/main/java/org/odpi/openmetadata/accessservices/datamanager/listener/DataManagerOMRSTopicListener.java b/open-metadata-implementation/access-services/data-manager/data-manager-server/src/main/java/org/odpi/openmetadata/accessservices/datamanager/listener/DataManagerOMRSTopicListener.java index 8e8e81b9990..b7571571adc 100644 --- a/open-metadata-implementation/access-services/data-manager/data-manager-server/src/main/java/org/odpi/openmetadata/accessservices/datamanager/listener/DataManagerOMRSTopicListener.java +++ b/open-metadata-implementation/access-services/data-manager/data-manager-server/src/main/java/org/odpi/openmetadata/accessservices/datamanager/listener/DataManagerOMRSTopicListener.java @@ -283,9 +283,9 @@ private void processRelationshipEvent(DataManagerOutboundEventType eventType, (repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.SEMANTIC_ASSIGNMENT.typeName)) || (repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.API_ENDPOINT_RELATIONSHIP.typeName)) || (repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.SERVER_ASSET_USE_RELATIONSHIP.typeName)) || - (repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.ASSET_TO_CONNECTION_TYPE_NAME)) || - (repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.CONNECTION_ENDPOINT_TYPE_NAME)) || - (repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.CONNECTION_CONNECTOR_TYPE_TYPE_NAME)) || + (repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeName)) || + (repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.CONNECTION_ENDPOINT_RELATIONSHIP.typeName)) || + (repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.CONNECTION_CONNECTOR_TYPE_RELATIONSHIP.typeName)) || (repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.ATTRIBUTE_TO_TYPE_RELATIONSHIP_TYPE_NAME)) || (repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.TYPE_TO_ATTRIBUTE_RELATIONSHIP_TYPE_NAME)) || (repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.SCHEMA_QUERY_TARGET_RELATIONSHIP_TYPE_NAME)) || diff --git a/open-metadata-implementation/access-services/governance-engine/governance-engine-server/src/main/java/org/odpi/openmetadata/accessservices/governanceengine/converters/CatalogTargetConverter.java b/open-metadata-implementation/access-services/governance-engine/governance-engine-server/src/main/java/org/odpi/openmetadata/accessservices/governanceengine/converters/CatalogTargetConverter.java index c23c29bd990..bb7910c5ded 100644 --- a/open-metadata-implementation/access-services/governance-engine/governance-engine-server/src/main/java/org/odpi/openmetadata/accessservices/governanceengine/converters/CatalogTargetConverter.java +++ b/open-metadata-implementation/access-services/governance-engine/governance-engine-server/src/main/java/org/odpi/openmetadata/accessservices/governanceengine/converters/CatalogTargetConverter.java @@ -73,7 +73,7 @@ public B getNewBean(Class beanClass, relationship.getProperties(), methodName)); bean.setConfigurationProperties(repositoryHelper.getMapFromProperty(serviceName, - OpenMetadataType.CONFIGURATION_PROPERTIES_PROPERTY_NAME, + OpenMetadataProperty.CONFIGURATION_PROPERTIES.name, relationship.getProperties(), methodName)); bean.setConnectionName(repositoryHelper.getStringProperty(serviceName, diff --git a/open-metadata-implementation/access-services/governance-engine/governance-engine-server/src/main/java/org/odpi/openmetadata/accessservices/governanceengine/converters/GovernanceServiceConverter.java b/open-metadata-implementation/access-services/governance-engine/governance-engine-server/src/main/java/org/odpi/openmetadata/accessservices/governanceengine/converters/GovernanceServiceConverter.java index 08e0a39674d..abeac8f5b7a 100644 --- a/open-metadata-implementation/access-services/governance-engine/governance-engine-server/src/main/java/org/odpi/openmetadata/accessservices/governanceengine/converters/GovernanceServiceConverter.java +++ b/open-metadata-implementation/access-services/governance-engine/governance-engine-server/src/main/java/org/odpi/openmetadata/accessservices/governanceengine/converters/GovernanceServiceConverter.java @@ -95,7 +95,7 @@ public B getNewComplexBean(Class beanClass, { if ((entity != null) && (entity.getType() != null)) { - if (repositoryHelper.isTypeOf(serviceName, entity.getType().getTypeDefName(), OpenMetadataType.CONNECTION_TYPE_NAME)) + if (repositoryHelper.isTypeOf(serviceName, entity.getType().getTypeDefName(), OpenMetadataType.CONNECTION.typeName)) { properties.setConnection(super.getEmbeddedConnection(beanClass, entity, diff --git a/open-metadata-implementation/access-services/governance-engine/governance-engine-server/src/main/java/org/odpi/openmetadata/accessservices/governanceengine/converters/IntegrationConnectorConverter.java b/open-metadata-implementation/access-services/governance-engine/governance-engine-server/src/main/java/org/odpi/openmetadata/accessservices/governanceengine/converters/IntegrationConnectorConverter.java index 508a8092c15..9cb0b811ba8 100644 --- a/open-metadata-implementation/access-services/governance-engine/governance-engine-server/src/main/java/org/odpi/openmetadata/accessservices/governanceengine/converters/IntegrationConnectorConverter.java +++ b/open-metadata-implementation/access-services/governance-engine/governance-engine-server/src/main/java/org/odpi/openmetadata/accessservices/governanceengine/converters/IntegrationConnectorConverter.java @@ -96,7 +96,7 @@ public B getNewComplexBean(Class beanClass, { if ((entity != null) && (entity.getType() != null)) { - if (repositoryHelper.isTypeOf(serviceName, entity.getType().getTypeDefName(), OpenMetadataType.CONNECTION_TYPE_NAME)) + if (repositoryHelper.isTypeOf(serviceName, entity.getType().getTypeDefName(), OpenMetadataType.CONNECTION.typeName)) { properties.setConnection(super.getEmbeddedConnection(beanClass, entity, diff --git a/open-metadata-implementation/access-services/governance-engine/governance-engine-server/src/main/java/org/odpi/openmetadata/accessservices/governanceengine/handlers/GovernanceConfigurationHandler.java b/open-metadata-implementation/access-services/governance-engine/governance-engine-server/src/main/java/org/odpi/openmetadata/accessservices/governanceengine/handlers/GovernanceConfigurationHandler.java index 2296e83214f..02925dd5ce8 100644 --- a/open-metadata-implementation/access-services/governance-engine/governance-engine-server/src/main/java/org/odpi/openmetadata/accessservices/governanceengine/handlers/GovernanceConfigurationHandler.java +++ b/open-metadata-implementation/access-services/governance-engine/governance-engine-server/src/main/java/org/odpi/openmetadata/accessservices/governanceengine/handlers/GovernanceConfigurationHandler.java @@ -649,8 +649,8 @@ public List getGovernanceServiceRegistrations(String userId, List relationships = repositoryHandler.getRelationshipsByType(userId, governanceServiceGUID, OpenMetadataType.GOVERNANCE_SERVICE.typeName, - OpenMetadataType.CONNECTION_TO_ASSET_TYPE_GUID, - OpenMetadataType.CONNECTION_TO_ASSET_TYPE_NAME, + OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeGUID, + OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeName, 1, false, false, @@ -2216,7 +2216,7 @@ public String addCatalogTarget(String userId, instanceProperties = repositoryHelper.addMapPropertyToInstance(serviceName, instanceProperties, - OpenMetadataType.CONFIGURATION_PROPERTIES_PROPERTY_NAME, + OpenMetadataProperty.CONFIGURATION_PROPERTIES.name, properties.getConfigurationProperties(), methodName); @@ -2328,7 +2328,7 @@ public void updateCatalogTarget(String userId, instanceProperties = repositoryHelper.addMapPropertyToInstance(serviceName, instanceProperties, - OpenMetadataType.CONFIGURATION_PROPERTIES_PROPERTY_NAME, + OpenMetadataProperty.CONFIGURATION_PROPERTIES.name, properties.getConfigurationProperties(), methodName); diff --git a/open-metadata-implementation/access-services/governance-program/governance-program-server/src/main/java/org/odpi/openmetadata/accessservices/governanceprogram/handlers/AppointmentHandler.java b/open-metadata-implementation/access-services/governance-program/governance-program-server/src/main/java/org/odpi/openmetadata/accessservices/governanceprogram/handlers/AppointmentHandler.java index 298e8dea1fb..64b4bc6fe77 100644 --- a/open-metadata-implementation/access-services/governance-program/governance-program-server/src/main/java/org/odpi/openmetadata/accessservices/governanceprogram/handlers/AppointmentHandler.java +++ b/open-metadata-implementation/access-services/governance-program/governance-program-server/src/main/java/org/odpi/openmetadata/accessservices/governanceprogram/handlers/AppointmentHandler.java @@ -108,9 +108,9 @@ public List getCurrentGovernanceRoleAppointments(String List appointmentRelationships = roleHandler.getAttachmentLinks(userId, governanceRole.getElementHeader().getGUID(), governanceRoleGUIDParameterName, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, - OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP_TYPE_GUID, - OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.PERSON_ROLE.typeName, + OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP.typeGUID, + OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP.typeName, null, OpenMetadataType.ACTOR_PROFILE.typeName, 1, @@ -145,7 +145,7 @@ public List getCurrentGovernanceRoleAppointments(String } else { - errorHandler.logBadRelationship(OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP_TYPE_NAME, + errorHandler.logBadRelationship(OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP.typeName, relationship, methodName); } @@ -195,7 +195,7 @@ public GovernanceRoleHistory getGovernanceRoleHistoryByGUID(String userId, GovernanceRoleElement governanceRole = roleHandler.getBeanFromRepository(userId, governanceRoleGUID, governanceRoleGUIDParameterName, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, + OpenMetadataType.PERSON_ROLE.typeName, false, false, new Date(), @@ -208,9 +208,9 @@ public GovernanceRoleHistory getGovernanceRoleHistoryByGUID(String userId, List appointmentRelationships = roleHandler.getAttachmentLinks(userId, governanceRole.getElementHeader().getGUID(), governanceRoleGUIDParameterName, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, - OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP_TYPE_GUID, - OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.PERSON_ROLE.typeName, + OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP.typeGUID, + OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP.typeName, null, OpenMetadataType.ACTOR_PROFILE.typeName, 1, @@ -327,7 +327,7 @@ private GovernanceAppointee getAppointeeFromRelationship(String userId, } else { - errorHandler.logBadRelationship(OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP_TYPE_NAME, + errorHandler.logBadRelationship(OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP.typeName, relationship, methodName); } diff --git a/open-metadata-implementation/access-services/governance-program/governance-program-server/src/main/java/org/odpi/openmetadata/accessservices/governanceprogram/server/GovernanceRolesRESTServices.java b/open-metadata-implementation/access-services/governance-program/governance-program-server/src/main/java/org/odpi/openmetadata/accessservices/governanceprogram/server/GovernanceRolesRESTServices.java index c97828cd0f3..64e3790b680 100644 --- a/open-metadata-implementation/access-services/governance-program/governance-program-server/src/main/java/org/odpi/openmetadata/accessservices/governanceprogram/server/GovernanceRolesRESTServices.java +++ b/open-metadata-implementation/access-services/governance-program/governance-program-server/src/main/java/org/odpi/openmetadata/accessservices/governanceprogram/server/GovernanceRolesRESTServices.java @@ -281,7 +281,7 @@ public VoidResponse linkRoleToResponsibility(String serverName, requestBody.getExternalSourceName(), governanceRoleGUID, governanceRoleGUIDParameterName, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, + OpenMetadataType.PERSON_ROLE.typeName, responsibilityGUID, responsibilityGUIDParameterName, OpenMetadataType.GOVERNANCE_RESPONSIBILITY_TYPE_NAME, @@ -302,7 +302,7 @@ public VoidResponse linkRoleToResponsibility(String serverName, requestBody.getExternalSourceName(), governanceRoleGUID, governanceRoleGUIDParameterName, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, + OpenMetadataType.PERSON_ROLE.typeName, responsibilityGUID, responsibilityGUIDParameterName, OpenMetadataType.GOVERNANCE_RESPONSIBILITY_TYPE_NAME, @@ -375,7 +375,7 @@ public VoidResponse unlinkRoleFromResponsibility(String serverN requestBody.getExternalSourceName(), governanceRoleGUID, governanceRoleGUIDParameterName, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, + OpenMetadataType.PERSON_ROLE.typeName, responsibilityGUID, responsibilityGUIDParameterName, OpenMetadataType.GOVERNANCE_RESPONSIBILITY_TYPE_GUID, @@ -450,7 +450,7 @@ public VoidResponse linkRoleToResource(String serverName, OpenMetadataType.REFERENCEABLE.typeName, governanceRoleGUID, governanceRoleGUIDParameterName, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, + OpenMetadataType.PERSON_ROLE.typeName, false, false, OpenMetadataType.GOVERNANCE_ROLE_ASSIGNMENT_TYPE_GUID, @@ -471,7 +471,7 @@ public VoidResponse linkRoleToResource(String serverName, OpenMetadataType.REFERENCEABLE.typeName, governanceRoleGUID, governanceRoleGUIDParameterName, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, + OpenMetadataType.PERSON_ROLE.typeName, false, false, OpenMetadataType.GOVERNANCE_ROLE_ASSIGNMENT_TYPE_GUID, @@ -544,8 +544,8 @@ public VoidResponse unlinkRoleFromResource(String serverName, OpenMetadataType.REFERENCEABLE.typeName, governanceRoleGUID, governanceRoleGUIDParameterName, - OpenMetadataType.PERSON_ROLE_TYPE_GUID, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, + OpenMetadataType.PERSON_ROLE.typeGUID, + OpenMetadataType.PERSON_ROLE.typeName, false, false, OpenMetadataType.GOVERNANCE_ROLE_ASSIGNMENT_TYPE_GUID, @@ -666,7 +666,7 @@ public GovernanceRoleResponse getGovernanceRoleByGUID(String serverName, response.setElement(handler.getBeanFromRepository(userId, governanceRoleGUID, governanceRoleGUIDParameterName, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, + OpenMetadataType.PERSON_ROLE.typeName, false, false, new Date(), diff --git a/open-metadata-implementation/access-services/it-infrastructure/it-infrastructure-server/src/main/java/org/odpi/openmetadata/accessservices/itinfrastructure/server/ITInfrastructureRESTServices.java b/open-metadata-implementation/access-services/it-infrastructure/it-infrastructure-server/src/main/java/org/odpi/openmetadata/accessservices/itinfrastructure/server/ITInfrastructureRESTServices.java index 2153e655678..2a71e6204b6 100644 --- a/open-metadata-implementation/access-services/it-infrastructure/it-infrastructure-server/src/main/java/org/odpi/openmetadata/accessservices/itinfrastructure/server/ITInfrastructureRESTServices.java +++ b/open-metadata-implementation/access-services/it-infrastructure/it-infrastructure-server/src/main/java/org/odpi/openmetadata/accessservices/itinfrastructure/server/ITInfrastructureRESTServices.java @@ -3267,7 +3267,7 @@ private InstanceProperties getServerAssetUseProperties(ServerAssetUseProperties OpenMetadataProperty.USE_TYPE.name, ServerAssetUseType.getOpenTypeGUID(), ServerAssetUseType.getOpenTypeName(), - properties.getUseType().getOpenTypeOrdinal(), + properties.getUseType().getOrdinal(), methodName); } catch (TypeErrorException error) @@ -3806,7 +3806,7 @@ private ServerAssetUseElement getServerAssetUseElement(String } else { - if (requestedUseType.getOpenTypeOrdinal() == propertyUseTypeOrdinal) + if (requestedUseType.getOrdinal() == propertyUseTypeOrdinal) { matchingUseType = true; } @@ -3873,7 +3873,7 @@ else if (OpenMetadataProperty.USE_TYPE.name.equals(propertyName)) for (ServerAssetUseType useTypeValue : ServerAssetUseType.values()) { - if (useTypeValue.getOpenTypeOrdinal() == propertyUseTypeOrdinal) + if (useTypeValue.getOrdinal() == propertyUseTypeOrdinal) { properties.setUseType(useTypeValue); } diff --git a/open-metadata-implementation/access-services/it-infrastructure/it-infrastructure-server/src/main/java/org/odpi/openmetadata/accessservices/itinfrastructure/server/ITProfileRESTServices.java b/open-metadata-implementation/access-services/it-infrastructure/it-infrastructure-server/src/main/java/org/odpi/openmetadata/accessservices/itinfrastructure/server/ITProfileRESTServices.java index 78a5c8cef7b..5f6e4c7786e 100644 --- a/open-metadata-implementation/access-services/it-infrastructure/it-infrastructure-server/src/main/java/org/odpi/openmetadata/accessservices/itinfrastructure/server/ITProfileRESTServices.java +++ b/open-metadata-implementation/access-services/it-infrastructure/it-infrastructure-server/src/main/java/org/odpi/openmetadata/accessservices/itinfrastructure/server/ITProfileRESTServices.java @@ -96,7 +96,7 @@ public GUIDResponse createITProfile(String serverName, new Date(), methodName); - String typeName = OpenMetadataType.IT_PROFILE_TYPE_NAME; + String typeName = OpenMetadataType.IT_PROFILE.typeName; if (requestBody.getProperties().getTypeName() != null) { @@ -170,8 +170,8 @@ public GUIDResponse createITProfile(String serverName, typeName, false, false, - OpenMetadataType.IT_INFRASTRUCTURE_PROFILE_RELATIONSHIP_TYPE_GUID, - OpenMetadataType.IT_INFRASTRUCTURE_PROFILE_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.IT_INFRASTRUCTURE_PROFILE_RELATIONSHIP.typeGUID, + OpenMetadataType.IT_INFRASTRUCTURE_PROFILE_RELATIONSHIP.typeName, (InstanceProperties) null, null, null, @@ -558,7 +558,7 @@ public ITProfileResponse getITProfileByUserId(String serverName, response.setElement(handler.getActorProfileForUser(userId, actorProfileUserId, nameParameterName, - OpenMetadataType.IT_PROFILE_TYPE_NAME, + OpenMetadataType.IT_PROFILE.typeName, false, false, new Date(), @@ -611,8 +611,8 @@ public ITProfilesResponse getITProfileByName(String serverName, response.setElements(handler.getActorProfilesByName(userId, requestBody.getName(), nameParameterName, - OpenMetadataType.IT_PROFILE_TYPE_GUID, - OpenMetadataType.IT_PROFILE_TYPE_NAME, + OpenMetadataType.IT_PROFILE.typeGUID, + OpenMetadataType.IT_PROFILE.typeName, startFrom, pageSize, false, @@ -667,8 +667,8 @@ public ITProfilesResponse findITProfile(String serverName, response.setElements(handler.findActorProfiles(userId, requestBody.getSearchString(), searchStringParameterName, - OpenMetadataType.IT_PROFILE_TYPE_GUID, - OpenMetadataType.IT_PROFILE_TYPE_NAME, + OpenMetadataType.IT_PROFILE.typeGUID, + OpenMetadataType.IT_PROFILE.typeName, startFrom, pageSize, false, diff --git a/open-metadata-implementation/access-services/security-manager/security-manager-server/src/main/java/org/odpi/openmetadata/accessservices/securitymanager/server/SecurityManagerRESTServices.java b/open-metadata-implementation/access-services/security-manager/security-manager-server/src/main/java/org/odpi/openmetadata/accessservices/securitymanager/server/SecurityManagerRESTServices.java index 87fac25c288..d69b3d88678 100644 --- a/open-metadata-implementation/access-services/security-manager/security-manager-server/src/main/java/org/odpi/openmetadata/accessservices/securitymanager/server/SecurityManagerRESTServices.java +++ b/open-metadata-implementation/access-services/security-manager/security-manager-server/src/main/java/org/odpi/openmetadata/accessservices/securitymanager/server/SecurityManagerRESTServices.java @@ -1397,9 +1397,9 @@ public AppointeesResponse getAppointees(String serverName, List appointmentRelationships = roleHandler.getAttachmentLinks(userId, personRoleGUID, personRoleGUIDParameterName, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, - OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP_TYPE_GUID, - OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.PERSON_ROLE.typeName, + OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP.typeGUID, + OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP.typeName, null, OpenMetadataType.ACTOR_PROFILE.typeName, 1, @@ -1460,7 +1460,7 @@ public AppointeesResponse getAppointees(String serverName, } else { - errorHandler.logBadRelationship(OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP_TYPE_NAME, + errorHandler.logBadRelationship(OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP.typeName, relationship, methodName); } @@ -1548,7 +1548,7 @@ private Appointee getAppointeeFromRelationship(String } else { - errorHandler.logBadRelationship(OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP_TYPE_NAME, + errorHandler.logBadRelationship(OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP.typeName, relationship, methodName); } diff --git a/open-metadata-implementation/adapters/open-connectors/data-manager-connectors/postgres-server-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/postgres/catalog/PostgresServerIntegrationConnector.java b/open-metadata-implementation/adapters/open-connectors/data-manager-connectors/postgres-server-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/postgres/catalog/PostgresServerIntegrationConnector.java index f3a07166665..192f7006323 100644 --- a/open-metadata-implementation/adapters/open-connectors/data-manager-connectors/postgres-server-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/postgres/catalog/PostgresServerIntegrationConnector.java +++ b/open-metadata-implementation/adapters/open-connectors/data-manager-connectors/postgres-server-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/postgres/catalog/PostgresServerIntegrationConnector.java @@ -456,10 +456,10 @@ private void catalogDatabase(String databaseName, databaseUserId); elementProperties = propertyHelper.addStringProperty(elementProperties, - OpenMetadataType.CLEAR_PASSWORD_PROPERTY_NAME, + OpenMetadataProperty.CLEAR_PASSWORD.name, databasePassword); - String connectionGUID = openMetadataAccess.createMetadataElementInStore(OpenMetadataType.CONNECTION_TYPE_NAME, + String connectionGUID = openMetadataAccess.createMetadataElementInStore(OpenMetadataType.CONNECTION.typeName, ElementStatus.ACTIVE, null, databaseGUID, @@ -468,7 +468,7 @@ private void catalogDatabase(String databaseName, null, elementProperties, databaseGUID, - OpenMetadataType.CONNECTION_TO_ASSET_TYPE_NAME, + OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeName, null, false); @@ -499,7 +499,7 @@ private void catalogDatabase(String databaseName, null, elementProperties, connectionGUID, - OpenMetadataType.CONNECTION_ENDPOINT_TYPE_NAME, + OpenMetadataType.CONNECTION_ENDPOINT_RELATIONSHIP.typeName, null, false); } diff --git a/open-metadata-implementation/adapters/open-connectors/governance-action-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/governanceactions/stewardship/CatalogServerGovernanceActionConnector.java b/open-metadata-implementation/adapters/open-connectors/governance-action-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/governanceactions/stewardship/CatalogServerGovernanceActionConnector.java index c90d858fcad..c74c9d6314c 100644 --- a/open-metadata-implementation/adapters/open-connectors/governance-action-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/governanceactions/stewardship/CatalogServerGovernanceActionConnector.java +++ b/open-metadata-implementation/adapters/open-connectors/governance-action-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/governanceactions/stewardship/CatalogServerGovernanceActionConnector.java @@ -110,7 +110,7 @@ else if (newAssetGUID == null) serverName); catalogTargetProperties = propertyHelper.addMapProperty(catalogTargetProperties, - OpenMetadataType.CONFIGURATION_PROPERTIES_PROPERTY_NAME, + OpenMetadataProperty.CONFIGURATION_PROPERTIES.name, this.combineProperties()); governanceContext.getOpenMetadataStore().createRelatedElementsInStore(OpenMetadataType.CATALOG_TARGET_RELATIONSHIP_TYPE_NAME, diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/openlineage-integration-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/openlineage/OpenLineageLogStoreConnectorBase.java b/open-metadata-implementation/adapters/open-connectors/integration-connectors/openlineage-integration-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/openlineage/OpenLineageLogStoreConnectorBase.java index ec22358e4c1..38ec5a82356 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/openlineage-integration-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/openlineage/OpenLineageLogStoreConnectorBase.java +++ b/open-metadata-implementation/adapters/open-connectors/integration-connectors/openlineage-integration-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/openlineage/OpenLineageLogStoreConnectorBase.java @@ -201,11 +201,11 @@ public void refresh() throws ConnectorCheckedException { endpointGUID = catalogTarget.getCatalogTargetElement().getGUID(); } - else if (propertyHelper.isTypeOf(catalogTarget.getCatalogTargetElement(), OpenMetadataType.CONNECTION_TYPE_NAME)) + else if (propertyHelper.isTypeOf(catalogTarget.getCatalogTargetElement(), OpenMetadataType.CONNECTION.typeName)) { RelatedMetadataElement endpointElement = myContext.getIntegrationGovernanceContext().getOpenMetadataAccess().getRelatedMetadataElement(catalogTarget.getCatalogTargetElement().getGUID(), 2, - OpenMetadataType.CONNECTION_ENDPOINT_TYPE_NAME, + OpenMetadataType.CONNECTION_ENDPOINT_RELATIONSHIP.typeName, new Date()); if (endpointElement != null) @@ -217,14 +217,14 @@ else if (propertyHelper.isTypeOf(catalogTarget.getCatalogTargetElement(), OpenMe { RelatedMetadataElement connectionElement = myContext.getIntegrationGovernanceContext().getOpenMetadataAccess().getRelatedMetadataElement(catalogTarget.getCatalogTargetElement().getGUID(), 2, - OpenMetadataType.CONNECTION_TO_ASSET_TYPE_NAME, + OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeName, new Date()); if (connectionElement != null) { RelatedMetadataElement endpointElement = myContext.getIntegrationGovernanceContext().getOpenMetadataAccess().getRelatedMetadataElement(connectionElement.getElement().getElementGUID(), 2, - OpenMetadataType.CONNECTION_ENDPOINT_TYPE_NAME, + OpenMetadataType.CONNECTION_ENDPOINT_RELATIONSHIP.typeName, new Date()); if (endpointElement != null) diff --git a/open-metadata-implementation/adapters/open-connectors/nanny-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/nannyconnectors/harvestopenmetadata/HarvestOpenMetadataCatalogTargetProcessor.java b/open-metadata-implementation/adapters/open-connectors/nanny-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/nannyconnectors/harvestopenmetadata/HarvestOpenMetadataCatalogTargetProcessor.java index 07fbcad6d92..d014626cafe 100644 --- a/open-metadata-implementation/adapters/open-connectors/nanny-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/nannyconnectors/harvestopenmetadata/HarvestOpenMetadataCatalogTargetProcessor.java +++ b/open-metadata-implementation/adapters/open-connectors/nanny-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/nannyconnectors/harvestopenmetadata/HarvestOpenMetadataCatalogTargetProcessor.java @@ -599,7 +599,7 @@ public void refresh() throws ConnectorCheckedException startFrom = 0; - List teamElements = openMetadataAccess.findMetadataElements(OpenMetadataType.TEAM_TYPE_NAME, + List teamElements = openMetadataAccess.findMetadataElements(OpenMetadataType.TEAM.typeName, null, null, null, @@ -667,7 +667,7 @@ public void refresh() throws ConnectorCheckedException startFrom = 0; - List roleElements = openMetadataAccess.findMetadataElements(OpenMetadataType.PERSON_ROLE_TYPE_NAME, + List roleElements = openMetadataAccess.findMetadataElements(OpenMetadataType.PERSON_ROLE.typeName, null, null, null, @@ -687,7 +687,7 @@ public void refresh() throws ConnectorCheckedException startFrom = startFrom + openMetadataAccess.getMaxPagingSize(); - roleElements = openMetadataAccess.findMetadataElements(OpenMetadataType.PERSON_ROLE_TYPE_NAME, + roleElements = openMetadataAccess.findMetadataElements(OpenMetadataType.PERSON_ROLE.typeName, null, null, null, @@ -735,7 +735,7 @@ public void refresh() throws ConnectorCheckedException startFrom = 0; - List personRoleAppointments = openMetadataAccess.findRelationshipsBetweenMetadataElements(OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP_TYPE_NAME, + List personRoleAppointments = openMetadataAccess.findRelationshipsBetweenMetadataElements(OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP.typeName, null, null, null, @@ -757,7 +757,7 @@ public void refresh() throws ConnectorCheckedException } startFrom = startFrom + openMetadataAccess.getMaxPagingSize(); - personRoleAppointments = openMetadataAccess.findRelationshipsBetweenMetadataElements(OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP_TYPE_NAME, + personRoleAppointments = openMetadataAccess.findRelationshipsBetweenMetadataElements(OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP.typeName, null, null, null, @@ -1490,7 +1490,7 @@ private String getTeamManagerGUID(String teamGUID) { List relatedMetadataElements = openMetadataAccess.getRelatedMetadataElements(teamGUID, 2, - OpenMetadataType.TEAM_LEADERSHIP_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.TEAM_LEADERSHIP_RELATIONSHIP.typeName, 0, openMetadataAccess.getMaxPagingSize()); @@ -1502,7 +1502,7 @@ private String getTeamManagerGUID(String teamGUID) { List appointees = openMetadataAccess.getRelatedMetadataElements(teamGUID, 2, - OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP.typeName, 0, openMetadataAccess.getMaxPagingSize()); if (appointees != null) @@ -1673,7 +1673,7 @@ private void processToDo(OpenMetadataElement toDoElement) List relatedMetadataElements = openMetadataAccess.getRelatedMetadataElements(toDoElement.getElementGUID(), 2, - OpenMetadataType.TO_DO_SOURCE_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.TO_DO_SOURCE_RELATIONSHIP.typeName, 0, openMetadataAccess.getMaxPagingSize()); @@ -1691,7 +1691,7 @@ private void processToDo(OpenMetadataElement toDoElement) relatedMetadataElements = openMetadataAccess.getRelatedMetadataElements(toDoElement.getElementGUID(), 2, - OpenMetadataType.ACTION_ASSIGNMENT_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.ACTION_ASSIGNMENT_RELATIONSHIP.typeName, 0, openMetadataAccess.getMaxPagingSize()); @@ -1734,7 +1734,7 @@ private String getAssociatedDepartment(String profileGUID) { List roleElements = openMetadataAccess.getRelatedMetadataElements(profileGUID, 1, - OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP.typeName, 0, openMetadataAccess.getMaxPagingSize()); @@ -1746,7 +1746,7 @@ private String getAssociatedDepartment(String profileGUID) { List teamElements = openMetadataAccess.getRelatedMetadataElements(profileGUID, 1, - OpenMetadataType.TEAM_MEMBERSHIP_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.TEAM_MEMBERSHIP_RELATIONSHIP.typeName, 0, openMetadataAccess.getMaxPagingSize()); @@ -1754,7 +1754,7 @@ private String getAssociatedDepartment(String profileGUID) { teamElements = openMetadataAccess.getRelatedMetadataElements(profileGUID, 1, - OpenMetadataType.TEAM_LEADERSHIP_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.TEAM_LEADERSHIP_RELATIONSHIP.typeName, 0, openMetadataAccess.getMaxPagingSize()); } @@ -1802,7 +1802,7 @@ private OpenMetadataElement getAssociatedParentTeam(String departmentGUID) { List relatedMetadataElements = openMetadataAccess.getRelatedMetadataElements(departmentGUID, 2, - OpenMetadataType.TEAM_STRUCTURE_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.TEAM_STRUCTURE_RELATIONSHIP.typeName, 0, openMetadataAccess.getMaxPagingSize()); @@ -4140,25 +4140,25 @@ private Map getToDoDataValues(OpenMetadataElement toDo Types.VARCHAR)); openMetadataRecord.put(columnNameCreationTime, new JDBCDataValue(propertyHelper.getDateProperty(connectorName, - OpenMetadataType.CREATION_TIME_PROPERTY_NAME, + OpenMetadataProperty.CREATION_TIME.name, toDoElement.getElementProperties(), methodName), Types.TIMESTAMP)); openMetadataRecord.put(columnNameToDoType, new JDBCDataValue(propertyHelper.getStringProperty(connectorName, - OpenMetadataType.TO_DO_TYPE_PROPERTY_NAME, + OpenMetadataProperty.TO_DO_TYPE.name, toDoElement.getElementProperties(), methodName), Types.VARCHAR)); openMetadataRecord.put(columnNamePriority, new JDBCDataValue(propertyHelper.getIntProperty(connectorName, - OpenMetadataType.PRIORITY_PROPERTY_NAME, + OpenMetadataProperty.PRIORITY.name, toDoElement.getElementProperties(), methodName), Types.INTEGER)); openMetadataRecord.put(columnNameDueTime, new JDBCDataValue(propertyHelper.getDateProperty(connectorName, - OpenMetadataType.DUE_TIME_PROPERTY_NAME, + OpenMetadataProperty.DUE_TIME.name, toDoElement.getElementProperties(), methodName), Types.TIMESTAMP)); @@ -4170,7 +4170,7 @@ private Map getToDoDataValues(OpenMetadataElement toDo Types.TIMESTAMP)); openMetadataRecord.put(columnNameCompletionTime, new JDBCDataValue(propertyHelper.getDateProperty(connectorName, - OpenMetadataType.COMPLETION_TIME_PROPERTY_NAME, + OpenMetadataProperty.COMPLETION_TIME.name, toDoElement.getElementProperties(), methodName), Types.TIMESTAMP)); diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ActorProfileBuilder.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ActorProfileBuilder.java index 15edb52a9dc..238526eb2c7 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ActorProfileBuilder.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ActorProfileBuilder.java @@ -146,7 +146,7 @@ InstanceProperties getTeamStructureProperties(boolean delegationEscalationAuthor { InstanceProperties properties = repositoryHelper.addBooleanPropertyToInstance(serviceName, null, - OpenMetadataType.DELEGATION_ESCALATION_PROPERTY_NAME, + OpenMetadataProperty.DELEGATION_ESCALATION.name, delegationEscalationAuthority, methodName); diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ActorProfileConverter.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ActorProfileConverter.java index 07d0afc1e46..ffb03f63be0 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ActorProfileConverter.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ActorProfileConverter.java @@ -133,7 +133,7 @@ public B getNewComplexBean(Class beanClass, userIdentities.put(entity.getGUID(), userBean); } - else if (repositoryHelper.isTypeOf(serviceName, entityTypeName, OpenMetadataType.CONTRIBUTION_RECORD_TYPE_NAME)) + else if (repositoryHelper.isTypeOf(serviceName, entityTypeName, OpenMetadataType.CONTRIBUTION_RECORD.typeName)) { ContributionRecordElement contributionBean = new ContributionRecordElement(); ContributionRecord contributionRecord = new ContributionRecord(); @@ -213,7 +213,7 @@ else if (repositoryHelper.isTypeOf(serviceName, entityTypeName, OpenMetadataType { String relationshipTypeName = relationship.getType().getTypeDefName(); - if (repositoryHelper.isTypeOf(serviceName, relationshipTypeName, OpenMetadataType.PEER_RELATIONSHIP_TYPE_NAME)) + if (repositoryHelper.isTypeOf(serviceName, relationshipTypeName, OpenMetadataType.PEER_RELATIONSHIP.typeName)) { EntityProxy entityProxy = repositoryHelper.getOtherEnd(serviceName, primaryEntity.getGUID(), relationship); @@ -221,7 +221,7 @@ else if (repositoryHelper.isTypeOf(serviceName, entityTypeName, OpenMetadataType peers.add(elementStub); } - else if (repositoryHelper.isTypeOf(serviceName, relationshipTypeName, OpenMetadataType.TEAM_MEMBERSHIP_RELATIONSHIP_TYPE_NAME)) + else if (repositoryHelper.isTypeOf(serviceName, relationshipTypeName, OpenMetadataType.TEAM_MEMBERSHIP_RELATIONSHIP.typeName)) { EntityProxy entityProxy = repositoryHelper.getOtherEnd(serviceName, primaryEntity.getGUID(), relationship); @@ -229,7 +229,7 @@ else if (repositoryHelper.isTypeOf(serviceName, relationshipTypeName, OpenMetada teamMembers.add(elementStub); } - else if (repositoryHelper.isTypeOf(serviceName, relationshipTypeName, OpenMetadataType.TEAM_LEADERSHIP_RELATIONSHIP_TYPE_NAME)) + else if (repositoryHelper.isTypeOf(serviceName, relationshipTypeName, OpenMetadataType.TEAM_LEADERSHIP_RELATIONSHIP.typeName)) { EntityProxy entityProxy = repositoryHelper.getOtherEnd(serviceName, primaryEntity.getGUID(), relationship); @@ -237,7 +237,7 @@ else if (repositoryHelper.isTypeOf(serviceName, relationshipTypeName, OpenMetada teamLeaders.add(elementStub); } - else if (repositoryHelper.isTypeOf(serviceName, relationshipTypeName, OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP_TYPE_NAME)) + else if (repositoryHelper.isTypeOf(serviceName, relationshipTypeName, OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP.typeName)) { EntityProxy entityProxy = repositoryHelper.getOtherEnd(serviceName, primaryEntity.getGUID(), relationship); @@ -245,7 +245,7 @@ else if (repositoryHelper.isTypeOf(serviceName, relationshipTypeName, OpenMetada roles.add(elementStub); } - else if (repositoryHelper.isTypeOf(serviceName, relationshipTypeName, OpenMetadataType.IT_INFRASTRUCTURE_PROFILE_RELATIONSHIP_TYPE_NAME)) + else if (repositoryHelper.isTypeOf(serviceName, relationshipTypeName, OpenMetadataType.IT_INFRASTRUCTURE_PROFILE_RELATIONSHIP.typeName)) { EntityProxy entityProxy = repositoryHelper.getOtherEnd(serviceName, primaryEntity.getGUID(), relationship); @@ -294,7 +294,7 @@ else if (repositoryHelper.isTypeOf(serviceName, relationshipTypeName, OpenMetada profileIdentities.add(profileIdentityElement); } - else if (repositoryHelper.isTypeOf(serviceName, relationshipTypeName, OpenMetadataType.TEAM_STRUCTURE_RELATIONSHIP_TYPE_NAME)) + else if (repositoryHelper.isTypeOf(serviceName, relationshipTypeName, OpenMetadataType.TEAM_STRUCTURE_RELATIONSHIP.typeName)) { EntityProxy entityProxy = relationship.getEntityOneProxy(); diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ActorProfileHandler.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ActorProfileHandler.java index f677c870343..f542c073258 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ActorProfileHandler.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ActorProfileHandler.java @@ -364,8 +364,8 @@ public void linkPeerPersonProfiles(String userId, forLineage, forDuplicateProcessing, supportedZones, - OpenMetadataType.PEER_RELATIONSHIP_TYPE_GUID, - OpenMetadataType.PEER_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.PEER_RELATIONSHIP.typeGUID, + OpenMetadataType.PEER_RELATIONSHIP.typeName, setUpEffectiveDates(null, effectiveFrom, effectiveTo), effectiveFrom, effectiveTo, @@ -422,8 +422,8 @@ public void unlinkPeerPersonProfiles(String userId, forLineage, forDuplicateProcessing, supportedZones, - OpenMetadataType.PEER_RELATIONSHIP_TYPE_GUID, - OpenMetadataType.PEER_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.PEER_RELATIONSHIP.typeGUID, + OpenMetadataType.PEER_RELATIONSHIP.typeName, effectiveTime, methodName); } @@ -477,15 +477,15 @@ public void linkTeamHierarchy(String userId, externalSourceName, superTeamGUID, superTeamGUIDParameterName, - OpenMetadataType.TEAM_TYPE_NAME, + OpenMetadataType.TEAM.typeName, subTeamGUID, subTeamGUIDParameterName, - OpenMetadataType.TEAM_TYPE_NAME, + OpenMetadataType.TEAM.typeName, forLineage, forDuplicateProcessing, supportedZones, - OpenMetadataType.TEAM_STRUCTURE_RELATIONSHIP_TYPE_GUID, - OpenMetadataType.TEAM_STRUCTURE_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.TEAM_STRUCTURE_RELATIONSHIP.typeGUID, + OpenMetadataType.TEAM_STRUCTURE_RELATIONSHIP.typeName, setUpEffectiveDates(relationshipProperties, effectiveFrom, effectiveTo), effectiveFrom, effectiveTo, @@ -533,16 +533,16 @@ public void unlinkTeamHierarchy(String userId, externalSourceName, superTeamGUID, superTeamGUIDParameterName, - OpenMetadataType.TEAM_TYPE_NAME, + OpenMetadataType.TEAM.typeName, subTeamGUID, subTeamGUIDParameterName, - OpenMetadataType.TEAM_TYPE_GUID, - OpenMetadataType.TEAM_TYPE_NAME, + OpenMetadataType.TEAM.typeGUID, + OpenMetadataType.TEAM.typeName, forLineage, forDuplicateProcessing, supportedZones, - OpenMetadataType.TEAM_STRUCTURE_RELATIONSHIP_TYPE_GUID, - OpenMetadataType.TEAM_STRUCTURE_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.TEAM_STRUCTURE_RELATIONSHIP.typeGUID, + OpenMetadataType.TEAM_STRUCTURE_RELATIONSHIP.typeName, effectiveTime, methodName); } @@ -982,7 +982,7 @@ public EntityDetail getActorProfileEntityForUser(String userId, final String userGUIDParameterName = "userIdentity.getGUID"; List specificMatchPropertyNames = new ArrayList<>(); - specificMatchPropertyNames.add(OpenMetadataType.USER_ID_PROPERTY_NAME); + specificMatchPropertyNames.add(OpenMetadataProperty.USER_ID.name); EntityDetail userIdentity = this.getEntityByValue(userId, profileUserId, @@ -1282,14 +1282,14 @@ else if (repositoryHelper.isTypeOf(serviceName, relationshipTypeName, OpenMetada supplementaryEntities.add(entity); } } - else if (repositoryHelper.isTypeOf(serviceName, relationshipTypeName, OpenMetadataType.PERSONAL_CONTRIBUTION_RELATIONSHIP_TYPE_NAME)) + else if (repositoryHelper.isTypeOf(serviceName, relationshipTypeName, OpenMetadataType.PERSONAL_CONTRIBUTION_RELATIONSHIP.typeName)) { EntityProxy entityProxy = repositoryHelper.getOtherEnd(serviceName, primaryEntity.getGUID(), relationship); EntityDetail entity = getEntityFromRepository(userId, entityProxy.getGUID(), contributionRecordGUIDParameterName, - OpenMetadataType.CONTRIBUTION_RECORD_TYPE_NAME, + OpenMetadataType.CONTRIBUTION_RECORD.typeName, null, null, forLineage, diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/AssetHandler.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/AssetHandler.java index cf37be47a1f..25f88f2ecb5 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/AssetHandler.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/AssetHandler.java @@ -690,8 +690,8 @@ public String addAssetFromTemplate(String userId, Relationship assetConnectionRelationship = repositoryHandler.getUniqueRelationshipByType(userId, assetGUID, OpenMetadataType.ASSET.typeName, - OpenMetadataType.CONNECTION_TO_ASSET_TYPE_GUID, - OpenMetadataType.CONNECTION_TO_ASSET_TYPE_NAME, + OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeGUID, + OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeName, 1, forLineage, forDuplicateProcessing, @@ -704,9 +704,9 @@ public String addAssetFromTemplate(String userId, Relationship connectionEndpointRelationship = repositoryHandler.getUniqueRelationshipByType(userId, connectionGUID, - OpenMetadataType.CONNECTION_TYPE_NAME, - OpenMetadataType.CONNECTION_ENDPOINT_TYPE_GUID, - OpenMetadataType.CONNECTION_ENDPOINT_TYPE_NAME, + OpenMetadataType.CONNECTION.typeName, + OpenMetadataType.CONNECTION_ENDPOINT_RELATIONSHIP.typeGUID, + OpenMetadataType.CONNECTION_ENDPOINT_RELATIONSHIP.typeName, 1, forLineage, forDuplicateProcessing, @@ -1365,8 +1365,8 @@ public void updateAssetWithConnection(String userId, Relationship assetConnectionRelationship = repositoryHandler.getUniqueRelationshipByType(userId, assetGUID, OpenMetadataType.ASSET.typeName, - OpenMetadataType.CONNECTION_TO_ASSET_TYPE_GUID, - OpenMetadataType.CONNECTION_TO_ASSET_TYPE_NAME, + OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeGUID, + OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeName, 1, forLineage, forDuplicateProcessing, @@ -1384,9 +1384,9 @@ public void updateAssetWithConnection(String userId, forLineage, forDuplicateProcessing, serviceSupportedZones, - OpenMetadataType.CONNECTION_TO_ASSET_TYPE_GUID, - OpenMetadataType.CONNECTION_TO_ASSET_TYPE_NAME, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeGUID, + OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeName, + OpenMetadataType.CONNECTION.typeName, effectiveTime, methodName); } @@ -1414,7 +1414,7 @@ public void updateAssetWithConnection(String userId, { relationshipProperties = repositoryHelper.addStringPropertyToInstance(serviceName, null, - OpenMetadataType.ASSET_SUMMARY_PROPERTY_NAME, + OpenMetadataProperty.ASSET_SUMMARY.name, assetSummary, methodName); } @@ -1423,7 +1423,7 @@ public void updateAssetWithConnection(String userId, { repositoryHandler.createRelationship(userId, - OpenMetadataType.CONNECTION_TO_ASSET_TYPE_GUID, + OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeGUID, null, null, connectionGUID, @@ -1437,11 +1437,11 @@ public void updateAssetWithConnection(String userId, null, null, connectionGUID, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeName, assetGUID, OpenMetadataType.ASSET.typeName, - OpenMetadataType.CONNECTION_TO_ASSET_TYPE_GUID, - OpenMetadataType.CONNECTION_TO_ASSET_TYPE_NAME, + OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeGUID, + OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeName, relationshipProperties, forLineage, forDuplicateProcessing, @@ -2027,9 +2027,9 @@ public String getAssetForConnection(String userId, return this.getAttachedElementGUID(userId, connectionGUID, connectionGUIDParameterName, - OpenMetadataType.CONNECTION_TYPE_NAME, - OpenMetadataType.ASSET_TO_CONNECTION_TYPE_GUID, - OpenMetadataType.ASSET_TO_CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeName, + OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeGUID, + OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeName, OpenMetadataType.ASSET.typeName, 0, forLineage, @@ -2147,8 +2147,8 @@ public String getAssetForConnectionName(String userId, List connectionGUIDs = this.getEntityGUIDsByValue(userId, connectionName, connectionNameParameter, - OpenMetadataType.CONNECTION_TYPE_GUID, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeGUID, + OpenMetadataType.CONNECTION.typeName, specificMatchPropertyNames, true, null, @@ -2425,8 +2425,8 @@ private B getAssetWithConnectionBean(String userId, Relationship relationshipToConnection = repositoryHandler.getUniqueRelationshipByType(userId, assetEntity.getGUID(), assetEntity.getType().getTypeDefName(), - OpenMetadataType.CONNECTION_TO_ASSET_TYPE_GUID, - OpenMetadataType.CONNECTION_TO_ASSET_TYPE_NAME, + OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeGUID, + OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeName, 1, forLineage, forDuplicateProcessing, @@ -2444,7 +2444,7 @@ private B getAssetWithConnectionBean(String userId, connectionEntity = this.getEntityFromRepository(userId, end1.getGUID(), connectionGUIDParameterName, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeName, null, null, forLineage, @@ -2488,16 +2488,16 @@ private B getAssetWithConnectionBean(String userId, if ((repositoryHelper.isTypeOf(serviceName, relationship.getType().getTypeDefName(), - OpenMetadataType.CONNECTION_CONNECTOR_TYPE_TYPE_NAME)) + OpenMetadataType.CONNECTION_CONNECTOR_TYPE_RELATIONSHIP.typeName)) || (repositoryHelper.isTypeOf(serviceName, relationship.getType().getTypeDefName(), - OpenMetadataType.EMBEDDED_CONNECTION_TYPE_NAME))) + OpenMetadataType.EMBEDDED_CONNECTION_RELATIONSHIP.typeName))) { entityProxy = relationship.getEntityTwoProxy(); } else if (repositoryHelper.isTypeOf(serviceName, relationship.getType().getTypeDefName(), - OpenMetadataType.CONNECTION_ENDPOINT_TYPE_NAME)) + OpenMetadataType.CONNECTION_ENDPOINT_RELATIONSHIP.typeName)) { entityProxy = relationship.getEntityOneProxy(); } @@ -2593,19 +2593,19 @@ private List getEmbeddedConnectionRelationships(String user { if ((repositoryHelper.isTypeOf(serviceName, relationship.getType().getTypeDefName(), - OpenMetadataType.CONNECTION_ENDPOINT_TYPE_NAME)) + OpenMetadataType.CONNECTION_ENDPOINT_RELATIONSHIP.typeName)) || (repositoryHelper.isTypeOf(serviceName, relationship.getType().getTypeDefName(), - OpenMetadataType.CONNECTION_CONNECTOR_TYPE_TYPE_NAME)) + OpenMetadataType.CONNECTION_CONNECTOR_TYPE_RELATIONSHIP.typeName)) || (repositoryHelper.isTypeOf(serviceName, relationship.getType().getTypeDefName(), - OpenMetadataType.CONNECTION_TO_ASSET_TYPE_NAME))) + OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeName))) { supplementaryRelationships.add(relationship); } else if (repositoryHelper.isTypeOf(serviceName, relationship.getType().getTypeDefName(), - OpenMetadataType.EMBEDDED_CONNECTION_TYPE_NAME)) + OpenMetadataType.EMBEDDED_CONNECTION_RELATIONSHIP.typeName)) { supplementaryRelationships.add(relationship); @@ -3720,9 +3720,9 @@ public List getAssetGUIDsByTag(String userId, return this.getAttachedElementGUIDs(userId, tagGUID, tagGUIDParameterName, - OpenMetadataType.INFORMAL_TAG_TYPE_NAME, - OpenMetadataType.REFERENCEABLE_TO_TAG_TYPE_GUID, - OpenMetadataType.REFERENCEABLE_TO_TAG_TYPE_NAME, + OpenMetadataType.INFORMAL_TAG.typeName, + OpenMetadataType.ATTACHED_TAG_RELATIONSHIP.typeGUID, + OpenMetadataType.ATTACHED_TAG_RELATIONSHIP.typeName, OpenMetadataType.ASSET.typeName, forLineage, forDuplicateProcessing, diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/CommentBuilder.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/CommentBuilder.java index d45d9e56eb8..fca5c4fb930 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/CommentBuilder.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/CommentBuilder.java @@ -86,7 +86,7 @@ public InstanceProperties getInstanceProperties(String methodName) throws Inval properties = repositoryHelper.addStringPropertyToInstance(serviceName, properties, - OpenMetadataType.COMMENT_TEXT_PROPERTY_NAME, + OpenMetadataProperty.TEXT.name, commentText, methodName); diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/CommentHandler.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/CommentHandler.java index d2b7ac0d86c..e62c903e51f 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/CommentHandler.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/CommentHandler.java @@ -241,8 +241,8 @@ public String attachNewComment(String userId, forLineage, forDuplicateProcessing, supportedZones, - OpenMetadataType.REFERENCEABLE_TO_COMMENT_TYPE_GUID, - OpenMetadataType.REFERENCEABLE_TO_COMMENT_TYPE_NAME, + OpenMetadataType.ATTACHED_COMMENT_RELATIONSHIP.typeGUID, + OpenMetadataType.ATTACHED_COMMENT_RELATIONSHIP.typeName, builder.getRelationshipInstanceProperties(methodName), effectiveFrom, methodName); @@ -337,8 +337,8 @@ public void updateComment(String userId, startingEntity, commentGUIDParameterName, OpenMetadataType.COMMENT.typeName, - OpenMetadataType.REFERENCEABLE_TO_COMMENT_TYPE_GUID, - OpenMetadataType.REFERENCEABLE_TO_COMMENT_TYPE_NAME, + OpenMetadataType.ATTACHED_COMMENT_RELATIONSHIP.typeGUID, + OpenMetadataType.ATTACHED_COMMENT_RELATIONSHIP.typeName, null, OpenMetadataType.REFERENCEABLE.typeName, 1, @@ -355,7 +355,7 @@ public void updateComment(String userId, { errorHandler.handleNoRelationship(commentGUID, OpenMetadataType.COMMENT.typeName, - OpenMetadataType.REFERENCEABLE_TO_COMMENT_TYPE_NAME, + OpenMetadataType.ATTACHED_COMMENT_RELATIONSHIP.typeName, methodName); } else if (relationships.size() == 1) @@ -371,7 +371,7 @@ else if (relationships.size() == 1) { errorHandler.handleAmbiguousRelationships(commentGUID, OpenMetadataType.COMMENT.typeName, - OpenMetadataType.REFERENCEABLE_TO_COMMENT_TYPE_NAME, + OpenMetadataType.ATTACHED_COMMENT_RELATIONSHIP.typeName, relationships, methodName); } @@ -480,8 +480,8 @@ public void setupAcceptedAnswer(String userId, forLineage, forDuplicateProcessing, supportedZones, - OpenMetadataType.ANSWER_RELATIONSHIP_TYPE_GUID, - OpenMetadataType.ANSWER_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.ACCEPTED_ANSWER_RELATIONSHIP.typeGUID, + OpenMetadataType.ACCEPTED_ANSWER_RELATIONSHIP.typeName, instanceProperties, effectiveFrom, effectiveTo, @@ -536,8 +536,8 @@ public void clearAcceptedAnswer(String userId, OpenMetadataType.COMMENT.typeName, forLineage, forDuplicateProcessing, - OpenMetadataType.ANSWER_RELATIONSHIP_TYPE_GUID, - OpenMetadataType.ANSWER_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.ACCEPTED_ANSWER_RELATIONSHIP.typeGUID, + OpenMetadataType.ACCEPTED_ANSWER_RELATIONSHIP.typeName, effectiveTime, methodName); } @@ -587,8 +587,8 @@ public List getComments(String userId, elementGUID, elementGUIDParameterName, elementTypeName, - OpenMetadataType.REFERENCEABLE_TO_COMMENT_TYPE_GUID, - OpenMetadataType.REFERENCEABLE_TO_COMMENT_TYPE_NAME, + OpenMetadataType.ATTACHED_COMMENT_RELATIONSHIP.typeGUID, + OpenMetadataType.ATTACHED_COMMENT_RELATIONSHIP.typeName, OpenMetadataType.COMMENT.typeName, null, null, @@ -642,8 +642,8 @@ public List getComments(String userId, elementGUID, elementGUIDParameterName, elementTypeName, - OpenMetadataType.REFERENCEABLE_TO_COMMENT_TYPE_GUID, - OpenMetadataType.REFERENCEABLE_TO_COMMENT_TYPE_NAME, + OpenMetadataType.ATTACHED_COMMENT_RELATIONSHIP.typeGUID, + OpenMetadataType.ATTACHED_COMMENT_RELATIONSHIP.typeName, OpenMetadataType.COMMENT.typeName, null, null, diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/CommunityBuilder.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/CommunityBuilder.java index de45d44af1d..dcee493dc64 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/CommunityBuilder.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/CommunityBuilder.java @@ -81,8 +81,8 @@ public class CommunityBuilder extends ReferenceableBuilder { super(qualifiedName, null, - OpenMetadataType.COMMUNITY_TYPE_GUID, - OpenMetadataType.COMMUNITY_TYPE_NAME, + OpenMetadataType.COMMUNITY.typeGUID, + OpenMetadataType.COMMUNITY.typeName, null, repositoryHelper, serviceName, @@ -104,8 +104,8 @@ public class CommunityBuilder extends ReferenceableBuilder String serviceName, String serverName) { - super(OpenMetadataType.COMMUNITY_TYPE_GUID, - OpenMetadataType.COMMUNITY_TYPE_NAME, + super(OpenMetadataType.COMMUNITY.typeGUID, + OpenMetadataType.COMMUNITY.typeName, repositoryHelper, serviceName, serverName); @@ -138,7 +138,7 @@ public InstanceProperties getInstanceProperties(String methodName) throws Inval properties = repositoryHelper.addStringPropertyToInstance(serviceName, properties, - OpenMetadataType.MISSION_PROPERTY_NAME, + OpenMetadataProperty.MISSION.name, mission, methodName); return properties; diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/CommunityHandler.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/CommunityHandler.java index dfdf2b76ebd..154950443f2 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/CommunityHandler.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/CommunityHandler.java @@ -2,6 +2,7 @@ /* Copyright Contributors to the ODPi Egeria project. */ package org.odpi.openmetadata.commonservices.generichandlers; +import org.odpi.openmetadata.frameworks.openmetadata.enums.CommunityMembershipType; import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataProperty; import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataType; import org.odpi.openmetadata.commonservices.ffdc.InvalidParameterHandler; @@ -119,7 +120,7 @@ public String createCommunity(String userId, invalidParameterHandler.validateUserId(userId, methodName); invalidParameterHandler.validateName(qualifiedName, qualifiedNameParameterName, methodName); - String typeName = OpenMetadataType.COMMUNITY_TYPE_NAME; + String typeName = OpenMetadataType.COMMUNITY.typeName; if (suppliedTypeName != null) { @@ -127,7 +128,7 @@ public String createCommunity(String userId, } String typeGUID = invalidParameterHandler.validateTypeName(typeName, - OpenMetadataType.COMMUNITY_TYPE_NAME, + OpenMetadataType.COMMUNITY.typeName, serviceName, methodName, repositoryHelper); @@ -206,8 +207,8 @@ public String createCommunityFromTemplate(String userId, builder.setAnchors(userId, null, - OpenMetadataType.COMMUNITY_TYPE_NAME, - OpenMetadataType.COMMUNITY_TYPE_NAME, + OpenMetadataType.COMMUNITY.typeName, + OpenMetadataType.COMMUNITY.typeName, methodName); @@ -216,8 +217,8 @@ public String createCommunityFromTemplate(String userId, externalSourceName, templateGUID, templateGUIDParameterName, - OpenMetadataType.COMMUNITY_TYPE_GUID, - OpenMetadataType.COMMUNITY_TYPE_NAME, + OpenMetadataType.COMMUNITY.typeGUID, + OpenMetadataType.COMMUNITY.typeName, qualifiedName, OpenMetadataProperty.QUALIFIED_NAME.name, builder, @@ -286,7 +287,7 @@ public void updateCommunity(String userId, invalidParameterHandler.validateName(qualifiedName, qualifiedNameParameterName, methodName); } - String typeName = OpenMetadataType.COMMUNITY_TYPE_NAME; + String typeName = OpenMetadataType.COMMUNITY.typeName; if (suppliedTypeName != null) { @@ -294,7 +295,7 @@ public void updateCommunity(String userId, } String typeGUID = invalidParameterHandler.validateTypeName(typeName, - OpenMetadataType.COMMUNITY_TYPE_NAME, + OpenMetadataType.COMMUNITY.typeName, serviceName, methodName, repositoryHelper); @@ -375,15 +376,15 @@ public void addRoleToCommunity(String userId, { properties = repositoryHelper.addEnumPropertyToInstance(serviceName, null, - OpenMetadataType.MEMBERSHIP_TYPE_PROPERTY_NAME, - OpenMetadataType.COMMUNITY_MEMBERSHIP_TYPE_ENUM_TYPE_GUID, - OpenMetadataType.COMMUNITY_MEMBERSHIP_TYPE_ENUM_TYPE_NAME, + OpenMetadataProperty.MEMBERSHIP_TYPE.name, + CommunityMembershipType.getOpenTypeGUID(), + CommunityMembershipType.getOpenTypeName(), membershipType, methodName); } catch (TypeErrorException classificationNotSupported) { - throw new InvalidParameterException(classificationNotSupported, OpenMetadataType.MEMBERSHIP_TYPE_PROPERTY_NAME); + throw new InvalidParameterException(classificationNotSupported, OpenMetadataProperty.MEMBERSHIP_TYPE.name); } this.linkElementToElement(userId, @@ -391,15 +392,15 @@ public void addRoleToCommunity(String userId, externalSourceName, communityGUID, communityGUIDParameterName, - OpenMetadataType.COMMUNITY_TYPE_NAME, + OpenMetadataType.COMMUNITY.typeName, memberGUID, memberGUIDParameterName, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, + OpenMetadataType.PERSON_ROLE.typeName, forLineage, forDuplicateProcessing, supportedZones, - OpenMetadataType.COMMUNITY_MEMBERSHIP_TYPE_GUID, - OpenMetadataType.COMMUNITY_MEMBERSHIP_TYPE_NAME, + OpenMetadataType.COMMUNITY_MEMBERSHIP_RELATIONSHIP.typeGUID, + OpenMetadataType.COMMUNITY_MEMBERSHIP_RELATIONSHIP.typeName, properties, effectiveFrom, effectiveTo, @@ -447,15 +448,15 @@ public void removeRoleFromCommunity(String userId, externalSourceName, communityGUID, communityGUIDParameterName, - OpenMetadataType.COMMUNITY_TYPE_NAME, + OpenMetadataType.COMMUNITY.typeName, memberGUID, memberGUIDParameterName, - OpenMetadataType.PERSON_ROLE_TYPE_GUID, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, + OpenMetadataType.PERSON_ROLE.typeGUID, + OpenMetadataType.PERSON_ROLE.typeName, forLineage, forDuplicateProcessing, - OpenMetadataType.COMMUNITY_MEMBERSHIP_TYPE_GUID, - OpenMetadataType.COMMUNITY_MEMBERSHIP_TYPE_NAME, + OpenMetadataType.COMMUNITY_MEMBERSHIP_RELATIONSHIP.typeGUID, + OpenMetadataType.COMMUNITY_MEMBERSHIP_RELATIONSHIP.typeName, effectiveTime, methodName); } @@ -496,8 +497,8 @@ public void removeCommunity(String userId, externalSourceName, communityGUID, communityGUIDParameterName, - OpenMetadataType.COMMUNITY_TYPE_GUID, - OpenMetadataType.COMMUNITY_TYPE_NAME, + OpenMetadataType.COMMUNITY.typeGUID, + OpenMetadataType.COMMUNITY.typeName, null, null, forLineage, @@ -542,8 +543,8 @@ public List findCommunities(String userId, return this.findBeans(userId, searchString, searchStringParameterName, - OpenMetadataType.COMMUNITY_TYPE_GUID, - OpenMetadataType.COMMUNITY_TYPE_NAME, + OpenMetadataType.COMMUNITY.typeGUID, + OpenMetadataType.COMMUNITY.typeName, null, startFrom, pageSize, @@ -594,8 +595,8 @@ public List getCommunitiesByName(String userId, return this.getBeansByValue(userId, name, nameParameterName, - OpenMetadataType.COMMUNITY_TYPE_GUID, - OpenMetadataType.COMMUNITY_TYPE_NAME, + OpenMetadataType.COMMUNITY.typeGUID, + OpenMetadataType.COMMUNITY.typeName, specificMatchPropertyNames, true, null, @@ -640,8 +641,8 @@ public List getCommunities(String userId, PropertyServerException { return this.getBeansByType(userId, - OpenMetadataType.COMMUNITY_TYPE_GUID, - OpenMetadataType.COMMUNITY_TYPE_NAME, + OpenMetadataType.COMMUNITY.typeGUID, + OpenMetadataType.COMMUNITY.typeName, null, forLineage, forDuplicateProcessing, @@ -683,7 +684,7 @@ public B getCommunityByGUID(String userId, return this.getBeanFromRepository(userId, guid, guidParameterName, - OpenMetadataType.COMMUNITY_TYPE_NAME, + OpenMetadataType.COMMUNITY.typeName, forLineage, forDuplicateProcessing, supportedZones, diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ConnectionBuilder.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ConnectionBuilder.java index e9565c75e37..f38e18ac635 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ConnectionBuilder.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ConnectionBuilder.java @@ -98,8 +98,8 @@ public class ConnectionBuilder extends ReferenceableBuilder { super(qualifiedName, null, - OpenMetadataType.CONNECTION_TYPE_GUID, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeGUID, + OpenMetadataType.CONNECTION.typeName, null, repositoryHelper, serviceName, @@ -136,31 +136,31 @@ public InstanceProperties getInstanceProperties(String methodName) throws Inval properties = repositoryHelper.addStringMapPropertyToInstance(serviceName, properties, - OpenMetadataType.SECURED_PROPERTIES_PROPERTY_NAME, + OpenMetadataProperty.SECURED_PROPERTIES.name, securedProperties, methodName); properties = repositoryHelper.addMapPropertyToInstance(serviceName, properties, - OpenMetadataType.CONFIGURATION_PROPERTIES_PROPERTY_NAME, + OpenMetadataProperty.CONFIGURATION_PROPERTIES.name, configurationProperties, methodName); properties = repositoryHelper.addStringPropertyToInstance(serviceName, properties, - OpenMetadataType.USER_ID_PROPERTY_NAME, + OpenMetadataProperty.USER_ID.name, connectorUserId, methodName); properties = repositoryHelper.addStringPropertyToInstance(serviceName, properties, - OpenMetadataType.CLEAR_PASSWORD_PROPERTY_NAME, + OpenMetadataProperty.CLEAR_PASSWORD.name, clearPassword, methodName); properties = repositoryHelper.addStringPropertyToInstance(serviceName, properties, - OpenMetadataType.ENCRYPTED_PASSWORD_PROPERTY_NAME, + OpenMetadataProperty.ENCRYPTED_PASSWORD.name, encryptedPassword, methodName); diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ConnectionConverter.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ConnectionConverter.java index e7307a49797..7d239939820 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ConnectionConverter.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ConnectionConverter.java @@ -111,7 +111,7 @@ public B getNewComplexBean(Class beanClass, { if ((relationship != null) && (relationship.getType() != null)) { - if (repositoryHelper.isTypeOf(serviceName, relationship.getType().getTypeDefName(), OpenMetadataType.EMBEDDED_CONNECTION_TYPE_NAME)) + if (repositoryHelper.isTypeOf(serviceName, relationship.getType().getTypeDefName(), OpenMetadataType.EMBEDDED_CONNECTION_RELATIONSHIP.typeName)) { EmbeddedConnection embeddedConnection = new EmbeddedConnection(); @@ -125,11 +125,11 @@ public B getNewComplexBean(Class beanClass, embeddedConnections.add(embeddedConnection); } - else if (repositoryHelper.isTypeOf(serviceName, relationship.getType().getTypeDefName(), OpenMetadataType.CONNECTION_CONNECTOR_TYPE_TYPE_NAME)) + else if (repositoryHelper.isTypeOf(serviceName, relationship.getType().getTypeDefName(), OpenMetadataType.CONNECTION_CONNECTOR_TYPE_RELATIONSHIP.typeName)) { bean.setConnectorType(getElementStub(beanClass, relationship.getEntityTwoProxy(), methodName)); } - else if (repositoryHelper.isTypeOf(serviceName, relationship.getType().getTypeDefName(), OpenMetadataType.CONNECTION_ENDPOINT_TYPE_NAME)) + else if (repositoryHelper.isTypeOf(serviceName, relationship.getType().getTypeDefName(), OpenMetadataType.CONNECTION_ENDPOINT_RELATIONSHIP.typeName)) { bean.setEndpoint(getElementStub(beanClass, relationship.getEntityOneProxy(), methodName)); } diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ConnectionHandler.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ConnectionHandler.java index 42afc055241..afe6b8e9b51 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ConnectionHandler.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ConnectionHandler.java @@ -174,7 +174,7 @@ private String findConnection(String userId, if (this.getEntityFromRepository(userId, connectionGUID, guidParameterName, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeName, null, null, forLineage, @@ -202,8 +202,8 @@ private String findConnection(String userId, qualifiedName, qualifiedNameParameter, OpenMetadataProperty.QUALIFIED_NAME.name, - OpenMetadataType.CONNECTION_TYPE_GUID, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeGUID, + OpenMetadataType.CONNECTION.typeName, false, false, supportedZones, @@ -217,8 +217,8 @@ private String findConnection(String userId, displayName, displayNameParameter, OpenMetadataProperty.DISPLAY_NAME.name, - OpenMetadataType.CONNECTION_TYPE_GUID, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeGUID, + OpenMetadataType.CONNECTION.typeName, false, false, supportedZones, @@ -397,8 +397,8 @@ private void saveAssociatedConnectionEntities(String userId, null, endpointGUID, connectionGUID, - OpenMetadataType.CONNECTION_ENDPOINT_TYPE_GUID, - OpenMetadataType.CONNECTION_ENDPOINT_TYPE_NAME, + OpenMetadataType.CONNECTION_ENDPOINT_RELATIONSHIP.typeGUID, + OpenMetadataType.CONNECTION_ENDPOINT_RELATIONSHIP.typeName, null, forLineage, forDuplicateProcessing, @@ -418,9 +418,9 @@ private void saveAssociatedConnectionEntities(String userId, externalSourceGUID, externalSourceName, connectionGUID, - OpenMetadataType.CONNECTION_TYPE_NAME, - OpenMetadataType.CONNECTION_ENDPOINT_TYPE_GUID, - OpenMetadataType.CONNECTION_ENDPOINT_TYPE_NAME, + OpenMetadataType.CONNECTION.typeName, + OpenMetadataType.CONNECTION_ENDPOINT_RELATIONSHIP.typeGUID, + OpenMetadataType.CONNECTION_ENDPOINT_RELATIONSHIP.typeName, forLineage, forDuplicateProcessing, effectiveTime, @@ -441,11 +441,11 @@ private void saveAssociatedConnectionEntities(String userId, repositoryHandler.ensureRelationship(userId, externalSourceGUID, externalSourceName, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeName, connectionGUID, connectorTypeGUID, - OpenMetadataType.CONNECTION_CONNECTOR_TYPE_TYPE_GUID, - OpenMetadataType.CONNECTION_CONNECTOR_TYPE_TYPE_NAME, + OpenMetadataType.CONNECTION_CONNECTOR_TYPE_RELATIONSHIP.typeGUID, + OpenMetadataType.CONNECTION_CONNECTOR_TYPE_RELATIONSHIP.typeName, null, forLineage, forDuplicateProcessing, @@ -465,9 +465,9 @@ private void saveAssociatedConnectionEntities(String userId, externalSourceGUID, externalSourceName, connectionGUID, - OpenMetadataType.CONNECTION_TYPE_NAME, - OpenMetadataType.CONNECTION_CONNECTOR_TYPE_TYPE_GUID, - OpenMetadataType.CONNECTION_CONNECTOR_TYPE_TYPE_NAME, + OpenMetadataType.CONNECTION.typeName, + OpenMetadataType.CONNECTION_CONNECTOR_TYPE_RELATIONSHIP.typeGUID, + OpenMetadataType.CONNECTION_CONNECTOR_TYPE_RELATIONSHIP.typeName, forLineage, forDuplicateProcessing, effectiveTime, @@ -484,12 +484,12 @@ private void saveAssociatedConnectionEntities(String userId, externalSourceName, connectionGUID, connectionGUIDParameterName, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeName, forLineage, forDuplicateProcessing, serviceSupportedZones, - OpenMetadataType.EMBEDDED_CONNECTION_TYPE_GUID, - OpenMetadataType.EMBEDDED_CONNECTION_TYPE_NAME, + OpenMetadataType.EMBEDDED_CONNECTION_RELATIONSHIP.typeGUID, + OpenMetadataType.EMBEDDED_CONNECTION_RELATIONSHIP.typeName, effectiveTime, methodName); @@ -528,7 +528,7 @@ private void saveAssociatedConnectionEntities(String userId, serverName); repositoryHandler.createRelationship(userId, - OpenMetadataType.EMBEDDED_CONNECTION_TYPE_GUID, + OpenMetadataType.EMBEDDED_CONNECTION_RELATIONSHIP.typeGUID, externalSourceGUID, externalSourceName, connectionGUID, @@ -591,20 +591,20 @@ private String addConnection(String userId, invalidParameterHandler.validateObject(connection.getConnectorType(), connectionParameterName, methodName); - String connectionTypeGUID = OpenMetadataType.CONNECTION_TYPE_GUID; - String connectionTypeName = OpenMetadataType.CONNECTION_TYPE_NAME; + String connectionTypeGUID = OpenMetadataType.CONNECTION.typeGUID; + String connectionTypeName = OpenMetadataType.CONNECTION.typeName; List embeddedConnections = null; if (connection instanceof VirtualConnection virtualConnection) { - connectionTypeGUID = OpenMetadataType.VIRTUAL_CONNECTION_TYPE_GUID; - connectionTypeName = OpenMetadataType.VIRTUAL_CONNECTION_TYPE_NAME; + connectionTypeGUID = OpenMetadataType.VIRTUAL_CONNECTION.typeGUID; + connectionTypeName = OpenMetadataType.VIRTUAL_CONNECTION.typeName; embeddedConnections = virtualConnection.getEmbeddedConnections(); } String anchorTypeName = null; - String anchorDomainName = OpenMetadataType.CONNECTION_TYPE_NAME; + String anchorDomainName = OpenMetadataType.CONNECTION.typeName; if (anchorGUID != null) { @@ -642,8 +642,8 @@ private String addConnection(String userId, connection.getUserId(), connection.getClearPassword(), connection.getEncryptedPassword(), - OpenMetadataType.CONNECTION_TYPE_GUID, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeGUID, + OpenMetadataType.CONNECTION.typeName, connection.getExtendedProperties(), repositoryHelper, serviceName, @@ -694,7 +694,7 @@ private String addConnection(String userId, { properties = repositoryHelper.addStringPropertyToInstance(serviceName, null, - OpenMetadataType.ASSET_SUMMARY_PROPERTY_NAME, + OpenMetadataProperty.ASSET_SUMMARY.name, assetSummary, methodName); } @@ -704,15 +704,15 @@ private String addConnection(String userId, null, connectionGUID, connectionParameterName, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeName, assetGUID, assetGUIDParameterName, assetTypeName, forLineage, forDuplicateProcessing, serviceSupportedZones, - OpenMetadataType.CONNECTION_TO_ASSET_TYPE_GUID, - OpenMetadataType.CONNECTION_TO_ASSET_TYPE_NAME, + OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeGUID, + OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeName, properties, null, null, @@ -764,12 +764,12 @@ private String updateConnection(String userId, invalidParameterHandler.validateObject(connection.getConnectorType(), parameterName, methodName); - String connectionTypeName = OpenMetadataType.CONNECTION_TYPE_NAME; + String connectionTypeName = OpenMetadataType.CONNECTION.typeName; List embeddedConnections = null; if (connection instanceof VirtualConnection virtualConnection) { - connectionTypeName = OpenMetadataType.VIRTUAL_CONNECTION_TYPE_NAME; + connectionTypeName = OpenMetadataType.VIRTUAL_CONNECTION.typeName; embeddedConnections = virtualConnection.getEmbeddedConnections(); } @@ -975,7 +975,7 @@ public void addAssetConnection(String userId, null, null, null, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeName, null, connectorTypeGUID, connectorTypeGUIDParameterName, @@ -1073,7 +1073,7 @@ public String createConnection(String userId, connectorUserId, clearPassword, encryptedPassword, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeName, null, connectorTypeGUID, connectorTypeGUIDParameterName, @@ -1164,7 +1164,7 @@ public String createConnection(String userId, invalidParameterHandler.validateName(qualifiedName, nameParameter, methodName); String connectionTypeId = invalidParameterHandler.validateTypeName(connectionTypeName, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeName, serviceName, methodName, repositoryHelper); @@ -1186,7 +1186,7 @@ public String createConnection(String userId, serverName); builder.setEffectivityDates(effectiveFrom, effectiveTo); - String domainName = OpenMetadataType.CONNECTION_TYPE_NAME; + String domainName = OpenMetadataType.CONNECTION.typeName; if (assetGUID != null) { @@ -1230,7 +1230,7 @@ public String createConnection(String userId, { relationshipProperties = repositoryHelper.addStringPropertyToInstance(serviceName, null, - OpenMetadataType.ASSET_SUMMARY_PROPERTY_NAME, + OpenMetadataProperty.ASSET_SUMMARY.name, assetSummary, methodName); } @@ -1247,8 +1247,8 @@ public String createConnection(String userId, forLineage, forDuplicateProcessing, serviceSupportedZones, - OpenMetadataType.ASSET_TO_CONNECTION_TYPE_GUID, - OpenMetadataType.ASSET_TO_CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeGUID, + OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeName, this.setUpEffectiveDates(relationshipProperties, effectiveFrom,effectiveTo), effectiveTime, methodName); @@ -1264,12 +1264,12 @@ public String createConnection(String userId, connectionTypeName, connectorTypeGUID, connectorTypeGUIDParameterName, - OpenMetadataType.CONNECTOR_TYPE_TYPE_NAME, + OpenMetadataType.CONNECTOR_TYPE.typeName, forLineage, forDuplicateProcessing, serviceSupportedZones, - OpenMetadataType.CONNECTION_CONNECTOR_TYPE_TYPE_GUID, - OpenMetadataType.CONNECTION_CONNECTOR_TYPE_TYPE_NAME, + OpenMetadataType.CONNECTION_CONNECTOR_TYPE_RELATIONSHIP.typeGUID, + OpenMetadataType.CONNECTION_CONNECTOR_TYPE_RELATIONSHIP.typeName, null, effectiveFrom, effectiveTo, @@ -1291,8 +1291,8 @@ public String createConnection(String userId, forLineage, forDuplicateProcessing, serviceSupportedZones, - OpenMetadataType.CONNECTION_ENDPOINT_TYPE_GUID, - OpenMetadataType.CONNECTION_ENDPOINT_TYPE_NAME, + OpenMetadataType.CONNECTION_ENDPOINT_RELATIONSHIP.typeGUID, + OpenMetadataType.CONNECTION_ENDPOINT_RELATIONSHIP.typeName, null, effectiveFrom, effectiveTo, @@ -1357,7 +1357,7 @@ public void addEmbeddedConnection(String userId, InstanceProperties properties = repositoryHelper.addIntPropertyToInstance(serviceName, null, - OpenMetadataType.POSITION_PROPERTY_NAME, + OpenMetadataProperty.POSITION.name, position, methodName); @@ -1374,7 +1374,7 @@ public void addEmbeddedConnection(String userId, { properties = repositoryHelper.addMapPropertyToInstance(serviceName, properties, - OpenMetadataType.ARGUMENTS_PROPERTY_NAME, + OpenMetadataProperty.ARGUMENTS.name, arguments, methodName); } @@ -1384,15 +1384,15 @@ public void addEmbeddedConnection(String userId, externalSourceName, virtualConnectionGUID, virtualConnectionGUIDParameterName, - OpenMetadataType.VIRTUAL_CONNECTION_TYPE_NAME, + OpenMetadataType.VIRTUAL_CONNECTION.typeName, embeddedConnectionGUID, embeddedConnectionGUIDParameterName, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeName, forLineage, forDuplicateProcessing, serviceSupportedZones, - OpenMetadataType.EMBEDDED_CONNECTION_TYPE_GUID, - OpenMetadataType.EMBEDDED_CONNECTION_TYPE_NAME, + OpenMetadataType.EMBEDDED_CONNECTION_RELATIONSHIP.typeGUID, + OpenMetadataType.EMBEDDED_CONNECTION_RELATIONSHIP.typeName, properties, effectiveFrom, effectiveTo, @@ -1442,16 +1442,16 @@ public void removeEmbeddedConnection(String userId, externalSourceName, connectionGUID, connectionGUIDParameterName, - OpenMetadataType.VIRTUAL_CONNECTION_TYPE_NAME, + OpenMetadataType.VIRTUAL_CONNECTION.typeName, embeddedConnectionGUID, embeddedConnectionGUIDParameterName, - OpenMetadataType.CONNECTION_TYPE_GUID, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeGUID, + OpenMetadataType.CONNECTION.typeName, forLineage, forDuplicateProcessing, serviceSupportedZones, - OpenMetadataType.EMBEDDED_CONNECTION_TYPE_GUID, - OpenMetadataType.EMBEDDED_CONNECTION_TYPE_NAME, + OpenMetadataType.EMBEDDED_CONNECTION_RELATIONSHIP.typeGUID, + OpenMetadataType.EMBEDDED_CONNECTION_RELATIONSHIP.typeName, effectiveTime, methodName); } @@ -1507,8 +1507,8 @@ public String createConnectionFromTemplate(String userId, externalSourceName, templateGUID, templateGUIDParameterName, - OpenMetadataType.CONNECTION_TYPE_GUID, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeGUID, + OpenMetadataType.CONNECTION.typeName, qualifiedName, OpenMetadataProperty.QUALIFIED_NAME.name, builder, @@ -1585,7 +1585,7 @@ public void updateConnection(String userId, } String typeGUID = invalidParameterHandler.validateTypeName(typeName, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeName, serviceName, methodName, repositoryHelper); @@ -1667,15 +1667,15 @@ public void addConnectionConnectorType(String userId, externalSourceName, connectionGUID, connectionGUIDParameterName, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeName, connectorTypeGUID, connectorTypeGUIDParameterName, - OpenMetadataType.CONNECTOR_TYPE_TYPE_NAME, + OpenMetadataType.CONNECTOR_TYPE.typeName, forLineage, forDuplicateProcessing, supportedZones, - OpenMetadataType.CONNECTION_CONNECTOR_TYPE_TYPE_GUID, - OpenMetadataType.CONNECTION_CONNECTOR_TYPE_TYPE_NAME, + OpenMetadataType.CONNECTION_CONNECTOR_TYPE_RELATIONSHIP.typeGUID, + OpenMetadataType.CONNECTION_CONNECTOR_TYPE_RELATIONSHIP.typeName, null, effectiveFrom, effectiveTo, @@ -1723,16 +1723,16 @@ public void removeConnectionConnectorType(String userId, externalSourceName, connectionGUID, connectionGUIDParameterName, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeName, connectorTypeGUID, connectorTypeGUIDParameterName, - OpenMetadataType.CONNECTOR_TYPE_TYPE_GUID, - OpenMetadataType.CONNECTOR_TYPE_TYPE_NAME, + OpenMetadataType.CONNECTOR_TYPE.typeGUID, + OpenMetadataType.CONNECTOR_TYPE.typeName, forLineage, forDuplicateProcessing, supportedZones, - OpenMetadataType.CONNECTION_CONNECTOR_TYPE_TYPE_GUID, - OpenMetadataType.CONNECTION_CONNECTOR_TYPE_TYPE_NAME, + OpenMetadataType.CONNECTION_CONNECTOR_TYPE_RELATIONSHIP.typeGUID, + OpenMetadataType.CONNECTION_CONNECTOR_TYPE_RELATIONSHIP.typeName, effectiveTime, methodName); } @@ -1783,12 +1783,12 @@ public void addConnectionEndpoint(String userId, OpenMetadataType.ENDPOINT.typeName, connectionGUID, connectionGUIDParameterName, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeName, forLineage, forDuplicateProcessing, supportedZones, - OpenMetadataType.CONNECTION_ENDPOINT_TYPE_GUID, - OpenMetadataType.CONNECTION_ENDPOINT_TYPE_NAME, + OpenMetadataType.CONNECTION_ENDPOINT_RELATIONSHIP.typeGUID, + OpenMetadataType.CONNECTION_ENDPOINT_RELATIONSHIP.typeName, null, effectiveFrom, effectiveTo, @@ -1839,13 +1839,13 @@ public void removeConnectionEndpoint(String userId, OpenMetadataType.ENDPOINT.typeName, connectionGUID, connectionGUIDParameterName, - OpenMetadataType.CONNECTION_TYPE_GUID, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeGUID, + OpenMetadataType.CONNECTION.typeName, forLineage, forDuplicateProcessing, supportedZones, - OpenMetadataType.CONNECTION_ENDPOINT_TYPE_GUID, - OpenMetadataType.CONNECTION_ENDPOINT_TYPE_NAME, + OpenMetadataType.CONNECTION_ENDPOINT_RELATIONSHIP.typeGUID, + OpenMetadataType.CONNECTION_ENDPOINT_RELATIONSHIP.typeName, effectiveTime, methodName); } @@ -1893,7 +1893,7 @@ public void addConnectionToAsset(String userId, { InstanceProperties properties = repositoryHelper.addStringPropertyToInstance(serviceName, null, - OpenMetadataType.ASSET_SUMMARY_PROPERTY_NAME, + OpenMetadataProperty.ASSET_SUMMARY.name, assetSummary, methodName); this.linkElementToElement(userId, @@ -1901,15 +1901,15 @@ public void addConnectionToAsset(String userId, externalSourceName, connectionGUID, connectionGUIDParameterName, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeName, assetGUID, assetGUIDParameterName, OpenMetadataType.ASSET.typeName, forLineage, forDuplicateProcessing, supportedZones, - OpenMetadataType.CONNECTION_TO_ASSET_TYPE_GUID, - OpenMetadataType.CONNECTION_TO_ASSET_TYPE_NAME, + OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeGUID, + OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeName, properties, effectiveFrom, effectiveTo, @@ -1930,7 +1930,7 @@ public void addConnectionToAsset(String userId, this.addAnchorsClassification(userId, connectionGUID, connectionGUIDParameterName, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeName, assetGUID, assetEntity.getType().getTypeDefName(), OpenMetadataType.ASSET.typeName, @@ -1981,7 +1981,7 @@ public void removeConnectionToAsset(String userId, externalSourceName, connectionGUID, connectionGUIDParameterName, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeName, assetGUID, assetGUIDParameterName, OpenMetadataType.ASSET.typeGUID, @@ -1989,8 +1989,8 @@ public void removeConnectionToAsset(String userId, forLineage, forDuplicateProcessing, supportedZones, - OpenMetadataType.CONNECTION_TO_ASSET_TYPE_GUID, - OpenMetadataType.CONNECTION_TO_ASSET_TYPE_NAME, + OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeGUID, + OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeName, effectiveTime, methodName); } @@ -2030,8 +2030,8 @@ public void removeConnection(String userId, externalSourceName, guid, guidParameterName, - OpenMetadataType.CONNECTION_TYPE_GUID, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeGUID, + OpenMetadataType.CONNECTION.typeName, null, null, forLineage, @@ -2092,9 +2092,9 @@ public B getConnectionForAsset(String userId, assetEntity, assetGUIDParameterName, OpenMetadataType.ASSET.typeName, - OpenMetadataType.ASSET_TO_CONNECTION_TYPE_GUID, - OpenMetadataType.ASSET_TO_CONNECTION_TYPE_NAME, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeGUID, + OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeName, + OpenMetadataType.CONNECTION.typeName, null, null, 1, @@ -2167,16 +2167,16 @@ private B getFullConnection(String userId, if ((repositoryHelper.isTypeOf(serviceName, relationship.getType().getTypeDefName(), - OpenMetadataType.CONNECTION_CONNECTOR_TYPE_TYPE_NAME)) + OpenMetadataType.CONNECTION_CONNECTOR_TYPE_RELATIONSHIP.typeName)) || (repositoryHelper.isTypeOf(serviceName, relationship.getType().getTypeDefName(), - OpenMetadataType.EMBEDDED_CONNECTION_TYPE_NAME))) + OpenMetadataType.EMBEDDED_CONNECTION_RELATIONSHIP.typeName))) { entityProxy = relationship.getEntityTwoProxy(); } else if (repositoryHelper.isTypeOf(serviceName, relationship.getType().getTypeDefName(), - OpenMetadataType.CONNECTION_ENDPOINT_TYPE_NAME)) + OpenMetadataType.CONNECTION_ENDPOINT_RELATIONSHIP.typeName)) { entityProxy = relationship.getEntityOneProxy(); } @@ -2266,19 +2266,19 @@ private List getEmbeddedRelationships(String userId, { if ((repositoryHelper.isTypeOf(serviceName, relationship.getType().getTypeDefName(), - OpenMetadataType.CONNECTION_ENDPOINT_TYPE_NAME)) + OpenMetadataType.CONNECTION_ENDPOINT_RELATIONSHIP.typeName)) || (repositoryHelper.isTypeOf(serviceName, relationship.getType().getTypeDefName(), - OpenMetadataType.CONNECTION_CONNECTOR_TYPE_TYPE_NAME)) + OpenMetadataType.CONNECTION_CONNECTOR_TYPE_RELATIONSHIP.typeName)) || (repositoryHelper.isTypeOf(serviceName, relationship.getType().getTypeDefName(), - OpenMetadataType.CONNECTION_TO_ASSET_TYPE_NAME))) + OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeName))) { supplementaryRelationships.add(relationship); } else if (repositoryHelper.isTypeOf(serviceName, relationship.getType().getTypeDefName(), - OpenMetadataType.EMBEDDED_CONNECTION_TYPE_NAME)) + OpenMetadataType.EMBEDDED_CONNECTION_RELATIONSHIP.typeName)) { supplementaryRelationships.add(relationship); @@ -2408,9 +2408,9 @@ public List getConnectionsForAsset(String userId, assetGUID, assetGUIDParameterName, OpenMetadataType.ASSET.typeName, - OpenMetadataType.ASSET_TO_CONNECTION_TYPE_GUID, - OpenMetadataType.ASSET_TO_CONNECTION_TYPE_NAME, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeGUID, + OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeName, + OpenMetadataType.CONNECTION.typeName, null, null, 1, @@ -2461,8 +2461,8 @@ public List findConnections(String userId, List entities = this.findEntities(userId, searchString, searchStringParameterName, - OpenMetadataType.CONNECTION_TYPE_GUID, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeGUID, + OpenMetadataType.CONNECTION.typeName, null, null, null, @@ -2516,8 +2516,8 @@ public List getConnectionsByName(String userId, List entities = this.getEntitiesByValue(userId, name, nameParameterName, - OpenMetadataType.CONNECTION_TYPE_GUID, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeGUID, + OpenMetadataType.CONNECTION.typeName, specificMatchPropertyNames, true, false, @@ -2566,7 +2566,7 @@ public B getConnectionByGUID(String userId, EntityDetail entity = this.getEntityFromRepository(userId, guid, guidParameterName, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeName, null, null, forLineage, diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ConnectorTypeBuilder.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ConnectorTypeBuilder.java index ea41c11c4ac..f9d7475314f 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ConnectorTypeBuilder.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ConnectorTypeBuilder.java @@ -135,8 +135,8 @@ public ConnectorTypeBuilder(String qualifiedName, { super(qualifiedName, null, - OpenMetadataType.CONNECTOR_TYPE_TYPE_GUID, - OpenMetadataType.CONNECTOR_TYPE_TYPE_NAME, + OpenMetadataType.CONNECTOR_TYPE.typeGUID, + OpenMetadataType.CONNECTOR_TYPE.typeName, null, repositoryHelper, serviceName, @@ -191,7 +191,7 @@ public InstanceProperties getInstanceProperties(String methodName) throws Inval properties = repositoryHelper.addStringPropertyToInstance(serviceName, properties, - OpenMetadataType.CONNECTOR_PROVIDER_PROPERTY_NAME, + OpenMetadataProperty.CONNECTOR_PROVIDER_CLASS_NAME.name, connectorProviderClassName, methodName); @@ -239,19 +239,19 @@ public InstanceProperties getInstanceProperties(String methodName) throws Inval properties = repositoryHelper.addStringArrayPropertyToInstance(serviceName, properties, - OpenMetadataType.RECOGNIZED_ADD_PROPS_PROPERTY_NAME, + OpenMetadataProperty.RECOGNIZED_ADDITIONAL_PROPERTIES.name, recognizedAdditionalProperties, methodName); properties = repositoryHelper.addStringArrayPropertyToInstance(serviceName, properties, - OpenMetadataType.RECOGNIZED_SEC_PROPS_PROPERTY_NAME, + OpenMetadataProperty.RECOGNIZED_SECURED_PROPERTIES.name, recognizedSecuredProperties, methodName); properties = repositoryHelper.addStringArrayPropertyToInstance(serviceName, properties, - OpenMetadataType.RECOGNIZED_CONFIG_PROPS_PROPERTY_NAME, + OpenMetadataProperty.RECOGNIZED_CONFIGURATION_PROPERTIES.name, recognizedConfigurationProperties, methodName); diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ConnectorTypeHandler.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ConnectorTypeHandler.java index 0abced504ed..08b3eb6c0ee 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ConnectorTypeHandler.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ConnectorTypeHandler.java @@ -110,7 +110,7 @@ private String findConnectorType(String userId, if (this.getEntityFromRepository(userId, connectorType.getGUID(), guidParameterName, - OpenMetadataType.CONNECTOR_TYPE_TYPE_NAME, + OpenMetadataType.CONNECTOR_TYPE.typeName, null, null, false, @@ -138,8 +138,8 @@ private String findConnectorType(String userId, connectorType.getQualifiedName(), qualifiedNameParameter, OpenMetadataProperty.QUALIFIED_NAME.name, - OpenMetadataType.CONNECTOR_TYPE_TYPE_GUID, - OpenMetadataType.CONNECTOR_TYPE_TYPE_NAME, + OpenMetadataType.CONNECTOR_TYPE.typeGUID, + OpenMetadataType.CONNECTOR_TYPE.typeName, false, false, supportedZones, @@ -153,8 +153,8 @@ private String findConnectorType(String userId, connectorType.getDisplayName(), displayNameParameter, OpenMetadataProperty.DISPLAY_NAME.name, - OpenMetadataType.CONNECTOR_TYPE_TYPE_GUID, - OpenMetadataType.CONNECTOR_TYPE_TYPE_NAME, + OpenMetadataType.CONNECTOR_TYPE.typeGUID, + OpenMetadataType.CONNECTOR_TYPE.typeName, false, false, supportedZones, @@ -357,7 +357,7 @@ public String createConnectorType(String userId, invalidParameterHandler.validateName(qualifiedName, nameParameter, methodName); - String typeName = OpenMetadataType.CONNECTOR_TYPE_TYPE_NAME; + String typeName = OpenMetadataType.CONNECTOR_TYPE.typeName; if (suppliedTypeName != null) { @@ -365,7 +365,7 @@ public String createConnectorType(String userId, } String typeGUID = invalidParameterHandler.validateTypeName(typeName, - OpenMetadataType.CONNECTOR_TYPE_TYPE_NAME, + OpenMetadataType.CONNECTOR_TYPE.typeName, serviceName, methodName, repositoryHelper); @@ -466,8 +466,8 @@ public String createConnectorTypeFromTemplate(String userId, builder.setAnchors(userId, null, - OpenMetadataType.CONNECTOR_TYPE_TYPE_NAME, - OpenMetadataType.CONNECTOR_TYPE_TYPE_NAME, + OpenMetadataType.CONNECTOR_TYPE.typeName, + OpenMetadataType.CONNECTOR_TYPE.typeName, methodName); return this.createBeanFromTemplate(userId, @@ -475,8 +475,8 @@ public String createConnectorTypeFromTemplate(String userId, externalSourceName, templateGUID, templateGUIDParameterName, - OpenMetadataType.CONNECTOR_TYPE_TYPE_GUID, - OpenMetadataType.CONNECTOR_TYPE_TYPE_NAME, + OpenMetadataType.CONNECTOR_TYPE.typeGUID, + OpenMetadataType.CONNECTOR_TYPE.typeName, qualifiedName, OpenMetadataProperty.QUALIFIED_NAME.name, builder, @@ -522,8 +522,8 @@ public String getConnectorTypeForAsset(String userId, List connectorTypes = this.getEntitiesByValue(userId, supportedAssetTypeName, parameterName, - OpenMetadataType.CONNECTOR_TYPE_TYPE_GUID, - OpenMetadataType.CONNECTOR_TYPE_TYPE_NAME, + OpenMetadataType.CONNECTOR_TYPE.typeGUID, + OpenMetadataType.CONNECTOR_TYPE.typeName, specificMatchPropertyNames, true, false, @@ -653,9 +653,9 @@ public String getConnectorTypeForConnection(String userId, String connectorTypeGUID = this.getBeanGUIDByUniqueName(userId, connectorProviderClassName, connectorProviderClassNameParameterName, - OpenMetadataType.CONNECTOR_PROVIDER_PROPERTY_NAME, - OpenMetadataType.CONNECTOR_TYPE_TYPE_GUID, - OpenMetadataType.CONNECTOR_TYPE_TYPE_NAME, + OpenMetadataProperty.CONNECTOR_PROVIDER_CLASS_NAME.name, + OpenMetadataType.CONNECTOR_TYPE.typeGUID, + OpenMetadataType.CONNECTOR_TYPE.typeName, forLineage, forDuplicateProcessing, supportedZones, @@ -668,8 +668,8 @@ public String getConnectorTypeForConnection(String userId, qualifiedName, qualifiedNameParameterName, OpenMetadataProperty.QUALIFIED_NAME.name, - OpenMetadataType.CONNECTOR_TYPE_TYPE_GUID, - OpenMetadataType.CONNECTOR_TYPE_TYPE_NAME, + OpenMetadataType.CONNECTOR_TYPE.typeGUID, + OpenMetadataType.CONNECTOR_TYPE.typeName, forLineage, forDuplicateProcessing, supportedZones, @@ -796,7 +796,7 @@ public void updateConnectorType(String userId, invalidParameterHandler.validateName(qualifiedName, nameParameter, methodName); } - String typeName = OpenMetadataType.CONNECTOR_TYPE_TYPE_NAME; + String typeName = OpenMetadataType.CONNECTOR_TYPE.typeName; if (suppliedTypeName != null) { @@ -804,7 +804,7 @@ public void updateConnectorType(String userId, } String typeGUID = invalidParameterHandler.validateTypeName(typeName, - OpenMetadataType.CONNECTOR_TYPE_TYPE_NAME, + OpenMetadataType.CONNECTOR_TYPE.typeName, serviceName, methodName, repositoryHelper); @@ -887,8 +887,8 @@ public void removeConnectorType(String userId, externalSourceName, guid, guidParameterName, - OpenMetadataType.CONNECTOR_TYPE_TYPE_GUID, - OpenMetadataType.CONNECTOR_TYPE_TYPE_NAME, + OpenMetadataType.CONNECTOR_TYPE.typeGUID, + OpenMetadataType.CONNECTOR_TYPE.typeName, null, null, forLineage, @@ -933,8 +933,8 @@ public List findConnectorTypes(String userId, return this.findBeans(userId, searchString, searchStringParameterName, - OpenMetadataType.CONNECTOR_TYPE_TYPE_GUID, - OpenMetadataType.CONNECTOR_TYPE_TYPE_NAME, + OpenMetadataType.CONNECTOR_TYPE.typeGUID, + OpenMetadataType.CONNECTOR_TYPE.typeName, forLineage, forDuplicateProcessing, supportedZones, @@ -981,13 +981,13 @@ public List getConnectorTypesByName(String userId, List specificMatchPropertyNames = new ArrayList<>(); specificMatchPropertyNames.add(OpenMetadataProperty.QUALIFIED_NAME.name); specificMatchPropertyNames.add(OpenMetadataProperty.DISPLAY_NAME.name); - specificMatchPropertyNames.add(OpenMetadataType.CONNECTOR_PROVIDER_PROPERTY_NAME); + specificMatchPropertyNames.add(OpenMetadataProperty.CONNECTOR_PROVIDER_CLASS_NAME.name); return this.getBeansByValue(userId, name, nameParameterName, - OpenMetadataType.CONNECTOR_TYPE_TYPE_GUID, - OpenMetadataType.CONNECTOR_TYPE_TYPE_NAME, + OpenMetadataType.CONNECTOR_TYPE.typeGUID, + OpenMetadataType.CONNECTOR_TYPE.typeName, specificMatchPropertyNames, true, null, @@ -1033,7 +1033,7 @@ public B getConnectorTypeByGUID(String userId, return this.getBeanFromRepository(userId, guid, guidParameterName, - OpenMetadataType.CONNECTOR_TYPE_TYPE_NAME, + OpenMetadataType.CONNECTOR_TYPE.typeName, forLineage, forDuplicateProcessing, supportedZones, diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ContributionRecordBuilder.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ContributionRecordBuilder.java index fbdf5c47441..e440008e9e9 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ContributionRecordBuilder.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ContributionRecordBuilder.java @@ -79,7 +79,7 @@ public InstanceProperties getInstanceProperties(String methodName) throws Inval return repositoryHelper.addLongPropertyToInstance(serviceName, properties, - OpenMetadataType.KARMA_POINTS_PROPERTY_NAME, + OpenMetadataProperty.KARMA_POINTS.name, karmaPoints, methodName); } diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ContributionRecordHandler.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ContributionRecordHandler.java index b82dd5e2802..b6bc56bc4c9 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ContributionRecordHandler.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ContributionRecordHandler.java @@ -109,9 +109,9 @@ public B getContributionRecord(String userId, profileGUID, profileGUIDParameterName, OpenMetadataType.PERSON.typeName, - OpenMetadataType.PERSONAL_CONTRIBUTION_RELATIONSHIP_TYPE_GUID, - OpenMetadataType.PERSONAL_CONTRIBUTION_RELATIONSHIP_TYPE_NAME, - OpenMetadataType.CONTRIBUTION_RECORD_TYPE_NAME, + OpenMetadataType.PERSONAL_CONTRIBUTION_RELATIONSHIP.typeGUID, + OpenMetadataType.PERSONAL_CONTRIBUTION_RELATIONSHIP.typeName, + OpenMetadataType.CONTRIBUTION_RECORD.typeName, 0, forLineage, forDuplicateProcessing, @@ -150,9 +150,9 @@ EntityDetail getContributionRecordEntity(String userId, profileGUID, profileGUIDParameterName, OpenMetadataType.PERSON.typeName, - OpenMetadataType.PERSONAL_CONTRIBUTION_RELATIONSHIP_TYPE_GUID, - OpenMetadataType.PERSONAL_CONTRIBUTION_RELATIONSHIP_TYPE_NAME, - OpenMetadataType.CONTRIBUTION_RECORD_TYPE_NAME, + OpenMetadataType.PERSONAL_CONTRIBUTION_RELATIONSHIP.typeGUID, + OpenMetadataType.PERSONAL_CONTRIBUTION_RELATIONSHIP.typeName, + OpenMetadataType.CONTRIBUTION_RECORD.typeName, 2, forLineage, forDuplicateProcessing, @@ -210,7 +210,7 @@ public void saveContributionRecord(String userId, effectiveTime, methodName); - String typeName = OpenMetadataType.CONTRIBUTION_RECORD_TYPE_NAME; + String typeName = OpenMetadataType.CONTRIBUTION_RECORD.typeName; if (suppliedTypeName != null) { @@ -218,7 +218,7 @@ public void saveContributionRecord(String userId, } String typeGUID = invalidParameterHandler.validateTypeName(typeName, - OpenMetadataType.CONTRIBUTION_RECORD_TYPE_NAME, + OpenMetadataType.CONTRIBUTION_RECORD.typeName, serviceName, methodName, repositoryHelper); @@ -250,8 +250,8 @@ public void saveContributionRecord(String userId, String contributionRecordGUID = this.createBeanInRepository(userId, null, null, - OpenMetadataType.CONTRIBUTION_RECORD_TYPE_GUID, - OpenMetadataType.CONTRIBUTION_RECORD_TYPE_NAME, + OpenMetadataType.CONTRIBUTION_RECORD.typeGUID, + OpenMetadataType.CONTRIBUTION_RECORD.typeName, builder, effectiveTime, methodName); @@ -266,12 +266,12 @@ public void saveContributionRecord(String userId, OpenMetadataType.PERSON.typeName, contributionRecordGUID, contributionRecordGUIDParameterName, - OpenMetadataType.CONTRIBUTION_RECORD_TYPE_NAME, + OpenMetadataType.CONTRIBUTION_RECORD.typeName, forLineage, forDuplicateProcessing, supportedZones, - OpenMetadataType.PERSONAL_CONTRIBUTION_RELATIONSHIP_TYPE_GUID, - OpenMetadataType.PERSONAL_CONTRIBUTION_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.PERSONAL_CONTRIBUTION_RELATIONSHIP.typeGUID, + OpenMetadataType.PERSONAL_CONTRIBUTION_RELATIONSHIP.typeName, null, effectiveTime, methodName); @@ -294,8 +294,8 @@ public void saveContributionRecord(String userId, null, contributionRecordEntity.getGUID(), contributionRecordGUIDParameterName, - OpenMetadataType.CONTRIBUTION_RECORD_TYPE_GUID, - OpenMetadataType.CONTRIBUTION_RECORD_TYPE_NAME, + OpenMetadataType.CONTRIBUTION_RECORD.typeGUID, + OpenMetadataType.CONTRIBUTION_RECORD.typeName, forLineage, forDuplicateProcessing, supportedZones, @@ -348,8 +348,8 @@ public void removeContributionRecord(String userId, null, contributionRecordEntity.getGUID(), contributionRecordGUIDParameterName, - OpenMetadataType.CONTRIBUTION_RECORD_TYPE_GUID, - OpenMetadataType.CONTRIBUTION_RECORD_TYPE_NAME, + OpenMetadataType.CONTRIBUTION_RECORD.typeGUID, + OpenMetadataType.CONTRIBUTION_RECORD.typeName, null, null, forLineage, diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/EmbeddedConnectionBuilder.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/EmbeddedConnectionBuilder.java index a319c00f19e..b1d3ab3d653 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/EmbeddedConnectionBuilder.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/EmbeddedConnectionBuilder.java @@ -38,8 +38,8 @@ public class EmbeddedConnectionBuilder extends OpenMetadataAPIGenericBuilder String serviceName, String serverName) { - super(OpenMetadataType.EMBEDDED_CONNECTION_TYPE_GUID, - OpenMetadataType.EMBEDDED_CONNECTION_TYPE_NAME, + super(OpenMetadataType.EMBEDDED_CONNECTION_RELATIONSHIP.typeGUID, + OpenMetadataType.EMBEDDED_CONNECTION_RELATIONSHIP.typeName, null, InstanceStatus.ACTIVE, null, @@ -66,13 +66,13 @@ public InstanceProperties getInstanceProperties(String methodName) throws Inval properties = repositoryHelper.addIntPropertyToInstance(serviceName, null, - OpenMetadataType.POSITION_PROPERTY_NAME, + OpenMetadataProperty.POSITION.name, position, methodName); properties = repositoryHelper.addMapPropertyToInstance(serviceName, properties, - OpenMetadataType.ARGUMENTS_PROPERTY_NAME, + OpenMetadataProperty.ARGUMENTS.name, arguments, methodName); diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/EndpointHandler.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/EndpointHandler.java index 9dd26631ec2..cdeb73644ff 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/EndpointHandler.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/EndpointHandler.java @@ -141,8 +141,8 @@ private String findEndpoint(String userId, endpoint.getQualifiedName(), qualifiedNameParameter, OpenMetadataProperty.QUALIFIED_NAME.name, - OpenMetadataType.CONNECTION_TYPE_GUID, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeGUID, + OpenMetadataType.CONNECTION.typeName, forLineage, forDuplicateProcessing, supportedZones, @@ -156,8 +156,8 @@ private String findEndpoint(String userId, endpoint.getDisplayName(), displayNameParameter, OpenMetadataProperty.NAME.name, - OpenMetadataType.CONNECTION_TYPE_GUID, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeGUID, + OpenMetadataType.CONNECTION.typeName, forLineage, forDuplicateProcessing, supportedZones, diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/FilesAndFoldersHandler.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/FilesAndFoldersHandler.java index a170171e9bb..e1d603b18f8 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/FilesAndFoldersHandler.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/FilesAndFoldersHandler.java @@ -1247,8 +1247,8 @@ public void moveDataFileInCatalog(String userId, methodName); List relationshipPath = new ArrayList<>(); - relationshipPath.add(OpenMetadataType.ASSET_TO_CONNECTION_TYPE_GUID); - relationshipPath.add(OpenMetadataType.CONNECTION_ENDPOINT_TYPE_GUID); + relationshipPath.add(OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeGUID); + relationshipPath.add(OpenMetadataType.CONNECTION_ENDPOINT_RELATIONSHIP.typeGUID); List endpointGUIDs = new ArrayList<>(); while (endpointGUIDs != null) @@ -3032,9 +3032,9 @@ public void archiveFileInCatalog(String userId, dataFileGUID, dataFileGUIDParameterName, OpenMetadataType.DATA_FILE.typeName, - OpenMetadataType.ASSET_TO_CONNECTION_TYPE_GUID, - OpenMetadataType.ASSET_TO_CONNECTION_TYPE_NAME, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeGUID, + OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeName, + OpenMetadataType.CONNECTION.typeName, 0, forLineage, forDuplicateProcessing, @@ -3050,8 +3050,8 @@ public void archiveFileInCatalog(String userId, externalSourceName, connectionGUID, connectionGUIDParameterName, - OpenMetadataType.CONNECTION_TYPE_GUID, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeGUID, + OpenMetadataType.CONNECTION.typeName, null, null, forLineage, @@ -3125,9 +3125,9 @@ public void archiveFolderInCatalog(String userId, dataFolderGUID, dataFolderGUIDParameterName, OpenMetadataType.DATA_FOLDER.typeName, - OpenMetadataType.ASSET_TO_CONNECTION_TYPE_GUID, - OpenMetadataType.ASSET_TO_CONNECTION_TYPE_NAME, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeGUID, + OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeName, + OpenMetadataType.CONNECTION.typeName, 0, forLineage, forDuplicateProcessing, @@ -3143,8 +3143,8 @@ public void archiveFolderInCatalog(String userId, externalSourceName, connectionGUID, connectionGUIDParameterName, - OpenMetadataType.CONNECTION_TYPE_GUID, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeGUID, + OpenMetadataType.CONNECTION.typeName, null, null, forLineage, diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/GlossaryTermBuilder.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/GlossaryTermBuilder.java index 45419fa7de5..11607ed7b43 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/GlossaryTermBuilder.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/GlossaryTermBuilder.java @@ -321,7 +321,7 @@ InstanceProperties getTermCategorizationProperties(String description, } catch (TypeErrorException error) { - throw new InvalidParameterException(error, OpenMetadataType.STARS_PROPERTY_NAME); + throw new InvalidParameterException(error, OpenMetadataProperty.STARS.name); } setEffectivityDates(properties); diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/GovernanceDefinitionBuilder.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/GovernanceDefinitionBuilder.java index d6330768885..1b05fb4c20d 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/GovernanceDefinitionBuilder.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/GovernanceDefinitionBuilder.java @@ -182,7 +182,7 @@ public InstanceProperties getInstanceProperties(String methodName) throws Inval properties = repositoryHelper.addStringPropertyToInstance(serviceName, properties, - OpenMetadataType.TITLE_PROPERTY_NAME, + OpenMetadataProperty.TITLE.name, title, methodName); @@ -212,7 +212,7 @@ public InstanceProperties getInstanceProperties(String methodName) throws Inval properties = repositoryHelper.addStringPropertyToInstance(serviceName, properties, - OpenMetadataType.IMPORTANCE_PROPERTY_NAME, + OpenMetadataProperty.IMPORTANCE.name, priority, methodName); diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/GovernanceDefinitionHandler.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/GovernanceDefinitionHandler.java index 6367ca11b14..5790c25bdad 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/GovernanceDefinitionHandler.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/GovernanceDefinitionHandler.java @@ -918,7 +918,7 @@ public List getGovernanceDefinitionsByName(String userId, List specificMatchPropertyNames = new ArrayList<>(); specificMatchPropertyNames.add(OpenMetadataProperty.QUALIFIED_NAME.name); - specificMatchPropertyNames.add(OpenMetadataType.TITLE_PROPERTY_NAME); + specificMatchPropertyNames.add(OpenMetadataProperty.TITLE.name); String typeName = OpenMetadataType.GOVERNANCE_DEFINITION_TYPE_NAME; @@ -1222,7 +1222,7 @@ public List getGovernanceResponsibilitiesForRole(String userId, null, personRoleGUID, personRoleGUIDParameterName, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, + OpenMetadataType.PERSON_ROLE.typeName, OpenMetadataType.GOVERNANCE_RESPONSIBILITY_ASSIGNMENT_TYPE_GUID, OpenMetadataType.GOVERNANCE_RESPONSIBILITY_ASSIGNMENT_TYPE_NAME, OpenMetadataType.GOVERNANCE_RESPONSIBILITY_TYPE_NAME, diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/GovernanceRoleConverter.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/GovernanceRoleConverter.java index b1ac9bad568..ebadccde032 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/GovernanceRoleConverter.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/GovernanceRoleConverter.java @@ -5,6 +5,7 @@ import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.GovernanceRoleElement; import org.odpi.openmetadata.frameworks.openmetadata.properties.governance.GovernanceRoleProperties; +import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataProperty; import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataType; import org.odpi.openmetadata.frameworks.connectors.ffdc.PropertyServerException; import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.instances.EntityDetail; @@ -78,7 +79,7 @@ public B getNewBean(Class beanClass, governanceRoleProperties.setScope(this.removeScope(instanceProperties)); governanceRoleProperties.setTitle(this.removeName(instanceProperties)); governanceRoleProperties.setDescription(this.removeDescription(instanceProperties)); - governanceRoleProperties.setHeadCountLimitSet(instanceProperties.getPropertyValue(OpenMetadataType.HEAD_COUNT_PROPERTY_NAME) != null); + governanceRoleProperties.setHeadCountLimitSet(instanceProperties.getPropertyValue(OpenMetadataProperty.HEAD_COUNT.name) != null); governanceRoleProperties.setHeadCount(this.removeHeadCount(instanceProperties)); governanceRoleProperties.setAdditionalProperties(this.removeAdditionalProperties(instanceProperties)); diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ITProfileConverter.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ITProfileConverter.java index 28a9e4c6e5e..42540cc55b8 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ITProfileConverter.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ITProfileConverter.java @@ -178,7 +178,7 @@ else if (repositoryHelper.isTypeOf(serviceName, entityTypeName, OpenMetadataType { String relationshipTypeName = relationship.getType().getTypeDefName(); - if (repositoryHelper.isTypeOf(serviceName, relationshipTypeName, OpenMetadataType.IT_INFRASTRUCTURE_PROFILE_RELATIONSHIP_TYPE_NAME)) + if (repositoryHelper.isTypeOf(serviceName, relationshipTypeName, OpenMetadataType.IT_INFRASTRUCTURE_PROFILE_RELATIONSHIP.typeName)) { EntityProxy entityProxy = repositoryHelper.getOtherEnd(serviceName, primaryEntity.getGUID(), relationship); diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/InformalTagBuilder.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/InformalTagBuilder.java index 3302a9a73a5..e45c852e04c 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/InformalTagBuilder.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/InformalTagBuilder.java @@ -2,6 +2,7 @@ /* Copyright Contributors to the ODPi Egeria project. */ package org.odpi.openmetadata.commonservices.generichandlers; +import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataProperty; import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataType; import org.odpi.openmetadata.frameworks.connectors.ffdc.InvalidParameterException; import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.instances.InstanceProperties; @@ -35,8 +36,8 @@ public class InformalTagBuilder extends OpenMetadataAPIGenericBuilder String serviceName, String serverName) { - super(OpenMetadataType.INFORMAL_TAG_TYPE_GUID, - OpenMetadataType.INFORMAL_TAG_TYPE_NAME, + super(OpenMetadataType.INFORMAL_TAG.typeGUID, + OpenMetadataType.INFORMAL_TAG.typeName, repositoryHelper, serviceName, serverName); @@ -62,19 +63,19 @@ public InstanceProperties getInstanceProperties(String methodName) throws Inval properties = repositoryHelper.addStringPropertyToInstance(serviceName, properties, - OpenMetadataType.TAG_NAME_PROPERTY_NAME, + OpenMetadataProperty.TAG_NAME.name, tagName, methodName); properties = repositoryHelper.addStringPropertyToInstance(serviceName, properties, - OpenMetadataType.TAG_DESCRIPTION_PROPERTY_NAME, + OpenMetadataProperty.TAG_DESCRIPTION.name, tagDescription, methodName); properties = repositoryHelper.addBooleanPropertyToInstance(serviceName, properties, - OpenMetadataType.TAG_IS_PUBLIC_PROPERTY_NAME, + OpenMetadataProperty.IS_PUBLIC.name, isPublic, methodName); diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/InformalTagHandler.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/InformalTagHandler.java index bf41f74147b..31134fbbcd7 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/InformalTagHandler.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/InformalTagHandler.java @@ -111,9 +111,9 @@ public List getAttachedTags(String userId, elementGUID, elementGUIDParameterName, elementTypeName, - OpenMetadataType.REFERENCEABLE_TO_TAG_TYPE_GUID, - OpenMetadataType.REFERENCEABLE_TO_TAG_TYPE_NAME, - OpenMetadataType.INFORMAL_TAG_TYPE_NAME, + OpenMetadataType.ATTACHED_TAG_RELATIONSHIP.typeGUID, + OpenMetadataType.ATTACHED_TAG_RELATIONSHIP.typeName, + OpenMetadataType.INFORMAL_TAG.typeName, null, null, 0, @@ -168,9 +168,9 @@ public List getAttachedTags(String userId, elementGUID, elementGUIDParameterName, elementTypeName, - OpenMetadataType.REFERENCEABLE_TO_TAG_TYPE_GUID, - OpenMetadataType.REFERENCEABLE_TO_TAG_TYPE_NAME, - OpenMetadataType.INFORMAL_TAG_TYPE_NAME, + OpenMetadataType.ATTACHED_TAG_RELATIONSHIP.typeGUID, + OpenMetadataType.ATTACHED_TAG_RELATIONSHIP.typeName, + OpenMetadataType.INFORMAL_TAG.typeName, null, null, 0, @@ -235,8 +235,8 @@ public String createTag(String userId, return this.createBeanInRepository(userId, externalSourceGUID, externalSourceName, - OpenMetadataType.INFORMAL_TAG_TYPE_GUID, - OpenMetadataType.INFORMAL_TAG_TYPE_NAME, + OpenMetadataType.INFORMAL_TAG.typeGUID, + OpenMetadataType.INFORMAL_TAG.typeName, builder, effectiveTime, methodName); @@ -281,7 +281,7 @@ public void updateTagDescription(String userId, { InstanceProperties properties = repositoryHelper.addStringPropertyToInstance(serviceName, null, - OpenMetadataType.TAG_DESCRIPTION_PROPERTY_NAME, + OpenMetadataProperty.TAG_DESCRIPTION.name, tagDescription, methodName); @@ -290,8 +290,8 @@ public void updateTagDescription(String userId, externalSourceName, tagGUID, tagGUIDParameterName, - OpenMetadataType.INFORMAL_TAG_TYPE_GUID, - OpenMetadataType.INFORMAL_TAG_TYPE_NAME, + OpenMetadataType.INFORMAL_TAG.typeGUID, + OpenMetadataType.INFORMAL_TAG.typeName, forLineage, forDuplicateProcessing, supportedZones, @@ -339,8 +339,8 @@ public void deleteTag(String userId, externalSourceName, tagGUID, tagGUIDParameterName, - OpenMetadataType.INFORMAL_TAG_TYPE_GUID, - OpenMetadataType.INFORMAL_TAG_TYPE_NAME, + OpenMetadataType.INFORMAL_TAG.typeGUID, + OpenMetadataType.INFORMAL_TAG.typeName, null, null, forLineage, @@ -390,8 +390,8 @@ public void deleteTag(String userId, externalSourceName, tagGUID, tagGUIDParameterName, - OpenMetadataType.INFORMAL_TAG_TYPE_GUID, - OpenMetadataType.INFORMAL_TAG_TYPE_NAME, + OpenMetadataType.INFORMAL_TAG.typeGUID, + OpenMetadataType.INFORMAL_TAG.typeName, null, null, forLineage, @@ -432,7 +432,7 @@ public B getTag(String userId, return this.getBeanFromRepository(userId, guid, guidParameterName, - OpenMetadataType.INFORMAL_TAG_TYPE_NAME, + OpenMetadataType.INFORMAL_TAG.typeName, forLineage, forDuplicateProcessing, supportedZones, @@ -473,7 +473,7 @@ public B getTag(String userId, return this.getBeanFromRepository(userId, guid, guidParameterName, - OpenMetadataType.INFORMAL_TAG_TYPE_NAME, + OpenMetadataType.INFORMAL_TAG.typeName, forLineage, forDuplicateProcessing, serviceSupportedZones, @@ -516,13 +516,13 @@ public List getTagsByName(String userId, { List propertyNames = new ArrayList<>(); - propertyNames.add(OpenMetadataType.TAG_NAME_PROPERTY_NAME); + propertyNames.add(OpenMetadataProperty.TAG_NAME.name); return this.getBeansByValue(userId, name, nameParameterName, - OpenMetadataType.INFORMAL_TAG_TYPE_GUID, - OpenMetadataType.INFORMAL_TAG_TYPE_NAME, + OpenMetadataType.INFORMAL_TAG.typeGUID, + OpenMetadataType.INFORMAL_TAG.typeName, propertyNames, true, null, @@ -570,13 +570,13 @@ public List getMyTagsByName(String userId, { List propertyNames = new ArrayList<>(); - propertyNames.add(OpenMetadataType.TAG_NAME_PROPERTY_NAME); + propertyNames.add(OpenMetadataProperty.TAG_NAME.name); return this.getBeansByCreator(userId, name, nameParameterName, - OpenMetadataType.INFORMAL_TAG_TYPE_GUID, - OpenMetadataType.INFORMAL_TAG_TYPE_NAME, + OpenMetadataType.INFORMAL_TAG.typeGUID, + OpenMetadataType.INFORMAL_TAG.typeName, propertyNames, true, forLineage, @@ -623,8 +623,8 @@ public List findTags(String userId, return this.getBeansByValue(userId, searchString, searchStringParameterName, - OpenMetadataType.INFORMAL_TAG_TYPE_GUID, - OpenMetadataType.INFORMAL_TAG_TYPE_NAME, + OpenMetadataType.INFORMAL_TAG.typeGUID, + OpenMetadataType.INFORMAL_TAG.typeName, null, false, null, @@ -673,8 +673,8 @@ public List findMyTags(String userId, return this.getBeansByCreator(userId, searchString, searchStringParameterName, - OpenMetadataType.INFORMAL_TAG_TYPE_GUID, - OpenMetadataType.INFORMAL_TAG_TYPE_NAME, + OpenMetadataType.INFORMAL_TAG.typeGUID, + OpenMetadataType.INFORMAL_TAG.typeName, null, false, forLineage, @@ -805,12 +805,12 @@ public void addTagToElement(String userId, elementType, tagGUID, tagGUIDParameterName, - OpenMetadataType.INFORMAL_TAG_TYPE_NAME, + OpenMetadataType.INFORMAL_TAG.typeName, forLineage, forDuplicateProcessing, suppliedSupportedZones, - OpenMetadataType.REFERENCEABLE_TO_TAG_TYPE_GUID, - OpenMetadataType.REFERENCEABLE_TO_TAG_TYPE_NAME, + OpenMetadataType.ATTACHED_TAG_RELATIONSHIP.typeGUID, + OpenMetadataType.ATTACHED_TAG_RELATIONSHIP.typeName, this.setUpEffectiveDates(properties, effectiveFrom, effectiveTo), effectiveFrom, effectiveTo, @@ -865,13 +865,13 @@ public void removeTagFromElement(String userId, elementType, tagGUID, tagGUIDParameterName, - OpenMetadataType.INFORMAL_TAG_TYPE_GUID, - OpenMetadataType.INFORMAL_TAG_TYPE_NAME, + OpenMetadataType.INFORMAL_TAG.typeGUID, + OpenMetadataType.INFORMAL_TAG.typeName, forLineage, forDuplicateProcessing, suppliedSupportedZones, - OpenMetadataType.REFERENCEABLE_TO_TAG_TYPE_GUID, - OpenMetadataType.REFERENCEABLE_TO_TAG_TYPE_NAME, + OpenMetadataType.ATTACHED_TAG_RELATIONSHIP.typeGUID, + OpenMetadataType.ATTACHED_TAG_RELATIONSHIP.typeName, effectiveTime, methodName); } diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/LikeBuilder.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/LikeBuilder.java index 83d2e274938..5231b58f084 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/LikeBuilder.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/LikeBuilder.java @@ -27,8 +27,8 @@ public LikeBuilder(boolean isPublic, String serviceName, String serverName) { - super(OpenMetadataType.LIKE_TYPE_GUID, - OpenMetadataType.LIKE_TYPE_NAME, + super(OpenMetadataType.LIKE.typeGUID, + OpenMetadataType.LIKE.typeName, repositoryHelper, serviceName, serverName); diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/LikeHandler.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/LikeHandler.java index 451f27b3b34..4f2744607da 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/LikeHandler.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/LikeHandler.java @@ -108,9 +108,9 @@ public List getLikes(String userId, elementGUID, elementGUIDParameterName, elementTypeName, - OpenMetadataType.REFERENCEABLE_TO_LIKE_TYPE_GUID, - OpenMetadataType.REFERENCEABLE_TO_LIKE_TYPE_NAME, - OpenMetadataType.LIKE_TYPE_NAME, + OpenMetadataType.ATTACHED_LIKE_RELATIONSHIP.typeGUID, + OpenMetadataType.ATTACHED_LIKE_RELATIONSHIP.typeName, + OpenMetadataType.LIKE.typeName, null, null, 0, @@ -185,8 +185,8 @@ public void saveLike(String userId, String likeGUID = this.createBeanInRepository(userId, externalSourceGUID, externalSourceName, - OpenMetadataType.LIKE_TYPE_GUID, - OpenMetadataType.LIKE_TYPE_NAME, + OpenMetadataType.LIKE.typeGUID, + OpenMetadataType.LIKE.typeName, builder, effectiveTime, methodName); @@ -203,12 +203,12 @@ public void saveLike(String userId, OpenMetadataType.REFERENCEABLE.typeName, likeGUID, likeGUIDParameterName, - OpenMetadataType.LIKE_TYPE_NAME, + OpenMetadataType.LIKE.typeName, forLineage, forDuplicateProcessing, supportedZones, - OpenMetadataType.REFERENCEABLE_TO_LIKE_TYPE_GUID, - OpenMetadataType.REFERENCEABLE_TO_LIKE_TYPE_NAME, + OpenMetadataType.ATTACHED_LIKE_RELATIONSHIP.typeGUID, + OpenMetadataType.ATTACHED_LIKE_RELATIONSHIP.typeName, builder.getRelationshipInstanceProperties(methodName), effectiveTime, methodName); @@ -254,9 +254,9 @@ public void removeLike(String userId, forLineage, forDuplicateProcessing, supportedZones, - OpenMetadataType.REFERENCEABLE_TO_LIKE_TYPE_GUID, - OpenMetadataType.REFERENCEABLE_TO_LIKE_TYPE_NAME, - OpenMetadataType.LIKE_TYPE_NAME, + OpenMetadataType.ATTACHED_LIKE_RELATIONSHIP.typeGUID, + OpenMetadataType.ATTACHED_LIKE_RELATIONSHIP.typeName, + OpenMetadataType.LIKE.typeName, effectiveTime, methodName); @@ -269,8 +269,8 @@ public void removeLike(String userId, externalSourceName, likeGUID, ratingGUIDParameterName, - OpenMetadataType.LIKE_TYPE_GUID, - OpenMetadataType.LIKE_TYPE_NAME, + OpenMetadataType.LIKE.typeGUID, + OpenMetadataType.LIKE.typeName, null, null, forLineage, diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/NoteBuilder.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/NoteBuilder.java index 0c01c2a47d7..ef0e25c1b1a 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/NoteBuilder.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/NoteBuilder.java @@ -2,6 +2,7 @@ /* Copyright Contributors to the ODPi Egeria project. */ package org.odpi.openmetadata.commonservices.generichandlers; +import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataProperty; import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataType; import org.odpi.openmetadata.frameworks.connectors.ffdc.InvalidParameterException; import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.instances.InstanceProperties; @@ -34,8 +35,8 @@ public NoteBuilder(String qualifiedName, String serverName) { super(qualifiedName, - OpenMetadataType.NOTE_TYPE_GUID, - OpenMetadataType.NOTE_TYPE_NAME, + OpenMetadataType.NOTE_ENTRY.typeGUID, + OpenMetadataType.NOTE_ENTRY.typeName, repositoryHelper, serviceName, serverName); @@ -59,12 +60,12 @@ public InstanceProperties getInstanceProperties(String methodName) throws Inval properties = repositoryHelper.addStringPropertyToInstance(serviceName, properties, - OpenMetadataType.TITLE_PROPERTY_NAME, + OpenMetadataProperty.TITLE.name, title, methodName); properties = repositoryHelper.addStringPropertyToInstance(serviceName, properties, - OpenMetadataType.TEXT_PROPERTY_NAME, + OpenMetadataProperty.TEXT.name, text, methodName); return properties; diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/NoteHandler.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/NoteHandler.java index f2ef8513c15..8c1ee618e02 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/NoteHandler.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/NoteHandler.java @@ -153,8 +153,8 @@ public String attachNewNote(String userId, String noteGUID = this.createBeanInRepository(userId, externalSourceGUID, externalSourceName, - OpenMetadataType.NOTE_TYPE_GUID, - OpenMetadataType.NOTE_TYPE_NAME, + OpenMetadataType.NOTE_ENTRY.typeGUID, + OpenMetadataType.NOTE_ENTRY.typeName, builder, effectiveTime, methodName); @@ -169,12 +169,12 @@ public String attachNewNote(String userId, OpenMetadataType.REFERENCEABLE.typeName, noteGUID, noteGUIDParameter, - OpenMetadataType.NOTE_TYPE_NAME, + OpenMetadataType.NOTE_ENTRY.typeName, forLineage, forDuplicateProcessing, supportedZones, - OpenMetadataType.NOTE_LOG_ENTRIES_RELATIONSHIP_TYPE_GUID, - OpenMetadataType.NOTE_LOG_ENTRIES_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.ATTACHED_NOTE_LOG_ENTRY_RELATIONSHIP.typeGUID, + OpenMetadataType.ATTACHED_NOTE_LOG_ENTRY_RELATIONSHIP.typeName, null, effectiveFrom, methodName); @@ -232,7 +232,7 @@ public void updateNote(String userId, EntityDetail startingEntity = repositoryHandler.getEntityByGUID(userId, noteGUID, noteGUIDParameterName, - OpenMetadataType.NOTE_TYPE_NAME, + OpenMetadataType.NOTE_ENTRY.typeName, forLineage, forDuplicateProcessing, effectiveTime, @@ -252,8 +252,8 @@ public void updateNote(String userId, externalSourceName, startingEntity, noteGUIDParameterName, - OpenMetadataType.NOTE_TYPE_GUID, - OpenMetadataType.NOTE_TYPE_NAME, + OpenMetadataType.NOTE_ENTRY.typeGUID, + OpenMetadataType.NOTE_ENTRY.typeName, forLineage, forDuplicateProcessing, supportedZones, @@ -298,8 +298,8 @@ public void removeNoteFromElement(String userId, externalSourceName, noteGUID, noteGUIDParameterName, - OpenMetadataType.NOTE_TYPE_GUID, - OpenMetadataType.NOTE_TYPE_NAME, + OpenMetadataType.NOTE_ENTRY.typeGUID, + OpenMetadataType.NOTE_ENTRY.typeName, null, null, forLineage, @@ -348,9 +348,9 @@ public List getNotes(String userId, noteLogGUID, noteLogGUIDParameterName, noteLogTypeName, - OpenMetadataType.NOTE_LOG_ENTRIES_RELATIONSHIP_TYPE_GUID, - OpenMetadataType.NOTE_LOG_ENTRIES_RELATIONSHIP_TYPE_NAME, - OpenMetadataType.NOTE_TYPE_NAME, + OpenMetadataType.ATTACHED_NOTE_LOG_ENTRY_RELATIONSHIP.typeGUID, + OpenMetadataType.ATTACHED_NOTE_LOG_ENTRY_RELATIONSHIP.typeName, + OpenMetadataType.NOTE_ENTRY.typeName, null, null, 2, @@ -405,9 +405,9 @@ public List getNotes(String userId, noteLogGUID, noteLogGUIDParameterName, noteLogTypeName, - OpenMetadataType.NOTE_LOG_ENTRIES_RELATIONSHIP_TYPE_GUID, - OpenMetadataType.NOTE_LOG_ENTRIES_RELATIONSHIP_TYPE_NAME, - OpenMetadataType.NOTE_TYPE_NAME, + OpenMetadataType.ATTACHED_NOTE_LOG_ENTRY_RELATIONSHIP.typeGUID, + OpenMetadataType.ATTACHED_NOTE_LOG_ENTRY_RELATIONSHIP.typeName, + OpenMetadataType.NOTE_ENTRY.typeName, null, null, 2, @@ -455,8 +455,8 @@ public List findNotes(String userId, return this.findBeans(userId, searchString, searchStringParameterName, - OpenMetadataType.NOTE_TYPE_GUID, - OpenMetadataType.NOTE_TYPE_NAME, + OpenMetadataType.NOTE_ENTRY.typeGUID, + OpenMetadataType.NOTE_ENTRY.typeName, null, startFrom, pageSize, diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/NoteLogBuilder.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/NoteLogBuilder.java index a045cd76a34..43a04148744 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/NoteLogBuilder.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/NoteLogBuilder.java @@ -38,8 +38,8 @@ public NoteLogBuilder(String qualifiedName, String serverName) { super(qualifiedName, - OpenMetadataType.NOTE_LOG_TYPE_GUID, - OpenMetadataType.NOTE_LOG_TYPE_NAME, + OpenMetadataType.NOTE_LOG.typeName, + OpenMetadataType.NOTE_LOG.typeName, repositoryHelper, serviceName, serverName); diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/NoteLogHandler.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/NoteLogHandler.java index 12b942dfbb4..e0fc51e8443 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/NoteLogHandler.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/NoteLogHandler.java @@ -152,8 +152,8 @@ public String attachNewNoteLog(String userId, String noteLogGUID = this.createBeanInRepository(userId, externalSourceGUID, externalSourceName, - OpenMetadataType.NOTE_LOG_TYPE_GUID, - OpenMetadataType.NOTE_LOG_TYPE_NAME, + OpenMetadataType.NOTE_LOG.typeGUID, + OpenMetadataType.NOTE_LOG.typeName, builder, effectiveTime, methodName); @@ -168,12 +168,12 @@ public String attachNewNoteLog(String userId, OpenMetadataType.REFERENCEABLE.typeName, noteLogGUID, noteLogGUIDParameter, - OpenMetadataType.NOTE_LOG_TYPE_NAME, + OpenMetadataType.NOTE_LOG.typeName, forLineage, forDuplicateProcessing, supportedZones, - OpenMetadataType.REFERENCEABLE_TO_NOTE_LOG_TYPE_GUID, - OpenMetadataType.REFERENCEABLE_TO_NOTE_LOG_TYPE_NAME, + OpenMetadataType.ATTACHED_NOTE_LOG_RELATIONSHIP.typeGUID, + OpenMetadataType.ATTACHED_NOTE_LOG_RELATIONSHIP.typeName, builder.getRelationshipInstanceProperties(methodName), effectiveFrom, methodName); @@ -233,7 +233,7 @@ public void updateNoteLog(String userId, EntityDetail startingEntity = repositoryHandler.getEntityByGUID(userId, noteLogGUID, noteLogGUIDParameterName, - OpenMetadataType.NOTE_LOG_TYPE_NAME, + OpenMetadataType.NOTE_LOG.typeName, forLineage, forDuplicateProcessing, effectiveTime, @@ -254,8 +254,8 @@ public void updateNoteLog(String userId, externalSourceName, startingEntity, noteLogGUIDParameterName, - OpenMetadataType.NOTE_LOG_TYPE_GUID, - OpenMetadataType.NOTE_LOG_TYPE_NAME, + OpenMetadataType.NOTE_LOG.typeGUID, + OpenMetadataType.NOTE_LOG.typeName, forLineage, forDuplicateProcessing, supportedZones, @@ -267,9 +267,9 @@ public void updateNoteLog(String userId, List relationships = this.getAttachmentLinks(userId, startingEntity, noteLogGUIDParameterName, - OpenMetadataType.NOTE_LOG_TYPE_NAME, - OpenMetadataType.REFERENCEABLE_TO_NOTE_LOG_TYPE_GUID, - OpenMetadataType.REFERENCEABLE_TO_NOTE_LOG_TYPE_NAME, + OpenMetadataType.NOTE_LOG.typeName, + OpenMetadataType.ATTACHED_NOTE_LOG_RELATIONSHIP.typeGUID, + OpenMetadataType.ATTACHED_NOTE_LOG_RELATIONSHIP.typeName, null, OpenMetadataType.REFERENCEABLE.typeName, 1, @@ -285,8 +285,8 @@ public void updateNoteLog(String userId, if ((relationships == null) || (relationships.isEmpty())) { errorHandler.handleNoRelationship(noteLogGUID, - OpenMetadataType.NOTE_LOG_TYPE_NAME, - OpenMetadataType.REFERENCEABLE_TO_NOTE_LOG_TYPE_NAME, + OpenMetadataType.NOTE_LOG.typeName, + OpenMetadataType.ATTACHED_NOTE_LOG_RELATIONSHIP.typeName, methodName); } else if (relationships.size() == 1) @@ -301,8 +301,8 @@ else if (relationships.size() == 1) else { errorHandler.handleAmbiguousRelationships(noteLogGUID, - OpenMetadataType.NOTE_LOG_TYPE_NAME, - OpenMetadataType.REFERENCEABLE_TO_NOTE_LOG_TYPE_NAME, + OpenMetadataType.NOTE_LOG.typeName, + OpenMetadataType.ATTACHED_NOTE_LOG_RELATIONSHIP.typeName, relationships, methodName); } @@ -344,8 +344,8 @@ public void removeNoteLogFromElement(String userId, externalSourceName, noteLogGUID, noteLogGUIDParameterName, - OpenMetadataType.NOTE_LOG_TYPE_GUID, - OpenMetadataType.NOTE_LOG_TYPE_NAME, + OpenMetadataType.NOTE_LOG.typeGUID, + OpenMetadataType.NOTE_LOG.typeName, null, null, forLineage, @@ -400,9 +400,9 @@ public List getAttachedNoteLogs(String userId, elementGUID, elementGUIDParameterName, elementTypeName, - OpenMetadataType.REFERENCEABLE_TO_NOTE_LOG_TYPE_GUID, - OpenMetadataType.REFERENCEABLE_TO_NOTE_LOG_TYPE_NAME, - OpenMetadataType.NOTE_LOG_TYPE_NAME, + OpenMetadataType.ATTACHED_NOTE_LOG_RELATIONSHIP.typeGUID, + OpenMetadataType.ATTACHED_NOTE_LOG_RELATIONSHIP.typeName, + OpenMetadataType.NOTE_LOG.typeName, null, null, 2, @@ -455,9 +455,9 @@ public List getAttachedNoteLogs(String userId, elementGUID, elementGUIDParameterName, elementTypeName, - OpenMetadataType.REFERENCEABLE_TO_NOTE_LOG_TYPE_GUID, - OpenMetadataType.REFERENCEABLE_TO_NOTE_LOG_TYPE_NAME, - OpenMetadataType.NOTE_LOG_TYPE_NAME, + OpenMetadataType.ATTACHED_NOTE_LOG_RELATIONSHIP.typeGUID, + OpenMetadataType.ATTACHED_NOTE_LOG_RELATIONSHIP.typeName, + OpenMetadataType.NOTE_LOG.typeName, null, null, 2, @@ -506,8 +506,8 @@ public List findNoteLogs(String userId, return this.findBeans(userId, searchString, searchStringParameterName, - OpenMetadataType.NOTE_LOG_TYPE_GUID, - OpenMetadataType.NOTE_LOG_TYPE_NAME, + OpenMetadataType.NOTE_LOG.typeGUID, + OpenMetadataType.NOTE_LOG.typeName, null, startFrom, pageSize, @@ -557,8 +557,8 @@ public List getNoteLogsByName(String userId, return this.getBeansByValue(userId, name, nameParameterName, - OpenMetadataType.NOTE_LOG_TYPE_GUID, - OpenMetadataType.NOTE_LOG_TYPE_NAME, + OpenMetadataType.NOTE_LOG.typeGUID, + OpenMetadataType.NOTE_LOG.typeName, specificMatchPropertyNames, true, null, diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/OMFConverter.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/OMFConverter.java index 6adaf2758b7..1176b701674 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/OMFConverter.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/OMFConverter.java @@ -352,11 +352,11 @@ protected Connection getEmbeddedConnection(Class beanClass, { String actualTypeName = primaryEntity.getType().getTypeDefName(); - if (repositoryHelper.isTypeOf(serviceName, actualTypeName, OpenMetadataType.VIRTUAL_CONNECTION_TYPE_NAME)) + if (repositoryHelper.isTypeOf(serviceName, actualTypeName, OpenMetadataType.VIRTUAL_CONNECTION.typeName)) { return getNewVirtualConnection(beanClass, primaryEntity, supplementaryEntities, relationships, methodName); } - else if (repositoryHelper.isTypeOf(serviceName, actualTypeName, OpenMetadataType.CONNECTION_TYPE_NAME)) + else if (repositoryHelper.isTypeOf(serviceName, actualTypeName, OpenMetadataType.CONNECTION.typeName)) { return getNewConnection(beanClass, primaryEntity, supplementaryEntities, relationships, methodName); } @@ -365,7 +365,7 @@ else if (repositoryHelper.isTypeOf(serviceName, actualTypeName, OpenMetadataType /* * This will throw an exception */ - super.validateInstanceType(OpenMetadataType.CONNECTION_TYPE_NAME, + super.validateInstanceType(OpenMetadataType.CONNECTION.typeName, beanClass.getName(), primaryEntity, methodName); @@ -448,7 +448,7 @@ private Connection getNewVirtualConnection(Class beanClass, { if ((relationship != null) && (relationship.getType() != null)) { - if (repositoryHelper.isTypeOf(serviceName, relationship.getType().getTypeDefName(), OpenMetadataType.EMBEDDED_CONNECTION_TYPE_NAME)) + if (repositoryHelper.isTypeOf(serviceName, relationship.getType().getTypeDefName(), OpenMetadataType.EMBEDDED_CONNECTION_RELATIONSHIP.typeName)) { EntityProxy parentConnectionProxy = relationship.getEntityOneProxy(); @@ -553,7 +553,7 @@ private void fillInConnectionProperties(Connection connection, List supplementaryEntities, String methodName) throws PropertyServerException { - this.setUpElementHeader(connection, primaryEntity, OpenMetadataType.CONNECTION_TYPE_NAME, methodName); + this.setUpElementHeader(connection, primaryEntity, OpenMetadataType.CONNECTION.typeName, methodName); /* * The initial set of values come from the entity properties. The super class properties are removed from a copy of the entities @@ -583,7 +583,7 @@ private void fillInConnectionProperties(Connection connection, { if (relationship != null) { - if (repositoryHelper.isTypeOf(serviceName, relationship.getType().getTypeDefName(), OpenMetadataType.ASSET_TO_CONNECTION_TYPE_NAME)) + if (repositoryHelper.isTypeOf(serviceName, relationship.getType().getTypeDefName(), OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeName)) { connection.setAssetSummary(this.getAssetSummary(instanceProperties)); } @@ -616,7 +616,7 @@ private void fillInConnectionProperties(Connection connection, */ connection.setEndpoint(endpoint); } - else if (repositoryHelper.isTypeOf(serviceName, actualTypeName, OpenMetadataType.CONNECTOR_TYPE_TYPE_NAME)) + else if (repositoryHelper.isTypeOf(serviceName, actualTypeName, OpenMetadataType.CONNECTOR_TYPE.typeName)) { ConnectorType connectorType = getConnectorType(entity, methodName); @@ -714,7 +714,7 @@ private ConnectorType getConnectorType(EntityDetail entity, { ConnectorType connectorType = new ConnectorType(); - this.setUpElementHeader(connectorType, entity, OpenMetadataType.CONNECTOR_TYPE_TYPE_NAME, methodName); + this.setUpElementHeader(connectorType, entity, OpenMetadataType.CONNECTOR_TYPE.typeName, methodName); /* * The initial set of values come from the entity. diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/OpenMetadataAPIGenericConverter.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/OpenMetadataAPIGenericConverter.java index fbebad549c0..0f876a3e11b 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/OpenMetadataAPIGenericConverter.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/OpenMetadataAPIGenericConverter.java @@ -1682,7 +1682,7 @@ protected String removeMission(InstanceProperties instanceProperties) if (instanceProperties != null) { return repositoryHelper.removeStringProperty(serviceName, - OpenMetadataType.MISSION_PROPERTY_NAME, + OpenMetadataProperty.MISSION.name, instanceProperties, methodName); } @@ -2082,7 +2082,7 @@ protected String removeConnectorProviderClassName(InstanceProperties instancePr if (instanceProperties != null) { return repositoryHelper.removeStringProperty(serviceName, - OpenMetadataType.CONNECTOR_PROVIDER_PROPERTY_NAME, + OpenMetadataProperty.CONNECTOR_PROVIDER_CLASS_NAME.name, instanceProperties, methodName); } @@ -2310,7 +2310,7 @@ protected List removeRecognizedAdditionalProperties(InstanceProperties if (instanceProperties != null) { return repositoryHelper.removeStringArrayProperty(serviceName, - OpenMetadataType.RECOGNIZED_ADD_PROPS_PROPERTY_NAME, + OpenMetadataProperty.RECOGNIZED_ADDITIONAL_PROPERTIES.name, instanceProperties, methodName); } @@ -2332,7 +2332,7 @@ protected List removeRecognizedSecuredProperties(InstanceProperties ins if (instanceProperties != null) { return repositoryHelper.removeStringArrayProperty(serviceName, - OpenMetadataType.RECOGNIZED_SEC_PROPS_PROPERTY_NAME, + OpenMetadataProperty.RECOGNIZED_SECURED_PROPERTIES.name, instanceProperties, methodName); } @@ -2355,7 +2355,7 @@ protected List removeRecognizedConfigurationProperties(InstancePropertie if (instanceProperties != null) { return repositoryHelper.removeStringArrayProperty(serviceName, - OpenMetadataType.RECOGNIZED_CONFIG_PROPS_PROPERTY_NAME, + OpenMetadataProperty.RECOGNIZED_CONFIGURATION_PROPERTIES.name, instanceProperties, methodName); } @@ -2377,7 +2377,7 @@ protected Map removeSecuredProperties(InstanceProperties instan if (instanceProperties != null) { return repositoryHelper.removeStringMapFromProperty(serviceName, - OpenMetadataType.SECURED_PROPERTIES_PROPERTY_NAME, + OpenMetadataProperty.SECURED_PROPERTIES.name, instanceProperties, methodName); } @@ -2399,7 +2399,7 @@ protected Map removeConfigurationProperties(InstanceProperties if (instanceProperties != null) { return repositoryHelper.removeMapFromProperty(serviceName, - OpenMetadataType.CONFIGURATION_PROPERTIES_PROPERTY_NAME, + OpenMetadataProperty.CONFIGURATION_PROPERTIES.name, instanceProperties, methodName); } @@ -2421,7 +2421,7 @@ protected String removeUserId(InstanceProperties instanceProperties) if (instanceProperties != null) { return repositoryHelper.removeStringProperty(serviceName, - OpenMetadataType.USER_ID_PROPERTY_NAME, + OpenMetadataProperty.USER_ID.name, instanceProperties, methodName); } @@ -2443,7 +2443,7 @@ protected String removeClearPassword(InstanceProperties instanceProperties) if (instanceProperties != null) { return repositoryHelper.removeStringProperty(serviceName, - OpenMetadataType.CLEAR_PASSWORD_PROPERTY_NAME, + OpenMetadataProperty.CLEAR_PASSWORD.name, instanceProperties, methodName); } @@ -2465,7 +2465,7 @@ protected String removeEncryptedPassword(InstanceProperties instanceProperties) if (instanceProperties != null) { return repositoryHelper.removeStringProperty(serviceName, - OpenMetadataType.ENCRYPTED_PASSWORD_PROPERTY_NAME, + OpenMetadataProperty.ENCRYPTED_PASSWORD.name, instanceProperties, methodName); } @@ -2487,7 +2487,7 @@ protected String getAssetSummary(InstanceProperties instanceProperties) if (instanceProperties != null) { return repositoryHelper.getStringProperty(serviceName, - OpenMetadataType.ASSET_SUMMARY_PROPERTY_NAME, + OpenMetadataProperty.ASSET_SUMMARY.name, instanceProperties, methodName); } @@ -2509,7 +2509,7 @@ protected Map getArguments(InstanceProperties instancePropertie if (instanceProperties != null) { return repositoryHelper.getMapFromProperty(serviceName, - OpenMetadataType.ARGUMENTS_PROPERTY_NAME, + OpenMetadataProperty.ARGUMENTS.name, instanceProperties, methodName); } @@ -2619,7 +2619,7 @@ protected int removeKarmaPoints(InstanceProperties instanceProperties) if (instanceProperties != null) { return repositoryHelper.removeIntProperty(serviceName, - OpenMetadataType.KARMA_POINTS_PROPERTY_NAME, + OpenMetadataProperty.KARMA_POINTS.name, instanceProperties, methodName); } @@ -3507,7 +3507,7 @@ protected int removePosition(InstanceProperties instanceProperties) if (instanceProperties != null) { return repositoryHelper.removeIntProperty(serviceName, - OpenMetadataType.POSITION_PROPERTY_NAME, + OpenMetadataProperty.POSITION.name, instanceProperties, methodName); } @@ -3529,7 +3529,7 @@ protected int getPosition(InstanceProperties instanceProperties) if (instanceProperties != null) { return repositoryHelper.getIntProperty(serviceName, - OpenMetadataType.POSITION_PROPERTY_NAME, + OpenMetadataProperty.POSITION.name, instanceProperties, methodName); } @@ -4219,7 +4219,7 @@ protected String removeTitle(InstanceProperties instanceProperties) if (instanceProperties != null) { return repositoryHelper.removeStringProperty(serviceName, - OpenMetadataType.TITLE_PROPERTY_NAME, + OpenMetadataProperty.TITLE.name, instanceProperties, methodName); } @@ -4241,7 +4241,7 @@ protected String removeText(InstanceProperties instanceProperties) if (instanceProperties != null) { return repositoryHelper.removeStringProperty(serviceName, - OpenMetadataType.TEXT_PROPERTY_NAME, + OpenMetadataProperty.TEXT.name, instanceProperties, methodName); } @@ -4263,7 +4263,7 @@ protected String removePriority(InstanceProperties instanceProperties) if (instanceProperties != null) { return repositoryHelper.removeStringProperty(serviceName, - OpenMetadataType.IMPORTANCE_PROPERTY_NAME, + OpenMetadataProperty.IMPORTANCE.name, instanceProperties, methodName); } @@ -4285,7 +4285,7 @@ protected int removeIntPriority(InstanceProperties instanceProperties) if (instanceProperties != null) { return repositoryHelper.removeIntProperty(serviceName, - OpenMetadataType.PRIORITY_PROPERTY_NAME, + OpenMetadataProperty.PRIORITY.name, instanceProperties, methodName); } @@ -4307,7 +4307,7 @@ protected int removeHeadCount(InstanceProperties instanceProperties) if (instanceProperties != null) { return repositoryHelper.removeIntProperty(serviceName, - OpenMetadataType.HEAD_COUNT_PROPERTY_NAME, + OpenMetadataProperty.HEAD_COUNT.name, instanceProperties, methodName); } @@ -4329,7 +4329,7 @@ protected String removeScope(InstanceProperties instanceProperties) if (instanceProperties != null) { return repositoryHelper.removeStringProperty(serviceName, - OpenMetadataType.SCOPE_PROPERTY_NAME, + OpenMetadataProperty.SCOPE.name, instanceProperties, methodName); } @@ -5744,7 +5744,7 @@ protected String removeCommentText(InstanceProperties instanceProperties) if (instanceProperties != null) { return repositoryHelper.removeStringProperty(serviceName, - OpenMetadataType.COMMENT_TEXT_PROPERTY_NAME, + OpenMetadataProperty.TEXT.name, instanceProperties, methodName); } @@ -5810,7 +5810,7 @@ protected String removeReview(InstanceProperties instanceProperties) if (instanceProperties != null) { return repositoryHelper.removeStringProperty(serviceName, - OpenMetadataType.REVIEW_PROPERTY_NAME, + OpenMetadataProperty.REVIEW.name, instanceProperties, methodName); } @@ -5832,7 +5832,7 @@ protected String removeTagName(InstanceProperties instanceProperties) if (instanceProperties != null) { return repositoryHelper.removeStringProperty(serviceName, - OpenMetadataType.TAG_NAME_PROPERTY_NAME, + OpenMetadataProperty.TAG_NAME.name, instanceProperties, methodName); } @@ -5854,7 +5854,7 @@ protected String removeTagDescription(InstanceProperties instanceProperties) if (instanceProperties != null) { return repositoryHelper.removeStringProperty(serviceName, - OpenMetadataType.TAG_DESCRIPTION_PROPERTY_NAME, + OpenMetadataProperty.TAG_DESCRIPTION.name, instanceProperties, methodName); } diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/OpenMetadataAPIGenericHandler.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/OpenMetadataAPIGenericHandler.java index 0b81f0e7704..0e1e583bf23 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/OpenMetadataAPIGenericHandler.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/OpenMetadataAPIGenericHandler.java @@ -1436,10 +1436,10 @@ private boolean visibleToUserThroughRelationship(String userId, * These are the feedback relationships. They have a property called "isPrivate". If it is set to true, only the user * that created it can see it (or update or delete it). */ - if ((repositoryHelper.isTypeOf(serviceName, relationshipTypeName, OpenMetadataType.REFERENCEABLE_TO_LIKE_TYPE_NAME)) || - (repositoryHelper.isTypeOf(serviceName, relationshipTypeName, OpenMetadataType.REFERENCEABLE_TO_TAG_TYPE_NAME)) || - (repositoryHelper.isTypeOf(serviceName, relationshipTypeName, OpenMetadataType.REFERENCEABLE_TO_RATING_TYPE_NAME)) || - (repositoryHelper.isTypeOf(serviceName, relationshipTypeName, OpenMetadataType.REFERENCEABLE_TO_COMMENT_TYPE_NAME))) + if ((repositoryHelper.isTypeOf(serviceName, relationshipTypeName, OpenMetadataType.ATTACHED_LIKE_RELATIONSHIP.typeName)) || + (repositoryHelper.isTypeOf(serviceName, relationshipTypeName, OpenMetadataType.ATTACHED_TAG_RELATIONSHIP.typeName)) || + (repositoryHelper.isTypeOf(serviceName, relationshipTypeName, OpenMetadataType.ATTACHED_RATING_RELATIONSHIP.typeName)) || + (repositoryHelper.isTypeOf(serviceName, relationshipTypeName, OpenMetadataType.ATTACHED_COMMENT_RELATIONSHIP.typeName))) { if (userId.equals(relationship.getCreatedBy())) { @@ -2125,10 +2125,10 @@ private AnchorIdentifiers getAnchorGUIDForConnection(String userId, */ Relationship relationship = repositoryHandler.getUniqueRelationshipByType(userId, connectionGUID, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeName, true, - OpenMetadataType.ASSET_TO_CONNECTION_TYPE_GUID, - OpenMetadataType.ASSET_TO_CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeGUID, + OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeName, forLineage, forDuplicateProcessing, effectiveTime, @@ -2225,8 +2225,8 @@ private AnchorIdentifiers getAnchorGUIDForEndpoint(String userId, relationships = repositoryHandler.getRelationshipsByType(userId, endpointGUID, OpenMetadataType.ENDPOINT.typeName, - OpenMetadataType.CONNECTION_ENDPOINT_TYPE_GUID, - OpenMetadataType.CONNECTION_ENDPOINT_TYPE_NAME, + OpenMetadataType.CONNECTION_ENDPOINT_RELATIONSHIP.typeGUID, + OpenMetadataType.CONNECTION_ENDPOINT_RELATIONSHIP.typeName, 2, forLineage, forDuplicateProcessing, @@ -2294,10 +2294,10 @@ private AnchorIdentifiers getAnchorGUIDForLike(String userId, */ Relationship relationship = repositoryHandler.getUniqueRelationshipByType(userId, likeGUID, - OpenMetadataType.LIKE_TYPE_NAME, + OpenMetadataType.LIKE.typeName, false, - OpenMetadataType.REFERENCEABLE_TO_LIKE_TYPE_GUID, - OpenMetadataType.REFERENCEABLE_TO_LIKE_TYPE_NAME, + OpenMetadataType.ATTACHED_LIKE_RELATIONSHIP.typeGUID, + OpenMetadataType.ATTACHED_LIKE_RELATIONSHIP.typeName, forLineage, forDuplicateProcessing, effectiveTime, @@ -2351,10 +2351,10 @@ private AnchorIdentifiers getAnchorGUIDForRating(String userId, */ Relationship relationship = repositoryHandler.getUniqueRelationshipByType(userId, ratingGUID, - OpenMetadataType.RATING_TYPE_NAME, + OpenMetadataType.RATING.typeName, false, - OpenMetadataType.REFERENCEABLE_TO_RATING_TYPE_GUID, - OpenMetadataType.REFERENCEABLE_TO_RATING_TYPE_NAME, + OpenMetadataType.ATTACHED_RATING_RELATIONSHIP.typeGUID, + OpenMetadataType.ATTACHED_RATING_RELATIONSHIP.typeName, forLineage, forDuplicateProcessing, effectiveTime, @@ -2694,8 +2694,8 @@ private AnchorIdentifiers getAnchorGUIDForComment(String userId, List relationships = repositoryHandler.getRelationshipsByType(userId, commentGUID, OpenMetadataType.COMMENT.typeName, - OpenMetadataType.REFERENCEABLE_TO_COMMENT_TYPE_GUID, - OpenMetadataType.REFERENCEABLE_TO_COMMENT_TYPE_NAME, + OpenMetadataType.ATTACHED_COMMENT_RELATIONSHIP.typeGUID, + OpenMetadataType.ATTACHED_COMMENT_RELATIONSHIP.typeName, 1, forLineage, forDuplicateProcessing, @@ -2913,7 +2913,7 @@ private AnchorIdentifiers deriveAnchorGUID(String targetGUID, * This group of calls walks the chain of entities to detect the anchorIdentifiers for specific types of entities. There is scope for more * method calls added here, for example, for comments, note logs, connections etc. */ - if (repositoryHelper.isTypeOf(serviceName, targetTypeName, OpenMetadataType.SCHEMA_TYPE_TYPE_NAME)) + if (repositoryHelper.isTypeOf(serviceName, targetTypeName, OpenMetadataType.SCHEMA_TYPE.typeName)) { anchorIdentifiers = this.getAnchorGUIDForSchemaType(localServerUserId, targetGUID, forLineage, forDuplicateProcessing, effectiveTime, methodName); } @@ -2921,7 +2921,7 @@ else if (repositoryHelper.isTypeOf(serviceName, targetTypeName, OpenMetadataType { anchorIdentifiers = this.getAnchorGUIDForSchemaAttribute(localServerUserId, targetGUID, forLineage, forDuplicateProcessing, effectiveTime, methodName); } - else if (repositoryHelper.isTypeOf(serviceName, targetTypeName, OpenMetadataType.CONNECTION_TYPE_NAME)) + else if (repositoryHelper.isTypeOf(serviceName, targetTypeName, OpenMetadataType.CONNECTION.typeName)) { anchorIdentifiers = this.getAnchorGUIDForConnection(localServerUserId, targetGUID, forLineage, forDuplicateProcessing, effectiveTime, methodName); } @@ -2933,11 +2933,11 @@ else if (repositoryHelper.isTypeOf(serviceName, targetTypeName, OpenMetadataType { anchorIdentifiers = this.getAnchorGUIDForComment(localServerUserId, targetGUID, forLineage, forDuplicateProcessing, effectiveTime, methodName); } - else if (repositoryHelper.isTypeOf(serviceName, targetTypeName, OpenMetadataType.RATING_TYPE_NAME)) + else if (repositoryHelper.isTypeOf(serviceName, targetTypeName, OpenMetadataType.RATING.typeName)) { anchorIdentifiers = this.getAnchorGUIDForRating(localServerUserId, targetGUID, forLineage, forDuplicateProcessing, effectiveTime, methodName); } - else if (repositoryHelper.isTypeOf(serviceName, targetTypeName, OpenMetadataType.LIKE_TYPE_NAME)) + else if (repositoryHelper.isTypeOf(serviceName, targetTypeName, OpenMetadataType.LIKE.typeName)) { anchorIdentifiers = this.getAnchorGUIDForLike(localServerUserId, targetGUID, forLineage,forDuplicateProcessing, effectiveTime, methodName); } @@ -2961,7 +2961,7 @@ else if (repositoryHelper.isTypeOf(serviceName, targetTypeName, OpenMetadataType { anchorIdentifiers = this.getAnchorGUIDForDataField(localServerUserId, targetGUID, forLineage, forDuplicateProcessing, effectiveTime, methodName); } - else if (repositoryHelper.isTypeOf(serviceName, targetTypeName, OpenMetadataType.GLOSSARY_TERM_TYPE_NAME)) + else if (repositoryHelper.isTypeOf(serviceName, targetTypeName, OpenMetadataType.GLOSSARY_TERM.typeName)) { anchorIdentifiers = this.getAnchorGUIDForGlossaryTerm(localServerUserId, targetGUID, forLineage, forDuplicateProcessing, effectiveTime, methodName); } @@ -3248,7 +3248,7 @@ public EntityDetail validateAnchorEntity(String userId, /* * This first processing looks at the retrieved entity itself to ensure it is visible. */ - if (repositoryHelper.isTypeOf(serviceName, connectToType, OpenMetadataType.INFORMAL_TAG_TYPE_NAME)) + if (repositoryHelper.isTypeOf(serviceName, connectToType, OpenMetadataType.INFORMAL_TAG.typeName)) { /* * InformalTags have a property that says whether they are public or private @@ -3272,7 +3272,7 @@ public EntityDetail validateAnchorEntity(String userId, } } } - else if (repositoryHelper.isTypeOf(serviceName, connectToType, OpenMetadataType.CONNECTION_TYPE_NAME)) + else if (repositoryHelper.isTypeOf(serviceName, connectToType, OpenMetadataType.CONNECTION.typeName)) { securityVerifier.validateUserForConnection(userId, connectToEntity, repositoryHelper, serviceName, methodName); } @@ -3375,10 +3375,10 @@ else if (repositoryHelper.isTypeOf(serviceName, connectToType, OpenMetadataType. if (anchorEntityType != null) { - boolean isFeedbackEntity = (repositoryHelper.isTypeOf(serviceName, connectToType, OpenMetadataType.INFORMAL_TAG_TYPE_NAME)) || + boolean isFeedbackEntity = (repositoryHelper.isTypeOf(serviceName, connectToType, OpenMetadataType.INFORMAL_TAG.typeName)) || (repositoryHelper.isTypeOf(serviceName, connectToType, OpenMetadataType.COMMENT.typeName)) || - (repositoryHelper.isTypeOf(serviceName, connectToType, OpenMetadataType.RATING_TYPE_NAME)) || - (repositoryHelper.isTypeOf(serviceName, connectToType, OpenMetadataType.LIKE_TYPE_NAME)); + (repositoryHelper.isTypeOf(serviceName, connectToType, OpenMetadataType.RATING.typeName)) || + (repositoryHelper.isTypeOf(serviceName, connectToType, OpenMetadataType.LIKE.typeName)); /* * Determine if the element is attached directly or indirectly to an asset (or is an asset) so it is possible to determine diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/PersonRoleBuilder.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/PersonRoleBuilder.java index b842527a70c..5055e6b6ecc 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/PersonRoleBuilder.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/PersonRoleBuilder.java @@ -131,8 +131,8 @@ public class PersonRoleBuilder extends ReferenceableBuilder String serviceName, String serverName) { - super(OpenMetadataType.PERSON_ROLE_TYPE_GUID, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, + super(OpenMetadataType.PERSON_ROLE.typeGUID, + OpenMetadataType.PERSON_ROLE.typeName, repositoryHelper, serviceName, serverName); @@ -179,7 +179,7 @@ public InstanceProperties getInstanceProperties(String methodName) throws Inval { properties = repositoryHelper.addIntPropertyToInstance(serviceName, properties, - OpenMetadataType.HEAD_COUNT_PROPERTY_NAME, + OpenMetadataProperty.HEAD_COUNT.name, headCount, methodName); } @@ -215,7 +215,7 @@ InstanceProperties getTeamLeadershipProperties(String position, { InstanceProperties properties = repositoryHelper.addStringPropertyToInstance(serviceName, null, - OpenMetadataType.POSITION_PROPERTY_NAME, + OpenMetadataProperty.ROLE_POSITION.name, position, methodName); @@ -237,7 +237,7 @@ InstanceProperties getTeamMembershipProperties(String position, { InstanceProperties properties = repositoryHelper.addStringPropertyToInstance(serviceName, null, - OpenMetadataType.POSITION_PROPERTY_NAME, + OpenMetadataProperty.ROLE_POSITION.name, position, methodName); diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/PersonRoleConverter.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/PersonRoleConverter.java index 9e1df718fb9..346cdfd3bb4 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/PersonRoleConverter.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/PersonRoleConverter.java @@ -5,6 +5,7 @@ import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.PersonRoleElement; import org.odpi.openmetadata.frameworks.openmetadata.properties.actors.PersonRoleProperties; +import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataProperty; import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataType; import org.odpi.openmetadata.frameworks.connectors.ffdc.PropertyServerException; import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.instances.EntityDetail; @@ -77,7 +78,7 @@ public B getNewBean(Class beanClass, roleProperties.setDescription(this.removeDescription(instanceProperties)); roleProperties.setScope(this.removeScope(instanceProperties)); roleProperties.setDomainIdentifier(this.removeDomainIdentifier(instanceProperties)); - roleProperties.setHeadCountLimitSet(instanceProperties.getPropertyValue(OpenMetadataType.HEAD_COUNT_PROPERTY_NAME) != null); + roleProperties.setHeadCountLimitSet(instanceProperties.getPropertyValue(OpenMetadataProperty.HEAD_COUNT.name) != null); roleProperties.setHeadCount(this.removeHeadCount(instanceProperties)); roleProperties.setAdditionalProperties(this.removeAdditionalProperties(instanceProperties)); diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/PersonRoleHandler.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/PersonRoleHandler.java index 47e5ee2599d..3cb26349fc3 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/PersonRoleHandler.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/PersonRoleHandler.java @@ -130,7 +130,7 @@ public String createPersonRole(String userId, invalidParameterHandler.validateUserId(userId, methodName); invalidParameterHandler.validateName(qualifiedName, qualifiedNameParameterName, methodName); - String typeName = OpenMetadataType.PERSON_ROLE_TYPE_NAME; + String typeName = OpenMetadataType.PERSON_ROLE.typeName; if (suppliedTypeName != null) { @@ -138,7 +138,7 @@ public String createPersonRole(String userId, } String typeGUID = invalidParameterHandler.validateTypeName(typeName, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, + OpenMetadataType.PERSON_ROLE.typeName, serviceName, methodName, repositoryHelper); @@ -238,8 +238,8 @@ public String createPersonRoleFromTemplate(String userId, externalSourceName, templateGUID, templateGUIDParameterName, - OpenMetadataType.PERSON_ROLE_TYPE_GUID, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, + OpenMetadataType.PERSON_ROLE.typeGUID, + OpenMetadataType.PERSON_ROLE.typeName, qualifiedName, OpenMetadataProperty.QUALIFIED_NAME.name, roleBuilder, @@ -302,12 +302,12 @@ public String appointPersonToRole(String userId, OpenMetadataType.PERSON.typeName, roleGUID, roleGUIDParameterName, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, + OpenMetadataType.PERSON_ROLE.typeName, forLineage, forDuplicateProcessing, supportedZones, - OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP_TYPE_GUID, - OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP.typeGUID, + OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP.typeName, builder.getAppointmentProperties(isPublic, effectiveFrom, effectiveTo, methodName), effectiveFrom, effectiveTo, @@ -361,7 +361,7 @@ public void updateAppointment(String userId, externalSourceName, appointmentGUID, appointmentGUIDParameterName, - OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP.typeName, isMergeUpdate, builder.getAppointmentProperties(isPublic, effectiveFrom, effectiveTo, methodName), forLineage, @@ -411,7 +411,7 @@ public void relievePersonFromRole(String userId, Relationship relationship = repositoryHandler.getRelationshipByGUID(userId, appointmentGUID, appointmentGUIDParameterName, - OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP.typeName, effectiveTime, methodName); @@ -548,15 +548,15 @@ public void addTeamLeader(String userId, externalSourceName, teamLeaderRoleGUID, teamLeaderRoleGUIDParameterName, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, + OpenMetadataType.PERSON_ROLE.typeName, teamGUID, teamGUIDParameterName, - OpenMetadataType.TEAM_TYPE_NAME, + OpenMetadataType.TEAM.typeName, forLineage, forDuplicateProcessing, supportedZones, - OpenMetadataType.TEAM_LEADERSHIP_RELATIONSHIP_TYPE_GUID, - OpenMetadataType.TEAM_LEADERSHIP_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.TEAM_LEADERSHIP_RELATIONSHIP.typeGUID, + OpenMetadataType.TEAM_LEADERSHIP_RELATIONSHIP.typeName, this.setUpEffectiveDates(relationshipProperties, effectiveFrom, effectiveTo), effectiveFrom, effectiveTo, @@ -604,16 +604,16 @@ public void removeTeamLeader(String userId, externalSourceName, teamLeaderRoleGUID, teamLeaderRoleGUIDParameterName, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, + OpenMetadataType.PERSON_ROLE.typeName, teamGUID, teamGUIDParameterName, - OpenMetadataType.TEAM_TYPE_GUID, - OpenMetadataType.TEAM_TYPE_NAME, + OpenMetadataType.TEAM.typeGUID, + OpenMetadataType.TEAM.typeName, forLineage, forDuplicateProcessing, supportedZones, - OpenMetadataType.TEAM_LEADERSHIP_RELATIONSHIP_TYPE_GUID, - OpenMetadataType.TEAM_LEADERSHIP_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.TEAM_LEADERSHIP_RELATIONSHIP.typeGUID, + OpenMetadataType.TEAM_LEADERSHIP_RELATIONSHIP.typeName, effectiveTime, methodName); } @@ -667,15 +667,15 @@ public void addTeamMember(String userId, externalSourceName, teamMemberRoleGUID, teamMemberRoleGUIDParameterName, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, + OpenMetadataType.PERSON_ROLE.typeName, teamGUID, teamGUIDParameterName, - OpenMetadataType.TEAM_TYPE_NAME, + OpenMetadataType.TEAM.typeName, forLineage, forDuplicateProcessing, supportedZones, - OpenMetadataType.TEAM_MEMBERSHIP_RELATIONSHIP_TYPE_GUID, - OpenMetadataType.TEAM_MEMBERSHIP_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.TEAM_MEMBERSHIP_RELATIONSHIP.typeGUID, + OpenMetadataType.TEAM_MEMBERSHIP_RELATIONSHIP.typeName, this.setUpEffectiveDates(relationshipProperties, effectiveFrom, effectiveTo), effectiveFrom, effectiveTo, @@ -723,16 +723,16 @@ public void removeTeamMember(String userId, externalSourceName, teamMemberRoleGUID, teamMemberRoleGUIDParameterName, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, + OpenMetadataType.PERSON_ROLE.typeName, teamGUID, teamGUIDParameterName, - OpenMetadataType.TEAM_TYPE_GUID, - OpenMetadataType.TEAM_TYPE_NAME, + OpenMetadataType.TEAM.typeGUID, + OpenMetadataType.TEAM.typeName, forLineage, forDuplicateProcessing, supportedZones, - OpenMetadataType.TEAM_MEMBERSHIP_RELATIONSHIP_TYPE_GUID, - OpenMetadataType.TEAM_MEMBERSHIP_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.TEAM_MEMBERSHIP_RELATIONSHIP.typeGUID, + OpenMetadataType.TEAM_MEMBERSHIP_RELATIONSHIP.typeName, effectiveTime, methodName); } @@ -781,15 +781,15 @@ public void addGovernanceResponsibility(String userId, externalSourceName, personRoleGUID, personRoleGUIDParameterName, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, + OpenMetadataType.PERSON_ROLE.typeName, governanceResponsibilityGUID, governanceResponsibilityGUIDParameterName, - OpenMetadataType.TEAM_TYPE_NAME, + OpenMetadataType.TEAM.typeName, forLineage, forDuplicateProcessing, supportedZones, - OpenMetadataType.TEAM_MEMBERSHIP_RELATIONSHIP_TYPE_GUID, - OpenMetadataType.TEAM_MEMBERSHIP_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.TEAM_MEMBERSHIP_RELATIONSHIP.typeGUID, + OpenMetadataType.TEAM_MEMBERSHIP_RELATIONSHIP.typeName, this.setUpEffectiveDates(null, effectiveFrom, effectiveTo), effectiveFrom, effectiveTo, @@ -837,7 +837,7 @@ public void removeGovernanceResponsibility(String userId, externalSourceName, personRoleGUID, personRoleGUIDParameterName, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, + OpenMetadataType.PERSON_ROLE.typeName, governanceResponsibilityGUID, governanceResponsibilityGUIDParameterName, OpenMetadataType.GOVERNANCE_RESPONSIBILITY_TYPE_GUID, @@ -891,7 +891,7 @@ public List getRolesWithGovernanceResponsibility(String userId, OpenMetadataType.GOVERNANCE_RESPONSIBILITY_TYPE_NAME, OpenMetadataType.GOVERNANCE_RESPONSIBILITY_ASSIGNMENT_TYPE_GUID, OpenMetadataType.GOVERNANCE_RESPONSIBILITY_ASSIGNMENT_TYPE_NAME, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, + OpenMetadataType.PERSON_ROLE.typeName, null, null, 1, @@ -978,7 +978,7 @@ public void updatePersonRole(String userId, String typeGUID = invalidParameterHandler.validateTypeName(typeName, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, + OpenMetadataType.PERSON_ROLE.typeName, serviceName, methodName, repositoryHelper); @@ -1063,8 +1063,8 @@ public void removePersonRole(String userId, externalSourceName, roleGUID, roleGUIDParameterName, - OpenMetadataType.PERSON_ROLE_TYPE_GUID, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, + OpenMetadataType.PERSON_ROLE.typeGUID, + OpenMetadataType.PERSON_ROLE.typeName, null, null, forLineage, @@ -1109,8 +1109,8 @@ public List findPersonRoles(String userId, return this.findBeans(userId, searchString, searchStringParameterName, - OpenMetadataType.PERSON_ROLE_TYPE_GUID, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, + OpenMetadataType.PERSON_ROLE.typeGUID, + OpenMetadataType.PERSON_ROLE.typeName, null, startFrom, pageSize, @@ -1161,8 +1161,8 @@ public List getPersonRolesByName(String userId, return this.getBeansByValue(userId, name, nameParameterName, - OpenMetadataType.PERSON_ROLE_TYPE_GUID, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, + OpenMetadataType.PERSON_ROLE.typeGUID, + OpenMetadataType.PERSON_ROLE.typeName, specificMatchPropertyNames, true, null, @@ -1215,7 +1215,7 @@ public List getProjectManagerRoles(String userId, OpenMetadataType.PROJECT.typeName, OpenMetadataType.PROJECT_MANAGEMENT_RELATIONSHIP.typeGUID, OpenMetadataType.PROJECT_MANAGEMENT_RELATIONSHIP.typeName, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, + OpenMetadataType.PERSON_ROLE.typeName, null, null, 2, @@ -1263,10 +1263,10 @@ public List getTeamLeaderRoles(String userId, null, teamGUID, teamGUIDParameterName, - OpenMetadataType.TEAM_TYPE_NAME, - OpenMetadataType.TEAM_LEADERSHIP_RELATIONSHIP_TYPE_GUID, - OpenMetadataType.TEAM_LEADERSHIP_RELATIONSHIP_TYPE_NAME, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, + OpenMetadataType.TEAM.typeName, + OpenMetadataType.TEAM_LEADERSHIP_RELATIONSHIP.typeGUID, + OpenMetadataType.TEAM_LEADERSHIP_RELATIONSHIP.typeName, + OpenMetadataType.PERSON_ROLE.typeName, null, null, 1, @@ -1314,10 +1314,10 @@ public List getTeamMemberRoles(String userId, null, teamGUID, teamGUIDParameterName, - OpenMetadataType.TEAM_TYPE_NAME, - OpenMetadataType.TEAM_MEMBERSHIP_RELATIONSHIP_TYPE_GUID, - OpenMetadataType.TEAM_MEMBERSHIP_RELATIONSHIP_TYPE_NAME, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, + OpenMetadataType.TEAM.typeName, + OpenMetadataType.TEAM_MEMBERSHIP_RELATIONSHIP.typeGUID, + OpenMetadataType.TEAM_MEMBERSHIP_RELATIONSHIP.typeName, + OpenMetadataType.PERSON_ROLE.typeName, null, null, 1, @@ -1366,10 +1366,10 @@ public List getCommunityRoles(String userId, null, communityGUID, communityGUIDParameterName, - OpenMetadataType.COMMUNITY_TYPE_NAME, - OpenMetadataType.COMMUNITY_MEMBERSHIP_TYPE_NAME, - OpenMetadataType.COMMUNITY_MEMBERSHIP_TYPE_NAME, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, + OpenMetadataType.COMMUNITY.typeName, + OpenMetadataType.COMMUNITY_MEMBERSHIP_RELATIONSHIP.typeGUID, + OpenMetadataType.COMMUNITY_MEMBERSHIP_RELATIONSHIP.typeName, + OpenMetadataType.PERSON_ROLE.typeName, null, null, 2, @@ -1414,7 +1414,7 @@ public B getPersonRoleByGUID(String userId, return getBeanFromRepository(userId, personRoleGUID, personRoleGUIDParameterName, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, + OpenMetadataType.PERSON_ROLE.typeName, forLineage, forDuplicateProcessing, effectiveTime, @@ -1460,8 +1460,8 @@ public List getPersonRolesForRoleId(String userId, return this.getBeansByValue(userId, name, nameParameterName, - OpenMetadataType.PERSON_ROLE_TYPE_GUID, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, + OpenMetadataType.PERSON_ROLE.typeGUID, + OpenMetadataType.PERSON_ROLE.typeName, specificMatchPropertyNames, true, null, @@ -1515,8 +1515,8 @@ public List getPersonRolesForTitle(String userId, return this.getBeansByValue(userId, name, nameParameterName, - OpenMetadataType.PERSON_ROLE_TYPE_GUID, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, + OpenMetadataType.PERSON_ROLE.typeGUID, + OpenMetadataType.PERSON_ROLE.typeName, specificMatchPropertyNames, true, null, @@ -1567,8 +1567,8 @@ public List getPersonRolesForDomainId(String userId, if (domainIdentifier == 0) { return this.getBeansByType(userId, - OpenMetadataType.PERSON_ROLE_TYPE_GUID, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, + OpenMetadataType.PERSON_ROLE.typeGUID, + OpenMetadataType.PERSON_ROLE.typeName, null, forLineage, forDuplicateProcessing, @@ -1581,8 +1581,8 @@ public List getPersonRolesForDomainId(String userId, return this.getBeansByIntValue(userId, domainIdentifier, - OpenMetadataType.PERSON_ROLE_TYPE_GUID, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, + OpenMetadataType.PERSON_ROLE.typeGUID, + OpenMetadataType.PERSON_ROLE.typeName, OpenMetadataType.DOMAIN_IDENTIFIER_PROPERTY_NAME, null, null, diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ProjectHandler.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ProjectHandler.java index 2e0a85f02d6..0aeba0257a0 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ProjectHandler.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ProjectHandler.java @@ -354,7 +354,7 @@ public void addActorToProject(String userId, { InstanceProperties properties = repositoryHelper.addStringPropertyToInstance(serviceName, null, - OpenMetadataType.TEAM_ROLE_PROPERTY_NAME, + OpenMetadataProperty.TEAM_ROLE.name, teamRole, methodName); @@ -587,7 +587,7 @@ public void addProjectDependency(String userId, { InstanceProperties properties = repositoryHelper.addStringPropertyToInstance(serviceName, null, - OpenMetadataType.DEPENDENCY_SUMMARY_PROPERTY_NAME, + OpenMetadataProperty.DEPENDENCY_SUMMARY.name, dependencySummary, methodName); @@ -711,7 +711,7 @@ public void addProjectManager(String userId, OpenMetadataType.PROJECT.typeName, personRoleGUID, personRoleGUIDParameterName, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, + OpenMetadataType.PERSON_ROLE.typeName, forLineage, forDuplicateProcessing, supportedZones, @@ -767,8 +767,8 @@ public void removeProjectManager(String userId, OpenMetadataType.PROJECT.typeName, personRoleGUID, personRoleGUIDParameterName, - OpenMetadataType.PERSON_ROLE_TYPE_GUID, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, + OpenMetadataType.PERSON_ROLE.typeGUID, + OpenMetadataType.PERSON_ROLE.typeName, forLineage, forDuplicateProcessing, OpenMetadataType.PROJECT_MANAGEMENT_RELATIONSHIP.typeGUID, @@ -1057,7 +1057,7 @@ public List getRoleProjects(String userId, null, personRoleGUID, personRoleGUIDParameterName, - OpenMetadataType.PERSON_ROLE_TYPE_NAME, + OpenMetadataType.PERSON_ROLE.typeName, OpenMetadataType.PROJECT_MANAGEMENT_RELATIONSHIP.typeGUID, OpenMetadataType.PROJECT_MANAGEMENT_RELATIONSHIP.typeName, OpenMetadataType.PROJECT.typeName, diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/RatingBuilder.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/RatingBuilder.java index f9839b67a0a..7189bc6ef87 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/RatingBuilder.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/RatingBuilder.java @@ -2,6 +2,7 @@ /* Copyright Contributors to the ODPi Egeria project. */ package org.odpi.openmetadata.commonservices.generichandlers; +import org.odpi.openmetadata.frameworks.openmetadata.enums.StarRating; import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataProperty; import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataType; import org.odpi.openmetadata.frameworks.connectors.ffdc.InvalidParameterException; @@ -35,8 +36,8 @@ public RatingBuilder(int starRating, String serviceName, String serverName) { - super(OpenMetadataType.RATING_TYPE_GUID, - OpenMetadataType.RATING_TYPE_NAME, + super(OpenMetadataType.RATING.typeGUID, + OpenMetadataType.RATING.typeName, repositoryHelper, serviceName, serverName); @@ -79,20 +80,20 @@ public InstanceProperties getInstanceProperties(String methodName) throws Inval { properties = repositoryHelper.addEnumPropertyToInstance(serviceName, properties, - OpenMetadataType.STARS_PROPERTY_NAME, - OpenMetadataType.STAR_RATING_ENUM_TYPE_GUID, - OpenMetadataType.STAR_RATING_ENUM_TYPE_NAME, + OpenMetadataProperty.STARS.name, + StarRating.getOpenTypeGUID(), + StarRating.getOpenTypeName(), starRating, methodName); } catch (TypeErrorException error) { - throw new InvalidParameterException(error, OpenMetadataType.STARS_PROPERTY_NAME); + throw new InvalidParameterException(error, OpenMetadataProperty.STARS.name); } properties = repositoryHelper.addStringPropertyToInstance(serviceName, properties, - OpenMetadataType.REVIEW_PROPERTY_NAME, + OpenMetadataProperty.REVIEW.name, review, methodName); diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/RatingConverter.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/RatingConverter.java index 720044f6695..0d7e3062c1b 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/RatingConverter.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/RatingConverter.java @@ -6,6 +6,7 @@ import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.FeedbackTargetElement; import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.RatingElement; import org.odpi.openmetadata.frameworks.openmetadata.properties.feedback.RatingProperties; +import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataProperty; import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataType; import org.odpi.openmetadata.frameworks.connectors.ffdc.PropertyServerException; import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.instances.EntityDetail; @@ -151,7 +152,7 @@ private StarRating removeStarRatingFromProperties(InstanceProperties propertie if (instancePropertiesMap != null) { - instancePropertiesMap.remove(OpenMetadataType.STARS_PROPERTY_NAME); + instancePropertiesMap.remove(OpenMetadataProperty.STARS.name); } properties.setInstanceProperties(instancePropertiesMap); @@ -177,7 +178,7 @@ private StarRating getStarRatingFromProperties(InstanceProperties properties) if (instancePropertiesMap != null) { - InstancePropertyValue instancePropertyValue = instancePropertiesMap.get(OpenMetadataType.STARS_PROPERTY_NAME); + InstancePropertyValue instancePropertyValue = instancePropertiesMap.get(OpenMetadataProperty.STARS.name); if (instancePropertyValue instanceof EnumPropertyValue enumPropertyValue) { diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/RatingHandler.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/RatingHandler.java index d6c8c78e4fa..937f57e69f2 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/RatingHandler.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/RatingHandler.java @@ -108,9 +108,9 @@ public List getRatings(String userId, elementGUID, elementGUIDParameterName, elementTypeName, - OpenMetadataType.REFERENCEABLE_TO_RATING_TYPE_GUID, - OpenMetadataType.REFERENCEABLE_TO_RATING_TYPE_NAME, - OpenMetadataType.RATING_TYPE_NAME, + OpenMetadataType.ATTACHED_RATING_RELATIONSHIP.typeGUID, + OpenMetadataType.ATTACHED_RATING_RELATIONSHIP.typeName, + OpenMetadataType.RATING.typeName, null, null, 0, @@ -199,8 +199,8 @@ public String saveRating(String userId, String ratingGUID = this.createBeanInRepository(userId, externalSourceGUID, externalSourceName, - OpenMetadataType.RATING_TYPE_GUID, - OpenMetadataType.RATING_TYPE_NAME, + OpenMetadataType.RATING.typeGUID, + OpenMetadataType.RATING.typeName, builder, effectiveTime, methodName); @@ -217,12 +217,12 @@ public String saveRating(String userId, OpenMetadataType.REFERENCEABLE.typeName, ratingGUID, ratingGUIDParameterName, - OpenMetadataType.RATING_TYPE_NAME, + OpenMetadataType.RATING.typeName, forLineage, forDuplicateProcessing, supportedZones, - OpenMetadataType.REFERENCEABLE_TO_RATING_TYPE_GUID, - OpenMetadataType.REFERENCEABLE_TO_RATING_TYPE_NAME, + OpenMetadataType.ATTACHED_RATING_RELATIONSHIP.typeGUID, + OpenMetadataType.ATTACHED_RATING_RELATIONSHIP.typeName, builder.getRelationshipInstanceProperties(methodName), effectiveTime, methodName); @@ -271,9 +271,9 @@ public void removeRating(String userId, forLineage, forDuplicateProcessing, supportedZones, - OpenMetadataType.REFERENCEABLE_TO_RATING_TYPE_GUID, - OpenMetadataType.REFERENCEABLE_TO_RATING_TYPE_NAME, - OpenMetadataType.RATING_TYPE_NAME, + OpenMetadataType.ATTACHED_RATING_RELATIONSHIP.typeGUID, + OpenMetadataType.ATTACHED_RATING_RELATIONSHIP.typeName, + OpenMetadataType.RATING.typeName, effectiveTime, methodName); @@ -286,8 +286,8 @@ public void removeRating(String userId, externalSourceName, ratingGUID, ratingGUIDParameterName, - OpenMetadataType.RATING_TYPE_GUID, - OpenMetadataType.RATING_TYPE_NAME, + OpenMetadataType.RATING.typeGUID, + OpenMetadataType.RATING.typeName, null, null, forLineage, diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ReferenceableHandler.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ReferenceableHandler.java index 836f09088a6..601837e4325 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ReferenceableHandler.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/ReferenceableHandler.java @@ -3995,7 +3995,7 @@ public void addAssignmentScope(String userId, { InstanceProperties properties = repositoryHelper.addStringPropertyToInstance(serviceName, null, - OpenMetadataType.ASSIGNMENT_TYPE_PROPERTY_NAME, + OpenMetadataProperty.ASSIGNMENT_TYPE.name, assignmentType, methodName); @@ -4017,8 +4017,8 @@ public void addAssignmentScope(String userId, forLineage, forDuplicateProcessing, supportedZones, - OpenMetadataType.ASSIGNMENT_SCOPE_RELATIONSHIP_TYPE_GUID, - OpenMetadataType.ASSIGNMENT_SCOPE_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.ASSIGNMENT_SCOPE_RELATIONSHIP.typeGUID, + OpenMetadataType.ASSIGNMENT_SCOPE_RELATIONSHIP.typeName, this.setUpEffectiveDates(properties, effectiveFrom, effectiveTo), effectiveFrom, effectiveTo, @@ -4073,8 +4073,8 @@ public void removeAssignmentScope(String userId, OpenMetadataType.REFERENCEABLE.typeName, forLineage, forDuplicateProcessing, - OpenMetadataType.ASSIGNMENT_SCOPE_RELATIONSHIP_TYPE_GUID, - OpenMetadataType.ASSIGNMENT_SCOPE_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.ASSIGNMENT_SCOPE_RELATIONSHIP.typeGUID, + OpenMetadataType.ASSIGNMENT_SCOPE_RELATIONSHIP.typeName, effectiveTime, methodName); } @@ -4132,8 +4132,8 @@ public List getAssignmentScope(String userId, startingGUID, startingGUIDParameterName, startingTypeName, - OpenMetadataType.ASSIGNMENT_SCOPE_RELATIONSHIP_TYPE_GUID, - OpenMetadataType.ASSIGNMENT_SCOPE_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.ASSIGNMENT_SCOPE_RELATIONSHIP.typeGUID, + OpenMetadataType.ASSIGNMENT_SCOPE_RELATIONSHIP.typeName, resultingTypeName, null, null, @@ -4200,8 +4200,8 @@ public List getAssignedActors(String userId, startingGUID, startingGUIDParameterName, startingTypeName, - OpenMetadataType.ASSIGNMENT_SCOPE_RELATIONSHIP_TYPE_GUID, - OpenMetadataType.ASSIGNMENT_SCOPE_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.ASSIGNMENT_SCOPE_RELATIONSHIP.typeGUID, + OpenMetadataType.ASSIGNMENT_SCOPE_RELATIONSHIP.typeName, resultingTypeName, null, null, @@ -4257,7 +4257,7 @@ public void addStakeholder(String userId, { InstanceProperties properties = repositoryHelper.addStringPropertyToInstance(serviceName, null, - OpenMetadataType.STAKEHOLDER_ROLE_PROPERTY_NAME, + OpenMetadataProperty.STAKEHOLDER_ROLE.name, stakeholderRole, methodName); @@ -4273,8 +4273,8 @@ public void addStakeholder(String userId, forLineage, forDuplicateProcessing, supportedZones, - OpenMetadataType.STAKEHOLDER_RELATIONSHIP_TYPE_GUID, - OpenMetadataType.STAKEHOLDER_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.STAKEHOLDER_RELATIONSHIP.typeGUID, + OpenMetadataType.STAKEHOLDER_RELATIONSHIP.typeName, this.setUpEffectiveDates(properties, effectiveFrom, effectiveTo), effectiveFrom, effectiveTo, @@ -4329,8 +4329,8 @@ public void removeStakeholder(String userId, OpenMetadataType.REFERENCEABLE.typeName, forLineage, forDuplicateProcessing, - OpenMetadataType.STAKEHOLDER_RELATIONSHIP_TYPE_GUID, - OpenMetadataType.STAKEHOLDER_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.STAKEHOLDER_RELATIONSHIP.typeGUID, + OpenMetadataType.STAKEHOLDER_RELATIONSHIP.typeName, effectiveTime, methodName); } @@ -4388,8 +4388,8 @@ public List getStakeholders(String userId, startingGUID, startingGUIDParameterName, startingTypeName, - OpenMetadataType.STAKEHOLDER_RELATIONSHIP_TYPE_GUID, - OpenMetadataType.STAKEHOLDER_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.STAKEHOLDER_RELATIONSHIP.typeGUID, + OpenMetadataType.STAKEHOLDER_RELATIONSHIP.typeName, resultingTypeName, null, null, @@ -4456,8 +4456,8 @@ public List getCommissionedByStakeholder(String userId, startingGUID, startingGUIDParameterName, startingTypeName, - OpenMetadataType.STAKEHOLDER_RELATIONSHIP_TYPE_GUID, - OpenMetadataType.STAKEHOLDER_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.STAKEHOLDER_RELATIONSHIP.typeGUID, + OpenMetadataType.STAKEHOLDER_RELATIONSHIP.typeName, resultingTypeName, null, null, diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/UserIdentityBuilder.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/UserIdentityBuilder.java index 6c9064179b3..f353def02d4 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/UserIdentityBuilder.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/UserIdentityBuilder.java @@ -103,7 +103,7 @@ public InstanceProperties getInstanceProperties(String methodName) throws Inval properties = repositoryHelper.addStringPropertyToInstance(serviceName, properties, - OpenMetadataType.USER_ID_PROPERTY_NAME, + OpenMetadataProperty.USER_ID.name, userId, methodName); diff --git a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/UserIdentityHandler.java b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/UserIdentityHandler.java index 690da3e1753..9bee7d16c16 100644 --- a/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/UserIdentityHandler.java +++ b/open-metadata-implementation/common-services/generic-handlers/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/UserIdentityHandler.java @@ -556,7 +556,7 @@ public List getUserIdentitiesByName(String userId, { List specificMatchPropertyNames = new ArrayList<>(); specificMatchPropertyNames.add(OpenMetadataProperty.QUALIFIED_NAME.name); - specificMatchPropertyNames.add(OpenMetadataType.USER_ID_PROPERTY_NAME); + specificMatchPropertyNames.add(OpenMetadataProperty.USER_ID.name); return this.getBeansByValue(userId, name, diff --git a/open-metadata-implementation/framework-services/gaf-metadata-management/gaf-metadata-client/src/main/java/org/odpi/openmetadata/frameworkservices/gaf/client/OpenMetadataClientBase.java b/open-metadata-implementation/framework-services/gaf-metadata-management/gaf-metadata-client/src/main/java/org/odpi/openmetadata/frameworkservices/gaf/client/OpenMetadataClientBase.java index 837f822a42f..e0468a854b4 100644 --- a/open-metadata-implementation/framework-services/gaf-metadata-management/gaf-metadata-client/src/main/java/org/odpi/openmetadata/frameworkservices/gaf/client/OpenMetadataClientBase.java +++ b/open-metadata-implementation/framework-services/gaf-metadata-management/gaf-metadata-client/src/main/java/org/odpi/openmetadata/frameworkservices/gaf/client/OpenMetadataClientBase.java @@ -4073,9 +4073,9 @@ public String openToDo(String userId, properties = propertyHelper.addStringProperty(properties, OpenMetadataProperty.NAME.name, title); properties = propertyHelper.addStringProperty(properties, OpenMetadataProperty.DESCRIPTION.name, instructions); - properties = propertyHelper.addStringProperty(properties, OpenMetadataType.TO_DO_TYPE_PROPERTY_NAME, category); - properties = propertyHelper.addDateProperty(properties, OpenMetadataType.DUE_TIME_PROPERTY_NAME, dueDate); - properties = propertyHelper.addIntProperty(properties, OpenMetadataType.PRIORITY_PROPERTY_NAME, priority); + properties = propertyHelper.addStringProperty(properties, OpenMetadataProperty.TO_DO_TYPE.name, category); + properties = propertyHelper.addDateProperty(properties, OpenMetadataProperty.DUE_TIME.name, dueDate); + properties = propertyHelper.addIntProperty(properties, OpenMetadataProperty.PRIORITY.name, priority); properties = propertyHelper.addEnumProperty(properties, OpenMetadataProperty.TO_DO_STATUS.name, ToDoStatus.getOpenTypeName(), @@ -4091,7 +4091,7 @@ public String openToDo(String userId, null, properties, assignToGUID, - OpenMetadataType.ACTION_ASSIGNMENT_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.ACTION_ASSIGNMENT_RELATIONSHIP.typeName, null, true); @@ -4126,7 +4126,7 @@ public String openToDo(String userId, * Link the "to do" and the sponsor */ this.createRelatedElementsInStore(userId, - OpenMetadataType.ACTION_SPONSOR_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.ACTION_SPONSOR_RELATIONSHIP.typeName, sponsorGUID, toDoGUID, false, @@ -4143,7 +4143,7 @@ public String openToDo(String userId, * Link the "to do" and the originator */ this.createRelatedElementsInStore(userId, - OpenMetadataType.TO_DO_SOURCE_RELATIONSHIP_TYPE_NAME, + OpenMetadataType.TO_DO_SOURCE_RELATIONSHIP.typeName, originatorGUID, toDoGUID, false, diff --git a/open-metadata-implementation/framework-services/gaf-metadata-management/gaf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/gaf/converters/CatalogTargetConverter.java b/open-metadata-implementation/framework-services/gaf-metadata-management/gaf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/gaf/converters/CatalogTargetConverter.java index c25c651a001..1c5e54d49bf 100644 --- a/open-metadata-implementation/framework-services/gaf-metadata-management/gaf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/gaf/converters/CatalogTargetConverter.java +++ b/open-metadata-implementation/framework-services/gaf-metadata-management/gaf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/gaf/converters/CatalogTargetConverter.java @@ -83,7 +83,7 @@ public B getNewBean(Class beanClass, relationship.getProperties(), methodName)); bean.setConfigurationProperties(repositoryHelper.getMapFromProperty(serviceName, - OpenMetadataType.CONFIGURATION_PROPERTIES_PROPERTY_NAME, + OpenMetadataProperty.CONFIGURATION_PROPERTIES.name, relationship.getProperties(), methodName)); bean.setPermittedSynchronization(getPermittedSynchronization(relationship.getProperties())); diff --git a/open-metadata-implementation/framework-services/gaf-metadata-management/gaf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/gaf/converters/GovernanceServiceConverter.java b/open-metadata-implementation/framework-services/gaf-metadata-management/gaf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/gaf/converters/GovernanceServiceConverter.java index 0853e2eb913..c8a3d0f5d7c 100644 --- a/open-metadata-implementation/framework-services/gaf-metadata-management/gaf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/gaf/converters/GovernanceServiceConverter.java +++ b/open-metadata-implementation/framework-services/gaf-metadata-management/gaf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/gaf/converters/GovernanceServiceConverter.java @@ -95,7 +95,7 @@ public B getNewComplexBean(Class beanClass, { if ((entity != null) && (entity.getType() != null)) { - if (repositoryHelper.isTypeOf(serviceName, entity.getType().getTypeDefName(), OpenMetadataType.CONNECTION_TYPE_NAME)) + if (repositoryHelper.isTypeOf(serviceName, entity.getType().getTypeDefName(), OpenMetadataType.CONNECTION.typeName)) { properties.setConnection(super.getEmbeddedConnection(beanClass, entity, diff --git a/open-metadata-implementation/framework-services/gaf-metadata-management/gaf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/gaf/converters/IntegrationConnectorConverter.java b/open-metadata-implementation/framework-services/gaf-metadata-management/gaf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/gaf/converters/IntegrationConnectorConverter.java index d58cef8d35d..1a61c091781 100644 --- a/open-metadata-implementation/framework-services/gaf-metadata-management/gaf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/gaf/converters/IntegrationConnectorConverter.java +++ b/open-metadata-implementation/framework-services/gaf-metadata-management/gaf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/gaf/converters/IntegrationConnectorConverter.java @@ -66,9 +66,8 @@ public B getNewComplexBean(Class beanClass, */ B returnBean = beanClass.getDeclaredConstructor().newInstance(); - if (returnBean instanceof IntegrationConnectorElement) + if (returnBean instanceof IntegrationConnectorElement bean) { - IntegrationConnectorElement bean = (IntegrationConnectorElement)returnBean; IntegrationConnectorProperties properties = new IntegrationConnectorProperties(); if (primaryEntity != null) @@ -97,7 +96,7 @@ public B getNewComplexBean(Class beanClass, { if ((entity != null) && (entity.getType() != null)) { - if (repositoryHelper.isTypeOf(serviceName, entity.getType().getTypeDefName(), OpenMetadataType.CONNECTION_TYPE_NAME)) + if (repositoryHelper.isTypeOf(serviceName, entity.getType().getTypeDefName(), OpenMetadataType.CONNECTION.typeName)) { properties.setConnection(super.getEmbeddedConnection(beanClass, entity, diff --git a/open-metadata-implementation/framework-services/gaf-metadata-management/gaf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/gaf/handlers/GovernanceEngineConfigurationHandler.java b/open-metadata-implementation/framework-services/gaf-metadata-management/gaf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/gaf/handlers/GovernanceEngineConfigurationHandler.java index 0da8e8461da..9353b12bea4 100644 --- a/open-metadata-implementation/framework-services/gaf-metadata-management/gaf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/gaf/handlers/GovernanceEngineConfigurationHandler.java +++ b/open-metadata-implementation/framework-services/gaf-metadata-management/gaf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/gaf/handlers/GovernanceEngineConfigurationHandler.java @@ -642,8 +642,8 @@ public List getGovernanceServiceRegistrations(String userId, List relationships = repositoryHandler.getRelationshipsByType(userId, governanceServiceGUID, OpenMetadataType.GOVERNANCE_SERVICE.typeName, - OpenMetadataType.CONNECTION_TO_ASSET_TYPE_GUID, - OpenMetadataType.CONNECTION_TO_ASSET_TYPE_NAME, + OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeGUID, + OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeName, 1, false, false, diff --git a/open-metadata-implementation/framework-services/gaf-metadata-management/gaf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/gaf/handlers/IntegrationGroupConfigurationHandler.java b/open-metadata-implementation/framework-services/gaf-metadata-management/gaf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/gaf/handlers/IntegrationGroupConfigurationHandler.java index 36af802698f..27daeaa6a5e 100644 --- a/open-metadata-implementation/framework-services/gaf-metadata-management/gaf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/gaf/handlers/IntegrationGroupConfigurationHandler.java +++ b/open-metadata-implementation/framework-services/gaf-metadata-management/gaf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/gaf/handlers/IntegrationGroupConfigurationHandler.java @@ -1129,7 +1129,7 @@ public String addCatalogTarget(String userId, instanceProperties = repositoryHelper.addMapPropertyToInstance(serviceName, instanceProperties, - OpenMetadataType.CONFIGURATION_PROPERTIES_PROPERTY_NAME, + OpenMetadataProperty.CONFIGURATION_PROPERTIES.name, properties.getConfigurationProperties(), methodName); @@ -1247,7 +1247,7 @@ public void updateCatalogTarget(String userId, instanceProperties = repositoryHelper.addMapPropertyToInstance(serviceName, instanceProperties, - OpenMetadataType.CONFIGURATION_PROPERTIES_PROPERTY_NAME, + OpenMetadataProperty.CONFIGURATION_PROPERTIES.name, properties.getConfigurationProperties(), methodName); diff --git a/open-metadata-implementation/framework-services/ocf-metadata-management/ocf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/ocf/metadatamanagement/converters/ConnectorTypeConverter.java b/open-metadata-implementation/framework-services/ocf-metadata-management/ocf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/ocf/metadatamanagement/converters/ConnectorTypeConverter.java index c70288077b0..e047906450d 100644 --- a/open-metadata-implementation/framework-services/ocf-metadata-management/ocf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/ocf/metadatamanagement/converters/ConnectorTypeConverter.java +++ b/open-metadata-implementation/framework-services/ocf-metadata-management/ocf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/ocf/metadatamanagement/converters/ConnectorTypeConverter.java @@ -59,7 +59,7 @@ public B getNewBean(Class beanClass, if (returnBean instanceof ConnectorType connectorType) { - this.setUpElementHeader(connectorType, entity, OpenMetadataType.CONNECTOR_TYPE_TYPE_NAME, methodName); + this.setUpElementHeader(connectorType, entity, OpenMetadataType.CONNECTOR_TYPE.typeName, methodName); /* * The initial set of values come from the entity. diff --git a/open-metadata-implementation/framework-services/ocf-metadata-management/ocf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/ocf/metadatamanagement/converters/InformalTagConverter.java b/open-metadata-implementation/framework-services/ocf-metadata-management/ocf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/ocf/metadatamanagement/converters/InformalTagConverter.java index 13ffff0f8e7..e683ac36de3 100644 --- a/open-metadata-implementation/framework-services/ocf-metadata-management/ocf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/ocf/metadatamanagement/converters/InformalTagConverter.java +++ b/open-metadata-implementation/framework-services/ocf-metadata-management/ocf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/ocf/metadatamanagement/converters/InformalTagConverter.java @@ -60,7 +60,7 @@ public B getNewBean(Class beanClass, if (returnBean instanceof InformalTag bean) { - this.setUpElementHeader(bean, entity, OpenMetadataType.INFORMAL_TAG_TYPE_NAME, methodName); + this.setUpElementHeader(bean, entity, OpenMetadataType.INFORMAL_TAG.typeName, methodName); /* * The initial set of values come from the entity. */ diff --git a/open-metadata-implementation/framework-services/ocf-metadata-management/ocf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/ocf/metadatamanagement/converters/LikeConverter.java b/open-metadata-implementation/framework-services/ocf-metadata-management/ocf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/ocf/metadatamanagement/converters/LikeConverter.java index 5c425b829cc..880470b9e13 100644 --- a/open-metadata-implementation/framework-services/ocf-metadata-management/ocf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/ocf/metadatamanagement/converters/LikeConverter.java +++ b/open-metadata-implementation/framework-services/ocf-metadata-management/ocf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/ocf/metadatamanagement/converters/LikeConverter.java @@ -60,7 +60,7 @@ public B getNewBean(Class beanClass, if (returnBean instanceof Like bean) { - this.setUpElementHeader(bean, entity, OpenMetadataType.LIKE_TYPE_NAME, methodName); + this.setUpElementHeader(bean, entity, OpenMetadataType.LIKE.typeName, methodName); /* * The initial set of values come from the entity. diff --git a/open-metadata-implementation/framework-services/ocf-metadata-management/ocf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/ocf/metadatamanagement/converters/NoteConverter.java b/open-metadata-implementation/framework-services/ocf-metadata-management/ocf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/ocf/metadatamanagement/converters/NoteConverter.java index 6f1739279c2..cef618dd561 100644 --- a/open-metadata-implementation/framework-services/ocf-metadata-management/ocf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/ocf/metadatamanagement/converters/NoteConverter.java +++ b/open-metadata-implementation/framework-services/ocf-metadata-management/ocf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/ocf/metadatamanagement/converters/NoteConverter.java @@ -61,7 +61,7 @@ public B getNewBean(Class beanClass, /* * Check that the entity is of the correct type. */ - this.setUpElementHeader(bean, entity, OpenMetadataType.NOTE_TYPE_NAME, methodName); + this.setUpElementHeader(bean, entity, OpenMetadataType.NOTE_ENTRY.typeName, methodName); /* * The initial set of values come from the entity properties. The super class properties are removed from a copy of the entities diff --git a/open-metadata-implementation/framework-services/ocf-metadata-management/ocf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/ocf/metadatamanagement/converters/NoteLogConverter.java b/open-metadata-implementation/framework-services/ocf-metadata-management/ocf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/ocf/metadatamanagement/converters/NoteLogConverter.java index 9e392befd8f..fa15ece86a9 100644 --- a/open-metadata-implementation/framework-services/ocf-metadata-management/ocf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/ocf/metadatamanagement/converters/NoteLogConverter.java +++ b/open-metadata-implementation/framework-services/ocf-metadata-management/ocf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/ocf/metadatamanagement/converters/NoteLogConverter.java @@ -61,7 +61,7 @@ public B getNewBean(Class beanClass, /* * Check that the entity is of the correct type. */ - this.setUpElementHeader(bean, entity, OpenMetadataType.NOTE_LOG_TYPE_NAME, methodName); + this.setUpElementHeader(bean, entity, OpenMetadataType.NOTE_LOG.typeName, methodName); /* * The initial set of values come from the entity properties. The super class properties are removed from a copy of the entities diff --git a/open-metadata-implementation/framework-services/ocf-metadata-management/ocf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/ocf/metadatamanagement/converters/RatingConverter.java b/open-metadata-implementation/framework-services/ocf-metadata-management/ocf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/ocf/metadatamanagement/converters/RatingConverter.java index 7e782671dcf..525420a1c27 100644 --- a/open-metadata-implementation/framework-services/ocf-metadata-management/ocf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/ocf/metadatamanagement/converters/RatingConverter.java +++ b/open-metadata-implementation/framework-services/ocf-metadata-management/ocf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/ocf/metadatamanagement/converters/RatingConverter.java @@ -7,6 +7,7 @@ import org.odpi.openmetadata.frameworks.connectors.ffdc.PropertyServerException; import org.odpi.openmetadata.frameworks.connectors.properties.beans.Rating; import org.odpi.openmetadata.frameworks.openmetadata.enums.StarRating; +import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataProperty; import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataType; import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.instances.*; import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.repositoryconnector.OMRSRepositoryHelper; @@ -64,7 +65,7 @@ public B getNewBean(Class beanClass, /* * Check that the entity is of the correct type. */ - this.setUpElementHeader(bean, entity, OpenMetadataType.RATING_TYPE_NAME, methodName); + this.setUpElementHeader(bean, entity, OpenMetadataType.RATING.typeName, methodName); /* * The initial set of values come from the entity. @@ -110,7 +111,7 @@ private StarRating removeStarRatingFromProperties(InstanceProperties propertie if (instancePropertiesMap != null) { - instancePropertiesMap.remove(OpenMetadataType.STARS_PROPERTY_NAME); + instancePropertiesMap.remove(OpenMetadataProperty.STARS.name); } properties.setInstanceProperties(instancePropertiesMap); @@ -136,7 +137,7 @@ private StarRating getStarRatingFromProperties(InstanceProperties properties) if (instancePropertiesMap != null) { - InstancePropertyValue instancePropertyValue = instancePropertiesMap.get(OpenMetadataType.STARS_PROPERTY_NAME); + InstancePropertyValue instancePropertyValue = instancePropertiesMap.get(OpenMetadataProperty.STARS.name); if (instancePropertyValue instanceof EnumPropertyValue enumPropertyValue) { diff --git a/open-metadata-implementation/framework-services/ocf-metadata-management/ocf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/ocf/metadatamanagement/server/OCFMetadataRESTServices.java b/open-metadata-implementation/framework-services/ocf-metadata-management/ocf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/ocf/metadatamanagement/server/OCFMetadataRESTServices.java index 7378fee328c..536d6c0d570 100644 --- a/open-metadata-implementation/framework-services/ocf-metadata-management/ocf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/ocf/metadatamanagement/server/OCFMetadataRESTServices.java +++ b/open-metadata-implementation/framework-services/ocf-metadata-management/ocf-metadata-server/src/main/java/org/odpi/openmetadata/frameworkservices/ocf/metadatamanagement/server/OCFMetadataRESTServices.java @@ -123,7 +123,7 @@ public ConnectionResponse getConnectionByGUID(String serverName, response.setConnection(connectionHandler.getBeanFromRepository(userId, guid, guidParameterName, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeName, false, false, instanceHandler.getSupportedZones(userId, @@ -181,8 +181,8 @@ public ConnectionResponse getConnectionByName(String serverName, name, nameParameterName, OpenMetadataProperty.QUALIFIED_NAME.name, - OpenMetadataType.CONNECTION_TYPE_GUID, - OpenMetadataType.CONNECTION_TYPE_NAME, + OpenMetadataType.CONNECTION.typeGUID, + OpenMetadataType.CONNECTION.typeName, false, false, instanceHandler.getSupportedZones(userId, diff --git a/open-metadata-implementation/frameworks/governance-action-framework/src/main/java/org/odpi/openmetadata/frameworks/governanceaction/converters/OpenMetadataConverterBase.java b/open-metadata-implementation/frameworks/governance-action-framework/src/main/java/org/odpi/openmetadata/frameworks/governanceaction/converters/OpenMetadataConverterBase.java index 185f0e54912..460356f8f7c 100644 --- a/open-metadata-implementation/frameworks/governance-action-framework/src/main/java/org/odpi/openmetadata/frameworks/governanceaction/converters/OpenMetadataConverterBase.java +++ b/open-metadata-implementation/frameworks/governance-action-framework/src/main/java/org/odpi/openmetadata/frameworks/governanceaction/converters/OpenMetadataConverterBase.java @@ -1086,7 +1086,7 @@ protected String removeToDoType(ElementProperties elementProperties) if (elementProperties != null) { return propertyHelper.removeStringProperty(serviceName, - OpenMetadataType.TO_DO_TYPE_PROPERTY_NAME, + OpenMetadataProperty.TO_DO_TYPE.name, elementProperties, methodName); } @@ -1282,7 +1282,7 @@ protected String removeInitials(ElementProperties elementProperties) if (elementProperties != null) { return propertyHelper.removeStringProperty(serviceName, - OpenMetadataType.INITIALS_PROPERTY_NAME, + OpenMetadataProperty.INITIALS.name, elementProperties, methodName); } @@ -1304,7 +1304,7 @@ protected String removeGivenNames(ElementProperties elementProperties) if (elementProperties != null) { return propertyHelper.removeStringProperty(serviceName, - OpenMetadataType.GIVEN_NAMES_PROPERTY_NAME, + OpenMetadataProperty.GIVEN_NAMES.name, elementProperties, methodName); } @@ -1326,7 +1326,7 @@ protected String removeSurname(ElementProperties elementProperties) if (elementProperties != null) { return propertyHelper.removeStringProperty(serviceName, - OpenMetadataType.SURNAME_PROPERTY_NAME, + OpenMetadataProperty.SURNAME.name, elementProperties, methodName); } @@ -1349,7 +1349,7 @@ protected String removeFullName(ElementProperties elementProperties) if (elementProperties != null) { return propertyHelper.removeStringProperty(serviceName, - OpenMetadataType.FULL_NAME_PROPERTY_NAME, + OpenMetadataProperty.FULL_NAME.name, elementProperties, methodName); } @@ -1371,7 +1371,7 @@ protected String removePreferredLanguage(ElementProperties elementProperties) if (elementProperties != null) { return propertyHelper.removeStringProperty(serviceName, - OpenMetadataType.PREFERRED_LANGUAGE_PROPERTY_NAME, + OpenMetadataProperty.PREFERRED_LANGUAGE.name, elementProperties, methodName); } @@ -1394,7 +1394,7 @@ protected String removeJobTitle(ElementProperties elementProperties) if (elementProperties != null) { return propertyHelper.removeStringProperty(serviceName, - OpenMetadataType.JOB_TITLE_PROPERTY_NAME, + OpenMetadataProperty.JOB_TITLE.name, elementProperties, methodName); } @@ -1417,7 +1417,7 @@ protected String removeEmployeeNumber(ElementProperties elementProperties) if (elementProperties != null) { return propertyHelper.removeStringProperty(serviceName, - OpenMetadataType.EMPLOYEE_NUMBER_PROPERTY_NAME, + OpenMetadataProperty.EMPLOYEE_NUMBER.name, elementProperties, methodName); } @@ -1440,7 +1440,7 @@ protected String removeEmployeeType(ElementProperties elementProperties) if (elementProperties != null) { return propertyHelper.removeStringProperty(serviceName, - OpenMetadataType.EMPLOYEE_TYPE_PROPERTY_NAME, + OpenMetadataProperty.EMPLOYEE_TYPE.name, elementProperties, methodName); } @@ -1529,7 +1529,7 @@ protected String removeMission(ElementProperties elementProperties) if (elementProperties != null) { return propertyHelper.removeStringProperty(serviceName, - OpenMetadataType.MISSION_PROPERTY_NAME, + OpenMetadataProperty.MISSION.name, elementProperties, methodName); } @@ -1882,7 +1882,7 @@ protected String removeTeamRole(ElementProperties elementProperties) if (elementProperties != null) { return propertyHelper.removeStringProperty(serviceName, - OpenMetadataType.TEAM_ROLE_PROPERTY_NAME, + OpenMetadataProperty.TEAM_ROLE.name, elementProperties, methodName); } @@ -2149,7 +2149,7 @@ protected String removeConnectorProviderClassName(ElementProperties elementProp if (elementProperties != null) { return propertyHelper.removeStringProperty(serviceName, - OpenMetadataType.CONNECTOR_PROVIDER_PROPERTY_NAME, + OpenMetadataProperty.CONNECTOR_PROVIDER_CLASS_NAME.name, elementProperties, methodName); } @@ -2377,7 +2377,7 @@ protected List removeRecognizedAdditionalProperties(ElementProperties e if (elementProperties != null) { return propertyHelper.removeStringArrayProperty(serviceName, - OpenMetadataType.RECOGNIZED_ADD_PROPS_PROPERTY_NAME, + OpenMetadataProperty.RECOGNIZED_ADDITIONAL_PROPERTIES.name, elementProperties, methodName); } @@ -2399,7 +2399,7 @@ protected List removeRecognizedSecuredProperties(ElementProperties elem if (elementProperties != null) { return propertyHelper.removeStringArrayProperty(serviceName, - OpenMetadataType.RECOGNIZED_SEC_PROPS_PROPERTY_NAME, + OpenMetadataProperty.RECOGNIZED_SECURED_PROPERTIES.name, elementProperties, methodName); } @@ -2422,7 +2422,7 @@ protected List removeRecognizedConfigurationProperties(ElementProperties if (elementProperties != null) { return propertyHelper.removeStringArrayProperty(serviceName, - OpenMetadataType.RECOGNIZED_CONFIG_PROPS_PROPERTY_NAME, + OpenMetadataProperty.RECOGNIZED_CONFIGURATION_PROPERTIES.name, elementProperties, methodName); } @@ -2444,7 +2444,7 @@ protected Map removeSecuredProperties(ElementProperties element if (elementProperties != null) { return propertyHelper.removeStringMapFromProperty(serviceName, - OpenMetadataType.SECURED_PROPERTIES_PROPERTY_NAME, + OpenMetadataProperty.SECURED_PROPERTIES.name, elementProperties, methodName); } @@ -2466,7 +2466,7 @@ protected Map removeConfigurationProperties(ElementProperties e if (elementProperties != null) { return propertyHelper.removeMapFromProperty(serviceName, - OpenMetadataType.CONFIGURATION_PROPERTIES_PROPERTY_NAME, + OpenMetadataProperty.CONFIGURATION_PROPERTIES.name, elementProperties, methodName); } @@ -2554,7 +2554,7 @@ protected String removeClearPassword(ElementProperties elementProperties) if (elementProperties != null) { return propertyHelper.removeStringProperty(serviceName, - OpenMetadataType.CLEAR_PASSWORD_PROPERTY_NAME, + OpenMetadataProperty.CLEAR_PASSWORD.name, elementProperties, methodName); } @@ -2576,7 +2576,7 @@ protected String removeEncryptedPassword(ElementProperties elementProperties) if (elementProperties != null) { return propertyHelper.removeStringProperty(serviceName, - OpenMetadataType.ENCRYPTED_PASSWORD_PROPERTY_NAME, + OpenMetadataProperty.ENCRYPTED_PASSWORD.name, elementProperties, methodName); } @@ -2598,7 +2598,7 @@ protected String getAssetSummary(ElementProperties elementProperties) if (elementProperties != null) { return propertyHelper.getStringProperty(serviceName, - OpenMetadataType.ASSET_SUMMARY_PROPERTY_NAME, + OpenMetadataProperty.ASSET_SUMMARY.name, elementProperties, methodName); } @@ -2620,7 +2620,7 @@ protected Map getArguments(ElementProperties elementProperties) if (elementProperties != null) { return propertyHelper.getMapFromProperty(serviceName, - OpenMetadataType.ARGUMENTS_PROPERTY_NAME, + OpenMetadataProperty.ARGUMENTS.name, elementProperties, methodName); } @@ -2931,7 +2931,7 @@ protected int removeKarmaPoints(ElementProperties elementProperties) if (elementProperties != null) { return propertyHelper.removeIntProperty(serviceName, - OpenMetadataType.KARMA_POINTS_PROPERTY_NAME, + OpenMetadataProperty.KARMA_POINTS.name, elementProperties, methodName); } @@ -3835,7 +3835,7 @@ protected int removePosition(ElementProperties elementProperties) if (elementProperties != null) { return propertyHelper.removeIntProperty(serviceName, - OpenMetadataType.POSITION_PROPERTY_NAME, + OpenMetadataProperty.POSITION.name, elementProperties, methodName); } @@ -3857,7 +3857,7 @@ protected int getPosition(ElementProperties elementProperties) if (elementProperties != null) { return propertyHelper.getIntProperty(serviceName, - OpenMetadataType.POSITION_PROPERTY_NAME, + OpenMetadataProperty.POSITION.name, elementProperties, methodName); } @@ -4556,7 +4556,7 @@ protected String removeTitle(ElementProperties elementProperties) if (elementProperties != null) { return propertyHelper.removeStringProperty(serviceName, - OpenMetadataType.TITLE_PROPERTY_NAME, + OpenMetadataProperty.TITLE.name, elementProperties, methodName); } @@ -4579,7 +4579,7 @@ protected String removePronouns(ElementProperties elementProperties) if (elementProperties != null) { return propertyHelper.removeStringProperty(serviceName, - OpenMetadataType.PRONOUNS_PROPERTY_NAME, + OpenMetadataProperty.PRONOUNS.name, elementProperties, methodName); } @@ -4601,7 +4601,7 @@ protected String removeText(ElementProperties elementProperties) if (elementProperties != null) { return propertyHelper.removeStringProperty(serviceName, - OpenMetadataType.TEXT_PROPERTY_NAME, + OpenMetadataProperty.TEXT.name, elementProperties, methodName); } @@ -4616,14 +4616,14 @@ protected String removeText(ElementProperties elementProperties) * @param elementProperties properties from governance entities * @return string property or null */ - protected String removePriority(ElementProperties elementProperties) + protected String removeImportance(ElementProperties elementProperties) { - final String methodName = "removePriority"; + final String methodName = "removeImportance"; if (elementProperties != null) { return propertyHelper.removeStringProperty(serviceName, - OpenMetadataType.IMPORTANCE_PROPERTY_NAME, + OpenMetadataProperty.IMPORTANCE.name, elementProperties, methodName); } @@ -4645,7 +4645,7 @@ protected int removeIntPriority(ElementProperties elementProperties) if (elementProperties != null) { return propertyHelper.removeIntProperty(serviceName, - OpenMetadataType.PRIORITY_PROPERTY_NAME, + OpenMetadataProperty.PRIORITY.name, elementProperties, methodName); } @@ -4667,7 +4667,7 @@ protected int removeHeadCount(ElementProperties elementProperties) if (elementProperties != null) { return propertyHelper.removeIntProperty(serviceName, - OpenMetadataType.HEAD_COUNT_PROPERTY_NAME, + OpenMetadataProperty.HEAD_COUNT.name, elementProperties, methodName); } @@ -4689,7 +4689,7 @@ protected String removeScope(ElementProperties elementProperties) if (elementProperties != null) { return propertyHelper.removeStringProperty(serviceName, - OpenMetadataType.SCOPE_PROPERTY_NAME, + OpenMetadataProperty.SCOPE.name, elementProperties, methodName); } @@ -5622,7 +5622,7 @@ protected Date removeCreationTime(ElementProperties elementProperties) if (elementProperties != null) { return propertyHelper.removeDateProperty(serviceName, - OpenMetadataType.CREATION_TIME_PROPERTY_NAME, + OpenMetadataProperty.CREATION_TIME.name, elementProperties, methodName); } @@ -5668,7 +5668,7 @@ protected Date removeDueTime(ElementProperties elementProperties) if (elementProperties != null) { return propertyHelper.removeDateProperty(serviceName, - OpenMetadataType.DUE_TIME_PROPERTY_NAME, + OpenMetadataProperty.DUE_TIME.name, elementProperties, methodName); } @@ -5691,7 +5691,7 @@ protected Date removeCompletionTime(ElementProperties elementProperties) if (elementProperties != null) { return propertyHelper.removeDateProperty(serviceName, - OpenMetadataType.COMPLETION_TIME_PROPERTY_NAME, + OpenMetadataProperty.COMPLETION_TIME.name, elementProperties, methodName); } @@ -5714,7 +5714,7 @@ protected Date removeCompletionDate(ElementProperties elementProperties) if (elementProperties != null) { return propertyHelper.removeDateProperty(serviceName, - OpenMetadataType.COMPLETION_DATE_PROPERTY_NAME, + OpenMetadataProperty.COMPLETION_DATE.name, elementProperties, methodName); } @@ -6454,7 +6454,7 @@ protected String removeCommentText(ElementProperties elementProperties) if (elementProperties != null) { return propertyHelper.removeStringProperty(serviceName, - OpenMetadataType.COMMENT_TEXT_PROPERTY_NAME, + OpenMetadataProperty.TEXT.name, elementProperties, methodName); } @@ -6520,7 +6520,7 @@ protected String removeReview(ElementProperties elementProperties) if (elementProperties != null) { return propertyHelper.removeStringProperty(serviceName, - OpenMetadataType.REVIEW_PROPERTY_NAME, + OpenMetadataProperty.REVIEW.name, elementProperties, methodName); } @@ -6542,7 +6542,7 @@ protected String removeTagName(ElementProperties elementProperties) if (elementProperties != null) { return propertyHelper.removeStringProperty(serviceName, - OpenMetadataType.TAG_NAME_PROPERTY_NAME, + OpenMetadataProperty.TAG_NAME.name, elementProperties, methodName); } @@ -6564,7 +6564,7 @@ protected String removeTagDescription(ElementProperties elementProperties) if (elementProperties != null) { return propertyHelper.removeStringProperty(serviceName, - OpenMetadataType.TAG_DESCRIPTION_PROPERTY_NAME, + OpenMetadataProperty.TAG_DESCRIPTION.name, elementProperties, methodName); } diff --git a/open-metadata-implementation/frameworks/governance-action-framework/src/main/java/org/odpi/openmetadata/frameworks/governanceaction/converters/ToDoConverter.java b/open-metadata-implementation/frameworks/governance-action-framework/src/main/java/org/odpi/openmetadata/frameworks/governanceaction/converters/ToDoConverter.java index 37ec880d14e..abdf6cc3b89 100644 --- a/open-metadata-implementation/frameworks/governance-action-framework/src/main/java/org/odpi/openmetadata/frameworks/governanceaction/converters/ToDoConverter.java +++ b/open-metadata-implementation/frameworks/governance-action-framework/src/main/java/org/odpi/openmetadata/frameworks/governanceaction/converters/ToDoConverter.java @@ -113,15 +113,15 @@ public B getNewComplexBean(Class beanClass, { if (relatedMetadataElement != null) { - if (propertyHelper.isTypeOf(relatedMetadataElement, OpenMetadataType.TO_DO_SOURCE_RELATIONSHIP_TYPE_NAME)) + if (propertyHelper.isTypeOf(relatedMetadataElement, OpenMetadataType.TO_DO_SOURCE_RELATIONSHIP.typeName)) { bean.setToDoSource(super.getElementStub(beanClass, relatedMetadataElement.getElement(), methodName)); } - else if (propertyHelper.isTypeOf(relatedMetadataElement, OpenMetadataType.ACTION_ASSIGNMENT_RELATIONSHIP_TYPE_NAME)) + else if (propertyHelper.isTypeOf(relatedMetadataElement, OpenMetadataType.ACTION_ASSIGNMENT_RELATIONSHIP.typeName)) { assignedActors.add(super.getElementStub(beanClass, relatedMetadataElement.getElement(), methodName)); } - else if (propertyHelper.isTypeOf(relatedMetadataElement, OpenMetadataType.ACTION_SPONSOR_RELATIONSHIP_TYPE_NAME)) + else if (propertyHelper.isTypeOf(relatedMetadataElement, OpenMetadataType.ACTION_SPONSOR_RELATIONSHIP.typeName)) { sponsors.add(super.getElementStub(beanClass, relatedMetadataElement.getElement(), methodName)); } diff --git a/open-metadata-implementation/frameworks/open-connector-framework/src/main/java/org/odpi/openmetadata/frameworks/connectors/controls/SecretsStoreCollectionProperty.java b/open-metadata-implementation/frameworks/open-connector-framework/src/main/java/org/odpi/openmetadata/frameworks/connectors/controls/SecretsStoreCollectionProperty.java index e72addabb9f..755fce0f160 100644 --- a/open-metadata-implementation/frameworks/open-connector-framework/src/main/java/org/odpi/openmetadata/frameworks/connectors/controls/SecretsStoreCollectionProperty.java +++ b/open-metadata-implementation/frameworks/open-connector-framework/src/main/java/org/odpi/openmetadata/frameworks/connectors/controls/SecretsStoreCollectionProperty.java @@ -3,7 +3,7 @@ package org.odpi.openmetadata.frameworks.connectors.controls; -import org.odpi.openmetadata.frameworks.openmetadata.enums.DataType; +import org.odpi.openmetadata.frameworks.openmetadata.types.DataType; /** * SecretsStoreConfigurationProperty provides definitions for typical properties used with the secrets store collections. diff --git a/open-metadata-implementation/frameworks/open-connector-framework/src/main/java/org/odpi/openmetadata/frameworks/connectors/controls/SecretsStoreConfigurationProperty.java b/open-metadata-implementation/frameworks/open-connector-framework/src/main/java/org/odpi/openmetadata/frameworks/connectors/controls/SecretsStoreConfigurationProperty.java index 460b8d71fdb..52ca854cd61 100644 --- a/open-metadata-implementation/frameworks/open-connector-framework/src/main/java/org/odpi/openmetadata/frameworks/connectors/controls/SecretsStoreConfigurationProperty.java +++ b/open-metadata-implementation/frameworks/open-connector-framework/src/main/java/org/odpi/openmetadata/frameworks/connectors/controls/SecretsStoreConfigurationProperty.java @@ -3,7 +3,7 @@ package org.odpi.openmetadata.frameworks.connectors.controls; -import org.odpi.openmetadata.frameworks.openmetadata.enums.DataType; +import org.odpi.openmetadata.frameworks.openmetadata.types.DataType; import java.util.ArrayList; import java.util.List; diff --git a/open-metadata-implementation/frameworks/open-connector-framework/src/main/java/org/odpi/openmetadata/frameworks/connectors/controls/SecretsStorePurpose.java b/open-metadata-implementation/frameworks/open-connector-framework/src/main/java/org/odpi/openmetadata/frameworks/connectors/controls/SecretsStorePurpose.java index 72ae7ce441f..8a62f1fd406 100644 --- a/open-metadata-implementation/frameworks/open-connector-framework/src/main/java/org/odpi/openmetadata/frameworks/connectors/controls/SecretsStorePurpose.java +++ b/open-metadata-implementation/frameworks/open-connector-framework/src/main/java/org/odpi/openmetadata/frameworks/connectors/controls/SecretsStorePurpose.java @@ -3,8 +3,6 @@ package org.odpi.openmetadata.frameworks.connectors.controls; -import org.odpi.openmetadata.frameworks.openmetadata.enums.DataType; - /** * SecretsStorePurpose defines the purpose of a secrets connector. These values are set into the "displayName" * property of the EmbeddedConnection entity (model 0205). diff --git a/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/enums/CommunityMembershipType.java b/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/enums/CommunityMembershipType.java index 7a9396366f0..a6f94a0904c 100644 --- a/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/enums/CommunityMembershipType.java +++ b/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/enums/CommunityMembershipType.java @@ -5,9 +5,13 @@ import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; +import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataProperty; +import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataWikiPages; import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.NONE; import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.PUBLIC_ONLY; +import static org.odpi.openmetadata.frameworks.openmetadata.mapper.OpenMetadataValidValues.constructValidValueCategory; +import static org.odpi.openmetadata.frameworks.openmetadata.mapper.OpenMetadataValidValues.constructValidValueQualifiedName; /** * CommunityMembershipType specifies the role of a member in the community. @@ -22,39 +26,58 @@ @JsonAutoDetect(getterVisibility=PUBLIC_ONLY, setterVisibility=PUBLIC_ONLY, fieldVisibility=NONE) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown=true) -public enum CommunityMembershipType +public enum CommunityMembershipType implements OpenMetadataEnum { - CONTRIBUTOR (0, "Contributor", "Individual is able to be a contributing member of the community."), - ADMINISTRATOR (1, "Administrator", "Individual is able to administer the community."), - LEADER (2, "Leader", "Individual sets the direction of the community."), - OBSERVER (3, "Observer", "Individual is receiving notifications about the community."), - OTHER (99, "Other", "Another meaning."); + CONTRIBUTOR (0, "959cae9b-218f-4254-8a79-721d568372bd", "Contributor", "Individual is able to be a contributing member of the community.", true), + ADMINISTRATOR (1, "35201771-3ca2-4b7a-9dd1-77aa0224abe8", "Administrator", "Individual is able to administer the community.", false), + LEADER (2, "d4f5dfdc-39d6-47c1-8dfb-077b5f7244d7", "Leader", "Individual sets the direction of the community.", false), + OBSERVER (3, "c1bd838c-f5be-4464-aee9-bcf0ff07ec32", "Observer", "Individual is receiving notifications about the community.", false), + OTHER (99, "1c9fd81c-d22a-4aca-b2f3-469088ff7887", "Other", "Another meaning.", false); + private static final String ENUM_TYPE_GUID = "b0ef45bf-d12b-4b6f-add6-59c14648d750"; + private static final String ENUM_TYPE_NAME = "CommunityMembershipType"; + + private static final String ENUM_DESCRIPTION = "Type of membership to a community."; + private static final String ENUM_DESCRIPTION_GUID = "69eeac39-f405-4196-97af-d25910fb93b6"; + private static final String ENUM_DESCRIPTION_WIKI = OpenMetadataWikiPages.MODEL_0140_COMMUNITIES; + + private final String descriptionGUID; private final int ordinal; private final String name; private final String description; + private final boolean isDefault; /** * Default constructor for the enumeration. * * @param ordinal numerical representation of the enumeration + * @param descriptionGUID identifier for valid value * @param name default string name of the enumeration * @param description default string description of the enumeration + * @param isDefault is this the default value for the enum? */ - CommunityMembershipType(int ordinal, String name, String description) + CommunityMembershipType(int ordinal, + String descriptionGUID, + String name, + String description, + boolean isDefault) { this.ordinal = ordinal; - this.name = name; - this.description = description; + this.name = name; + this.descriptionGUID = descriptionGUID; + this.description = description; + this.isDefault = isDefault; } + /** * Return the numeric representation of the enumeration. * * @return int ordinal */ + @Override public int getOrdinal() { return ordinal; } @@ -62,7 +85,7 @@ public enum CommunityMembershipType * Return the default name of the enumeration. * * @return String name - */ + */@Override public String getName() { return name; } @@ -71,9 +94,112 @@ public enum CommunityMembershipType * * @return String description */ + @Override public String getDescription() { return description; } + /** + * Return the unique identifier for the valid value that represents the enum value. + * + * @return guid + */ + @Override + public String getDescriptionGUID() + { + return descriptionGUID; + } + + + /** + * Return whether the enum is the default value or not. + * + * @return boolean + */ + @Override + public boolean isDefault() + { + return isDefault; + } + + + + + /** + * Return the unique identifier for the open metadata enum type that this enum class represents. + * + * @return string guid + */ + public static String getOpenTypeGUID() { return ENUM_TYPE_GUID; } + + + /** + * Return the unique name for the open metadata enum type that this enum class represents. + * + * @return string name + */ + public static String getOpenTypeName() { return ENUM_TYPE_NAME; } + + + /** + * Return the description for the open metadata enum type that this enum class represents. + * + * @return string description + */ + public static String getOpenTypeDescription() + { + return ENUM_DESCRIPTION; + } + + + /** + * Return the unique identifier for the valid value element for the open metadata enum type that this enum class represents. + * + * @return string guid + */ + public static String getOpenTypeDescriptionGUID() + { + return ENUM_DESCRIPTION_GUID; + } + + + /** + * Return the unique identifier for the valid value element for the open metadata enum type that this enum class represents. + * + * @return string guid + */ + public static String getOpenTypeDescriptionWiki() + { + return ENUM_DESCRIPTION_WIKI; + } + + + /** + * Return the qualified name for this value. + * + * @return string + */ + public String getQualifiedName() + { + return constructValidValueQualifiedName(ENUM_TYPE_NAME, + OpenMetadataProperty.SORT_ORDER.name, + null, + name); + } + + + /** + * Return the category for this value. + * + * @return string + */ + public String getCategory() + { + return constructValidValueCategory(ENUM_TYPE_NAME, + OpenMetadataProperty.SORT_ORDER.name, + null); + } + + /** * toString() JSON-style * diff --git a/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/enums/CrowdSourcingRole.java b/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/enums/CrowdSourcingRole.java new file mode 100644 index 00000000000..57b166ecee4 --- /dev/null +++ b/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/enums/CrowdSourcingRole.java @@ -0,0 +1,214 @@ +/* SPDX-License-Identifier: Apache-2.0 */ +/* Copyright Contributors to the ODPi Egeria project. */ +package org.odpi.openmetadata.frameworks.openmetadata.enums; + +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataProperty; +import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataWikiPages; + +import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.NONE; +import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.PUBLIC_ONLY; +import static org.odpi.openmetadata.frameworks.openmetadata.mapper.OpenMetadataValidValues.constructValidValueCategory; +import static org.odpi.openmetadata.frameworks.openmetadata.mapper.OpenMetadataValidValues.constructValidValueQualifiedName; + +/** + * CrowdSourcingRole specifies the role an actor plays in crowd-sourcing the contents of an element such as a + * glossary term. + *
    + *
  • PROPOSER - Actor that creates the initial version. This is the default.
    • + *
  • REVIEWER - Actor that provided feedback.
    • + *
  • SUPPORTER - Actor that agrees with the definition.
    • + *
  • APPROVER - Actor that declares the definition should be used.
    • + *
  • OTHER - Another role.
    • + *
+ */ +@JsonAutoDetect(getterVisibility=PUBLIC_ONLY, setterVisibility=PUBLIC_ONLY, fieldVisibility=NONE) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown=true) +public enum CrowdSourcingRole implements OpenMetadataEnum +{ + PROPOSER (0, "525078a5-fe45-4bd6-9ac1-9318d3548e6e", "Proposer", "Actor that creates the initial version.", true), + REVIEWER (1, "6be5948c-c743-41da-bbaf-a0518af3d54a", "Reviewer", "Actor that provided feedback.", false), + SUPPORTER (2, "cdeeb25b-a05e-4d03-afec-34d3e31c9a53", "Supporter","Actor that agrees with the definition.", false), + APPROVER (3, "a7915f4e-890b-40da-aece-2b36ba3d9099", "Approver", "Actor that declares the definition should be used.", false), + OTHER (99, "a6657027-1008-4e58-b5c7-14e89a6a5cd0", "Other", "Another role.", false); + + private static final String ENUM_TYPE_GUID = "0ded50c2-17cc-4ecf-915e-908e66dbb27f"; + private static final String ENUM_TYPE_NAME = "CrowdSourcingRole"; + + private static final String ENUM_DESCRIPTION = "Type of contributor to new information and/or assets."; + private static final String ENUM_DESCRIPTION_GUID = "e15acff5-137b-4703-8b6b-6e984f68cddd"; + private static final String ENUM_DESCRIPTION_WIKI = OpenMetadataWikiPages.MODEL_0155_CROWD_SOURCING; + + private final String descriptionGUID; + private final int ordinal; + private final String name; + private final String description; + private final boolean isDefault; + + + /** + * Default constructor for the enumeration. + * + * @param ordinal numerical representation of the enumeration + * @param descriptionGUID identifier for valid value + * @param name default string name of the enumeration + * @param description default string description of the enumeration + * @param isDefault is this the default value for the enum? + */ + CrowdSourcingRole(int ordinal, + String descriptionGUID, + String name, + String description, + boolean isDefault) + { + this.ordinal = ordinal; + this.name = name; + this.descriptionGUID = descriptionGUID; + this.description = description; + this.isDefault = isDefault; + } + + + + /** + * Return the numeric representation of the enumeration. + * + * @return int ordinal + */ + @Override + public int getOrdinal() { return ordinal; } + + + /** + * Return the default name of the enumeration. + * + * @return String name + */@Override + public String getName() { return name; } + + + /** + * Return the default description of the enumeration. + * + * @return String description + */ + @Override + public String getDescription() { return description; } + + + /** + * Return the unique identifier for the valid value that represents the enum value. + * + * @return guid + */ + @Override + public String getDescriptionGUID() + { + return descriptionGUID; + } + + + /** + * Return whether the enum is the default value or not. + * + * @return boolean + */ + @Override + public boolean isDefault() + { + return isDefault; + } + + + + + /** + * Return the unique identifier for the open metadata enum type that this enum class represents. + * + * @return string guid + */ + public static String getOpenTypeGUID() { return ENUM_TYPE_GUID; } + + + /** + * Return the unique name for the open metadata enum type that this enum class represents. + * + * @return string name + */ + public static String getOpenTypeName() { return ENUM_TYPE_NAME; } + + + /** + * Return the description for the open metadata enum type that this enum class represents. + * + * @return string description + */ + public static String getOpenTypeDescription() + { + return ENUM_DESCRIPTION; + } + + + /** + * Return the unique identifier for the valid value element for the open metadata enum type that this enum class represents. + * + * @return string guid + */ + public static String getOpenTypeDescriptionGUID() + { + return ENUM_DESCRIPTION_GUID; + } + + + /** + * Return the unique identifier for the valid value element for the open metadata enum type that this enum class represents. + * + * @return string guid + */ + public static String getOpenTypeDescriptionWiki() + { + return ENUM_DESCRIPTION_WIKI; + } + + + /** + * Return the qualified name for this value. + * + * @return string + */ + public String getQualifiedName() + { + return constructValidValueQualifiedName(ENUM_TYPE_NAME, + OpenMetadataProperty.ROLE_TYPE.name, + null, + name); + } + + + /** + * Return the category for this value. + * + * @return string + */ + public String getCategory() + { + return constructValidValueCategory(ENUM_TYPE_NAME, + OpenMetadataProperty.SORT_ORDER.name, + null); + } + + + /** + * toString() JSON-style + * + * @return string description + */ + @Override + public String toString() + { + return "CommunityMembershipType : " + name; + } +} diff --git a/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/enums/DataItemSortOrder.java b/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/enums/DataItemSortOrder.java index 51c7133d9ab..476f3204ac1 100644 --- a/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/enums/DataItemSortOrder.java +++ b/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/enums/DataItemSortOrder.java @@ -48,8 +48,7 @@ public enum DataItemSortOrder implements OpenMetadataEnum private static final String ENUM_DESCRIPTION_GUID = "3ad77990-beda-4877-b5ae-5368c372cab6"; private static final String ENUM_DESCRIPTION_WIKI = OpenMetadataWikiPages.MODEL_0505_SCHEMA_ATTRIBUTES; - private final String descriptionGUID; - + private final String descriptionGUID; private final int ordinal; private final String name; private final String description; @@ -125,6 +124,7 @@ public boolean isDefault() return isDefault; } + /** * Return the unique identifier for the open metadata enum type that this enum class represents. * diff --git a/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/enums/GovernanceDomain.java b/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/enums/GovernanceDomain.java index d107212516a..8ce59984bc9 100644 --- a/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/enums/GovernanceDomain.java +++ b/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/enums/GovernanceDomain.java @@ -6,9 +6,13 @@ import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; +import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataProperty; +import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataWikiPages; import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.NONE; import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.PUBLIC_ONLY; +import static org.odpi.openmetadata.frameworks.openmetadata.mapper.OpenMetadataValidValues.constructValidValueCategory; +import static org.odpi.openmetadata.frameworks.openmetadata.mapper.OpenMetadataValidValues.constructValidValueQualifiedName; /** * GovernanceDomain defines the different governance domains that open metadata seeks to unite. @@ -30,75 +34,93 @@ @JsonAutoDetect(getterVisibility=PUBLIC_ONLY, setterVisibility=PUBLIC_ONLY, fieldVisibility=NONE) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown=true) -public enum GovernanceDomain //implements OpenMetadataEnum +public enum GovernanceDomain implements OpenMetadataEnum { /** * The governance domain is not specified. */ - UNCLASSIFIED (0, "Unclassified", "The governance domain is not specified."), + UNCLASSIFIED (0,"8aace3ca-1db4-4927-ad45-9766770a92c4", "Unclassified", "The governance domain is not specified.", true), /** * The data (information) governance domain. */ - DATA (1, "Data", "The data (information) governance domain."), + DATA (1, "9c465654-ad9d-4c84-bbcb-b65eaf6b9c27", "Data", "The data (information) governance domain.", false), /** * The data privacy governance domain. */ - PRIVACY (2, "Privacy", "The data privacy governance domain."), + PRIVACY (2, "dc502370-2bcf-470c-b8d3-d523f7b4bbc1", "Privacy", "The data privacy governance domain.", false), /** * The security governance domain. */ - SECURITY (3, "Security", "The security governance domain."), + SECURITY (3, "27c1fa77-9ee7-4611-8bb5-b1aa7f0a03bd", "Security", "The security governance domain.", false), /** * The IT infrastructure management governance domain. */ - IT_INFRASTRUCTURE (4, "IT Infrastructure", "The IT infrastructure management governance domain."), + IT_INFRASTRUCTURE (4, "032ccb98-88af-4b60-87c2-46c95cc3ab71", "IT Infrastructure", "The IT infrastructure management governance domain.", false), /** * The software development lifecycle (SDLC) governance domain. */ - SOFTWARE_DEVELOPMENT (5, "Software Development", "The software development lifecycle (SDLC) governance domain."), + SOFTWARE_DEVELOPMENT (5, "463fec3c-95c7-47ba-bb50-c89ea52023cc", "Software Development", "The software development lifecycle (SDLC) governance domain.", false), /** * The corporate governance domain. */ - CORPORATE (6, "Corporate", "The corporate governance domain."), + CORPORATE (6, "7d5a47a6-008c-409d-bcc9-de55d39ea778", "Corporate", "The corporate governance domain.", false), /** * The physical asset management governance domain. */ - ASSET_MANAGEMENT (7, "Asset Management", "The physical asset management governance domain."), + ASSET_MANAGEMENT (7, "831e21d5-8e7c-448d-aa38-f977437f2a9e", "Asset Management", "The physical asset management governance domain.", false), /** * The governance domain is locally defined. */ - OTHER (99, "Other", "The governance domain is locally defined."); + OTHER (99, "c34e17d6-b924-4a7d-a5fd-13425a1de422", "Other", "The governance domain is locally defined.", false); + private static final String ENUM_TYPE_GUID = "baa31998-f3cb-47b0-9123-674a701e87bc"; + private static final String ENUM_TYPE_NAME = "GovernanceDomain"; + + private static final String ENUM_DESCRIPTION = "Defines the governance domains that open metadata seeks to unite."; + private static final String ENUM_DESCRIPTION_GUID = "e07492d8-b4d9-4a52-900c-2641ffa36d64"; + private static final String ENUM_DESCRIPTION_WIKI = OpenMetadataWikiPages.MODEL_0401_GOVERNANCE_DEFINITIONS; + + private final String descriptionGUID; private final int ordinal; private final String name; private final String description; + private final boolean isDefault; /** * Default constructor for the enumeration. * * @param ordinal numerical representation of the enumeration - * @param name default string name of the instance provenance type - * @param description default string description of the instance provenance type + * @param descriptionGUID identifier for valid value + * @param name default string name of the enumeration + * @param description default string description of the enumeration + * @param isDefault is this the default value for the enum? */ - GovernanceDomain(int ordinal, String name, String description) + GovernanceDomain(int ordinal, + String descriptionGUID, + String name, + String description, + boolean isDefault) { this.ordinal = ordinal; - this.name = name; - this.description = description; + this.name = name; + this.descriptionGUID = descriptionGUID; + this.description = description; + this.isDefault = isDefault; } + /** - * Return the numeric representation of the instance provenance type. + * Return the numeric representation of the enumeration. * * @return int ordinal */ @@ -106,7 +128,7 @@ public enum GovernanceDomain //implements OpenMetadataEnum /** - * Return the default name of the instance provenance type. + * Return the default name of the enumeration. * * @return String name */ @@ -114,13 +136,111 @@ public enum GovernanceDomain //implements OpenMetadataEnum /** - * Return the default description of the instance provenance type. + * Return the default description of the enumeration. * * @return String description */ public String getDescription() { return description; } + /** + * Return the unique identifier for the valid value that represents the enum value. + * + * @return guid + */ + public String getDescriptionGUID() + { + return descriptionGUID; + } + + + /** + * Return whether the enum is the default value or not. + * + * @return boolean + */ + public boolean isDefault() + { + return isDefault; + } + + + /** + * Return the unique identifier for the open metadata enum type that this enum class represents. + * + * @return string guid + */ + public static String getOpenTypeGUID() { return ENUM_TYPE_GUID; } + + + /** + * Return the unique name for the open metadata enum type that this enum class represents. + * + * @return string name + */ + public static String getOpenTypeName() { return ENUM_TYPE_NAME; } + + + /** + * Return the description for the open metadata enum type that this enum class represents. + * + * @return string description + */ + public static String getOpenTypeDescription() + { + return ENUM_DESCRIPTION; + } + + + /** + * Return the unique identifier for the valid value element for the open metadata enum type that this enum class represents. + * + * @return string guid + */ + public static String getOpenTypeDescriptionGUID() + { + return ENUM_DESCRIPTION_GUID; + } + + + /** + * Return the unique identifier for the valid value element for the open metadata enum type that this enum class represents. + * + * @return string guid + */ + public static String getOpenTypeDescriptionWiki() + { + return ENUM_DESCRIPTION_WIKI; + } + + + /** + * Return the qualified name for this value. + * + * @return string + */ + public String getQualifiedName() + { + return constructValidValueQualifiedName(ENUM_TYPE_NAME, + OpenMetadataProperty.SORT_ORDER.name, + null, + name); + } + + + /** + * Return the category for this value. + * + * @return string + */ + public String getCategory() + { + return constructValidValueCategory(ENUM_TYPE_NAME, + OpenMetadataProperty.SORT_ORDER.name, + null); + } + + /** * toString() JSON-style * diff --git a/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/enums/OperationalStatus.java b/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/enums/OperationalStatus.java index a8a12644c46..1b7ddaa6a0d 100644 --- a/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/enums/OperationalStatus.java +++ b/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/enums/OperationalStatus.java @@ -5,9 +5,13 @@ import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; +import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataProperty; +import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataWikiPages; import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.NONE; import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.PUBLIC_ONLY; +import static org.odpi.openmetadata.frameworks.openmetadata.mapper.OpenMetadataValidValues.constructValidValueCategory; +import static org.odpi.openmetadata.frameworks.openmetadata.mapper.OpenMetadataValidValues.constructValidValueQualifiedName; /** * OperationalStatus defines whether a component is usable. @@ -15,48 +19,54 @@ @JsonAutoDetect(getterVisibility=PUBLIC_ONLY, setterVisibility=PUBLIC_ONLY, fieldVisibility=NONE) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown=true) -public enum OperationalStatus// implements OpenMetadataEnum +public enum OperationalStatus implements OpenMetadataEnum { /** * Disabled - The component is deployed but not operational. */ - DISABLED (0, 0, "Disabled", "The component is deployed but not operational."), + DISABLED (0, "5c4e3e26-ea46-4f59-bedd-65393db3eac2", "Disabled", "The component is deployed but not operational.", true), /** * Enabled - The component is operational. */ - ENABLED (1, 1, "Enabled", "The component is operational."); + ENABLED (1, "36e3644a-9d36-437b-b71c-04d4304d3e4a", "Enabled", "The component is operational.", false); private static final String ENUM_TYPE_GUID = "24e1e33e-9250-4a6c-8b07-05c7adec3a1d"; private static final String ENUM_TYPE_NAME = "OperationalStatus"; - - private final int openTypeOrdinal; - - private final int ordinal; - private final String name; - private final String description; + private static final String ENUM_DESCRIPTION = "Defines whether a component is operational."; + private static final String ENUM_DESCRIPTION_GUID = "92aca118-02c0-4df3-a4e2-95391a3566fd"; + private static final String ENUM_DESCRIPTION_WIKI = OpenMetadataWikiPages.MODEL_0037_SOFTWARE_SERVER_PLATFORMS; + private final String descriptionGUID; + private final int ordinal; + private final String name; + private final String description; + private final boolean isDefault; /** - * Constructor to set up the instance of this enum. + * Default constructor for the enumeration. * - * @param ordinal code number - * @param openTypeOrdinal code number from the equivalent Enum Type - * @param name default name - * @param description default description - */ - OperationalStatus(int ordinal, - int openTypeOrdinal, - String name, - String description) + * @param ordinal numerical representation of the enumeration + * @param descriptionGUID identifier for valid value + * @param name default string name of the enumeration + * @param description default string description of the enumeration + * @param isDefault is this the default value for the enum? + */ + OperationalStatus(int ordinal, + String descriptionGUID, + String name, + String description, + boolean isDefault) { - this.ordinal = ordinal; - this.openTypeOrdinal = openTypeOrdinal; + this.ordinal = ordinal; this.name = name; + this.descriptionGUID = descriptionGUID; this.description = description; + this.isDefault = isDefault; } + /** * Return the numeric representation of the enumeration. * @@ -82,13 +92,24 @@ public enum OperationalStatus// implements OpenMetadataEnum /** - * Return the code for this enum that comes from the Open Metadata Type that this enum represents. + * Return the unique identifier for the valid value that represents the enum value. * - * @return int code number + * @return guid */ - public int getOpenTypeOrdinal() + public String getDescriptionGUID() { - return openTypeOrdinal; + return descriptionGUID; + } + + + /** + * Return whether the enum is the default value or not. + * + * @return boolean + */ + public boolean isDefault() + { + return isDefault; } @@ -108,6 +129,66 @@ public int getOpenTypeOrdinal() public static String getOpenTypeName() { return ENUM_TYPE_NAME; } + /** + * Return the description for the open metadata enum type that this enum class represents. + * + * @return string description + */ + public static String getOpenTypeDescription() + { + return ENUM_DESCRIPTION; + } + + + /** + * Return the unique identifier for the valid value element for the open metadata enum type that this enum class represents. + * + * @return string guid + */ + public static String getOpenTypeDescriptionGUID() + { + return ENUM_DESCRIPTION_GUID; + } + + + /** + * Return the unique identifier for the valid value element for the open metadata enum type that this enum class represents. + * + * @return string guid + */ + public static String getOpenTypeDescriptionWiki() + { + return ENUM_DESCRIPTION_WIKI; + } + + + /** + * Return the qualified name for this value. + * + * @return string + */ + public String getQualifiedName() + { + return constructValidValueQualifiedName(ENUM_TYPE_NAME, + OpenMetadataProperty.SORT_ORDER.name, + null, + name); + } + + + /** + * Return the category for this value. + * + * @return string + */ + public String getCategory() + { + return constructValidValueCategory(ENUM_TYPE_NAME, + OpenMetadataProperty.SORT_ORDER.name, + null); + } + + /** * toString() JSON-style * diff --git a/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/enums/ServerAssetUseType.java b/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/enums/ServerAssetUseType.java index 7cd65ccc313..e8e29d536e8 100644 --- a/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/enums/ServerAssetUseType.java +++ b/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/enums/ServerAssetUseType.java @@ -5,9 +5,13 @@ import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; +import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataProperty; +import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataWikiPages; import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.NONE; import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.PUBLIC_ONLY; +import static org.odpi.openmetadata.frameworks.openmetadata.mapper.OpenMetadataValidValues.constructValidValueCategory; +import static org.odpi.openmetadata.frameworks.openmetadata.mapper.OpenMetadataValidValues.constructValidValueQualifiedName; /** * ServerAssetUseType defines how a software server capability may use an asset. @@ -15,86 +19,96 @@ @JsonAutoDetect(getterVisibility=PUBLIC_ONLY, setterVisibility=PUBLIC_ONLY, fieldVisibility=NONE) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown=true) -public enum ServerAssetUseType// implements OpenMetadataEnum +public enum ServerAssetUseType implements OpenMetadataEnum { - OWNS (0, 0, "Owns", "The software server capability is accountable for the maintenance and protection of the asset."), - GOVERNS (1, 1, "Governs", "The software server capability provides management or oversight of the asset."), - MAINTAINS (2, 2, "Maintains", "The software server capability keeps the asset up-to-date."), - USES (3, 3, "Uses", "The server capability consumes the content of the asset."), - OTHER (4, 99, "Other", "Other usage."); + OWNS ( 0, "2cd9be3f-aab1-45cb-86d8-b73e5e1287d5", "Owns", "The software server capability is accountable for the maintenance and protection of the asset.", true), + GOVERNS ( 1, "264f123e-8675-4bc1-a4b4-1cfc96b95a08", "Governs", "The software server capability provides management or oversight of the asset.", false), + MAINTAINS ( 2, "e2bae930-4cef-431f-add3-44d3e1e32112", "Maintains", "The software server capability keeps the asset up-to-date.", false), + USES ( 3, "8a91ee82-f840-4eef-aa8f-b5eda277692a", "Uses", "The server capability consumes the content of the asset.", false), + OTHER (99, "e9cfe66e-6b54-46f7-8351-038088c0e83b", "Other", "Other usage.", false); private static final String ENUM_TYPE_GUID = "09439481-9489-467c-9ae5-178a6e0b6b5a"; private static final String ENUM_TYPE_NAME = "ServerAssetUseType"; + private static final String ENUM_DESCRIPTION = "Defines how a software server capability may use an asset."; + private static final String ENUM_DESCRIPTION_GUID = "7d9d5d67-1915-4944-a985-f01cc5394da7"; + private static final String ENUM_DESCRIPTION_WIKI = OpenMetadataWikiPages.MODEL_0045_SERVERS_AND_ASSETS; - private final int ordinal; - private final int openTypeOrdinal; - private final String name; - private final String description; + private final String descriptionGUID; + private final int ordinal; + private final String name; + private final String description; + private final boolean isDefault; /** - * Constructor to set up the instance of this enum. + * Default constructor for the enumeration. * - * @param ordinal code number - * @param openTypeOrdinal code number from the equivalent Enum Type - * @param name default name - * @param description default description + * @param ordinal numerical representation of the enumeration + * @param descriptionGUID identifier for valid value + * @param name default string name of the enumeration + * @param description default string description of the enumeration + * @param isDefault is this the default value for the enum? */ - ServerAssetUseType(int ordinal, - int openTypeOrdinal, - String name, - String description) + ServerAssetUseType(int ordinal, + String descriptionGUID, + String name, + String description, + boolean isDefault) { this.ordinal = ordinal; - this.openTypeOrdinal = openTypeOrdinal; this.name = name; + this.descriptionGUID = descriptionGUID; this.description = description; + this.isDefault = isDefault; } + /** - * Return the code for this enum used for indexing based on the enum value. + * Return the numeric representation of the enumeration. * - * @return int code number + * @return int ordinal */ - public int getOrdinal() - { - return ordinal; - } + public int getOrdinal() { return ordinal; } /** - * Return the default name for this enum type. + * Return the default name of the enumeration. * * @return String name */ - public String getName() - { - return name; - } + public String getName() { return name; } /** - * Return the default description for this enum. + * Return the default description of the enumeration. * * @return String description */ - public String getDescription() + public String getDescription() { return description; } + + + /** + * Return the unique identifier for the valid value that represents the enum value. + * + * @return guid + */ + public String getDescriptionGUID() { - return description; + return descriptionGUID; } /** - * Return the code for this enum that comes from the Open Metadata Type that this enum represents. + * Return whether the enum is the default value or not. * - * @return int code number + * @return boolean */ - public int getOpenTypeOrdinal() + public boolean isDefault() { - return openTypeOrdinal; + return isDefault; } @@ -114,6 +128,66 @@ public int getOpenTypeOrdinal() public static String getOpenTypeName() { return ENUM_TYPE_NAME; } + /** + * Return the description for the open metadata enum type that this enum class represents. + * + * @return string description + */ + public static String getOpenTypeDescription() + { + return ENUM_DESCRIPTION; + } + + + /** + * Return the unique identifier for the valid value element for the open metadata enum type that this enum class represents. + * + * @return string guid + */ + public static String getOpenTypeDescriptionGUID() + { + return ENUM_DESCRIPTION_GUID; + } + + + /** + * Return the unique identifier for the valid value element for the open metadata enum type that this enum class represents. + * + * @return string guid + */ + public static String getOpenTypeDescriptionWiki() + { + return ENUM_DESCRIPTION_WIKI; + } + + + /** + * Return the qualified name for this value. + * + * @return string + */ + public String getQualifiedName() + { + return constructValidValueQualifiedName(ENUM_TYPE_NAME, + OpenMetadataProperty.USE_TYPE.name, + null, + name); + } + + + /** + * Return the category for this value. + * + * @return string + */ + public String getCategory() + { + return constructValidValueCategory(ENUM_TYPE_NAME, + OpenMetadataProperty.USE_TYPE.name, + null); + } + + /** * Standard toString method. * @@ -122,13 +196,6 @@ public int getOpenTypeOrdinal() @Override public String toString() { - return "ServerAssetUseType{" + - "ordinal=" + ordinal + - ", openTypeOrdinal=" + openTypeOrdinal + - ", name='" + name + '\'' + - ", description='" + description + '\'' + - ", openTypeGUID='" + getOpenTypeGUID() + '\'' + - ", openTypeName='" + getOpenTypeName() + '\'' + - '}'; + return "SeverAssetUseType{name='" + name + '}'; } } diff --git a/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/properties/assets/infrastructure/DeploymentProperties.java b/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/properties/assets/infrastructure/DeploymentProperties.java index 424fd3e10aa..cb5a57b05e8 100644 --- a/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/properties/assets/infrastructure/DeploymentProperties.java +++ b/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/properties/assets/infrastructure/DeploymentProperties.java @@ -133,7 +133,7 @@ public Map cloneToMap() if (deploymentStatus != null) { - propertyMap.put(deploymentStatusProperty, deploymentStatus.getOpenTypeOrdinal()); + propertyMap.put(deploymentStatusProperty, deploymentStatus.getOrdinal()); } if (! propertyMap.isEmpty()) diff --git a/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/properties/assets/infrastructure/PlatformDeploymentProperties.java b/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/properties/assets/infrastructure/PlatformDeploymentProperties.java index 5e7e3a63146..238d312ef0c 100644 --- a/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/properties/assets/infrastructure/PlatformDeploymentProperties.java +++ b/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/properties/assets/infrastructure/PlatformDeploymentProperties.java @@ -83,7 +83,7 @@ public Map cloneToMap() if (platformDeploymentStatus != null) { - propertyMap.put(platformDeploymentStatusPropertyName, platformDeploymentStatus.getOpenTypeOrdinal()); + propertyMap.put(platformDeploymentStatusPropertyName, platformDeploymentStatus.getOrdinal()); } if (! propertyMap.isEmpty()) diff --git a/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/properties/softwarecapabilities/CapabilityDeploymentProperties.java b/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/properties/softwarecapabilities/CapabilityDeploymentProperties.java index cb54828c443..e7f186170c2 100644 --- a/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/properties/softwarecapabilities/CapabilityDeploymentProperties.java +++ b/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/properties/softwarecapabilities/CapabilityDeploymentProperties.java @@ -100,7 +100,7 @@ public Map cloneToMap() if (softwareCapabilityStatus != null) { - propertyMap.put(deploymentStatusProperty, softwareCapabilityStatus.getOpenTypeOrdinal()); + propertyMap.put(deploymentStatusProperty, softwareCapabilityStatus.getOrdinal()); } if (! propertyMap.isEmpty()) diff --git a/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/enums/DataType.java b/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/types/DataType.java similarity index 68% rename from open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/enums/DataType.java rename to open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/types/DataType.java index 66ed0d97584..18ec3548cba 100644 --- a/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/enums/DataType.java +++ b/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/types/DataType.java @@ -1,12 +1,11 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.frameworks.openmetadata.enums; +package org.odpi.openmetadata.frameworks.openmetadata.types; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; -import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataProperty; -import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataWikiPages; +import org.odpi.openmetadata.frameworks.openmetadata.enums.OpenMetadataEnum; import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.NONE; import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.PUBLIC_ONLY; @@ -14,7 +13,7 @@ import static org.odpi.openmetadata.frameworks.openmetadata.mapper.OpenMetadataValidValues.constructValidValueQualifiedName; /** - * DataType identifies the primitive type for a data item. + * DataType identifies the type for a data item. */ @JsonAutoDetect(getterVisibility=PUBLIC_ONLY, setterVisibility=PUBLIC_ONLY, fieldVisibility=NONE) @JsonInclude(JsonInclude.Include.NON_NULL) @@ -76,21 +75,64 @@ public enum DataType implements OpenMetadataEnum */ BIGDECIMAL(8, "1ea84469-27c0-4b70-81ba-18f4099f4a6f", "bigdecimal", "Big Decimal", false), + /** + * An ordered list of strings. + */ + ARRAY_STRING(9, "8e3dad3b-9590-4903-b2d0-3e549b8e1cb9", "array", "An ordered list of strings.", false), /** - * An unknown data type. + * An ordered list of strings. */ - OBJECT(99, "0441e0c1-96f0-4887-a038-72c7437628a1", "Other", "An unknown data type.", false); + ARRAY_INT(10, "fed660e8-f43b-459a-8d6e-76be1117a573", "array", "An ordered list of integers.", false), - private static final String ENUM_TYPE_GUID = "ae846797-d88a-4421-ad9a-318bf7c1fe6f"; - private static final String ENUM_TYPE_NAME = "ConfidenceLevel"; + /** + * A map from string value to string value. + */ + MAP_STRING_STRING(11, "26eb11f0-2bd1-4d25-8d07-a600b8396de7", "map", "A map from string value to string value.", false), - private static final String ENUM_DESCRIPTION = "Defines the level of confidence to place in the accuracy of a data item."; - private static final String ENUM_DESCRIPTION_GUID = "1f7a3730-8471-496b-a6e5-21eac7bb3b98"; - private static final String ENUM_DESCRIPTION_WIKI = OpenMetadataWikiPages.MODEL_0421_GOVERNANCE_CLASSIFICATION; + /** + * A map from string value to boolean value. + */ + MAP_STRING_BOOLEAN(12, "63a7dea2-e2ca-4882-809c-47108c97b725", "map", "A map from string value to boolean value.", false), - private final String descriptionGUID; + /** + * A map from string value to integer value. + */ + MAP_STRING_INT(13, "9d6da07a-173e-443f-828e-01b4079e4122", "map", "A map from string value to integer value.", false), + /** + * A map from string value to long value. + */ + MAP_STRING_LONG(14, "34e8937b-b4e5-4042-ba0d-4f9f8e6d553c", "map", "A map from string value to long value.", false), + + /** + * A map from string value to double value. + */ + MAP_STRING_DOUBLE(15, "f1950f13-ad2e-4a38-b933-7e723c80facc", "map", "A map from string value to double value.", false), + + /** + * A map from string value to date value. + */ + MAP_STRING_DATE(16, "9d09ac67-d3b5-4c5b-b8bf-e9140ae06877", "map", "A map from string value to date value.", false), + + /** + * A map from string value to date value. + */ + MAP_STRING_OBJECT(17, "9a99ee58-f18f-432c-b2ac-f5fb99a78690", "map", "A map from string value to object value.", false), + + /** + * Short + */ + SHORT(18, "142d1d09-9caf-415c-95e5-115f27679d26", "short", "Short", false), + + /** + * A generic data type. + */ + OBJECT(99, "0441e0c1-96f0-4887-a038-72c7437628a1", "Other", "An unknown data type.", false), + + ; + + private final String descriptionGUID; private final int ordinal; private final String name; private final String description; @@ -170,54 +212,6 @@ public boolean isDefault() return isDefault; } - /** - * Return the unique identifier for the open metadata enum type that this enum class represents. - * - * @return string guid - */ - public static String getOpenTypeGUID() { return ENUM_TYPE_GUID; } - - - /** - * Return the unique name for the open metadata enum type that this enum class represents. - * - * @return string name - */ - public static String getOpenTypeName() { return ENUM_TYPE_NAME; } - - - /** - * Return the description for the open metadata enum type that this enum class represents. - * - * @return string description - */ - public static String getOpenTypeDescription() - { - return ENUM_DESCRIPTION; - } - - - /** - * Return the unique identifier for the valid value element for the open metadata enum type that this enum class represents. - * - * @return string guid - */ - public static String getOpenTypeDescriptionGUID() - { - return ENUM_DESCRIPTION_GUID; - } - - - /** - * Return the unique identifier for the valid value element for the open metadata enum type that this enum class represents. - * - * @return string guid - */ - public static String getOpenTypeDescriptionWiki() - { - return ENUM_DESCRIPTION_WIKI; - } - /** * Return the qualified name for this value. @@ -226,8 +220,8 @@ public static String getOpenTypeDescriptionWiki() */ public String getQualifiedName() { - return constructValidValueQualifiedName(ENUM_TYPE_NAME, - OpenMetadataProperty.CONFIDENCE_LEVEL_IDENTIFIER.name, + return constructValidValueQualifiedName("DataType", + OpenMetadataProperty.DATA_TYPE.name, null, name); } @@ -240,8 +234,8 @@ public String getQualifiedName() */ public String getCategory() { - return constructValidValueCategory(ENUM_TYPE_NAME, - OpenMetadataProperty.CONFIDENCE_LEVEL_IDENTIFIER.name, + return constructValidValueCategory("DataType", + OpenMetadataProperty.DATA_TYPE.name, null); } @@ -253,6 +247,6 @@ public String getCategory() @Override public String toString() { - return "ConfidenceLevel{name='" + name + '}'; + return "DataType{name='" + name + '}'; } } diff --git a/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/types/OpenMetadataProperty.java b/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/types/OpenMetadataProperty.java index 1b195d5a489..132c6a24124 100644 --- a/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/types/OpenMetadataProperty.java +++ b/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/types/OpenMetadataProperty.java @@ -16,17 +16,17 @@ public enum OpenMetadataProperty /** * Unique identifier of an open metadata entity or relationship. */ - GUID("guid", "string", "Unique identifier of an open metadata entity or relationship.", "f1ad7bbe-1d9f-4149-b87c-205bbd174b55", "f1ad7bbe-1d9f-4149-b87c-205bbd174b55"), + GUID("guid", DataType.STRING.getName(), "Unique identifier of an open metadata entity or relationship.", "f1ad7bbe-1d9f-4149-b87c-205bbd174b55", "f1ad7bbe-1d9f-4149-b87c-205bbd174b55"), /** * The unique identifier for the metadata collection that is the home for a metadata element. */ - METADATA_COLLECTION_ID("metadataCollectionId", "string", "The unique identifier for the metadata collection that is the home for a metadata element.", "151b9d80-8417-41c4-8f04-3ab90a387196", "01d7e832-ef18-4451-8e4c-4ba972292a8e"), + METADATA_COLLECTION_ID("metadataCollectionId", DataType.STRING.getName(), "The unique identifier for the metadata collection that is the home for a metadata element.", "151b9d80-8417-41c4-8f04-3ab90a387196", "01d7e832-ef18-4451-8e4c-4ba972292a8e"), /** * The unique identifier for the metadata collection that is the home for a metadata element. */ - METADATA_COLLECTION_NAME("metadataCollectionName", "string", "The unique name for the metadata collection that is the home for a metadata element.", "MyDataManagerForDatabase1", "25b43665-87e9-4637-9e6d-d0658ba26261"), + METADATA_COLLECTION_NAME("metadataCollectionName", DataType.STRING.getName(), "The unique name for the metadata collection that is the home for a metadata element.", "MyDataManagerForDatabase1", "25b43665-87e9-4637-9e6d-d0658ba26261"), /* ====================================================== * These values are attributes defined in the type system. @@ -35,193 +35,198 @@ public enum OpenMetadataProperty /** * Unique identifier of an open metadata entity, classification or relationship. */ - TYPE_NAME("typeName", "string", "Unique name of an open metadata entity,classification or relationship.", "Asset", "7c5a7e83-2709-4789-b014-d23082a659bd"), + TYPE_NAME("typeName", DataType.STRING.getName(), "Unique name of an open metadata entity,classification or relationship.", "Asset", "7c5a7e83-2709-4789-b014-d23082a659bd"), /** * Time that an instance was created. */ - CREATE_TIME("createTime", "date", "Time that an instance was created.", null, "433f573a-0044-4943-a8ee-78102ae2fb32"), + CREATE_TIME("createTime", DataType.DATE.getName(), "Time that an instance was created.", null, "433f573a-0044-4943-a8ee-78102ae2fb32"), /** * Last time that an instance was updated. */ - UPDATE_TIME("updateTime", "date", "Last time that an instance was updated.", null, "6b94347b-f692-4c44-9c61-d050d9758c54"), + UPDATE_TIME("updateTime", DataType.DATE.getName(), "Last time that an instance was updated.", null, "6b94347b-f692-4c44-9c61-d050d9758c54"), /** * Timestamp when the archive occurred or was detected. */ - ARCHIVE_DATE("archiveDate", "string", "Timestamp when the archive occurred or was detected.", null, "5235c1b1-fa03-4d17-80e2-7826242dfc75"), + ARCHIVE_DATE("archiveDate", DataType.STRING.getName(), "Timestamp when the archive occurred or was detected.", null, "5235c1b1-fa03-4d17-80e2-7826242dfc75"), /** * Name of user that performed the archive - or detected the archive. */ - ARCHIVE_USER("archiveUser", "string", "Name of user that performed the archive - or detected the archive.", null, "fe81b808-3d78-4e84-a1de-b0b273a89bec"), + ARCHIVE_USER("archiveUser", DataType.STRING.getName(), "Name of user that performed the archive - or detected the archive.", null, "fe81b808-3d78-4e84-a1de-b0b273a89bec"), /** * Name of process that performed the archive - or detected the archive. */ - ARCHIVE_PROCESS("archiveProcess", "string", "Name of process that performed the archive - or detected the archive.", null, "0aef1b3a-50dc-4a6c-981f-93bf8815e7f4"), + ARCHIVE_PROCESS("archiveProcess", DataType.STRING.getName(), "Name of process that performed the archive - or detected the archive.", null, "0aef1b3a-50dc-4a6c-981f-93bf8815e7f4"), /** * Name of service that created this classification. */ - ARCHIVE_SERVICE("archiveService", "string", "Name of service that created this classification.", null, "c2170958-998e-4d8c-8e33-e91ef4872c8a"), + ARCHIVE_SERVICE("archiveService", DataType.STRING.getName(), "Name of service that created this classification.", null, "c2170958-998e-4d8c-8e33-e91ef4872c8a"), /** * Name of method that created this classification. */ - ARCHIVE_METHOD("archiveMethod", "string", "Name of method that created this classification.", null, "45d558ba-00b4-4a67-9226-590b100da7e9"), + ARCHIVE_METHOD("archiveMethod", DataType.STRING.getName(), "Name of method that created this classification.", null, "45d558ba-00b4-4a67-9226-590b100da7e9"), /** * Properties to locate the real-world counterpart in the archive. */ - ARCHIVE_PROPERTIES("archiveProperties", "string", "Properties to locate the real-world counterpart in the archive.", null, "d149d2d8-f181-4c20-8d68-5460f54bece5"), + ARCHIVE_PROPERTIES("archiveProperties", DataType.STRING.getName(), "Properties to locate the real-world counterpart in the archive.", null, "d149d2d8-f181-4c20-8d68-5460f54bece5"), /** * The unique identifier of the referenceable that this element is directly or indirectly anchored to. */ - ANCHOR_GUID("anchorGUID", "string", "The unique identifier of the referenceable that this element is directly or indirectly anchored to.", "f1ad7bbe-1d9f-4149-b87c-205bbd174b55", "e7de4efc-6fa4-4942-97eb-e9b5be701875"), + ANCHOR_GUID("anchorGUID", DataType.STRING.getName(), "The unique identifier of the referenceable that this element is directly or indirectly anchored to.", "f1ad7bbe-1d9f-4149-b87c-205bbd174b55", "e7de4efc-6fa4-4942-97eb-e9b5be701875"), /** * Unique name of the type of the anchor. */ - ANCHOR_TYPE_NAME("anchorTypeName", "string", "Unique name of the type of the anchor.", "Asset", "605c9dd5-fa79-4457-b299-9169c5567f97"), + ANCHOR_TYPE_NAME("anchorTypeName", DataType.STRING.getName(), "Unique name of the type of the anchor.", "Asset", "605c9dd5-fa79-4457-b299-9169c5567f97"), /** * Unique name of the domain of the anchor. This is an Open Metadata Type Name that either directly inherits from OpenMetadataRoot or Referenceable. */ - ANCHOR_DOMAIN_NAME("anchorDomainName", "string", "Unique name of the domain of the anchor. This is an Open Metadata Type Name that either directly inherits from OpenMetadataRoot or Referenceable.", "Asset", "00ba532f-792f-4b78-8940-b5a9fd72f854"), + ANCHOR_DOMAIN_NAME("anchorDomainName", DataType.STRING.getName(), "Unique name of the domain of the anchor. This is an Open Metadata Type Name that either directly inherits from OpenMetadataRoot or Referenceable.", "Asset", "00ba532f-792f-4b78-8940-b5a9fd72f854"), /** * Unique name for the element. */ - QUALIFIED_NAME("qualifiedName", "string", "Unique name for the element.", "SoftwareServer:MyAsset:MyAssetName", "e31e5b9b-0f96-42a9-8e67-0e3fc66ad305"), + QUALIFIED_NAME("qualifiedName", DataType.STRING.getName(), "Unique name for the element.", "SoftwareServer:MyAsset:MyAssetName", "e31e5b9b-0f96-42a9-8e67-0e3fc66ad305"), /** * Additional properties for the element. */ - ADDITIONAL_PROPERTIES("additionalProperties", "map", "Additional properties for the element.", null, "534b5665-73d4-4bdc-b83b-1a8fed19dba3"), + ADDITIONAL_PROPERTIES("additionalProperties", DataType.MAP_STRING_STRING.getName(), "Additional properties for the element.", null, "534b5665-73d4-4bdc-b83b-1a8fed19dba3"), /** * Name that the element is known as - not necessarily unique. */ - NAME("name", "string", "Short name that the element is known as - not necessarily unique.", "MyAssetName", "c075e0e7-8ecc-4f81-9ac4-ca3662c3ebe4"), + NAME("name", DataType.STRING.getName(), "Short name that the element is known as - not necessarily unique.", "MyAssetName", "c075e0e7-8ecc-4f81-9ac4-ca3662c3ebe4"), /** * Full name that the element is known as in the owning deployed technology. */ - RESOURCE_NAME("resourceName", "string", "Full name that the element is known as in the owning deployed technology. This name is typically unique within the scope of the owing technology", "MyAssetName", "c075e0e7-8ecc-4f81-9ac4-ca3662c3ebe4"), + RESOURCE_NAME("resourceName", DataType.STRING.getName(), "Full name that the element is known as in the owning deployed technology. This name is typically unique within the scope of the owing technology", "MyAssetName", "c075e0e7-8ecc-4f81-9ac4-ca3662c3ebe4"), /** * Display name of the element used for summary tables and titles */ - DISPLAY_NAME("displayName", "string", "Display name of the element used for summary tables and titles.", "MyGlossaryTerm", "a42ceece-6cd8-4c71-9920-e3c96df3c8bb"), + DISPLAY_NAME("displayName", DataType.STRING.getName(), "Display name of the element used for summary tables and titles.", "MyGlossaryTerm", "a42ceece-6cd8-4c71-9920-e3c96df3c8bb"), /** * Description of the element or associated resource in free-text. */ - DESCRIPTION("description", "string", "Description of the element or associated resource in free-text.", null, "ee09b6f9-e15b-40fb-9799-ef3b98c1de2c"), + DESCRIPTION("description", DataType.STRING.getName(), "Description of the element or associated resource in free-text.", null, "ee09b6f9-e15b-40fb-9799-ef3b98c1de2c"), /** * Version identifier to allow different versions of the same resource to appear in the catalog as separate assets. */ - VERSION_IDENTIFIER("versionIdentifier", "string", "Version identifier to allow different versions of the same resource to appear in the catalog as separate assets.", "V1.0", "6e765a3f-04c2-4eca-bd2d-519cae777c03"), + VERSION_IDENTIFIER("versionIdentifier", DataType.STRING.getName(), "Version identifier to allow different versions of the same resource to appear in the catalog as separate assets.", "V1.0", "6e765a3f-04c2-4eca-bd2d-519cae777c03"), /** * Name of a particular type of technology. It is more specific than the open metadata types and increases the precision in which technology is catalogued. This helps human understanding and enables connectors and other actions to be targeted to the right technology. */ - DEPLOYED_IMPLEMENTATION_TYPE("deployedImplementationType", "string", "Name of a particular type of technology. It is more specific than the open metadata types and increases the precision in which technology is catalogued. This helps human understanding and enables connectors and other actions to be targeted to the right technology.", "PostgreSQL Database Server", "2f71cd9f-c614-4531-a5ae-3bcb6a6a1918"), + DEPLOYED_IMPLEMENTATION_TYPE("deployedImplementationType", DataType.STRING.getName(), "Name of a particular type of technology. It is more specific than the open metadata types and increases the precision in which technology is catalogued. This helps human understanding and enables connectors and other actions to be targeted to the right technology.", "PostgreSQL Database Server", "2f71cd9f-c614-4531-a5ae-3bcb6a6a1918"), /** * Name of a particular type of technology. It is more specific than the open metadata types and increases the precision in which technology is catalogued. This helps human understanding and enables connectors and other actions to be targeted to the right technology. */ - SUPPORTED_DEPLOYED_IMPLEMENTATION_TYPE("supportedDeployedImplementationType", "string", "Name of a particular type of technology. It is more specific than the open metadata types and increases the precision in which technology is catalogued. This helps human understanding and enables connectors and other actions to be targeted to the right technology.", "PostgreSQL Database Server", "32567628-f7e3-4a6d-92b9-8ed734bd3dc1"), + SUPPORTED_DEPLOYED_IMPLEMENTATION_TYPE("supportedDeployedImplementationType", DataType.STRING.getName(), "Name of a particular type of technology. It is more specific than the open metadata types and increases the precision in which technology is catalogued. This helps human understanding and enables connectors and other actions to be targeted to the right technology.", "PostgreSQL Database Server", "32567628-f7e3-4a6d-92b9-8ed734bd3dc1"), /** * Identifier of the person or process who is accountable for the proper management of the element or related resource. */ - OWNER("owner", "string", "Identifier of the person or process who is accountable for the proper management of the element or related resource.", null, "8b3e49d6-987c-4f2f-b624-ba91e5d28b33"), + OWNER("owner", DataType.STRING.getName(), "Identifier of the person or process who is accountable for the proper management of the element or related resource.", null, "8b3e49d6-987c-4f2f-b624-ba91e5d28b33"), /** * Type of element that describes the owner. */ - OWNER_TYPE_NAME("ownerTypeName", "string", "Type of element that describes the owner.", "PersonRole", "c0acfbc6-4250-437b-9aa3-ce3d5a3bd490"), + OWNER_TYPE_NAME("ownerTypeName", DataType.STRING.getName(), "Type of element that describes the owner.", "PersonRole", "c0acfbc6-4250-437b-9aa3-ce3d5a3bd490"), /** * Name of the property from the element used to identify the owner. */ - OWNER_PROPERTY_NAME("ownerPropertyName", "string", "Name of the property from the element used to identify the owner.", "qualifiedName", "9d1fdeb4-132a-4ec7-8312-dc9362e4f2f7"), + OWNER_PROPERTY_NAME("ownerPropertyName", DataType.STRING.getName(), "Name of the property from the element used to identify the owner.", "qualifiedName", "9d1fdeb4-132a-4ec7-8312-dc9362e4f2f7"), /** * The list of governance zones that this asset belongs to. */ - ZONE_MEMBERSHIP("zoneMembership", "array", "The list of governance zones that this asset belongs to.", null, "2af69520-6991-4097-aa94-543127b73066"), + ZONE_MEMBERSHIP("zoneMembership", DataType.ARRAY_STRING.getName(), "The list of governance zones that this asset belongs to.", null, "2af69520-6991-4097-aa94-543127b73066"), /** * Formula that describes the behaviour of the element. May include placeholders for queryIds */ - FORMULA("formula", "string", "Formula that describes the behaviour of the element. May include placeholders for queryIds.", null, "0b35fe46-1c16-4af7-b7b1-ea6951718dc7"), + FORMULA("formula", DataType.STRING.getName(), "Formula that describes the behaviour of the element. May include placeholders for queryIds.", null, "0b35fe46-1c16-4af7-b7b1-ea6951718dc7"), /** * Format of the expression provided in the formula attribute. */ - FORMULA_TYPE("formulaType", "string", "Format of the expression provided in the formula attribute.", "SQL", "dd9b24cb-0359-4915-8b6b-9eae251adc1c"), + FORMULA_TYPE("formulaType", DataType.STRING.getName(), "Format of the expression provided in the formula attribute.", "SQL", "dd9b24cb-0359-4915-8b6b-9eae251adc1c"), /** * Time that a transient process started. */ - PROCESS_START_TIME("processStartTime", "date", "Time that a transient process started.", null, "f2c4180f-a803-42d6-9eb1-2bd29bd20d88"), + PROCESS_START_TIME("processStartTime", DataType.DATE.getName(), "Time that a transient process started.", null, "f2c4180f-a803-42d6-9eb1-2bd29bd20d88"), /** * Time that a transient process ended. */ - PROCESS_END_TIME("processEndTime", "date", "Time that a transient process ended.", null, "2179e4e3-b640-403a-a2bb-10da5c39acf6"), + PROCESS_END_TIME("processEndTime", DataType.DATE.getName(), "Time that a transient process ended.", null, "2179e4e3-b640-403a-a2bb-10da5c39acf6"), /** * Is this element visible to all, or only the author? */ - IS_PUBLIC("isPublic", "boolean", "Is this element visible to all, or only the author?", "true", "e7a8eaa8-4358-4dd3-8d82-2ab3c118cfe4"), + IS_PUBLIC("isPublic", DataType.BOOLEAN.getName(), "Is this element visible to all, or only the author?", "true", "e7a8eaa8-4358-4dd3-8d82-2ab3c118cfe4"), /** * Rating level provided. */ - STARS("stars", "StarRating", "Rating level provided.", "***", "896fd016-fad1-43dc-87a9-3ee577d8d898"), + STARS("stars", StarRating.getOpenTypeName(), "Rating level provided.", "***", "896fd016-fad1-43dc-87a9-3ee577d8d898"), /** * Additional comments associated with the rating. */ - REVIEW("review", "string", "Additional comments associated with the rating.", null, "ae1ef693-6264-44ee-8014-23a283ad3b0e"), + REVIEW("review", DataType.STRING.getName(), "Additional comments associated with the rating.", null, "ae1ef693-6264-44ee-8014-23a283ad3b0e"), /** * Feedback comments or additional information. */ - TEXT("text", "string", "Feedback comments or additional information.", null, "baef44c7-e345-46ef-b8f7-a4d7fbcf77d7"), + TEXT("text", DataType.STRING.getName(), "Feedback comments or additional information.", null, "baef44c7-e345-46ef-b8f7-a4d7fbcf77d7"), /** * Type of comment. */ - TYPE("type", "CommentType", "Type of comment.", "Answer", "465c7ed7-74d4-4eb3-9e4c-9d47f06a0ebd"), + TYPE("type", CommentType.getOpenTypeName(), "Type of comment.", "Answer", "465c7ed7-74d4-4eb3-9e4c-9d47f06a0ebd"), /** - * Title + * Role of contributor. */ - TITLE("title", "string", "Title", null, "c669dc73-3ae3-4350-95b7-4508a85bfc94"), + ROLE_TYPE("roleType", CrowdSourcingRole.getOpenTypeName(), "Role of contributor.", "Contributor", "05fdcacb-b7ec-475c-96eb-600fbbc1fb88"), + + /** + * The courtesy title for the person. + */ + COURTESY_TITLE("title", DataType.STRING.getName(), "The courtesy title for the person.", "Dr", "c669dc73-3ae3-4350-95b7-4508a85bfc94"), /** * Descriptive name of the tag. */ - TAG_NAME("tagName", "string", "Descriptive name of the tag.", null, "c6054168-4236-4de1-9ece-ebcb5597dbf4"), + TAG_NAME("tagName", DataType.STRING.getName(), "Descriptive name of the tag.", null, "c6054168-4236-4de1-9ece-ebcb5597dbf4"), /** * More detail on the meaning of the tag. */ - TAG_DESCRIPTION("tagDescription", "string", "More detail on the meaning of the tag.", null, "e8fc2fc9-afae-47cd-b5f0-f7c374fb6ea4"), + TAG_DESCRIPTION("tagDescription", DataType.STRING.getName(), "More detail on the meaning of the tag.", null, "e8fc2fc9-afae-47cd-b5f0-f7c374fb6ea4"), /** * Description of the technique used to create the sample. */ - SAMPLING_METHOD("samplingMethod", "string", "Description of the technique used to create the sample.", null, "1cb00437-adde-4b71-a655-f736f2c8989d"), + SAMPLING_METHOD("samplingMethod", DataType.STRING.getName(), "Description of the technique used to create the sample.", null, "1cb00437-adde-4b71-a655-f736f2c8989d"), /** * The relationship of element that has been changed to the anchor. @@ -236,242 +241,242 @@ public enum OpenMetadataProperty /** * The name of the associated classification. */ - CLASSIFICATION_NAME("classificationName", "string", "The name of the associated classification.", "Ownership", "ef2169c4-c8f3-48b0-9051-cfb2bbb1e5f2"), + CLASSIFICATION_NAME("classificationName", DataType.STRING.getName(), "The name of the associated classification.", "Ownership", "ef2169c4-c8f3-48b0-9051-cfb2bbb1e5f2"), /** * Name of the property in the classification where this value is used. */ - CLASSIFICATION_PROPERTY_NAME("classificationPropertyName", "string", "Name of the property in the classification where this value is used.", "owner", "5471ec69-a23d-4d89-b134-b30a8a01f435"), + CLASSIFICATION_PROPERTY_NAME("classificationPropertyName", DataType.STRING.getName(), "Name of the property in the classification where this value is used.", "owner", "5471ec69-a23d-4d89-b134-b30a8a01f435"), /** * If an attached entity or relationship to it changed, this is its unique identifier. */ - ATTACHMENT_GUID("attachmentGUID", "string", "If an attached entity or relationship to it changed, this is its unique identifier.", null, "74d62753-fd42-47c5-a804-29334f394728"), + ATTACHMENT_GUID("attachmentGUID", DataType.STRING.getName(), "If an attached entity or relationship to it changed, this is its unique identifier.", null, "74d62753-fd42-47c5-a804-29334f394728"), /** * If an attached entity or relationship to changed, this is its unique type name. */ - ATTACHMENT_TYPE("attachmentType", "string", "If an attached entity or relationship to changed, this is its unique type name.", null, "b7f9f49a-e227-44d8-ae26-7e9c4f552379"), + ATTACHMENT_TYPE("attachmentType", DataType.STRING.getName(), "If an attached entity or relationship to changed, this is its unique type name.", null, "b7f9f49a-e227-44d8-ae26-7e9c4f552379"), /** * If an attached entity or relationship to changed, this is its unique type name of the relationship. */ - RELATIONSHIP_TYPE("relationshipType", "string", "If an attached entity or relationship to changed, this is its unique type name of the relationship.", null, "afa67874-fa00-422e-8902-69e5e3cc9e43"), + RELATIONSHIP_TYPE("relationshipType", DataType.STRING.getName(), "If an attached entity or relationship to changed, this is its unique type name of the relationship.", null, "afa67874-fa00-422e-8902-69e5e3cc9e43"), /** * The user identifier for the person/system executing the request. */ - USER("user", "string", "The user identifier for the person/system executing the request.", null, "1afa1bb1-a9f0-4739-a45a-ff0d01b867f5"), + USER("user", DataType.STRING.getName(), "The user identifier for the person/system executing the request.", null, "1afa1bb1-a9f0-4739-a45a-ff0d01b867f5"), /** * The user identifier for the person/system executing the request. */ - USER_ID("userId", "string", "The user identifier for the person/system executing the request.", null, "c65a21dc-d1ae-4a8f-ba33-58ec401c1b42"), + USER_ID("userId", DataType.STRING.getName(), "The user identifier for the person/system executing the request.", null, "c65a21dc-d1ae-4a8f-ba33-58ec401c1b42"), /** * The unique identifier of the engine action that initiated the governance service that created this element. */ - ENGINE_ACTION_GUID("engineActionGUID", "string", "The unique identifier of the engine action that initiated the governance service that created this element.", null, "519cf063-9386-42e5-88dd-c5baab234df6"), + ENGINE_ACTION_GUID("engineActionGUID", DataType.STRING.getName(), "The unique identifier of the engine action that initiated the governance service that created this element.", null, "519cf063-9386-42e5-88dd-c5baab234df6"), /** * The unique identifier of the associated asset. */ - ASSET_GUID("assetGUID", "string", "The unique identifier of the associated asset.", null, "fd4b6779-9582-4cc2-885e-72e44445ff04"), + ASSET_GUID("assetGUID", DataType.STRING.getName(), "The unique identifier of the associated asset.", null, "fd4b6779-9582-4cc2-885e-72e44445ff04"), /** * Description of the activity. */ - ACTION_DESCRIPTION("actionDescription", "string", "Description of the activity.", null, "2f0a4467-7b72-4dba-a345-d80959d8a3d5"), + ACTION_DESCRIPTION("actionDescription", DataType.STRING.getName(), "Description of the activity.", null, "2f0a4467-7b72-4dba-a345-d80959d8a3d5"), /** * The version number of the template element when the copy was created. */ - SOURCE_VERSION_NUMBER("sourceVersionNumber", "long", "The version number of the template element when the copy was created.", null, "4729488f-2e42-4801-bc17-9dfad508c1fa"), + SOURCE_VERSION_NUMBER("sourceVersionNumber", DataType.LONG.getName(), "The version number of the template element when the copy was created.", null, "4729488f-2e42-4801-bc17-9dfad508c1fa"), /** * The fully qualified physical location of the data store. */ - PATH_NAME("pathName", "string", "The fully qualified physical location of the data store.", null, "34d24b66-12f1-437c-afd3-1f1ab3377472"), + PATH_NAME("pathName", DataType.STRING.getName(), "The fully qualified physical location of the data store.", null, "34d24b66-12f1-437c-afd3-1f1ab3377472"), /** * File type descriptor (or logical file type) typically extracted from the file name. */ - FILE_TYPE("fileType", "string", "File type descriptor (or logical file type) typically extracted from the file name.", null, "f180c49b-2de6-4657-bdf7-069747bc612d"), + FILE_TYPE("fileType", DataType.STRING.getName(), "File type descriptor (or logical file type) typically extracted from the file name.", null, "f180c49b-2de6-4657-bdf7-069747bc612d"), /** * The name of the file with extension. */ - FILE_NAME("fileName", "string", "The name of the file with extension.", null, "f22d0164-3790-42c3-aacb-154ccee7fbb6"), + FILE_NAME("fileName", DataType.STRING.getName(), "The name of the file with extension.", null, "f22d0164-3790-42c3-aacb-154ccee7fbb6"), /** * The file extension used at the end of the file's name. This identifies the format of the file. */ - FILE_EXTENSION("fileExtension", "string", "The file extension used at the end of the file's name. This identifies the format of the file.", null, "62b00622-fa2c-4ee0-be60-3f15b1cb3dd6"), + FILE_EXTENSION("fileExtension", DataType.STRING.getName(), "The file extension used at the end of the file's name. This identifies the format of the file.", null, "62b00622-fa2c-4ee0-be60-3f15b1cb3dd6"), /** * The request type used to call the service. */ - REQUEST_TYPE("requestType", "string", "The request type used to call the service.", null, "be22cf20-f704-459e-823f-bdd8f7ef003b"), + REQUEST_TYPE("requestType", DataType.STRING.getName(), "The request type used to call the service.", null, "be22cf20-f704-459e-823f-bdd8f7ef003b"), /** * The request type used to call the service. */ - REQUESTER_USER_ID("requesterUserId", "string", "User identity for the person, process or engine that requested this action.", null, "061de8f4-87a6-45b6-b91b-d375f202fe0f"), + REQUESTER_USER_ID("requesterUserId", DataType.STRING.getName(), "User identity for the person, process or engine that requested this action.", null, "061de8f4-87a6-45b6-b91b-d375f202fe0f"), /** * Properties that configure the governance service for this type of request. */ - REQUEST_PARAMETERS("requestParameters", "map", "Request parameters to pass to the governance service when called.", null, "882a5a30-3724-41ea-90ff-667cb7627bde"), + REQUEST_PARAMETERS("requestParameters", DataType.MAP_STRING_STRING.getName(), "Request parameters to pass to the governance service when called.", null, "882a5a30-3724-41ea-90ff-667cb7627bde"), /** * Lists the names of the request parameters to remove from the requestParameters supplied by the caller. */ - REQUEST_PARAMETER_FILTER("requestParameterFilter", "array", "Lists the names of the request parameters to remove from the requestParameters supplied by the caller.", null, "9f7e13d1-ec51-4c95-9931-383b3ab9295b"), + REQUEST_PARAMETER_FILTER("requestParameterFilter", DataType.ARRAY_STRING.getName(), "Lists the names of the request parameters to remove from the requestParameters supplied by the caller.", null, "9f7e13d1-ec51-4c95-9931-383b3ab9295b"), /** * Provides a translation map between the supplied name of the requestParameters and the names supported by the implementation of the governance service. */ - REQUEST_PARAMETER_MAP("requestParameterMap", "map", "Provides a translation map between the supplied names in the requestParameters and the names supported by the implementation of the governance service.", null, "64730138-399a-4f30-a0b8-1f6cc487cb53"), + REQUEST_PARAMETER_MAP("requestParameterMap", DataType.MAP_STRING_STRING.getName(), "Provides a translation map between the supplied names in the requestParameters and the names supported by the implementation of the governance service.", null, "64730138-399a-4f30-a0b8-1f6cc487cb53"), /** * Lists the names of the action targets to remove from the supplied action targets. */ - ACTION_TARGET_FILTER("actionTargetFilter", "array", "Lists the names of the action targets to remove from the supplied action targets.", null, "91b5c627-2c3a-4598-af72-e1b52f1f03c5"), + ACTION_TARGET_FILTER("actionTargetFilter", DataType.ARRAY_STRING.getName(), "Lists the names of the action targets to remove from the supplied action targets.", null, "91b5c627-2c3a-4598-af72-e1b52f1f03c5"), /** * Provides a translation map between the supplied name of an action target and the name supported by the implementation of the governance service. */ - ACTION_TARGET_MAP("actionTargetMap", "map", "Provides a translation map between the supplied name of an action target and the name supported by the implementation of the governance service.", null, "b848b720-4171-4d28-9e4c-1d34f51aaf5f"), + ACTION_TARGET_MAP("actionTargetMap", DataType.MAP_STRING_STRING.getName(), "Provides a translation map between the supplied name of an action target and the name supported by the implementation of the governance service.", null, "b848b720-4171-4d28-9e4c-1d34f51aaf5f"), /** * Request type supported by the governance service (overrides requestType on call to governance service if specified) */ - SERVICE_REQUEST_TYPE("serviceRequestType", "string", "Request type supported by the governance service (overrides requestType on call to governance service if specified).", null, "63238bb7-e935-4c38-8d0a-61917f01a31d"), + SERVICE_REQUEST_TYPE("serviceRequestType", DataType.STRING.getName(), "Request type supported by the governance service (overrides requestType on call to governance service if specified).", null, "63238bb7-e935-4c38-8d0a-61917f01a31d"), /** * Unique name of the link type that connects the edge to the vertex. */ - LINK_TYPE_NAME("linkTypeName", "string", "Unique name of the link type that connects the edge to the vertex.", null, "4f275bc0-3a33-4f6a-96ee-cd7bd13ba579"), + LINK_TYPE_NAME("linkTypeName", DataType.STRING.getName(), "Unique name of the link type that connects the edge to the vertex.", null, "4f275bc0-3a33-4f6a-96ee-cd7bd13ba579"), /** * If the end of a relationship is significant, set to 1 or 2 to indicate the desired end; otherwise use 0. */ - RELATIONSHIP_END("relationshipEnd", "int", "If the end of a relationship is significant, set to 1 or 2 to indicated the desired end; otherwise use 0.", null, "8b53224f-e330-4ded-9d18-da6517094994"), + RELATIONSHIP_END("relationshipEnd", DataType.INT.getName(), "If the end of a relationship is significant, set to 1 or 2 to indicated the desired end; otherwise use 0.", null, "8b53224f-e330-4ded-9d18-da6517094994"), /** * Display name for the relationship end. */ - RELATIONSHIP_END_NAME("relationshipEndName", "string", "Display name for the relationship end.", null, "e98f95e3-316b-4200-b608-57d7836d8901"), + RELATIONSHIP_END_NAME("relationshipEndName", DataType.STRING.getName(), "Display name for the relationship end.", null, "e98f95e3-316b-4200-b608-57d7836d8901"), /** * Open metadata type name for the associated schema type. */ - SCHEMA_TYPE_NAME("schemaTypeName", "string", "Open metadata type name for the associated schema type.", null, "4948ea82-387c-4a82-99ad-3e94bb5253b7"), + SCHEMA_TYPE_NAME("schemaTypeName", DataType.STRING.getName(), "Open metadata type name for the associated schema type.", null, "4948ea82-387c-4a82-99ad-3e94bb5253b7"), /** * The name of a primitive data type. */ - DATA_TYPE("dataType", "string", "The name of a primitive data type.", null, "50e73f9f-10a0-4b41-9cb6-bf55630f3734"), + DATA_TYPE("dataType", DataType.STRING.getName(), "The name of a primitive data type.", null, "50e73f9f-10a0-4b41-9cb6-bf55630f3734"), /** * The default value of a primitive data type. */ - DEFAULT_VALUE("defaultValue", "string", "The default value of a primitive data type.", null, "e2ac5648-054c-492f-9818-bb1c55554bd6"), + DEFAULT_VALUE("defaultValue", DataType.STRING.getName(), "The default value of a primitive data type.", null, "e2ac5648-054c-492f-9818-bb1c55554bd6"), /** * The value of a literal data type. */ - FIXED_VALUE("fixedValue", "string", "The value of a literal data type.", null, "bd0b89c3-d865-4b62-bd86-a06b3fad08fb"), + FIXED_VALUE("fixedValue", DataType.STRING.getName(), "The value of a literal data type.", null, "bd0b89c3-d865-4b62-bd86-a06b3fad08fb"), /** * Position of the element in a collection of relationships. */ - POSITION("position", "int", "Position of the element in a collection of relationships.", null, "2fd62293-99e3-48f9-825f-e9b22d8470ae"), + POSITION("position", DataType.INT.getName(), "Position of the element in a collection of relationships.", null, "2fd62293-99e3-48f9-825f-e9b22d8470ae"), /** * Minimum number of allowed instances. */ - MIN_CARDINALITY("minCardinality", "int", "Minimum number of allowed instances.", null, "d3e13cd5-414f-4c82-94b8-e61dad64f7c3"), + MIN_CARDINALITY("minCardinality", DataType.INT.getName(), "Minimum number of allowed instances.", null, "d3e13cd5-414f-4c82-94b8-e61dad64f7c3"), /** * Maximum number of allowed instances. */ - MAX_CARDINALITY("maxCardinality", "int", "Maximum number of allowed instances.", null, "5caa1b1a-590f-4a2e-85ad-260b64f4bbc1"), + MAX_CARDINALITY("maxCardinality", DataType.INT.getName(), "Maximum number of allowed instances.", null, "5caa1b1a-590f-4a2e-85ad-260b64f4bbc1"), /** * Provides additional reasons, or expectations from the results. */ - PURPOSE("purpose", "string", "Provides additional reasons, or expectations from the results. This is typically expressed in business terms", null, "be802acc-3324-4c32-9b4a-69746a9b3018"), + PURPOSE("purpose", DataType.STRING.getName(), "Provides additional reasons, or expectations from the results. This is typically expressed in business terms", null, "be802acc-3324-4c32-9b4a-69746a9b3018"), /** * Name of the type of annotation. */ - ANNOTATION_TYPE("annotationType", "string", "Name of the type of annotation.", null, "be802acc-3324-4c32-9b4a-69746a9b3018"), + ANNOTATION_TYPE("annotationType", DataType.STRING.getName(), "Name of the type of annotation.", null, "be802acc-3324-4c32-9b4a-69746a9b3018"), /** * Short description for summary tables. */ - SUMMARY("summary", "string", "Short description for summary tables.", null, "30719554-1a97-424f-ac05-f4e4e67bd278"), + SUMMARY("summary", DataType.STRING.getName(), "Short description for summary tables.", null, "30719554-1a97-424f-ac05-f4e4e67bd278"), /** * Level of certainty in the accuracy of the results. */ - CONFIDENCE_LEVEL("confidenceLevel", "int", "Level of certainty in the accuracy of the results.", null, "29372374-38bb-472d-9d6e-529b68aed1e0"), + CONFIDENCE_LEVEL("confidenceLevel", DataType.INT.getName(), "Level of certainty in the accuracy of the results.", null, "29372374-38bb-472d-9d6e-529b68aed1e0"), /** * Expression used to create the annotation. */ - EXPRESSION("expression", "string", "Expression used to create the annotation.", null, "e130bc01-7c58-4799-8d8a-ae3ec659a064"), + EXPRESSION("expression", DataType.STRING.getName(), "Expression used to create the annotation.", null, "e130bc01-7c58-4799-8d8a-ae3ec659a064"), /** * Explanation of the analysis. */ - EXPLANATION("explanation", "string", "Explanation of the analysis.", null, "9445c89d-250f-464c-bb9c-744f25b7b7e1"), + EXPLANATION("explanation", DataType.STRING.getName(), "Explanation of the analysis.", null, "9445c89d-250f-464c-bb9c-744f25b7b7e1"), /** * Additional request parameters passed to the service. */ - ANALYSIS_PARAMETERS("analysisParameters", "map", "Additional request parameters passed to the service.", null, "b3eb6d7f-9c52-44f0-99c3-359f52218c7e"), + ANALYSIS_PARAMETERS("analysisParameters", DataType.MAP_STRING_STRING.getName(), "Additional request parameters passed to the service.", null, "b3eb6d7f-9c52-44f0-99c3-359f52218c7e"), /** * The step in the analysis that produced the annotation. */ - ANALYSIS_STEP("analysisStep", "string", "The step in the analysis that produced the annotation.", null, "0b8d13b5-39eb-46d1-9ab0-1cc192697ff7"), + ANALYSIS_STEP("analysisStep", DataType.STRING.getName(), "The step in the analysis that produced the annotation.", null, "0b8d13b5-39eb-46d1-9ab0-1cc192697ff7"), /** * Additional properties used in the request. */ - JSON_PROPERTIES("jsonProperties", "map", "Additional properties used in the specification.", null, "fe0c84c7-6f19-4c36-897f-9067447d0d9a"), + JSON_PROPERTIES("jsonProperties", DataType.MAP_STRING_STRING.getName(), "Additional properties used in the specification.", null, "fe0c84c7-6f19-4c36-897f-9067447d0d9a"), /** * Date of the review. */ - REVIEW_DATE("reviewDate", "date", "Date of the review.", null, "7c19aa3a-5fbe-4455-928d-3330b21b22dd"), + REVIEW_DATE("reviewDate", DataType.DATE.getName(), "Date of the review.", null, "7c19aa3a-5fbe-4455-928d-3330b21b22dd"), /** * User identifier for the steward performing the review. */ - STEWARD("steward", "string", "Unique identifier for the steward performing the action.", null, "6777fa1e-3289-4896-a032-1097b4ad78b2"), + STEWARD("steward", DataType.STRING.getName(), "Unique identifier for the steward performing the action.", null, "6777fa1e-3289-4896-a032-1097b4ad78b2"), /** * Type name of the Actor entity identifying the steward. */ - STEWARD_TYPE_NAME("stewardTypeName", "string", "Type name of the Actor entity identifying the steward.", "Person", "b4c4637d-b196-4268-86a2-c6daf444dd7d"), + STEWARD_TYPE_NAME("stewardTypeName", DataType.STRING.getName(), "Type name of the Actor entity identifying the steward.", "Person", "b4c4637d-b196-4268-86a2-c6daf444dd7d"), /** * Property name for the steward's unique identifier (typically guid or qualifiedName). */ - STEWARD_PROPERTY_NAME("stewardPropertyName", "string", "Property name for the steward's unique identifier (typically guid or qualifiedName).", "guid", "b9e55ebe-43fb-4eb0-8485-6ef22e07f0a8"), + STEWARD_PROPERTY_NAME("stewardPropertyName", DataType.STRING.getName(), "Property name for the steward's unique identifier (typically guid or qualifiedName).", "guid", "b9e55ebe-43fb-4eb0-8485-6ef22e07f0a8"), /** * Notes on why decision were made relating to this element, and other useful information. */ - NOTES("notes", "string", "Notes on why decision were made relating to this element, and other useful information.", null, "577281c3-82f8-4c1d-ad95-04ef5919e57c"), + NOTES("notes", DataType.STRING.getName(), "Notes on why decision were made relating to this element, and other useful information.", null, "577281c3-82f8-4c1d-ad95-04ef5919e57c"), /** * Notes provided by the steward. */ - COMMENT("comment", "string", "Notes provided by the steward.", null, "bb38c0ab-de6c-47d6-ae3a-d4848fd79c58"), + COMMENT("comment", DataType.STRING.getName(), "Notes provided by the steward.", null, "bb38c0ab-de6c-47d6-ae3a-d4848fd79c58"), /** * Status of the processing as a result of the annotation. @@ -486,363 +491,363 @@ public enum OpenMetadataProperty /** * Date/time that work started on this element. */ - START_DATE("startDate", "date", "Date/time that work started on this element.", null, "e3e374cc-0f9d-45f6-ae74-7d7a438b17bf"), + START_DATE("startDate", DataType.DATE.getName(), "Date/time that work started on this element.", null, "e3e374cc-0f9d-45f6-ae74-7d7a438b17bf"), /** * Date/time that work is expected to be complete for this element. */ - PLANNED_END_DATE("startDate", "date", "Date/time that work is expected to be complete for this element.", null, "330ae312-1e88-4c7b-810e-4b4a50e540e8"), + PLANNED_END_DATE("startDate", DataType.DATE.getName(), "Date/time that work is expected to be complete for this element.", null, "330ae312-1e88-4c7b-810e-4b4a50e540e8"), /** * Date/time that work stopped on this element. */ - COMPLETION_DATE("completionDate", "date", "Date/time that work stopped on this element.", null, "28585eb7-ca9f-4149-b51f-ad29bbfe3f7c"), + COMPLETION_DATE("completionDate", DataType.DATE.getName(), "Date/time that work stopped on this element.", null, "28585eb7-ca9f-4149-b51f-ad29bbfe3f7c"), /** * The name to identify the action target to the actor that processes it. */ - ACTION_TARGET_NAME("actionTargetName", "string", "The name to identify the action target to the actor that processes it.", null, "3a5d325f-267c-4821-beb2-2c59d89891ed"), + ACTION_TARGET_NAME("actionTargetName", DataType.STRING.getName(), "The name to identify the action target to the actor that processes it.", null, "3a5d325f-267c-4821-beb2-2c59d89891ed"), /** * An example of the described concept, element or value. */ - EXAMPLE("example", "string", "An example of the described concept, element or value.", null, "b207bc5c-b5b5-43f1-94f8-41f4e2902ee5"), + EXAMPLE("example", DataType.STRING.getName(), "An example of the described concept, element or value.", null, "b207bc5c-b5b5-43f1-94f8-41f4e2902ee5"), /** * An example of the described concept, element or value. */ - EXAMPLES("examples", "string", "Examples of this concept in use.", null, "29c50714-461f-4856-8fcd-30e5b9e7ebaf"), + EXAMPLES("examples", DataType.STRING.getName(), "Examples of this concept in use.", null, "29c50714-461f-4856-8fcd-30e5b9e7ebaf"), /** * How this concept name is abbreviated. */ - ABBREVIATION("abbreviation", "string", "How this glossary term is abbreviated.", null, "0a1eae14-718b-416c-a7d8-04d6f194d7dc"), + ABBREVIATION("abbreviation", DataType.STRING.getName(), "How this glossary term is abbreviated.", null, "0a1eae14-718b-416c-a7d8-04d6f194d7dc"), /** * Visible version identifier. */ - PUBLISH_VERSION_ID("publishVersionIdentifier", "string", "Visible version identifier.", "V1.2", "cae42a1b-f752-4ca9-8d26-96829b2f591d"), + PUBLISH_VERSION_ID("publishVersionIdentifier", DataType.STRING.getName(), "Visible version identifier.", "V1.2", "cae42a1b-f752-4ca9-8d26-96829b2f591d"), /** * Is this value required? */ - REQUIRED("required", "boolean", "Is this value required?", null, "fb810cde-18a7-46a0-88a3-6a0fb69b2286"), + REQUIRED("required", DataType.BOOLEAN.getName(), "Is this value required?", null, "fb810cde-18a7-46a0-88a3-6a0fb69b2286"), /** * Message to provide additional information on the results of acting on the target by the actor or the reasons for any failures. */ - COMPLETION_MESSAGE("completionMessage", "string", "Message to provide additional information on the results of acting on the target by the actor or the reasons for any failures.", null, "f7633bda-9a90-4561-8d5a-356126a855ea"), + COMPLETION_MESSAGE("completionMessage", DataType.STRING.getName(), "Message to provide additional information on the results of acting on the target by the actor or the reasons for any failures.", null, "f7633bda-9a90-4561-8d5a-356126a855ea"), /** * Name of the keyword. */ - KEYWORD("keyword", "string", "Name of the keyword.", null, "b15f3d92-c4fb-44f6-a773-986b0c02906b"), + KEYWORD("keyword", DataType.STRING.getName(), "Name of the keyword.", null, "b15f3d92-c4fb-44f6-a773-986b0c02906b"), /** * Unique name of the process that initiated this request (if applicable). */ - PROCESS_NAME("processName", "string", "Unique name of the process that initiated this request (if applicable).", null, "9b3e9119-503e-42b4-b972-95169163539b"), + PROCESS_NAME("processName", DataType.STRING.getName(), "Unique name of the process that initiated this request (if applicable).", null, "9b3e9119-503e-42b4-b972-95169163539b"), /** * Unique identifier of the governance action process step that initiated this request (if applicable). */ - PROCESS_STEP_GUID("processStepGUID", "string", "Unique identifier of the governance action process step that initiated this request (if applicable).", null, "69f3ec60-338b-4af4-9ebf-4139a33850a4"), + PROCESS_STEP_GUID("processStepGUID", DataType.STRING.getName(), "Unique identifier of the governance action process step that initiated this request (if applicable).", null, "69f3ec60-338b-4af4-9ebf-4139a33850a4"), /** * Unique name of the governance action process step that initiated this request (if applicable). */ - PROCESS_STEP_NAME("processStepName", "string", "Unique name of the governance action process step that initiated this request (if applicable).", null, "5f851f84-c871-4ada-b8fa-629449f1ca7b"), + PROCESS_STEP_NAME("processStepName", DataType.STRING.getName(), "Unique name of the governance action process step that initiated this request (if applicable).", null, "5f851f84-c871-4ada-b8fa-629449f1ca7b"), /** * Unique identifier of the governance action type that initiated this request (if applicable). */ - GOVERNANCE_ACTION_TYPE_GUID("governanceActionTypeGUID", "string", "Unique identifier of the governance action type that initiated this request (if applicable).", null, "73c3d8bb-05ec-40eb-9ff0-31de48407c14"), + GOVERNANCE_ACTION_TYPE_GUID("governanceActionTypeGUID", DataType.STRING.getName(), "Unique identifier of the governance action type that initiated this request (if applicable).", null, "73c3d8bb-05ec-40eb-9ff0-31de48407c14"), /** * Unique name of the governance action type that initiated this request (if applicable). */ - GOVERNANCE_ACTION_TYPE_NAME("governanceActionTypeName", "string", "Unique name of the governance action type that initiated this request (if applicable).", null, "e1921f31-306c-4a11-b37c-67eaae2eefea"), + GOVERNANCE_ACTION_TYPE_NAME("governanceActionTypeName", DataType.STRING.getName(), "Unique name of the governance action type that initiated this request (if applicable).", null, "e1921f31-306c-4a11-b37c-67eaae2eefea"), /** * Display name for the discovered schema. */ - SCHEMA_NAME("schemaName", "string", "Display name for the discovered schema.", null, "c6011a00-b9c0-45d9-a525-88014aa3546f"), + SCHEMA_NAME("schemaName", DataType.STRING.getName(), "Display name for the discovered schema.", null, "c6011a00-b9c0-45d9-a525-88014aa3546f"), /** * Type name for the discovered schema. */ - SCHEMA_TYPE("schemaType", "string", "Type name for the discovered schema.", null, "6a68d174-fd29-49ef-aa4b-26205dbebb58"), + SCHEMA_TYPE("schemaType", DataType.STRING.getName(), "Type name for the discovered schema.", null, "6a68d174-fd29-49ef-aa4b-26205dbebb58"), /** * Length of the data field. */ - LENGTH("length", "int", "Length of the data field.", null, "35a17811-1635-4ab1-9a15-0f79bc771a27"), + LENGTH("length", DataType.INT.getName(), "Length of the data field.", null, "35a17811-1635-4ab1-9a15-0f79bc771a27"), /** * Potential classification names and properties as JSON. */ - CANDIDATE_CLASSIFICATIONS("candidateClassifications", "map", "Potential classification names and properties as JSON.", null, "3ea11266-368b-4c0d-ad4d-2943a14a38ad"), + CANDIDATE_CLASSIFICATIONS("candidateClassifications", DataType.MAP_STRING_STRING.getName(), "Potential classification names and properties as JSON.", null, "3ea11266-368b-4c0d-ad4d-2943a14a38ad"), /** * Inferred data type based on the data values. */ - INFERRED_DATA_TYPE("inferredDataType", "string", "Inferred data type based on the data values.", null, "27c3d24d-8ea9-4daf-ab82-c813b3dfa01a"), + INFERRED_DATA_TYPE("inferredDataType", DataType.STRING.getName(), "Inferred data type based on the data values.", null, "27c3d24d-8ea9-4daf-ab82-c813b3dfa01a"), /** * Inferred data format based on the data values. */ - INFERRED_FORMAT("inferredFormat", "string", "Inferred data format based on the data values.", null, "0198a639-1906-4377-b8ba-56cccbf88b3e"), + INFERRED_FORMAT("inferredFormat", DataType.STRING.getName(), "Inferred data format based on the data values.", null, "0198a639-1906-4377-b8ba-56cccbf88b3e"), /** * Inferred data field length based on the data values. */ - INFERRED_LENGTH("inferredLength", "int", "Inferred data field length based on the data values.", null, "e67b7353-20e0-46be-b912-e96192a200fc"), + INFERRED_LENGTH("inferredLength", DataType.INT.getName(), "Inferred data field length based on the data values.", null, "e67b7353-20e0-46be-b912-e96192a200fc"), /** * Inferred precision of the data based on the data values. */ - INFERRED_PRECISION("inferredPrecision", "int", "Inferred precision of the data based on the data values.", null, "4ce73780-f940-4da6-bfcb-3b726ede2f7b"), + INFERRED_PRECISION("inferredPrecision", DataType.INT.getName(), "Inferred precision of the data based on the data values.", null, "4ce73780-f940-4da6-bfcb-3b726ede2f7b"), /** * Inferred scale applied to the data based on the data values. */ - INFERRED_SCALE("inferredScale", "int", "Inferred scale applied to the data based on the data values.", null, "bd28ec07-01bd-4db4-9377-33b15097ded4"), + INFERRED_SCALE("inferredScale", DataType.INT.getName(), "Inferred scale applied to the data based on the data values.", null, "bd28ec07-01bd-4db4-9377-33b15097ded4"), /** * Time at which the profiling started collecting data. */ - PROFILE_PROPERTY_NAMES("profilePropertyNames", "array", "List of property names used in this annotation.", "[profileEndDate, profileCounts]", "210e2977-6803-4fce-93e8-15547168d459"), + PROFILE_PROPERTY_NAMES("profilePropertyNames", DataType.ARRAY_STRING.getName(), "List of property names used in this annotation.", "[profileEndDate, profileCounts]", "210e2977-6803-4fce-93e8-15547168d459"), /** * Time at which the profiling started collecting data. */ - PROFILE_START_DATE("profileStartDate", "date", "Time at which the profiling started collecting data.", null, "6bee91ad-4eae-4292-ab28-ff1e5404e74d"), + PROFILE_START_DATE("profileStartDate", DataType.DATE.getName(), "Time at which the profiling started collecting data.", null, "6bee91ad-4eae-4292-ab28-ff1e5404e74d"), /** * Time at which the profiling stopped collecting data. */ - PROFILE_END_DATE("profileEndDate", "date", "Time at which the profiling stopped collecting data.", null, "9f31776f-f567-40aa-92cd-b990131dbdb8"), + PROFILE_END_DATE("profileEndDate", DataType.DATE.getName(), "Time at which the profiling stopped collecting data.", null, "9f31776f-f567-40aa-92cd-b990131dbdb8"), /** * Additional profile properties discovered during the analysis. */ - PROFILE_PROPERTIES("profileProperties", "map", "Additional profile properties discovered during the analysis.", null, "53f5e89d-6730-4ae5-bfbf-62d4512eff58"), + PROFILE_PROPERTIES("profileProperties", DataType.MAP_STRING_STRING.getName(), "Additional profile properties discovered during the analysis.", null, "53f5e89d-6730-4ae5-bfbf-62d4512eff58"), /** * Additional flags (booleans) discovered during the analysis. */ - PROFILE_FLAGS("profileFlags", "map", "Additional flags (booleans) discovered during the analysis.", null, "b7b28f24-5464-4cab-8c6b-10bc11ed6118"), + PROFILE_FLAGS("profileFlags", DataType.MAP_STRING_BOOLEAN.getName(), "Additional flags (booleans) discovered during the analysis.", null, "b7b28f24-5464-4cab-8c6b-10bc11ed6118"), /** * Relevant dates discovered during the analysis. */ - PROFILE_DATES("profileDates", "map", "Relevant dates discovered during the analysis.", null, "7d700cc5-b56c-4aeb-8416-7cf8d17d16c2"), + PROFILE_DATES("profileDates", DataType.MAP_STRING_DATE.getName(), "Relevant dates discovered during the analysis.", null, "7d700cc5-b56c-4aeb-8416-7cf8d17d16c2"), /** * Additional counts discovered during the analysis. */ - PROFILE_COUNTS("profileCounts", "map", "Additional counts discovered during the analysis.", null, "6550a7b0-4ab2-4188-b32f-c1576f4bcedc"), + PROFILE_COUNTS("profileCounts", DataType.MAP_STRING_LONG.getName(), "Additional counts discovered during the analysis.", null, "6550a7b0-4ab2-4188-b32f-c1576f4bcedc"), /** * Additional large counts discovered during the analysis. */ - PROFILE_DOUBLES("profileDoubles", "map", "Additional large counts discovered during the analysis.", null, "e77933c9-64c6-476f-bd0f-e905838fb7fa"), + PROFILE_DOUBLES("profileDoubles", DataType.MAP_STRING_DOUBLE.getName(), "Additional large counts discovered during the analysis.", null, "e77933c9-64c6-476f-bd0f-e905838fb7fa"), /** * List of individual values in the data. */ - VALUE_LIST("valueList", "array", "List of individual values in the data.", null, "6d67712d-d302-48b0-a05a-35d9d6da4380"), + VALUE_LIST("valueList", DataType.ARRAY_STRING.getName(), "List of individual values in the data.", null, "6d67712d-d302-48b0-a05a-35d9d6da4380"), /** * Count of individual values in the data. */ - VALUE_COUNT("valueCount", "map", "Count of individual values in the data.", null, "544a4595-7d96-465f-acc9-1b1cf472c671"), + VALUE_COUNT("valueCount", DataType.MAP_STRING_INT.getName(), "Count of individual values in the data.", null, "544a4595-7d96-465f-acc9-1b1cf472c671"), /** * Lowest value in the data. */ - VALUE_RANGE_FROM("valueRangeFrom", "string", "Lowest value in the data.", null, "8a5f6805-1014-4016-a94e-6d02236f6408"), + VALUE_RANGE_FROM("valueRangeFrom", DataType.STRING.getName(), "Lowest value in the data.", null, "8a5f6805-1014-4016-a94e-6d02236f6408"), /** * Highest value in the data. */ - VALUE_RANGE_TO("valueRangeTo", "string", "Highest value in the data.", null, "623c5733-80b4-41be-a9cc-4823c5ce5cf7"), + VALUE_RANGE_TO("valueRangeTo", DataType.STRING.getName(), "Highest value in the data.", null, "623c5733-80b4-41be-a9cc-4823c5ce5cf7"), /** * Typical value in the data. */ - AVERAGE_VALUE("averageValue", "string", "Typical value in the data.", null, "52ed8053-42b9-4d26-a1d5-c6aba915ccb1"), + AVERAGE_VALUE("averageValue", DataType.STRING.getName(), "Typical value in the data.", null, "52ed8053-42b9-4d26-a1d5-c6aba915ccb1"), /** * List of possible matching data classes. */ - CANDIDATE_DATA_CLASS_GUIDS("candidateDataClassGUIDs", "array", "List of possible matching data classes.", null, "e6d6f746-50a4-4e1c-b998-06de82f0a839"), + CANDIDATE_DATA_CLASS_GUIDS("candidateDataClassGUIDs", DataType.ARRAY_STRING.getName(), "List of possible matching data classes.", null, "e6d6f746-50a4-4e1c-b998-06de82f0a839"), /** * Number of values that match the data class specification. */ - MATCHING_VALUES("matchingValues", "long", "Number of values that match the data class specification.", null, "96c33d36-cff9-455e-944f-38224eb7448b"), + MATCHING_VALUES("matchingValues", DataType.LONG.getName(), "Number of values that match the data class specification.", null, "96c33d36-cff9-455e-944f-38224eb7448b"), /** * Number of values that do not match the data class specification. */ - NON_MATCHING_VALUES("nonMatchingValues", "long", "Number of values that do not match the data class specification.", null, "7bb6364d-486f-4005-97c9-941c7b7154d5"), + NON_MATCHING_VALUES("nonMatchingValues", DataType.LONG.getName(), "Number of values that do not match the data class specification.", null, "7bb6364d-486f-4005-97c9-941c7b7154d5"), /** * Suggested term based on the analysis. */ - INFORMAL_TERM("informalTerm", "string", "Suggested term based on the analysis.", null, "3a13654b-f671-4928-990a-96cfe8d25422"), + INFORMAL_TERM("informalTerm", DataType.STRING.getName(), "Suggested term based on the analysis.", null, "3a13654b-f671-4928-990a-96cfe8d25422"), /** * List of potentially matching glossary terms. */ - CANDIDATE_GLOSSARY_TERM_GUIDS("candidateGlossaryTermGUIDs", "array", "List of potentially matching glossary terms.", null, "8be05385-75fe-42e2-a87f-2adb47289395"), + CANDIDATE_GLOSSARY_TERM_GUIDS("candidateGlossaryTermGUIDs", DataType.ARRAY_STRING.getName(), "List of potentially matching glossary terms.", null, "8be05385-75fe-42e2-a87f-2adb47289395"), /** * Suggested category based on the analysis. */ - INFORMAL_CATEGORY("informalCategory", "string", "Suggested category based on the analysis.", null, "15b33606-c660-43b8-b6fc-8b715aeac55f"), + INFORMAL_CATEGORY("informalCategory", DataType.STRING.getName(), "Suggested category based on the analysis.", null, "15b33606-c660-43b8-b6fc-8b715aeac55f"), /** * List of potentially matching glossary categories. */ - CANDIDATE_GLOSSARY_CATEGORY_GUIDS("candidateGlossaryCategoryGUIDs", "array", "List of potentially matching glossary categories.", null, "5b865d63-65b8-4d29-b382-e0490de041c9"), + CANDIDATE_GLOSSARY_CATEGORY_GUIDS("candidateGlossaryCategoryGUIDs", DataType.ARRAY_STRING.getName(), "List of potentially matching glossary categories.", null, "5b865d63-65b8-4d29-b382-e0490de041c9"), /** * Type of quality calculation. */ - QUALITY_DIMENSION("qualityDimension", "string", "Type of quality calculation.", null, "a865a7d9-b18c-4aae-853b-c429bd5f8c32"), + QUALITY_DIMENSION("qualityDimension", DataType.STRING.getName(), "Type of quality calculation.", null, "a865a7d9-b18c-4aae-853b-c429bd5f8c32"), /** * Calculated quality value. */ - QUALITY_SCORE("qualityScore", "int", "Calculated quality value.", null, "cdbe5189-771d-42a5-917a-42923dedaf89"), + QUALITY_SCORE("qualityScore", DataType.INT.getName(), "Calculated quality value.", null, "cdbe5189-771d-42a5-917a-42923dedaf89"), /** * Type name of the potential relationship. */ - RELATIONSHIP_TYPE_NAME("relationshipTypeName", "string", "Type name of the potential relationship.", null, "477c226d-ceb0-4f4a-87d2-f60632a9dbf2"), + RELATIONSHIP_TYPE_NAME("relationshipTypeName", DataType.STRING.getName(), "Type name of the potential relationship.", null, "477c226d-ceb0-4f4a-87d2-f60632a9dbf2"), /** * Entity that should be linked to the asset being analyzed. */ - RELATED_ENTITY_GUID("relatedEntityGUID", "string", "Entity that should be linked to the asset being analyzed.", null, "d399931b-29f4-4039-bee5-4a68c1b68d28"), + RELATED_ENTITY_GUID("relatedEntityGUID", DataType.STRING.getName(), "Entity that should be linked to the asset being analyzed.", null, "d399931b-29f4-4039-bee5-4a68c1b68d28"), /** * Properties to add to the relationship. */ - RELATIONSHIP_PROPERTIES("relationshipProperties", "map", "Properties to add to the relationship.", null, "d7cfc6d9-1b1a-4266-875a-b9f713d80643"), + RELATIONSHIP_PROPERTIES("relationshipProperties", DataType.MAP_STRING_STRING.getName(), "Properties to add to the relationship.", null, "d7cfc6d9-1b1a-4266-875a-b9f713d80643"), /** * Discovered properties of the data source. */ - RESOURCE_PROPERTIES("resourceProperties", "map", "Discovered properties of the resource.", null, "c187fe2c-cee8-4c4b-99e7-dcb27032a88d"), + RESOURCE_PROPERTIES("resourceProperties", DataType.MAP_STRING_STRING.getName(), "Discovered properties of the resource.", null, "c187fe2c-cee8-4c4b-99e7-dcb27032a88d"), /** * Name of the activity that revealed the need for action. */ - ACTION_SOURCE_NAME("actionSourceName", "string", "Name of the activity that revealed the need for action.", null, "dddf1c9e-d0d6-4812-a757-1d01c79f34ef"), + ACTION_SOURCE_NAME("actionSourceName", DataType.STRING.getName(), "Name of the activity that revealed the need for action.", null, "dddf1c9e-d0d6-4812-a757-1d01c79f34ef"), /** * What needs to be done. */ - ACTION_REQUESTED("actionRequested", "string", "What needs to be done.", null, "3eca27fe-0538-43f1-83b9-cf9ee43a32ec"), + ACTION_REQUESTED("actionRequested", DataType.STRING.getName(), "What needs to be done.", null, "3eca27fe-0538-43f1-83b9-cf9ee43a32ec"), /** * Additional information for use during action processing. */ - ACTION_PROPERTIES("actionProperties", "map", "Additional information for use during action processing.", null, "b2302d78-f5e2-4fd7-8932-ad10ac868ab9"), + ACTION_PROPERTIES("actionProperties", DataType.MAP_STRING_STRING.getName(), "Additional information for use during action processing.", null, "b2302d78-f5e2-4fd7-8932-ad10ac868ab9"), /** * Creation time of the data store. */ - RESOURCE_CREATE_TIME("resourceCreateTime", "date", "Creation time of the data store.", null, "766d9f17-40f9-44da-a0c8-679002a0cf91"), + RESOURCE_CREATE_TIME("resourceCreateTime", DataType.DATE.getName(), "Creation time of the data store.", null, "766d9f17-40f9-44da-a0c8-679002a0cf91"), /** * Last known modification time. */ - RESOURCE_UPDATE_TIME("resourceUpdateTime", "date", "Last known modification time.", null, "6012bdee-31d7-46d4-9f3b-f4d19c47e662"), + RESOURCE_UPDATE_TIME("resourceUpdateTime", DataType.DATE.getName(), "Last known modification time.", null, "6012bdee-31d7-46d4-9f3b-f4d19c47e662"), /** * Last known modification time. */ - RESOURCE_LAST_ACCESSED_TIME("resourceLastAccessedTime", "date", "Last known access time.", null, "f884c0bf-f2d1-4cdb-81ff-0fc7cc7c945c"), + RESOURCE_LAST_ACCESSED_TIME("resourceLastAccessedTime", DataType.DATE.getName(), "Last known access time.", null, "f884c0bf-f2d1-4cdb-81ff-0fc7cc7c945c"), /** * Creation time of the data store. */ - STORE_CREATE_TIME("storeCreateTime", "date", "Creation time of the data store.", null, "1a3abee2-f174-433d-8355-44c5810c471b"), + STORE_CREATE_TIME("storeCreateTime", DataType.DATE.getName(), "Creation time of the data store.", null, "1a3abee2-f174-433d-8355-44c5810c471b"), /** * Last known modification time. */ - STORE_UPDATE_TIME("storeUpdateTime", "date", "Last known modification time.", null, "134bbbc3-4b68-4d35-a8da-85719cced8a9"), + STORE_UPDATE_TIME("storeUpdateTime", DataType.DATE.getName(), "Last known modification time.", null, "134bbbc3-4b68-4d35-a8da-85719cced8a9"), /** * Size of the data source. */ - SIZE("size", "int", "Size of the data source.", null, "c2d67f78-3387-4b83-9c1c-bd0aa88a4df0"), + SIZE("size", DataType.INT.getName(), "Size of the data source.", null, "c2d67f78-3387-4b83-9c1c-bd0aa88a4df0"), /** * Encoding scheme used on the data. */ - ENCODING("encoding", "string", "Type of encoding scheme used on the data.", null, "7ebb8847-5ed3-4881-bee4-0e28c16613b8"), + ENCODING("encoding", DataType.STRING.getName(), "Type of encoding scheme used on the data.", null, "7ebb8847-5ed3-4881-bee4-0e28c16613b8"), /** * Language used in the encoding. */ - ENCODING_LANGUAGE("encodingLanguage", "string", "Language used in the encoding.", null, "7ebb8847-5ed3-4881-bee4-0e28c16613b8"), + ENCODING_LANGUAGE("encodingLanguage", DataType.STRING.getName(), "Language used in the encoding.", null, "7ebb8847-5ed3-4881-bee4-0e28c16613b8"), /** * Description of the encoding. */ - ENCODING_DESCRIPTION("encodingDescription", "string", "Description of the encoding.", null, "7ebb8847-5ed3-4881-bee4-0e28c16613b8"), + ENCODING_DESCRIPTION("encodingDescription", DataType.STRING.getName(), "Description of the encoding.", null, "7ebb8847-5ed3-4881-bee4-0e28c16613b8"), /** * Additional properties describing the encoding. */ - ENCODING_PROPERTIES("encodingProperties", "string", "Additional properties describing the encoding.", null, "7ebb8847-5ed3-4881-bee4-0e28c16613b8"), + ENCODING_PROPERTIES("encodingProperties", DataType.MAP_STRING_STRING.getName(), "Additional properties describing the encoding.", null, "7ebb8847-5ed3-4881-bee4-0e28c16613b8"), /** * Identifier that describes the type of resource use. */ - RESOURCE_USE("resourceUse", "string", "Identifier that describes the type of resource use.", null, "152aafd9-57c4-4341-82bb-945d213a686e"), + RESOURCE_USE("resourceUse", DataType.STRING.getName(), "Identifier that describes the type of resource use.", null, "152aafd9-57c4-4341-82bb-945d213a686e"), /** * Description of how the resource is used, or why it is useful. */ - RESOURCE_USE_DESCRIPTION("resourceUseDescription", "string", "Description of how the resource is used, or why it is useful.", null, "c579fd34-4144-4968-b0d9-fa17bd81ca9c"), + RESOURCE_USE_DESCRIPTION("resourceUseDescription", DataType.STRING.getName(), "Description of how the resource is used, or why it is useful.", null, "c579fd34-4144-4968-b0d9-fa17bd81ca9c"), /** * Additional properties that explains how to use the resource. */ - RESOURCE_USE_PROPERTIES("resourceUseProperties", "map", "Additional properties that explains how to use the resource.", null, "30c86736-c31a-4f29-8451-0c849f730a0b"), + RESOURCE_USE_PROPERTIES("resourceUseProperties", DataType.MAP_STRING_STRING.getName(), "Additional properties that explains how to use the resource.", null, "30c86736-c31a-4f29-8451-0c849f730a0b"), /** * Indicator whether the anchor should receive notifications of changes to the resource. */ - WATCH_RESOURCE("watchResource", "boolean", "Indicator whether the anchor should receive notifications of changes to the resource.", null, "d727b3ce-d58b-45d5-8abc-55b1394e030a"), + WATCH_RESOURCE("watchResource", DataType.BOOLEAN.getName(), "Indicator whether the anchor should receive notifications of changes to the resource.", null, "d727b3ce-d58b-45d5-8abc-55b1394e030a"), /** * "Time that the IT Infrastructure was deployed." */ - DEPLOYMENT_TIME( "deploymentTime", "date", "Time that the IT Infrastructure was deployed.", null, "aa372f7f-8284-4e24-902e-9f01dcc70b3e"), + DEPLOYMENT_TIME( "deploymentTime", DataType.DATE.getName(), "Time that the IT Infrastructure was deployed.", null, "aa372f7f-8284-4e24-902e-9f01dcc70b3e"), /** * Type name of deployer. */ - DEPLOYER_TYPE_NAME( "deployerTypeName", "string", "Type name of deployer.", null, "cb027494-8de7-43cc-845c-57d4f0bbf6d5"), + DEPLOYER_TYPE_NAME( "deployerTypeName", DataType.STRING.getName(), "Type name of deployer.", null, "cb027494-8de7-43cc-845c-57d4f0bbf6d5"), /** * Identifying property name of deployer. */ - DEPLOYER_PROPERTY_NAME( "deployerPropertyName", "string", "Identifying property name of deployer.", null, "152aafd9-57c4-4341-82bb-945d213a686e"), + DEPLOYER_PROPERTY_NAME( "deployerPropertyName", DataType.STRING.getName(), "Identifying property name of deployer.", null, "152aafd9-57c4-4341-82bb-945d213a686e"), /** * Person, organization or engine that deployed the IT Infrastructure. */ - DEPLOYER("deployer", "string", "Person, organization or engine that deployed the IT Infrastructure.", null, "c579fd34-4144-4968-b0d9-fa17bd81ca9c"), + DEPLOYER("deployer", DataType.STRING.getName(), "Person, organization or engine that deployed the IT Infrastructure.", null, "c579fd34-4144-4968-b0d9-fa17bd81ca9c"), /** * The operational status of the software server capability on this software server. @@ -852,17 +857,17 @@ public enum OpenMetadataProperty /** * Type of the software capability. */ - CAPABILITY_TYPE("capabilityType", "string", "Type of the software capability.", null, "c8ef1b3a-63bf-4ca1-9ef8-475e2ad67a2b"), + CAPABILITY_TYPE("capabilityType", DataType.STRING.getName(), "Type of the software capability.", null, "c8ef1b3a-63bf-4ca1-9ef8-475e2ad67a2b"), /** * Version number of the software capability. */ - CAPABILITY_VERSION("capabilityVersion", "string", "Version number of the software capability.", "V1.0", "7548df50-1553-46e1-a335-b782db998f88"), + CAPABILITY_VERSION("capabilityVersion", DataType.STRING.getName(), "Version number of the software capability.", "V1.0", "7548df50-1553-46e1-a335-b782db998f88"), /** * Patch level of the software server capability. */ - PATCH_LEVEL("patchLevel", "string", "Patch level of the software server capability.", "456", "574bea24-8dd6-407a-bed4-aaa432d10276"), + PATCH_LEVEL("patchLevel", DataType.STRING.getName(), "Patch level of the software server capability.", "456", "574bea24-8dd6-407a-bed4-aaa432d10276"), /** * Describes how the software capability uses the asset. @@ -882,42 +887,42 @@ public enum OpenMetadataProperty /** * Identifier used in an external system. */ - IDENTIFIER("identifier", "string", "Identifier used in an external system.", null, "2f831c53-0c71-4e03-92ed-20a899ed771f"), + IDENTIFIER("identifier", DataType.STRING.getName(), "Identifier used in an external system.", null, "2f831c53-0c71-4e03-92ed-20a899ed771f"), /** * The username of the person or process that created the instance in the external system. */ - EXT_INSTANCE_CREATED_BY("externalInstanceCreatedBy" , "string", "The username of the person or process that created the instance in the external system.", null, "480a57d1-7300-4691-ad8b-540d97ef0870"), + EXT_INSTANCE_CREATED_BY("externalInstanceCreatedBy" , DataType.STRING.getName(), "The username of the person or process that created the instance in the external system.", null, "480a57d1-7300-4691-ad8b-540d97ef0870"), /** * The date/time when the instance in the external system was created. */ - EXT_INSTANCE_CREATION_TIME("externalInstanceCreationTime", "date", "The date/time when the instance in the external system was created.", null, "50e22b77-6091-4316-836e-2f76468add71"), + EXT_INSTANCE_CREATION_TIME("externalInstanceCreationTime", DataType.DATE.getName(), "The date/time when the instance in the external system was created.", null, "50e22b77-6091-4316-836e-2f76468add71"), /** * The username of the person or process that last updated the instance in the external system. */ - EXT_INSTANCE_LAST_UPDATED_BY("externalInstanceLastUpdatedBy", "string", "The username of the person or process that last updated the instance in the external system.", null, "f29f9183-e651-42d5-b0c8-bb1491f3151e"), + EXT_INSTANCE_LAST_UPDATED_BY("externalInstanceLastUpdatedBy", DataType.STRING.getName(), "The username of the person or process that last updated the instance in the external system.", null, "f29f9183-e651-42d5-b0c8-bb1491f3151e"), /** * The date/time when the instance in the external system was last updated. */ - EXT_INSTANCE_LAST_UPDATE_TIME("externalInstanceLastUpdateTime", "date", "The date/time when the instance in the external system was last updated.", null, "0502401e-5292-4860-9fd7-dd2b0c46859d"), + EXT_INSTANCE_LAST_UPDATE_TIME("externalInstanceLastUpdateTime", DataType.DATE.getName(), "The date/time when the instance in the external system was last updated.", null, "0502401e-5292-4860-9fd7-dd2b0c46859d"), /** * The latest version of the element in the external system. */ - EXT_INSTANCE_VERSION("externalInstanceVersion" , "long", "The latest version of the element in the external system.", null, "349199e2-5781-4413-8550-c85241e20cc5"), + EXT_INSTANCE_VERSION("externalInstanceVersion" , DataType.LONG.getName(), "The latest version of the element in the external system.", null, "349199e2-5781-4413-8550-c85241e20cc5"), /** * Additional properties to aid the mapping to the element in an external metadata source. */ - MAPPING_PROPERTIES("mappingProperties", "map", "Additional properties to aid the mapping to the the element in an external metadata source.", null, "8161e120-993b-490c-bf66-cb9fd85192fc"), + MAPPING_PROPERTIES("mappingProperties", DataType.MAP_STRING_STRING.getName(), "Additional properties to aid the mapping to the the element in an external metadata source.", null, "8161e120-993b-490c-bf66-cb9fd85192fc"), /** * Timestamp documenting the last time the metadata in the external metadata source was synchronized with open metadata element. */ - LAST_SYNCHRONIZED("lastSynchronized", "date", "Timestamp documenting the last time the metadata in the external metadata source was synchronized with open metadata element.", null, "45f5f2fc-17ec-4f02-8d7a-8cfe8f1557fe"), + LAST_SYNCHRONIZED("lastSynchronized", DataType.DATE.getName(), "Timestamp documenting the last time the metadata in the external metadata source was synchronized with open metadata element.", null, "45f5f2fc-17ec-4f02-8d7a-8cfe8f1557fe"), /** * Defines the permitted directions of flow of metadata updates between open metadata and a third party technology. @@ -932,113 +937,113 @@ public enum OpenMetadataProperty /** * Guidance on how the element should be used. */ - USAGE("usage", "string", "Guidance on how the element should be used.", null, "e92f8669-5a07-4130-9ad6-62aadca7a505"), + USAGE("usage", DataType.STRING.getName(), "Guidance on how the element should be used.", null, "e92f8669-5a07-4130-9ad6-62aadca7a505"), /** * Details of where the element was sourced from. */ - SOURCE("source", "string", "Details of the organization, person or process that created the element, or provided the information used to create the element.", null, "9c40c4e3-1d6d-45fd-8df0-f1a2e09db636"), + SOURCE("source", DataType.STRING.getName(), "Details of the organization, person or process that created the element, or provided the information used to create the element.", null, "9c40c4e3-1d6d-45fd-8df0-f1a2e09db636"), /** * Deployed version number for this platform. */ - PLATFORM_VERSION("platformVersion", "string", "Deployed version number for this platform.", null, "03b0bab5-2a86-4720-8ab3-5b0d75c743dd"), + PLATFORM_VERSION("platformVersion", DataType.STRING.getName(), "Deployed version number for this platform.", null, "03b0bab5-2a86-4720-8ab3-5b0d75c743dd"), /** * Deployed version number for this server. */ - SERVER_VERSION("serverVersion", "string", "Deployed version number for this server.", null, "c762845d-f333-43b3-bd98-8780bc979167"), + SERVER_VERSION("serverVersion", DataType.STRING.getName(), "Deployed version number for this server.", null, "c762845d-f333-43b3-bd98-8780bc979167"), /** * Level of confidence in the correctness of the element. */ - CONFIDENCE("confidence", "int", "Level of confidence in the correctness of the element. 0=unknown; 1=low confidence; 100=total confidence.", "100", "26dd007a-cff3-45e7-963d-2a753c2b7000"), + CONFIDENCE("confidence", DataType.INT.getName(), "Level of confidence in the correctness of the element. 0=unknown; 1=low confidence; 100=total confidence.", "100", "26dd007a-cff3-45e7-963d-2a753c2b7000"), /** * The integration connector needs to use blocking calls to a third party technology and so needs to run in its own thread. */ - USES_BLOCKING_CALLS("usesBlockingCalls", "boolean", "The integration connector needs to use blocking calls to a third party technology and so needs to run in its own thread.", "false", "cd23ea21-75b0-45d2-9292-e63510c3a1e2"), + USES_BLOCKING_CALLS("usesBlockingCalls", DataType.BOOLEAN.getName(), "The integration connector needs to use blocking calls to a third party technology and so needs to run in its own thread.", "false", "cd23ea21-75b0-45d2-9292-e63510c3a1e2"), /** * Full name of the topic as used by programs to access its contents */ - TOPIC_NAME("topicName", "string", "Full name of the topic as used by programs to access its contents.", "egeria.omag.server.active-metadata-store.omas.assetconsumer.outTopic", "eda530d2-62d3-4325-9840-514f001ffc12"), + TOPIC_NAME("topicName", DataType.STRING.getName(), "Full name of the topic as used by programs to access its contents.", "egeria.omag.server.active-metadata-store.omas.assetconsumer.outTopic", "eda530d2-62d3-4325-9840-514f001ffc12"), /** * Type of topic. */ - TOPIC_TYPE("topicType", "string", "Type of topic.", "PLAINTEXT", "17eb67ae-6805-4f47-98a7-ed124804c9a6"), + TOPIC_TYPE("topicType", DataType.STRING.getName(), "Type of topic.", "PLAINTEXT", "17eb67ae-6805-4f47-98a7-ed124804c9a6"), /** * The type of property that the valid value represents. */ - PROPERTY_TYPE("propertyType", "string", "The type of property that the valid value represents.", "producedGuard", "f9f2eba1-943a-4611-8bdd-647c1645b036"), + PROPERTY_TYPE("propertyType", DataType.STRING.getName(), "The type of property that the valid value represents.", "producedGuard", "f9f2eba1-943a-4611-8bdd-647c1645b036"), /** * The phase in the lifecycle of the project. */ - PROJECT_PHASE("projectPhase", "string", "The phase in the lifecycle of the project.", "Plan", "9178fece-e112-4250-9c08-5c336bd93f78"), + PROJECT_PHASE("projectPhase", DataType.STRING.getName(), "The phase in the lifecycle of the project.", "Plan", "9178fece-e112-4250-9c08-5c336bd93f78"), /** * Indicator on how well the project is tracking to plan. */ - PROJECT_HEALTH("projectHealth", "string", "Indicator on how well the project is tracking to plan.", "On Track", "eabe799d-72d7-46a2-aa56-5ceaf723a65f"), + PROJECT_HEALTH("projectHealth", DataType.STRING.getName(), "Indicator on how well the project is tracking to plan.", "On Track", "eabe799d-72d7-46a2-aa56-5ceaf723a65f"), /** * Short description on current status of the project. */ - PROJECT_STATUS("projectStatus", "string", "Short description on current status of the project.", "Active", "39643f86-185b-465e-9e84-3f74905bad82"), + PROJECT_STATUS("projectStatus", DataType.STRING.getName(), "Short description on current status of the project.", "Active", "39643f86-185b-465e-9e84-3f74905bad82"), /** * Descriptive name of the concept that this collection represents. */ - COLLECTION_TYPE("collectionType", "string", "Descriptive name of the concept that this collection represents.", "Product Contents", "05b7dcee-1c4c-4d2b-a484-bd84ec4d67e2"), + COLLECTION_TYPE("collectionType", DataType.STRING.getName(), "Descriptive name of the concept that this collection represents.", "Product Contents", "05b7dcee-1c4c-4d2b-a484-bd84ec4d67e2"), /** * Display name of the product. */ - PRODUCT_STATUS("productStatus", "string", "Lifecycle status of the product.", "DRAFT", "9aecda29-f1e1-4fe2-8066-2a9d094b990e"), + PRODUCT_STATUS("productStatus", DataType.STRING.getName(), "Lifecycle status of the product.", "DRAFT", "9aecda29-f1e1-4fe2-8066-2a9d094b990e"), /** * Display name of the product. */ - PRODUCT_NAME("productName", "string", "Display name of the product.", "Teddy Bear Drop Foot Clinical Trial Patient Measurements", "aae2b086-05ea-433a-b1d6-502674c4ae6e"), + PRODUCT_NAME("productName", DataType.STRING.getName(), "Display name of the product.", "Teddy Bear Drop Foot Clinical Trial Patient Measurements", "aae2b086-05ea-433a-b1d6-502674c4ae6e"), /** * Type or category of the product. */ - PRODUCT_TYPE("productType", "string", "Type or category of the product.", "Files", "e64cd76f-f1b8-4c00-9ce9-87fcae8bd3d2"), + PRODUCT_TYPE("productType", DataType.STRING.getName(), "Type or category of the product.", "Files", "e64cd76f-f1b8-4c00-9ce9-87fcae8bd3d2"), /** * Date that the product was made available. */ - INTRODUCTION_DATE("introductionDate", "date", "Date that the product was made available.", null, "9fffa5e8-f2d2-4184-be1d-482d7e093ec0"), + INTRODUCTION_DATE("introductionDate", DataType.DATE.getName(), "Date that the product was made available.", null, "9fffa5e8-f2d2-4184-be1d-482d7e093ec0"), /** * Date when is the next version is expected to be released. */ - NEXT_VERSION_DATE("nextVersionDate", "date", "Date when is the next version is expected to be released.", null, "5866d607-157f-41f2-8875-00b60f534e99"), + NEXT_VERSION_DATE("nextVersionDate", DataType.DATE.getName(), "Date when is the next version is expected to be released.", null, "5866d607-157f-41f2-8875-00b60f534e99"), /** * Date when the product is expected to be (or has been) withdrawn, preventing new consumers from subscribing. */ - WITHDRAW_DATE("withdrawDate", "date", "Date when the product is expected to be (or has been) withdrawn, preventing new consumers from subscribing.", null, "f2fc6a12-6bf9-4c2f-ad99-68c892b44e76"), + WITHDRAW_DATE("withdrawDate", DataType.DATE.getName(), "Date when the product is expected to be (or has been) withdrawn, preventing new consumers from subscribing.", null, "f2fc6a12-6bf9-4c2f-ad99-68c892b44e76"), /** * Level of maturity for the product. */ - MATURITY("maturity", "string", "Level of maturity for the product.", "InDev", "666b4e71-cb40-4421-9291-0736cfa5136e"), + MATURITY("maturity", DataType.STRING.getName(), "Level of maturity for the product.", "InDev", "666b4e71-cb40-4421-9291-0736cfa5136e"), /** * Length of time that the product is expected to be in service. */ - SERVICE_LIFE("serviceLife", "string", "Length of time that the product is expected to be in service.", "2 years", "f61776bc-e78e-4c4a-9b22-275c8eb4c132"), + SERVICE_LIFE("serviceLife", DataType.STRING.getName(), "Length of time that the product is expected to be in service.", "2 years", "f61776bc-e78e-4c4a-9b22-275c8eb4c132"), /** * Which is the current supported version that is recommended for consumers. Specified as a versionIdentifier from the asset. */ - CURRENT_VERSION("currentVersion", "string", "Which is the current supported version that is recommended for consumers. Specified as a versionIdentifier from the asset.", "V1.0", "d863a1f5-5770-4a57-a331-01ef59994fba"), + CURRENT_VERSION("currentVersion", DataType.STRING.getName(), "Which is the current supported version that is recommended for consumers. Specified as a versionIdentifier from the asset.", "V1.0", "d863a1f5-5770-4a57-a331-01ef59994fba"), /** * Defines the provenance and confidence that a member belongs in a collection. @@ -1048,7 +1053,7 @@ public enum OpenMetadataProperty /** * Description of how the member is used, or why it is useful in this collection. */ - MEMBERSHIP_RATIONALE("membershipRationale", "string", "Description of how the member is used, or why it is useful in this collection.", null, "f4c0da71-f8e8-4d05-a92c-5a1e6b4a263e"), + MEMBERSHIP_RATIONALE("membershipRationale", DataType.STRING.getName(), "Description of how the member is used, or why it is useful in this collection.", null, "f4c0da71-f8e8-4d05-a92c-5a1e6b4a263e"), /** * Defines the sequencing for a collection. @@ -1058,7 +1063,7 @@ public enum OpenMetadataProperty /** * Name of property to use for ordering. */ - ORDER_BY_PROPERTY_NAME("orderByPropertyName", "string", "Name of property to use for ordering.", OpenMetadataProperty.STEWARD.name, "31b6f74e-5759-47e1-8b92-a0ce43bc73db"), + ORDER_BY_PROPERTY_NAME("orderByPropertyName", DataType.STRING.getName(), "Name of property to use for ordering.", OpenMetadataProperty.STEWARD.name, "31b6f74e-5759-47e1-8b92-a0ce43bc73db"), /** * Defines the sequential order in which bytes are arranged into larger numerical values when stored in memory or when transmitted over digital links. @@ -1078,48 +1083,48 @@ public enum OpenMetadataProperty /** * Type of contact - such as home address, work mobile, emergency contact ... */ - CONTACT_TYPE("contactType", "string", "Type of contact - such as home address, work mobile, emergency contact ...", ContactMethodType.EMAIL.getName(), "caa6fbd3-a470-473c-a656-0265c4496d54"), + CONTACT_TYPE("contactType", DataType.STRING.getName(), "Type of contact - such as home address, work mobile, emergency contact ...", ContactMethodType.EMAIL.getName(), "caa6fbd3-a470-473c-a656-0265c4496d54"), /** * Details of the contact method */ - CONTACT_METHOD_VALUE("contactMethodValue", "string", "Details of the contact method.", null, "ef793035-7111-4424-b776-6c6c84f38343"), + CONTACT_METHOD_VALUE("contactMethodValue", DataType.STRING.getName(), "Details of the contact method.", null, "ef793035-7111-4424-b776-6c6c84f38343"), /** * Details of the service supporting the contact method. */ - CONTACT_METHOD_SERVICE("contactMethodService", "string", "Details of the service supporting the contact method.", null, "55a9ed5a-c279-4dbc-895e-fda5c15000da"), + CONTACT_METHOD_SERVICE("contactMethodService", DataType.STRING.getName(), "Details of the service supporting the contact method.", null, "55a9ed5a-c279-4dbc-895e-fda5c15000da"), /** * Defines the level of confidence to place in the accuracy of a data item. */ - CONFIDENCE_LEVEL_IDENTIFIER("levelIdentifier", "int", ConfidenceLevel.getOpenTypeDescription(), Integer.toString(ConfidenceLevel.AUTHORITATIVE.getOrdinal()), "449558d5-3811-401d-b2be-f131480f9bc8"), + CONFIDENCE_LEVEL_IDENTIFIER("levelIdentifier", DataType.INT.getName(), ConfidenceLevel.getOpenTypeDescription(), Integer.toString(ConfidenceLevel.AUTHORITATIVE.getOrdinal()), "449558d5-3811-401d-b2be-f131480f9bc8"), /** * Defines how important a data item is to the organization. */ - CRITICALITY_LEVEL_IDENTIFIER("levelIdentifier", "int", CriticalityLevel.getOpenTypeDescription(), Integer.toString(CriticalityLevel.IMPORTANT.getOrdinal()), "b2c99d60-4078-4d06-beec-f7fcc588c344"), + CRITICALITY_LEVEL_IDENTIFIER("levelIdentifier", DataType.INT.getName(), CriticalityLevel.getOpenTypeDescription(), Integer.toString(CriticalityLevel.IMPORTANT.getOrdinal()), "b2c99d60-4078-4d06-beec-f7fcc588c344"), /** * Defines how confidential a data item is. */ - CONFIDENTIALITY_LEVEL_IDENTIFIER("levelIdentifier", "int", ConfidentialityLevel.getOpenTypeDescription(), Integer.toString(ConfidentialityLevel.CONFIDENTIAL.getOrdinal()), "908488a2-13f2-469d-b28d-20a7af6be4a1"), + CONFIDENTIALITY_LEVEL_IDENTIFIER("levelIdentifier", DataType.INT.getName(), ConfidentialityLevel.getOpenTypeDescription(), Integer.toString(ConfidentialityLevel.CONFIDENTIAL.getOrdinal()), "908488a2-13f2-469d-b28d-20a7af6be4a1"), /** * Defines the retention requirements associated with a data item. */ - RETENTION_BASIS_IDENTIFIER("basisIdentifier", "int", RetentionBasis.getOpenTypeDescription(), Integer.toString(RetentionBasis.PROJECT_LIFETIME.getOrdinal()), "68069d73-0e20-4cb7-a7ec-1555edbbc280"), + RETENTION_BASIS_IDENTIFIER("basisIdentifier", DataType.INT.getName(), RetentionBasis.getOpenTypeDescription(), Integer.toString(RetentionBasis.PROJECT_LIFETIME.getOrdinal()), "68069d73-0e20-4cb7-a7ec-1555edbbc280"), /** * Defines the severity of the impact that a situation has. */ - SEVERITY_IDENTIFIER("severityIdentifier", "int", ImpactSeverity.getOpenTypeDescription(), Integer.toString(ImpactSeverity.MEDIUM.getOrdinal()), "f565af06-37a1-42e9-b680-2c98715f9ff3"), + SEVERITY_IDENTIFIER("severityIdentifier", DataType.INT.getName(), ImpactSeverity.getOpenTypeDescription(), Integer.toString(ImpactSeverity.MEDIUM.getOrdinal()), "f565af06-37a1-42e9-b680-2c98715f9ff3"), /** * Defines how important a data item is to the organization. */ - STATUS_IDENTIFIER("statusIdentifier", "int", GovernanceClassificationStatus.getOpenTypeDescription(), Integer.toString(GovernanceClassificationStatus.VALIDATED.getOrdinal()), "8279602a-c86d-4cf7-b66d-1ea98b75c491"), + STATUS_IDENTIFIER("statusIdentifier", DataType.INT.getName(), GovernanceClassificationStatus.getOpenTypeDescription(), Integer.toString(GovernanceClassificationStatus.VALIDATED.getOrdinal()), "8279602a-c86d-4cf7-b66d-1ea98b75c491"), /** @@ -1165,117 +1170,117 @@ public enum OpenMetadataProperty /** * An indication of the relative position in which this work item should be tackled compared to others in the overall work list. */ - PRIORITY("priority", "int", "An indication of the relative position in which this work item should be tackled compared to others in the overall work list.", "10", "6168ae13-f6ee-49e7-9f21-693e7a401926"), + PRIORITY("priority", DataType.INT.getName(), "An indication of the relative position in which this work item should be tackled compared to others in the overall work list.", "10", "6168ae13-f6ee-49e7-9f21-693e7a401926"), /** * Metadata properties embedded in the media file. */ - EMBEDDED_METADATA("embeddedMetadata", "map", "Metadata properties embedded in the media file.", null, "af5a6693-e14c-489e-a76c-1a45248e9dbd"), + EMBEDDED_METADATA("embeddedMetadata", DataType.MAP_STRING_STRING.getName(), "Metadata properties embedded in the media file.", null, "af5a6693-e14c-489e-a76c-1a45248e9dbd"), /** * Full publication title of the external source. */ - REFERENCE_TITLE("referenceTitle", "string", "Full publication title of the external source.", null, "e98ea20f-111b-421d-91a5-586d469f990d"), + REFERENCE_TITLE("referenceTitle", DataType.STRING.getName(), "Full publication title of the external source.", null, "e98ea20f-111b-421d-91a5-586d469f990d"), /** * Summary of the key messages in the external source. */ - REFERENCE_ABSTRACT("referenceAbstract", "string", "Summary of the key messages in the external source.", null, "57b63b64-5139-45db-94e4-146a57389fe8"), + REFERENCE_ABSTRACT("referenceAbstract", DataType.STRING.getName(), "Summary of the key messages in the external source.", null, "57b63b64-5139-45db-94e4-146a57389fe8"), /** * Name of the revision or version of the external source. */ - REFERENCE_VERSION("referenceVersion", "string", "Name of the revision or version of the external source.", null, "f0365e94-3c4b-4386-a75a-a03f6e78cb7d"), + REFERENCE_VERSION("referenceVersion", DataType.STRING.getName(), "Name of the revision or version of the external source.", null, "f0365e94-3c4b-4386-a75a-a03f6e78cb7d"), /** * List of authors for the external source. */ - AUTHORS("authors", "array", "List of authors for the external source.", null, "b0dd1911-7bb6-47be-bd88-5a9c86f00fe0"), + AUTHORS("authors", DataType.ARRAY_STRING.getName(), "List of authors for the external source.", null, "b0dd1911-7bb6-47be-bd88-5a9c86f00fe0"), /** * Number of pages that this external source has. */ - NUMBER_OF_PAGES("numberOfPages", "int", "Number of pages that this external source has.", null, "dfdb0daa-3b5d-4f76-a674-bf2e683f587c"), + NUMBER_OF_PAGES("numberOfPages", DataType.INT.getName(), "Number of pages that this external source has.", null, "dfdb0daa-3b5d-4f76-a674-bf2e683f587c"), /** * Range of pages that this reference covers. */ - PAGE_RANGE("pageRange", "string", "Range of pages that this reference covers. For example, if it is a journal article, this could be the range of pages for the article in the journal.", "35-98", "6a97b691-fbba-44ae-9557-f18b627a7fb1"), + PAGE_RANGE("pageRange", DataType.STRING.getName(), "Range of pages that this reference covers. For example, if it is a journal article, this could be the range of pages for the article in the journal.", "35-98", "6a97b691-fbba-44ae-9557-f18b627a7fb1"), /** * Name of the journal or series of publications that this external source is from. */ - PUBLICATION_SERIES("publicationSeries", "string", "Name of the journal or series of publications that this external source is from.", null, "93426a39-9a40-475b-aa3c-937a3abfd40e"), + PUBLICATION_SERIES("publicationSeries", DataType.STRING.getName(), "Name of the journal or series of publications that this external source is from.", null, "93426a39-9a40-475b-aa3c-937a3abfd40e"), /** * Name of the volume in the publication series that this external source is from. */ - PUBLICATION_SERIES_VOLUME("publicationSeriesVolume", "string", "Name of the volume in the publication series that this external source is from.", null, "9ba221d6-d9c6-4d4e-9e65-9bb0a523faff"), + PUBLICATION_SERIES_VOLUME("publicationSeriesVolume", DataType.STRING.getName(), "Name of the volume in the publication series that this external source is from.", null, "9ba221d6-d9c6-4d4e-9e65-9bb0a523faff"), /** * Name of the edition for this external source. */ - EDITION("edition", "string", "Name of the edition for this external source.", "First Edition", "d327eb3c-22d5-4dc1-8206-fe82089c1011"), + EDITION("edition", DataType.STRING.getName(), "Name of the edition for this external source.", "First Edition", "d327eb3c-22d5-4dc1-8206-fe82089c1011"), /** * Network address where this external source can be accessed from. */ - URL("url", "string", "Network address where this external source can be accessed from.", null, "604dbf10-335d-4132-8a32-c30fa9fec154"), + URL("url", DataType.STRING.getName(), "Network address where this external source can be accessed from.", null, "604dbf10-335d-4132-8a32-c30fa9fec154"), /** * Name of the publisher responsible for producing this external source. */ - PUBLISHER("publisher", "string", "Name of the publisher responsible for producing this external source.", null, "3a92b878-c0ae-464b-a70b-63fd61a36ec5"), + PUBLISHER("publisher", DataType.STRING.getName(), "Name of the publisher responsible for producing this external source.", null, "3a92b878-c0ae-464b-a70b-63fd61a36ec5"), /** * Date of the first published version/edition of this external source. */ - FIRST_PUB_DATE("firstPublicationDate", "date", "Date of the first published version/edition of this external source.", null, "22eac39f-8097-4f17-84b2-d718f06b242c"), + FIRST_PUB_DATE("firstPublicationDate", DataType.DATE.getName(), "Date of the first published version/edition of this external source.", null, "22eac39f-8097-4f17-84b2-d718f06b242c"), /** * Date when this version/edition of this external source was published. */ - PUBLICATION_DATE("publicationDate", "", "Date when this version/edition of this external source was published.", null, "1b6d0398-31f3-4f8e-9998-3b975323423d"), + PUBLICATION_DATE("publicationDate", DataType.INT.getName(), "Date when this version/edition of this external source was published.", null, "1b6d0398-31f3-4f8e-9998-3b975323423d"), /** * City where the publishers are based. */ - PUBLICATION_CITY("publicationCity", "string", "City where the publishers are based.", "London", "16bb6599-a056-4d49-b757-833ba1bd2b38"), + PUBLICATION_CITY("publicationCity", DataType.STRING.getName(), "City where the publishers are based.", "London", "16bb6599-a056-4d49-b757-833ba1bd2b38"), /** * Year when the publication of this version/edition of the external source was published. */ - PUBLICATION_YEAR("publicationYear", "string", "Year when the publication of this version/edition of the external source was published.", "2020", "5ae46954-7762-4ab5-87e2-828287e82013"), + PUBLICATION_YEAR("publicationYear", DataType.STRING.getName(), "Year when the publication of this version/edition of the external source was published.", "2020", "5ae46954-7762-4ab5-87e2-828287e82013"), /** * List of unique numbers allocated by the publisher for this external source. For example ISBN, ASIN, UNSPSC code. */ - PUBLICATION_NUMBERS("publicationNumbers", "array", "List of unique numbers allocated by the publisher for this external source. For example ISBN, ASIN, UNSPSC code.", null, "2c734b4c-de01-490f-9675-da4addc5efe4"), + PUBLICATION_NUMBERS("publicationNumbers", DataType.ARRAY_STRING.getName(), "List of unique numbers allocated by the publisher for this external source. For example ISBN, ASIN, UNSPSC code.", null, "2c734b4c-de01-490f-9675-da4addc5efe4"), /** * Name of license associated with this external source. */ - LICENSE("license", "", "Name of license associated with this external source.", null, "c64f169a-863b-4355-b5a6-27338e1152c1"), + LICENSE("license", DataType.STRING.getName(), "Name of license associated with this external source.", null, "c64f169a-863b-4355-b5a6-27338e1152c1"), /** * Copyright statement associated with this external source. */ - COPYRIGHT("copyright", "string", "Copyright statement associated with this external source.", null, "0ece8225-2dfe-4716-bfe2-bac791b6c5f7"), + COPYRIGHT("copyright", DataType.STRING.getName(), "Copyright statement associated with this external source.", null, "0ece8225-2dfe-4716-bfe2-bac791b6c5f7"), /** * Attribution statement to use when consuming this external resource. */ - ATTRIBUTION("attribution", "string", "Attribution statement to use when consuming this external resource.", null, "f2e665a5-c7e0-48c0-b3d6-e47c3b1fde02"), + ATTRIBUTION("attribution", DataType.STRING.getName(), "Attribution statement to use when consuming this external resource.", null, "f2e665a5-c7e0-48c0-b3d6-e47c3b1fde02"), /** * Local identifier for the reference. */ - REFERENCE_ID("referenceId", "string", "Local identifier for the reference.", null, "90b32257-1795-4b2f-8383-bfdbdbc1ad89"), + REFERENCE_ID("referenceId", DataType.STRING.getName(), "Local identifier for the reference.", null, "90b32257-1795-4b2f-8383-bfdbdbc1ad89"), /** * Range of pages in the external reference that this link refers. */ - PAGES("pages", "string", "Range of pages in the external reference that this link refers.", "1-10", "31144831-a9df-47b1-9975-902e0f76836a"), + PAGES("pages", DataType.STRING.getName(), "Range of pages in the external reference that this link refers.", "1-10", "31144831-a9df-47b1-9975-902e0f76836a"), /** * Specific media usage by the consumer that overrides the default media usage documented in the related media. @@ -1285,184 +1290,402 @@ public enum OpenMetadataProperty /** * Unique identifier of the code (typically a valid value definition) that defines the media use. */ - MEDIA_USAGE_OTHER_ID("mediaUsageOtherId", "string", "Unique identifier of the code (typically a valid value definition) that defines the media use.", null, "66102545-c7b2-4501-a85e-de6e348a92a5"), + MEDIA_USAGE_OTHER_ID("mediaUsageOtherId", DataType.STRING.getName(), "Unique identifier of the code (typically a valid value definition) that defines the media use.", null, "66102545-c7b2-4501-a85e-de6e348a92a5"), /** * The most common, or expected use of this media resource. */ - DEFAULT_MEDIA_USAGE("defaultMediaUsage", "MediaUsage", "The most common, or expected use of this media resource.", null, "279f1eb4-e60c-4ebc-9568-cc545c2fe491"), + DEFAULT_MEDIA_USAGE("defaultMediaUsage", MediaUsage.getOpenTypeName(), "The most common, or expected use of this media resource.", null, "279f1eb4-e60c-4ebc-9568-cc545c2fe491"), /** * Unique identifier of the code (typically a valid value definition) that defines the media use. */ - DEFAULT_MEDIA_USAGE_OTHER_ID("defaultMediaUsageOtherId", "string", "Unique identifier of the code (typically a valid value definition) that defines the media use.", null, "7132f04f-92db-4571-9c98-f64f55390a55"), + DEFAULT_MEDIA_USAGE_OTHER_ID("defaultMediaUsageOtherId", DataType.STRING.getName(), "Unique identifier of the code (typically a valid value definition) that defines the media use.", null, "7132f04f-92db-4571-9c98-f64f55390a55"), /** * Type of media. */ - MEDIA_TYPE("mediaType", "MediaType", "Type of media.", null, "d6581642-3fbd-447c-a90b-95bfa770491e"), + MEDIA_TYPE("mediaType", MediaType.getOpenTypeName(), "Type of media.", null, "d6581642-3fbd-447c-a90b-95bfa770491e"), /** * Unique identifier of the code (typically a valid value definition) that defines the media type. */ - MEDIA_TYPE_OTHER_ID("mediaTypeOtherId", "string", "Unique identifier of the code (typically a valid value definition) that defines the media type.", null, "4a839c98-31ec-4c0d-88c1-206e1b13b7f6"), + MEDIA_TYPE_OTHER_ID("mediaTypeOtherId", DataType.STRING.getName(), "Unique identifier of the code (typically a valid value definition) that defines the media type.", null, "4a839c98-31ec-4c0d-88c1-206e1b13b7f6"), /** * Local identifier for the media. */ - MEDIA_ID("mediaId", "string", "Local identifier for the media, from the perspective of the referencee. For example. it may be the citation number in the list of references", "COLT-2", "1f738dc4-2df1-4177-919a-44b91b3ed22e"), + MEDIA_ID("mediaId", DataType.STRING.getName(), "Local identifier for the media, from the perspective of the referencee. For example. it may be the citation number in the list of references", "COLT-2", "1f738dc4-2df1-4177-919a-44b91b3ed22e"), /** * Name of the organization that this external source is from. */ - SOURCE_ORGANIZATION("sourceOrganization", "string", "Name of the organization that this external source is from.", null, ""), + SOURCE_ORGANIZATION("sourceOrganization", DataType.STRING.getName(), "Name of the organization that this external source is from.", null, ""), /** * Network address used to connect to the endpoint. */ - NETWORK_ADDRESS("networkAddress", "string", "Network address used to connect to the endpoint.", "https://localhost:9443", "0f38d466-e288-4971-bda8-1c5fde81bc82"), + NETWORK_ADDRESS("networkAddress", DataType.STRING.getName(), "Network address used to connect to the endpoint.", "https://localhost:9443", "0f38d466-e288-4971-bda8-1c5fde81bc82"), /** * Name of the protocol used to connect to the endpoint. */ - PROTOCOL("protocol", "string", "Name of the protocol used to connect to the endpoint.", "HTTPS", "173d3d2f-c0c2-4341-9693-20e3bb6abb86"), + PROTOCOL("protocol", DataType.STRING.getName(), "Name of the protocol used to connect to the endpoint.", "HTTPS", "173d3d2f-c0c2-4341-9693-20e3bb6abb86"), /** * Type of encryption used at the endpoint (if any). */ - ENCRYPTION_METHOD("encryptionMethod", "string", "Type of encryption used at the endpoint (if any).", null, "bc4a9ded-0414-4bbf-8cd2-c9ecc3e64ee9"), + ENCRYPTION_METHOD("encryptionMethod", DataType.STRING.getName(), "Type of encryption used at the endpoint (if any).", null, "bc4a9ded-0414-4bbf-8cd2-c9ecc3e64ee9"), /** * Version of the database. */ - DATABASE_VERSION("databaseVersion", "string", "Version of the database.", null, "f13db2cf-a0fc-4790-ba50-74ae5443bf36"), + DATABASE_VERSION("databaseVersion", DataType.STRING.getName(), "Version of the database.", null, "f13db2cf-a0fc-4790-ba50-74ae5443bf36"), /** * Instance of the database. */ - INSTANCE ("instance", "string", "Instance of the database.", null, "ecd5593a-647f-4767-b465-279e4bd35efc"), + INSTANCE ("instance", DataType.STRING.getName(), "Instance of the database.", null, "ecd5593a-647f-4767-b465-279e4bd35efc"), /** * importedFrom */ - IMPORTED_FROM("importedFrom", "string", "System that the database was imported from.", null, "6e7b1e16-bcf4-4010-becd-244506f1d3ed"), + IMPORTED_FROM("importedFrom", DataType.STRING.getName(), "System that the database was imported from.", null, "6e7b1e16-bcf4-4010-becd-244506f1d3ed"), /** * Name of the language used to implement this component. */ - IMPLEMENTATION_LANGUAGE("implementationLanguage", "string", "Name of the language used to implement this component.", "Java", "e56dbaa5-6a2a-4aa0-8584-b3305234851f"), + IMPLEMENTATION_LANGUAGE("implementationLanguage", DataType.STRING.getName(), "Name of the language used to implement this component.", "Java", "e56dbaa5-6a2a-4aa0-8584-b3305234851f"), /** * The Date/time that this action was reviewed. */ - LAST_REVIEW_TIME("lastReviewTime", "date", "The Date/time that this action was reviewed.", null, "adac8415-11c8-43e9-8a43-92a799893555"), + LAST_REVIEW_TIME("lastReviewTime", DataType.DATE.getName(), "The Date/time that this action was reviewed.", null, "adac8415-11c8-43e9-8a43-92a799893555"), /** * Version of the property facet schema. */ - SCHEMA_VERSION("schemaVersion", "string", "Version of the property facet schema.", null, "7eb8affc-c5d5-4ab2-9395-2ac8216be397"), + SCHEMA_VERSION("schemaVersion", DataType.STRING.getName(), "Version of the property facet schema.", null, "7eb8affc-c5d5-4ab2-9395-2ac8216be397"), /** * properties */ - PROPERTIES("properties", "map", "Property name-value pairs.", null, "6cf26b71-85db-41e0-9d7a-8e3fe956b649"), + PROPERTIES("properties", DataType.MAP_STRING_STRING.getName(), "Property name-value pairs.", null, "6cf26b71-85db-41e0-9d7a-8e3fe956b649"), /** * Identifies which type of delete to use. */ - DELETE_METHOD("deleteMethod", "DeleteMethod", "Identifies which type of delete to use.", "ARCHIVE", "0028d073-fe1f-482d-b546-28a77dd712e2"), + DELETE_METHOD("deleteMethod", DeleteMethod.getOpenTypeName(), "Identifies which type of delete to use.", "ARCHIVE", "0028d073-fe1f-482d-b546-28a77dd712e2"), /** * Geographical coordinates of this location. */ - COORDINATES("coordinates", "string", "Geographical coordinates of this location.", null, "bfa8b230-f9ec-4105-a2fd-3159e9715043"), + COORDINATES("coordinates", DataType.STRING.getName(), "Geographical coordinates of this location.", null, "bfa8b230-f9ec-4105-a2fd-3159e9715043"), /** * The scheme used to define the meaning of the coordinates. */ - MAP_PROJECTION("mapProjection", "string", "The scheme used to define the meaning of the coordinates.", null, "a4d71daa-6e87-4214-99e9-2db487ee6573"), + MAP_PROJECTION("mapProjection", DataType.STRING.getName(), "The scheme used to define the meaning of the coordinates.", null, "a4d71daa-6e87-4214-99e9-2db487ee6573"), /** * Postal address of the location. */ - POSTAL_ADDRESS("postalAddress", "string", "Postal address of the location.", null, "a2743556-f1d6-473b-93bd-1615a0f937b8"), + POSTAL_ADDRESS("postalAddress", DataType.STRING.getName(), "Postal address of the location.", null, "a2743556-f1d6-473b-93bd-1615a0f937b8"), /** * Timezone for the location. */ - TIME_ZONE("timezone", "string", "Timezone for the location.", null, "f163935d-78d1-41ab-b00f-b688e110fdc7"), + TIME_ZONE("timezone", DataType.STRING.getName(), "Timezone for the location.", null, "f163935d-78d1-41ab-b00f-b688e110fdc7"), /** * Level of security at this location. */ - LEVEL("level", "string", "Level of security at this location.", null, "82e1a347-ce26-4b35-83ac-e310652572bf"), + LEVEL("level", DataType.STRING.getName(), "Level of security at this location.", null, "82e1a347-ce26-4b35-83ac-e310652572bf"), /** * Descriptive name of the association. */ - ASSOCIATION_NAME("associationName", "string", "Descriptive name of the association.", null, "539b51a4-015d-4f3e-8389-6e73fcfb1555"), + ASSOCIATION_NAME("associationName", DataType.STRING.getName(), "Descriptive name of the association.", null, "539b51a4-015d-4f3e-8389-6e73fcfb1555"), /** * Type of the association, such as 'containment', 'aggregation' or 'inheritance.' */ - ASSOCIATION_TYPE("associationType", "string", "Type of the association, such as 'containment', 'aggregation' or 'inheritance.'", null, "6c2665d5-f202-49cb-8ce9-7333501e3072"), + ASSOCIATION_TYPE("associationType", DataType.STRING.getName(), "Type of the association, such as 'containment', 'aggregation' or 'inheritance.'", null, "6c2665d5-f202-49cb-8ce9-7333501e3072"), /** * Name of the operating system running on this operating platform. */ - OPERATING_SYSTEM("operatingSystem", "string", "Name of the operating system running on this operating platform.", "macOS", "cbd3c5ec-0259-43cf-94b8-0339291e871b"), + OPERATING_SYSTEM("operatingSystem", DataType.STRING.getName(), "Name of the operating system running on this operating platform.", "macOS", "cbd3c5ec-0259-43cf-94b8-0339291e871b"), /** * Level of patches applied to the operating system. */ - OPERATING_SYSTEM_PATCH_LEVEL("operatingSystemPatchLevel", "string", "Level of patches applied to the operating system.", null, "6fdda5ad-488a-477d-a1cc-33bb8267ef4b"), + OPERATING_SYSTEM_PATCH_LEVEL("operatingSystemPatchLevel", DataType.STRING.getName(), "Level of patches applied to the operating system.", null, "6fdda5ad-488a-477d-a1cc-33bb8267ef4b"), /** * Preferred pronouns to use when addressing this person. */ - PRONOUNS("pronouns", "string", "Preferred pronouns to use when addressing this person.", null, "8eaa378a-f50c-41da-bb1c-867251a63637"), + PRONOUNS("pronouns", DataType.STRING.getName(), "Preferred pronouns to use when addressing this person.", null, "8eaa378a-f50c-41da-bb1c-867251a63637"), /** * Identifier of the tenant. */ - TENANT_NAME("tenantName", "string", "Identifier of the tenant.", null, "16745cc3-d657-4e99-a030-6c0023878bb1"), + TENANT_NAME("tenantName", DataType.STRING.getName(), "Identifier of the tenant.", null, "16745cc3-d657-4e99-a030-6c0023878bb1"), /** * Description of the type of tenant. */ - TENANT_TYPE("tenantType", "string", "Description of the type of tenant.", null, "7b5805fe-397d-4171-96a3-f41072c6453b"), + TENANT_TYPE("tenantType", DataType.STRING.getName(), "Description of the type of tenant.", null, "7b5805fe-397d-4171-96a3-f41072c6453b"), /** * Commercial name of the service. */ - OFFERING_NAME("offeringName", "string", "Commercial name of the service.", null, "8294e9c1-2d8d-429f-8ac2-9f361551291c"), + OFFERING_NAME("offeringName", DataType.STRING.getName(), "Commercial name of the service.", null, "8294e9c1-2d8d-429f-8ac2-9f361551291c"), /** * Description of the type of the service. */ - SERVICE_TYPE("serviceType", "string", "Description of the type of the service.", null, "7c05c0a8-c2c3-4043-af10-75858616482d"), + SERVICE_TYPE("serviceType", DataType.STRING.getName(), "Description of the type of the service.", null, "7c05c0a8-c2c3-4043-af10-75858616482d"), /** * Name of the cloud provider. */ - PROVIDER_NAME("providerName", "string", "Name of the cloud provider.", null, "2c1df3cd-a043-457d-8a41-72bec6c12855"), + PROVIDER_NAME("providerName", DataType.STRING.getName(), "Name of the cloud provider.", null, "2c1df3cd-a043-457d-8a41-72bec6c12855"), /** * The LDAP distinguished name (DN) that gives a unique positional name in the LDAP DIT. */ - DISTINGUISHED_NAME("distinguishedName", "string", "The LDAP distinguished name (DN) that gives a unique positional name in the LDAP DIT.", null, "63d87f10-10c5-41b3-af11-17167e7c7269"), - + DISTINGUISHED_NAME("distinguishedName", DataType.STRING.getName(), "The LDAP distinguished name (DN) that gives a unique positional name in the LDAP DIT.", null, "63d87f10-10c5-41b3-af11-17167e7c7269"), /** * The type name of the PersonRole that the UserIdentity is used for. */ - ROLE_TYPE_NAME("roleTypeName", "string", "", null, "3216d40f-58e0-435c-90cd-980af2645ee7"), + ROLE_TYPE_NAME("roleTypeName", DataType.STRING.getName(), "", null, "3216d40f-58e0-435c-90cd-980af2645ee7"), /** * The unique identifier of the specific PersonRole that the UserIdentity is used for. */ - ROLE_GUID("roleGUID", "string", "The unique identifier of the specific PersonRole that the UserIdentity is used for.", null, "c2b71682-2d08-40b4-a250-96a99c6bc575"), + ROLE_GUID("roleGUID", DataType.STRING.getName(), "The unique identifier of the specific PersonRole that the UserIdentity is used for.", null, "c2b71682-2d08-40b4-a250-96a99c6bc575"), + + /** + * First letter of each of the person's given names. + */ + INITIALS("initials", DataType.STRING.getName(), "First letter of each of the person's given names.", "ABC", "dfac6629-2c0b-436b-831b-d6a2ef1fed94"), + + /** + * The name strings that are the part of a person's name that is not their surname. + */ + GIVEN_NAMES("givenNames", DataType.STRING.getName(), "The names that are the part of a person's name that is not their surname.", null, "1f50956a-e042-44b0-b032-bc9d49feeb82"), + + /** + * The family name of the person. + */ + SURNAME("surname", DataType.STRING.getName(), "The family name of the person.", null, "4fa69f84-0e64-43f3-a5bd-76bbf6466e0a"), + + /** + * Full or official/legal name of the individual (if different from known name). + */ + FULL_NAME("fullName", DataType.STRING.getName(), "Full or official/legal name of the individual (if different from known name).", null, "d8d1460f-7b04-4427-b928-d39ff555ab6e"), + + /** + * Spoken or written language preferred by the person. + */ + PREFERRED_LANGUAGE("preferredLanguage", DataType.STRING.getName(), "Spoken or written language preferred by the person.", null, "caa48b00-1953-46f8-abda-54211f831d98"), + + /** + * Principle role or level in the organization. + */ + JOB_TITLE("jobTitle", DataType.STRING.getName(), "Principle role or level in the organization.", null, "b20696fe-3ff4-49e0-bdaf-b587abd8f0be"), + + /** + * The unique identifier of a person used by their employer. + */ + EMPLOYEE_NUMBER("employeeNumber", DataType.STRING.getName(), "The unique identifier of a person used by their employer.", null, "fc94b1a2-08c2-4078-b349-32904097ac6a"), + + /** + * Code used by employer typically to describe the type of employment contract + */ + EMPLOYEE_TYPE("employeeType", DataType.STRING.getName(), "Code used by employer typically to describe the type of employment contract.", null, "62ef771b-87b6-4e0f-adf2-3b471f0e7173"), + + /** + * Points capturing a person's engagement with open metadata. + */ + KARMA_POINTS("karmaPoints", DataType.LONG.getName(), "Points capturing a person's engagement with open metadata.", null, "ec847574-376b-4b21-a8a9-4bcdfcb2000d"), + + /** + * Number of people that can be appointed to the role. + */ + HEAD_COUNT("headCount", DataType.INT.getName(), "Number of people that can be appointed to the role.", null, "58e9c9c4-d5e3-4576-a2a7-9f459bcdd439"), + /** + * Type of team, such as department. + */ + TEAM_TYPE("teamType", DataType.STRING.getName(), "Type of team, such as division, or department.", null, "109d24af-b694-4f1e-90d2-ad3945596f2f"), + + /** + * Details of the type of role position within a group, team, project, eg deputy. + */ + ROLE_POSITION("position", DataType.STRING.getName(), "Details of the type of role position within a group, team, project, eg deputy.", null, "dc83ac84-914f-441e-876b-5a02293fc568"), + + /** + * Can delegations and escalations flow on this relationship. + */ + DELEGATION_ESCALATION("delegationEscalationAuthority", DataType.BOOLEAN.getName(), "Can delegations and escalations flow on this relationship.", null, "c8238d05-07ac-4c1e-a89c-34299d9827f8"), + + /** + * What is the scope or nature of the assignment. + */ + ASSIGNMENT_TYPE("assignmentType", DataType.STRING.getName(), "What is the scope or nature of the assignment.", null, "6d6af0b8-1b56-4941-a0c9-524331c46038"), + + /** + * Description of the role of the team in the project. + */ + TEAM_ROLE("teamRole", DataType.STRING.getName(), "Description of the role of the team in the project.", null, "4ce8ffb3-2688-425e-abdd-b165bbf2adc6"), + + /** + * Reasons for the project dependency. + */ + DEPENDENCY_SUMMARY("dependencySummary", DataType.STRING.getName(), "Reasons for the project dependency.", null, "c1e02d1e-efb8-4299-be32-529b4a5976c1"), + + /** + * Identifier that describes the role that the stakeholders will play in the operation of the Referenceable. + */ + STAKEHOLDER_ROLE("stakeholderRole", DataType.STRING.getName(), "Identifier that describes the role that the stakeholders will play in the operation of the Referenceable.", "fundingExecutive", "09b45956-ad1b-4e51-ab7f-b1858f71de0d"), + + /** + * Short summary or purpose of the element. + */ + TITLE("title", DataType.STRING.getName(), "Short summary or purpose of the element.", null, "b87aeaa9-ef37-479b-9d59-dc03c98b3248"), + + /** + * Breadth of responsibility or coverage. + */ + SCOPE("scope", DataType.STRING.getName(), "Breadth of responsibility or coverage.", null, "033b4f92-fa46-4151-a095-c0bae938de8f"), + + /** + * "Reason for the meeting and intended outcome. + */ + OBJECTIVE("objective", DataType.STRING.getName(), "Reason for the meeting and intended outcome.", null, "a0f9f9c5-ea35-458c-b969-1de5fb3116eb"), + + /** + * Description of what happened at the meeting. + */ + MINUTES("minutes", DataType.ARRAY_STRING.getName(), "Description of what happened at the meeting.", null, "9b65f72c-76c1-438c-a672-49039f2ee62d"), + + /** + * Start time of the meeting. + */ + START_TIME("startTime", DataType.DATE.getName(), "Start time of the meeting.", null, "90ea014e-09ed-41a5-972d-68a534c61a5c"), + + /** + * End time of the meeting. + */ + END_TIME("endTime", DataType.DATE.getName(), "End time of the meeting.", null, "de498d70-59b4-4639-9069-5f41b40265fb"), + + /** + * When the requested action was identified. + */ + CREATION_TIME("creationTime", DataType.DATE.getName(), "When the requested action was identified.", null, "3b9586f3-3563-42cd-920b-11359d94e6ce"), + + /** + * Type of to do - typically managed in a valid value set and used in stewardship automation. + */ + TO_DO_TYPE("toDoType", DataType.STRING.getName(), "Type of to do - typically managed in a valid value set and used in stewardship automation.", null, "3ea557fa-9f01-49f0-ae17-e2825185312e"), + + /** + * Relative importance of this governance definition compared to its peers. + */ + IMPORTANCE("importance", null, "Relative importance of this definition compared to its peers.", null, "dfae7171-34a5-4460-bb61-4219454155db"), + + /** + * When the requested action needs to be completed. + */ + DUE_TIME("dueTime", DataType.DATE.getName(), "When the requested action needs to be completed.", null, "200f604a-8936-4ad7-aa13-01abbecc82a6"), + + /** + * When the requested action was completed. + */ + COMPLETION_TIME("completionTime", DataType.DATE.getName(), "When the requested action was completed.", null, "9359f36f-ed11-4c33-80c3-e02941fee6b5"), + + /** + * Purpose of the community. + */ + MISSION("mission", DataType.STRING.getName(), "Purpose of the community.", "To share new data science techniques.", "cb870681-de85-406b-bea6-6d138777cfe9"), + + /** + * Type of community membership. + */ + MEMBERSHIP_TYPE("membershipType", CommunityMembershipType.getOpenTypeName(), "Type of community membership.", "Observer.", "d94a88e9-f5f6-4c3f-8ce2-e565817d6294"), + + /** + * Private properties accessible only to the connector. + */ + SECURED_PROPERTIES("securedProperties", DataType.MAP_STRING_OBJECT.getName(), "Private properties accessible only to the connector.", null, "b1b3e2dd-0ad1-4466-884b-697cf6333382"), + + /** + * Specific configuration properties used to configure the behaviour of the connector. + */ + CONFIGURATION_PROPERTIES("configurationProperties", DataType.MAP_STRING_OBJECT.getName(), "Specific configuration properties used to configure the behaviour of the connector.", null, "ce3009ac-54f3-4c6f-9658-27c2d2e75c3a"), + + /** + * Password for the userId in clear text. + */ + CLEAR_PASSWORD("clearPassword", DataType.STRING.getName(), "Password for the userId in clear text.", null, "4b2912cb-5a98-457a-853f-44a853d9a459"), + + /** + * Encrypted password that the connector needs to decrypt before use. + */ + ENCRYPTED_PASSWORD("encryptedPassword", DataType.STRING.getName(), "Encrypted password that the connector needs to decrypt before use.", null, "8a5c52ed-8b82-434e-8a94-2a772da8caa7"), + + /** + * Name of the Java class that implements this connector type's open connector framework (OCF) connector provider. + */ + CONNECTOR_PROVIDER_CLASS_NAME("connectorProviderClassName", DataType.STRING.getName(), "Name of the Java class that implements this connector type's open connector framework (OCF) connector provider.", null, "7c8b3671-f6f4-4156-845c-ff20ca627eac"), + + /** + * List of additional connection property names supported by the connector implementation. + */ + RECOGNIZED_ADDITIONAL_PROPERTIES("recognizedAdditionalProperties", DataType.ARRAY_STRING.getName(), "List of additional connection property names supported by the connector implementation.", null, "93e83ce7-0255-43c0-b56f-a58835134106"), + + /** + * List of secured connection property names supported by the connector implementation. + */ + RECOGNIZED_SECURED_PROPERTIES("recognizedSecuredProperties", DataType.ARRAY_STRING.getName(), "List of secured connection property names supported by the connector implementation.", null, "6cdf6c43-cf30-485f-b174-1864b4f785d4"), + + /** + * List of configuration property names supported by the connector implementation. + */ + RECOGNIZED_CONFIGURATION_PROPERTIES("recognizedConfigurationProperties", DataType.ARRAY_STRING.getName(), "List of configuration property names supported by the connector implementation.", null, "750b88ff-c9b7-49cd-9c93-4f4c85d71e16"), + + /** + * Additional arguments needed by the virtual connector when using each connection. + */ + ARGUMENTS("arguments", DataType.MAP_STRING_OBJECT.getName(), "Additional arguments needed by the virtual connector when using each connection.", null, "0ba7abef-1a62-4bf6-a21c-0239c3521d50"), + + /** + * Description of the asset that is retrieved through this connection. + */ + ASSET_SUMMARY("assetSummary", DataType.STRING.getName(), "Description of the asset that is retrieved through this connection.", null, "2ab4e6eb-9064-4638-8c72-5c9d5eb61383"), + + /** + * Character used between each column. + */ + DELIMITER_CHARACTER("delimiterCharacter", DataType.STRING.getName(), "Character used between each column.", null, "9b6e9ae9-0251-41c8-a81c-0df3126453e8"), + + /** + * The character used to group the content of the column that contains one or more delimiter characters. + */ + QUOTE_CHARACTER("quoteCharacter", DataType.STRING.getName(), "The character used to group the content of the column that contains one or more delimiter characters.", null, "d23618c6-45a2-40a0-b34c-6385d252b5be"), + + /** + * Format of the file system. + */ + FORMAT("format", DataType.STRING.getName(), "Format of the file system.", null, "207a7ab2-e530-494f-a859-432d7fdb40fd"), + + /** + * Level of encryption used on the filesystem (if any). + */ + ENCRYPTION("encryption", DataType.STRING.getName(), "Level of encryption used on the filesystem (if any).", null, "011e4f70-b914-4dc8-9dc0-f259014e6f63"), ; diff --git a/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/types/OpenMetadataType.java b/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/types/OpenMetadataType.java index f28b8e1f0cd..5dc04abe9b7 100644 --- a/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/types/OpenMetadataType.java +++ b/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/types/OpenMetadataType.java @@ -748,6 +748,15 @@ public enum OpenMetadataType "44a1d90a-689e-4dc1-8dbb-cf3107388a1b", "Defines a capability that manages metadata about assets."), + /** + * A capability that supports a store of files organized into a hierarchy of file folders. + */ + FILE_SYSTEM_CLASSIFICATION("cab5ba1d-cfd3-4fca-857d-c07711fc4157", + "FileSystem", + OpenMetadataWikiPages.MODEL_0056_RESOURCE_MANAGERS, + "5a2077a7-6ff3-46b0-8799-93082e8a43b3", + "A capability that supports a store of files organized into a hierarchy of file folders."), + /** * A system that stores descriptions of individuals and their roles/interests in an organization. */ @@ -937,14 +946,144 @@ public enum OpenMetadataType "dc55b455-b2ea-4065-a972-6bbdc52ca688", "An individual."), + /** - * An action that has been identified to support the development, improvement, or remedy of an object or situation. + * Relationship identifying a person's contribution record. */ - ACTION("95261f26-8fe0-4723-b953-4ae5789ec639", - "Action", - OpenMetadataWikiPages.MODEL_0137_ACTIONS_FOR_PEOPLE, - "d1df6cb0-80af-473f-aacf-f29972fd4c34", - "An action that has been identified to support the development, improvement, or remedy of an object or situation."), + PERSONAL_CONTRIBUTION_RELATIONSHIP("4a316abe-eeee-4d11-ad5a-4bfb4079b80b", + "PersonalContribution", + OpenMetadataWikiPages.MODEL_0112_PEOPLE, + "73d21888-20f0-485f-b88e-36617b51b0a8", + "Relationship identifying a person's contribution record."), + + /** + * A record of the contribution of an individual. + */ + CONTRIBUTION_RECORD("ac406bf8-e53e-49f1-9088-2af28cccd285", + "ContributionRecord", + OpenMetadataWikiPages.MODEL_0112_PEOPLE, + "43bc8cc3-4496-45ad-a40c-42bcf22b0111", + "A record of the contribution of an individual."), + + + /** + * A role performed by one or more individuals. + */ + PERSON_ROLE("ac406bf8-e53e-49f1-9088-2af28bcbd285", + "PersonRole", + OpenMetadataWikiPages.MODEL_0112_PEOPLE, + "6259c839-f310-4b73-87dc-28e60a119e1a", + "A role performed by one or more individuals."), + + + /** + * Relationship identifying a person's roles. + */ + PERSON_ROLE_APPOINTMENT_RELATIONSHIP("4a316abe-bcce-4d11-ad5a-4bfb4079b80b", + "PersonRoleAppointment", + OpenMetadataWikiPages.MODEL_0112_PEOPLE, + "41282fe0-3d45-403f-97bc-c9c80c5081de", + "Relationship identifying a person's roles."), + + /** + * Relationship identifying a person's peer network. + */ + PEER_RELATIONSHIP("4a316abe-bccd-4d11-ad5a-4bfb4079b80b", + "Peer", + OpenMetadataWikiPages.MODEL_0112_PEOPLE, + "1d21a0e8-a80b-455f-9e5e-475026a6b8f4", + "Relationship identifying a person's peer network."), + + /** + * Group of people working together. + */ + TEAM("36db26d5-aba2-439b-bc15-d62d373c5db6", + "Team", + OpenMetadataWikiPages.MODEL_0115_TEAMS, + "1e008894-4221-4409-838b-e78125da060b", + "Group of people working together."), + + /** + * Relationship identifying a team reporting hierarchy. + */ + TEAM_STRUCTURE_RELATIONSHIP("5ebc4fb2-b62a-4269-8f18-e9237a2229ca", + "TeamStructure", + OpenMetadataWikiPages.MODEL_0115_TEAMS, + "51a4a318-d9d9-4833-a55b-b3f7948a1a37", + "Relationship identifying a team reporting hierarchy."), + + /** + * Person assigned to a team. + */ + TEAM_MEMBER("46db26d5-abb2-538b-bc15-d62d373c5db6", + "TeamMember", + OpenMetadataWikiPages.MODEL_0115_TEAMS, + "69b06feb-3880-4796-ae15-f85fcce35900", + "Person assigned to a team."), + + /** + * Relationship identifying the members of teams. + */ + TEAM_MEMBERSHIP_RELATIONSHIP("1ebc4fb2-b62a-4269-8f18-e9237a2119ca", + "TeamMembership", + OpenMetadataWikiPages.MODEL_0115_TEAMS, + "623667d6-2d09-4e2c-8078-bbfd7f8bdbcc", + "Relationship identifying the members of teams."), + + /** + * Person leading a team. + */ + TEAM_LEADER("36db26d5-abb2-439b-bc15-d62d373c5db6", + "TeamLeader", + OpenMetadataWikiPages.MODEL_0115_TEAMS, + "021c3a71-c912-49e1-a099-1866746e4825", + "Person leading a team."), + + /** + * Relationship identifying the leaders of teams. + */ + TEAM_LEADERSHIP_RELATIONSHIP("5ebc4fb2-b62a-4269-8f18-e9237a2119ca", + "TeamLeadership", + OpenMetadataWikiPages.MODEL_0115_TEAMS, + "83e54789-e20e-439c-99af-e5dcb21e3b29", + "Relationship identifying the leaders of teams."), + + /** + * Descriptive details about a processing engine or other IT infrastructure. + */ + IT_PROFILE("81394f85-6008-465b-926e-b3fae4668937", + "ITProfile", + OpenMetadataWikiPages.MODEL_0117_IT_PROFILES, + "c4fcd82e-24c8-40ef-8d80-e787841a6f92", + "Descriptive details about a processing engine or other IT infrastructure."), + + /** + * Link between an ITProfile and the asset for the piece of infrastructure it describes. + */ + IT_INFRASTRUCTURE_PROFILE_RELATIONSHIP("4c579e3d-a4ff-41c1-9931-33e6fc992f2b", + "ITInfrastructureProfile", + OpenMetadataWikiPages.MODEL_0117_IT_PROFILES, + "f52f4e19-f148-495b-84df-8ec2f2b02263", + "Link between an ITProfile and the asset for the piece of infrastructure it describes."), + + /** + * Links a profile, role or project to the elements that they are responsible for managing. + */ + ASSIGNMENT_SCOPE_RELATIONSHIP("e3fdafe3-692a-46c6-a595-c538cc189dd9", + "AssignmentScope", + OpenMetadataWikiPages.MODEL_0120_ASSIGNMENT_SCOPES, + "d2f5cbd5-36f7-4471-83fb-b1aec78d39df", + "Links a profile, role or project to the elements that they are responsible for managing."), + + + /** + * Identifies the Actor that commissioned work (such as a project or a community) or a capability, service or assets. + */ + STAKEHOLDER_RELATIONSHIP("efd8a136-0aea-4668-b91a-30f947e38b82", + "Stakeholder", + OpenMetadataWikiPages.MODEL_0120_ASSIGNMENT_SCOPES, + "97aa5776-e978-4684-b014-5be35c497ffe", + "Identifies the Actor that commissioned work (such as a project or a community) or a capability, service or assets."), /** * An organized activity, typically to achieve a well-defined goal. @@ -1036,6 +1175,64 @@ public enum OpenMetadataType "04b9427e-b6cc-45d4-b880-6eaa9a47f063", "A focused analysis of a topic, person, object or situation."), + /** + * Two or more people come together to discuss a topic, agree and action or exchange information. + */ + MEETING("6bf90c79-32f4-47ad-959c-8fff723fe744", + "Meeting", + OpenMetadataWikiPages.MODEL_0135_MEETINGS, + "dd75c9f3-8e17-4307-9729-c391bd7981bd", + "Two or more people come together to discuss a topic, agree and action or exchange information."), + + /** + * A meeting about a specific project, deliverable, situation or plan of action. + */ + MEETINGS("a05f918e-e7e2-419d-8016-5b37406df63a", + "Meetings", + OpenMetadataWikiPages.MODEL_0135_MEETINGS, + "02ff69de-bb0d-40ad-a7ec-367938b7767b", + "A meeting about a specific project, deliverable, situation or plan of action."), + + + /** + * An action that has been identified to support the development, improvement, or remedy of an object or situation. + */ + ACTION("95261f26-8fe0-4723-b953-4ae5789ec639", + "Action", + OpenMetadataWikiPages.MODEL_0137_ACTIONS_FOR_PEOPLE, + "d1df6cb0-80af-473f-aacf-f29972fd4c34", + "An action that has been identified to support the development, improvement, or remedy of an object or situation."), + + + /** + * The source of the to do, such as a person, meeting or a governance action. + */ + TO_DO_SOURCE_RELATIONSHIP("a0b7ba50-4c97-4b76-9a7d-c6a00e1be646", + "ToDoSource", + OpenMetadataWikiPages.MODEL_0137_ACTIONS_FOR_PEOPLE, + "4b7c5d49-cef0-495e-8710-23c293828575", + "The source of the to do, such as a person, meeting or a governance action."), + + + /** + * Identifies the sponsor that requires the action (To Do) to be completed. + */ + ACTION_SPONSOR_RELATIONSHIP("aca1277b-bf1c-42f5-9b3b-fbc2c9047325", + "ActionSponsor", + OpenMetadataWikiPages.MODEL_0137_ACTIONS_FOR_PEOPLE, + "c3d68cbc-9e1e-4820-8647-cdf29a64fb2b", + "Identifies the sponsor that requires the action (ToDo) to be completed."), + + /** + * A person who has been assigned to complete the to do (action). + */ + ACTION_ASSIGNMENT_RELATIONSHIP("af2b5fab-8f83-4a2b-b749-1e6219f61f79", + "ActionAssignment", + OpenMetadataWikiPages.MODEL_0137_ACTIONS_FOR_PEOPLE, + "5d77cc38-d0fa-410b-85fd-e077a6f9efb1", + "A person who has been assigned to complete the to do (action)."), + + /** * An action assigned to an individual. */ @@ -1054,6 +1251,34 @@ public enum OpenMetadataType "e087a192-707d-41fb-97c6-84861383e4b5", "Associates a To Do with one or more elements to work on."), + /** + * A group of people with a common interest or skill. + */ + COMMUNITY("fbd42379-f6c3-4f08-b6f7-378565cda993", + "Community", + OpenMetadataWikiPages.MODEL_0140_COMMUNITIES, + "e7300c49-b5ad-4808-aaa8-64ee81f40df6", + "A group of people with a common interest or skill."), + + /** + * A person who has joined a community. + */ + COMMUNITY_MEMBER("fbd42379-f6c3-4f09-b6f7-378565cda993", + "CommunityMember", + OpenMetadataWikiPages.MODEL_0140_COMMUNITIES, + "38833f01-dbad-4cf7-b825-54a9a97d6d78", + "A person who has joined a community."), + + /** + * Associates an actor profile with a community. + */ + COMMUNITY_MEMBERSHIP_RELATIONSHIP("7c7da1a3-01b3-473e-972e-606eff0cb112", + "CommunityMembership", + OpenMetadataWikiPages.MODEL_0140_COMMUNITIES, + "a4f0935f-78f3-4d0a-aa11-a3f86a50ea36", + "Associates an actor profile with a community."), + + /** * Quantitative feedback related to an item. */ @@ -1108,6 +1333,8 @@ public enum OpenMetadataType "b2bbaacb-c547-41b9-9bb2-e11d55bf74f7", "Boolean type of rating expressing a favorable impression."), + + /** * Links a like to an item. */ @@ -1135,6 +1362,24 @@ public enum OpenMetadataType "f5f7ed7d-bebe-454f-94aa-1029ff37ac6a", "Links an informal tag to an item."), + /** + * Person contributing new content. + */ + CROWD_SOURCING_CONTRIBUTOR("3a84c94c-ac6f-4be1-a72a-07dcec7b1fe3", + "CrowdSourcingContributor", + OpenMetadataWikiPages.MODEL_0155_CROWD_SOURCING, + "ee2046c9-aadd-4519-a76d-43e6cfce03a8", + "Person contributing new content."), + + /** + * Defines one of the actors contributing content to a new description or asset. + */ + CROWD_SOURCING_CONTRIBUTION("4db83564-b200-4956-94a4-c95a5c30e65a", + "CrowdSourcingContribution", + OpenMetadataWikiPages.MODEL_0155_CROWD_SOURCING, + "715c667a-7a9b-45f0-b44e-06c1c0401929", + "Defines one of the actors contributing content to a new description or asset."), + /** * An ordered list of related notes. */ @@ -1195,6 +1440,66 @@ public enum OpenMetadataType /* Area 2 - Assets */ /* ============================================================================================================================*/ + CONNECTION("114e9f8f-5ff3-4c32-bd37-a7eb42712253", + "Connection", + OpenMetadataWikiPages.MODEL_0201_CONNECTIONS, + "6c57f5f6-e692-4688-8a16-e81e5eb985f6", + "A set of properties to identify and configure a connector instance."), + + /** + * A set of properties describing a type of connector. + */ + CONNECTOR_TYPE("954421eb-33a6-462d-a8ca-b5709a1bd0d4", + "ConnectorType", + OpenMetadataWikiPages.MODEL_0201_CONNECTIONS, + "83d59e58-8f1d-4554-8a93-3c3b9c9808d1", + "A set of properties describing a type of connector."), + + /** + * A link between a connection and the endpoint that the connector should use. + */ + CONNECTION_ENDPOINT_RELATIONSHIP("887a7132-d6bc-4b92-a483-e80b60c86fb2", + "ConnectionEndpoint", + OpenMetadataWikiPages.MODEL_0201_CONNECTIONS, + "02af6e89-05df-4cc5-ac32-2de8299c6e2f", + "A link between a connection and the endpoint that the connector should use."), + + /** + * A link between a connection and the connector type that should be used. + */ + CONNECTION_CONNECTOR_TYPE_RELATIONSHIP("e542cfc1-0b4b-42b9-9921-f0a5a88aaf96", + "ConnectionConnectorType", + OpenMetadataWikiPages.MODEL_0201_CONNECTIONS, + "3ee0cc02-f058-4d88-a510-d463f448b4ac", + "A link between a connection and the connector type that should be used."), + + /** + * A connector for a virtual resource that needs to retrieve data from multiple places. + */ + VIRTUAL_CONNECTION("82f9c664-e59d-484c-a8f3-17088c23a2f3", + "VirtualConnection", + OpenMetadataWikiPages.MODEL_0205_CONNECTION_LINKAGE, + "04928167-1a20-4137-bbd8-b42151a38d8c", + "A connector for a virtual resource that needs to retrieve data from multiple places."), + + /** + * A link between a virtual connection and one of the connections it depends on. + */ + EMBEDDED_CONNECTION_RELATIONSHIP("eb6dfdd2-8c6f-4f0d-a17d-f6ce4799f64f", + "EmbeddedConnection", + OpenMetadataWikiPages.MODEL_0205_CONNECTION_LINKAGE, + "c05c1143-3ac4-4044-a0aa-eed71e949097", + "A link between a virtual connection and one of the connections it depends on."), + + /** + * Link between a connection and the description of the asset it can be used to access. + */ + CONNECTION_TO_ASSET_RELATIONSHIP("e777d660-8dbe-453e-8b83-903771f054c0", + "ConnectionToAsset", + OpenMetadataWikiPages.MODEL_0205_CONNECTION_LINKAGE, + "4fedfcf8-05c4-4c8c-8284-3554c4f4c295", + "Link between a connection and the description of the asset it can be used to access."), + /** * Collection of related data, not necessarily stored together. */ @@ -1214,6 +1519,16 @@ public enum OpenMetadataType "186e8199-1987-4578-9799-c13a8eaa08b6", "A physical store of data."), + + /** + * Description for how data is organized and represented in a data store. + */ + DATA_STORE_ENCODING_CLASSIFICATION("f08e48b5-6b66-40f5-8ff6-c2bfe527330b", + "DataStoreEncoding", + OpenMetadataWikiPages.MODEL_0210_DATA_STORES, + "327553db-b35b-49cc-8435-d2c665f5e260", + "Description for how data is organized and represented in a data store."), + /** * A data source that provides a constant stream of data, such as a sensor monitoring the environment. */ @@ -1259,6 +1574,33 @@ public enum OpenMetadataType "481182e8-90cf-47b2-ae1e-6247bf89698b", "The endpoint for a deployed API."), + /** + * Identifies an API that supports a request response interaction style. + */ + REQUEST_RESPONSE_INTERFACE_CLASSIFICATION("14a29330-e830-4343-a41e-d57e2cec82f8", + "RequestResponseInterface", + OpenMetadataWikiPages.MODEL_0212_DEPLOYED_APIS, + "343d4892-1f13-4a68-a9fc-32719cecb4a3", + "Identifies an API that supports a request response interaction style."), + + /** + * Identifies an API that listens for incoming events and processes them. + */ + LISTENER_INTERFACE_CLASSIFICATION("4099d2ed-2a5e-4c44-8443-9de4e378a4ba", + "ListenerInterface", + OpenMetadataWikiPages.MODEL_0212_DEPLOYED_APIS, + "39e5a428-663e-4fff-a4dd-e6d5e627c143", + "Identifies an API that listens for incoming events and processes them."), + + /** + * Identifies an API that sends out events to other listening components. + */ + PUBLISHER_INTERFACE_CLASSIFICATION("4fdedcd5-b186-4bee-887a-02fa29a10750", + "PublisherInterface", + OpenMetadataWikiPages.MODEL_0212_DEPLOYED_APIS, + "7c7d9e1c-72cd-4d64-89bf-be898edad980", + "Identifies an API that sends out events to other listening components."), + /** * A packaged and deployed software component supporting a well-defined function. @@ -1350,108 +1692,96 @@ public enum OpenMetadataType "8fc52dce-17fe-426a-b504-c15d5df35524", "A description of a file that follows the JavaScript Object Notation specification."), - - /** - * An asset supported by data virtualization technology. + * A file containing tabular data with formula. */ - INFORMATION_VIEW("68d7b905-6438-43be-88cf-5de027b4aaaf", - "InformationView", - OpenMetadataWikiPages.MODEL_0235_INFORMATION_VIEW, - "c0709c9e-8ff8-4af3-8b5d-85d89355bf64", - "An asset supported by data virtualization technology."), - + SPREADSHEET_FILE("2f38d248-8633-402b-b085-c88fcbc33fa8", + "SpreadsheetFile", + OpenMetadataWikiPages.MODEL_0220_FILE_AND_FOLDERS, + "777064c4-756e-4c78-84d7-268316481b9d", + "A file containing tabular data with formula."), /** - * A virtual asset that can be called as a table through a SQL-like API. + * A file containing an XML structure. */ - VIRTUAL_RELATIONAL_TABLE("fd166582-8ff5-46ad-978e-7770e7339949", - "VirtualRelationalTable", - OpenMetadataWikiPages.MODEL_0235_INFORMATION_VIEW, - "b6a9209c-de82-4357-8e03-447f904814e0", - "A virtual asset that can be called as a table through a SQL-like API."), - + XML_FILE("e1d8d6f1-3e75-41c7-a038-6e25ab985b44", + "XMLFile", + OpenMetadataWikiPages.MODEL_0220_FILE_AND_FOLDERS, + "0dbaed30-1cd5-4259-a0b2-f586966890ee", + "A file containing an XML structure."), /** - * A text file containing a program written in a language that needs to be complied into an executable form before it can run. + * A data file which is formatted using the Apache Parquet format. */ - SOURCE_CODE_FILE("5b26a2d2-3159-4e8e-bf28-e71904113fc8", - "SourceCodeFile", - OpenMetadataWikiPages.MODEL_0280_SOFTWARE_DEVELOPMENT_ASSETS, - "e241c208-9055-476f-bf56-38c627d98848", - "A text file containing a program written in a language that needs to be complied into an executable form before it can run."), + PARQUET_FILE("97cba3a0-1dfd-4129-82b6-798de3eec0a4", + "ParquetFile", + OpenMetadataWikiPages.MODEL_0220_FILE_AND_FOLDERS, + "b472c4a1-708d-4787-b0c3-730052cf19f4", + "A data file which is formatted using the Apache Parquet format."), /** - * A file containing instructions to run a build of a software artifact or system. + * A nested relationship between two file folders. */ - BUILD_INSTRUCTION_FILE("b1697a55-c731-4ef8-a9ff-d29c143cc1c3", - "BuildInstructionFile", - OpenMetadataWikiPages.MODEL_0280_SOFTWARE_DEVELOPMENT_ASSETS, - "e26b1579-2397-4a42-ad1a-55fa351117d8", - "A file containing instructions to run a build of a software artifact or system."), + FOLDER_HIERARCHY_RELATIONSHIP("48ac9028-45dd-495d-b3e1-622685b54a01", + "FolderHierarchy", + OpenMetadataWikiPages.MODEL_0220_FILE_AND_FOLDERS, + "1c35e932-a116-486c-891a-32c3300db62d", + "A nested relationship between two file folders."), /** - * A file containing compiled code that can be executed. + * The link between a data file and its containing folder. */ - EXECUTABLE_FILE("314219ed-4b81-4e1d-b66b-22958a05f0c9", - "ExecutableFile", - OpenMetadataWikiPages.MODEL_0280_SOFTWARE_DEVELOPMENT_ASSETS, - "b1ed127d-c5c7-41aa-b295-d3a13053e24f", - "A file containing compiled code that can be executed."), + NESTED_FILE_RELATIONSHIP("4cb88900-1446-4eb6-acea-29cd9da45e63", + "NestedFile", + OpenMetadataWikiPages.MODEL_0220_FILE_AND_FOLDERS, + "25f5b1b2-3ed4-452c-8e67-9dae915195ef", + "The link between a data file and its containing folder."), /** - * A file containing code that is interpreted when it is run. + * A data file that is linked to a file folder (rather than stored in it). */ - SCRIPT_FILE("cae5d609-16b0-4812-8582-adb742bbef89", - "ScriptFile", - OpenMetadataWikiPages.MODEL_0280_SOFTWARE_DEVELOPMENT_ASSETS, - "b03e1bcd-6451-4e9c-b8ec-0e686c2ed18b", - "A file containing code that is interpreted when it is run."), + LINKED_FILE_RELATIONSHIP("970a3405-fde1-4039-8249-9aa5f56d5151", + "LinkedFile", + OpenMetadataWikiPages.MODEL_0220_FILE_AND_FOLDERS, + "214c7af3-89e7-4ff1-9642-68af6b9fa12d", + "A data file that is linked to a file folder (rather than stored in it)."), /** - * A file containing a list of properties, typically used for configuration of some software. + * A data set that consists of a collection files (do not need to be co-located). */ - PROPERTIES_FILE("febdb5b9-92cc-4eb1-b058-86934f2ec18b", - "PropertiesFile", - OpenMetadataWikiPages.MODEL_0280_SOFTWARE_DEVELOPMENT_ASSETS, - "b09718ca-f956-41a7-9528-a0976b87a5ea", - "A file containing a list of properties, typically used for configuration of some software."), + DATA_FILE_COLLECTION("962de053-ab51-40eb-b843-85b98013f5ca", + "DataFileCollection", + OpenMetadataWikiPages.MODEL_0220_FILE_AND_FOLDERS, + "c2833bb5-5508-4328-a81d-f9b5971be095", + "A data set that consists of a collection files (do not need to be co-located)."), - /** - * A file containing properties in YAML format. This it typically used for configuration. - */ - YAML_FILE("2bd6feb5-1b79-417a-b430-4e8e1e0a63dd", - "YAMLFile", - OpenMetadataWikiPages.MODEL_0280_SOFTWARE_DEVELOPMENT_ASSETS, - "5e0ea8d1-bb58-4a85-931d-886f8388b9d2", - "A file containing properties in YAML format. This it typically used for configuration."), /** - * A file containing tabular data with formula. + * A group of related media files. */ - SPREADSHEET_FILE("2f38d248-8633-402b-b085-c88fcbc33fa8", - "SpreadsheetFile", - OpenMetadataWikiPages.MODEL_0220_FILE_AND_FOLDERS, - "777064c4-756e-4c78-84d7-268316481b9d", - "A file containing tabular data with formula."), + MEDIA_COLLECTION("0075d603-1627-41c5-8cae-f5458d1247fe", + "MediaCollection", + OpenMetadataWikiPages.MODEL_0221_DOCUMENT_STORES, + "5d968079-c51d-4168-8208-d6dabeab2105", + "A group of related media files."), /** - * A file containing an XML structure. + * Identifies a data store as one that contains documents. */ - XML_FILE("e1d8d6f1-3e75-41c7-a038-6e25ab985b44", - "XMLFile", - OpenMetadataWikiPages.MODEL_0220_FILE_AND_FOLDERS, - "0dbaed30-1cd5-4259-a0b2-f586966890ee", - "A file containing an XML structure."), + DOCUMENT_STORE("37156790-feac-4e1a-a42e-88858ae6f8e1", + "DocumentStore", + OpenMetadataWikiPages.MODEL_0221_DOCUMENT_STORES, + "a39cc327-bd4f-4cb7-9355-b7dbf55fa5c2", + "Identifies a data store as one that contains documents."), /** - * A data file which is formatted using the Apache Parquet format. + * Links a media file to another media file and describes relationship. */ - PARQUET_FILE("97cba3a0-1dfd-4129-82b6-798de3eec0a4", - "ParquetFile", - OpenMetadataWikiPages.MODEL_0220_FILE_AND_FOLDERS, - "b472c4a1-708d-4787-b0c3-730052cf19f4", - "A data file which is formatted using the Apache Parquet format."), + LINKED_MEDIA_RELATIONSHIP("cee3a190-fc8d-4e53-908a-f1b9689581e0", + "LinkedMedia", + OpenMetadataWikiPages.MODEL_0221_DOCUMENT_STORES, + "7eabb4c2-017e-4215-8ca0-5596ad4880d6", + "Links a media file to another media file and describes relationship."), /** * A data file containing formatted media such as images, audio or video. @@ -1492,11 +1822,11 @@ public enum OpenMetadataType /** * A file containing a three-dimensional image. */ - THREE_D_IMAGE_FILE("b2d56d90-ef55-4fa4-b1d6-a6049fd49466", - "3DImageFile", - OpenMetadataWikiPages.MODEL_0221_DOCUMENT_STORES, - "a37ea95a-4e43-499b-b2c6-a73ac99abbf8", - "A file containing a three-dimensional image."), + THREE_D_IMAGE_FILE("b2d56d90-ef55-4fa4-b1d6-a6049fd49466", + "3DImageFile", + OpenMetadataWikiPages.MODEL_0221_DOCUMENT_STORES, + "a37ea95a-4e43-499b-b2c6-a73ac99abbf8", + "A file containing a three-dimensional image."), /** * A file containing an image as a matrix of pixels. @@ -1516,14 +1846,15 @@ public enum OpenMetadataType "35d56124-280c-4434-9206-84eff153f73b", "A file containing an image described using mathematical formulas."), + /** - * A data set that consists of a collection files (do not need to be co-located). + * Identifies a data store as one that contains one or more graphs. */ - DATA_FILE_COLLECTION("962de053-ab51-40eb-b843-85b98013f5ca", - "DataFileCollection", - OpenMetadataWikiPages.MODEL_0220_FILE_AND_FOLDERS, - "c2833bb5-5508-4328-a81d-f9b5971be095", - "A data set that consists of a collection files (do not need to be co-located)."), + GRAPH_STORE("86de3633-eec8-4bf9-aad1-e92df1ca2024", + "GraphStore", + OpenMetadataWikiPages.MODEL_0222_GRAPH_STORES, + "ca06f2ea-ba2d-4538-9deb-76240bb616d2", + "Identifies a data store as one that contains one or more graphs."), /** * A location for storing and distributing related events. @@ -1543,6 +1874,24 @@ public enum OpenMetadataType "38bdd80b-706a-483c-8c39-4cba69e9a767,", "An event topic supported by Apache Kafka."), + /** + * A collection of elements registered to receive events from a topic. + */ + SUBSCRIBER_LIST("69751093-35f9-42b1-944b-ba6251ff513d", + "SubscriberList", + OpenMetadataWikiPages.MODEL_0223_EVENTS_AND_LOGS, + "934517a0-c664-4d08-80c9-d61da42a3167", + "A collection of elements registered to receive events from a topic."), + + /** + * Links the list of subscribers to a topic. + */ + TOPIC_SUBSCRIBERS_RELATIONSHIP("bc91a28c-afb9-41a7-8eb2-fc8b5271fe9e", + "TopicSubscribers", + OpenMetadataWikiPages.MODEL_0223_EVENTS_AND_LOGS, + "e42ab697-7457-48ae-89f8-b786a08e94aa", + "Links the list of subscribers to a topic."), + /** * "Identifies a data file as one containing log records." */ @@ -1561,8 +1910,6 @@ public enum OpenMetadataType "b6a17f72-2add-4db8-bf4d-9c6460386318", "Defines destination information for the log of activity associated with an element."), - - /** * 0921c83f-b2db-4086-a52c-0d10e52ca078 */ @@ -1636,6 +1983,82 @@ public enum OpenMetadataType "4aa6aae8-a0d6-4e05-8b93-6bab1962c3a6", "A data set containing authentication and related security information."), + + /** + * An asset supported by data virtualization technology. + */ + INFORMATION_VIEW("68d7b905-6438-43be-88cf-5de027b4aaaf", + "InformationView", + OpenMetadataWikiPages.MODEL_0235_INFORMATION_VIEW, + "c0709c9e-8ff8-4af3-8b5d-85d89355bf64", + "An asset supported by data virtualization technology."), + + + /** + * A virtual asset that can be called as a table through a SQL-like API. + */ + VIRTUAL_RELATIONAL_TABLE("fd166582-8ff5-46ad-978e-7770e7339949", + "VirtualRelationalTable", + OpenMetadataWikiPages.MODEL_0235_INFORMATION_VIEW, + "b6a9209c-de82-4357-8e03-447f904814e0", + "A virtual asset that can be called as a table through a SQL-like API."), + + + /** + * A text file containing a program written in a language that needs to be complied into an executable form before it can run. + */ + SOURCE_CODE_FILE("5b26a2d2-3159-4e8e-bf28-e71904113fc8", + "SourceCodeFile", + OpenMetadataWikiPages.MODEL_0280_SOFTWARE_DEVELOPMENT_ASSETS, + "e241c208-9055-476f-bf56-38c627d98848", + "A text file containing a program written in a language that needs to be complied into an executable form before it can run."), + + /** + * A file containing instructions to run a build of a software artifact or system. + */ + BUILD_INSTRUCTION_FILE("b1697a55-c731-4ef8-a9ff-d29c143cc1c3", + "BuildInstructionFile", + OpenMetadataWikiPages.MODEL_0280_SOFTWARE_DEVELOPMENT_ASSETS, + "e26b1579-2397-4a42-ad1a-55fa351117d8", + "A file containing instructions to run a build of a software artifact or system."), + + /** + * A file containing compiled code that can be executed. + */ + EXECUTABLE_FILE("314219ed-4b81-4e1d-b66b-22958a05f0c9", + "ExecutableFile", + OpenMetadataWikiPages.MODEL_0280_SOFTWARE_DEVELOPMENT_ASSETS, + "b1ed127d-c5c7-41aa-b295-d3a13053e24f", + "A file containing compiled code that can be executed."), + + /** + * A file containing code that is interpreted when it is run. + */ + SCRIPT_FILE("cae5d609-16b0-4812-8582-adb742bbef89", + "ScriptFile", + OpenMetadataWikiPages.MODEL_0280_SOFTWARE_DEVELOPMENT_ASSETS, + "b03e1bcd-6451-4e9c-b8ec-0e686c2ed18b", + "A file containing code that is interpreted when it is run."), + + /** + * A file containing a list of properties, typically used for configuration of some software. + */ + PROPERTIES_FILE("febdb5b9-92cc-4eb1-b058-86934f2ec18b", + "PropertiesFile", + OpenMetadataWikiPages.MODEL_0280_SOFTWARE_DEVELOPMENT_ASSETS, + "b09718ca-f956-41a7-9528-a0976b87a5ea", + "A file containing a list of properties, typically used for configuration of some software."), + + /** + * A file containing properties in YAML format. This it typically used for configuration. + */ + YAML_FILE("2bd6feb5-1b79-417a-b430-4e8e1e0a63dd", + "YAMLFile", + OpenMetadataWikiPages.MODEL_0280_SOFTWARE_DEVELOPMENT_ASSETS, + "5e0ea8d1-bb58-4a85-931d-886f8388b9d2", + "A file containing properties in YAML format. This it typically used for configuration."), + + /* ============================================================================================================================*/ /* Area 3 - Glossary */ /* ============================================================================================================================*/ @@ -2864,338 +3287,11 @@ public static String getDescriptionGUIDForType(String typeName) this.description = description; } - /* ============================================================================================================================*/ - /* Area 1 - Collaboration */ - /* ============================================================================================================================*/ - - - public static final String TITLE_PROPERTY_NAME = "title"; /* from Person entity */ - public static final String INITIALS_PROPERTY_NAME = "initials"; /* from Person entity */ - public static final String GIVEN_NAMES_PROPERTY_NAME = "givenNames"; /* from Person entity */ - public static final String SURNAME_PROPERTY_NAME = "surname"; /* from Person entity */ - public static final String FULL_NAME_PROPERTY_NAME = "fullName"; /* from Person entity */ - public static final String PRONOUNS_PROPERTY_NAME = "pronouns"; /* from Person entity */ - public static final String PREFERRED_LANGUAGE_PROPERTY_NAME = "preferredLanguage"; /* from Person entity */ - public static final String JOB_TITLE_PROPERTY_NAME = "jobTitle"; /* from Person entity */ - public static final String EMPLOYEE_NUMBER_PROPERTY_NAME = "employeeNumber"; /* from Person entity */ - public static final String EMPLOYEE_TYPE_PROPERTY_NAME = "employeeType"; /* from Person entity */ - - public static final String PERSONAL_CONTRIBUTION_RELATIONSHIP_TYPE_GUID = "4a316abe-eeee-4d11-ad5a-4bfb4079b80b"; /* from Area 1 */ - public static final String PERSONAL_CONTRIBUTION_RELATIONSHIP_TYPE_NAME = "PersonalContribution"; - /* End1 = Person; End 2 = ContributionRecord */ - - public static final String CONTRIBUTION_RECORD_TYPE_GUID = "ac406bf8-e53e-49f1-9088-2af28cccd285"; - public static final String CONTRIBUTION_RECORD_TYPE_NAME = "ContributionRecord"; /* from Area 1 */ - /* Referenceable */ - - public static final String KARMA_POINTS_PROPERTY_NAME = "karmaPoints"; /* from ContributionRecord entity */ - - public static final String PERSON_ROLE_TYPE_GUID = "ac406bf8-e53e-49f1-9088-2af28bcbd285"; - public static final String PERSON_ROLE_TYPE_NAME = "PersonRole"; - /* Actor */ - - public static final String HEAD_COUNT_PROPERTY_NAME = "headCount"; /* from PersonRole entity */ - - public static final String PERSON_ROLE_APPOINTMENT_RELATIONSHIP_TYPE_GUID = "4a316abe-bcce-4d11-ad5a-4bfb4079b80b"; /* from Area 1 */ - public static final String PERSON_ROLE_APPOINTMENT_RELATIONSHIP_TYPE_NAME = "PersonRoleAppointment"; - /* End1 = Person; End 2 = PersonRole */ - - public static final String PEER_RELATIONSHIP_TYPE_GUID = "4a316abe-bccd-4d11-ad5a-4bfb4079b80b"; /* from Area 1 */ - public static final String PEER_RELATIONSHIP_TYPE_NAME = "Peer"; - /* End1 = Person; End 2 = Person */ - - public static final String TEAM_TYPE_GUID = "36db26d5-aba2-439b-bc15-d62d373c5db6"; - public static final String TEAM_TYPE_NAME = "Team"; /* from Area 1 */ - /* ActorProfile */ - - public static final String TEAM_TYPE_PROPERTY_NAME = "teamType"; /* from Team entity */ - - public static final String TEAM_STRUCTURE_RELATIONSHIP_TYPE_GUID = "5ebc4fb2-b62a-4269-8f18-e9237a2229ca"; /* from Area 1 */ - public static final String TEAM_STRUCTURE_RELATIONSHIP_TYPE_NAME = "TeamStructure"; - /* End1 = Team; End 2 = Team */ - - public static final String DELEGATION_ESCALATION_PROPERTY_NAME = "delegationEscalationAuthority"; /* from TeamStructure relationship */ - - public static final String TEAM_MEMBER_TYPE_GUID = "46db26d5-abb2-538b-bc15-d62d373c5db6"; - public static final String TEAM_MEMBER_TYPE_NAME = "TeamMember"; /* from Area 1 */ - /* PersonRole */ - - public static final String TEAM_MEMBERSHIP_RELATIONSHIP_TYPE_GUID = "1ebc4fb2-b62a-4269-8f18-e9237a2119ca"; /* from Area 1 */ - public static final String TEAM_MEMBERSHIP_RELATIONSHIP_TYPE_NAME = "TeamMembership"; - /* End1 = TeamMember; End 2 = Team */ - - public static final String TEAM_LEADER_TYPE_GUID = "36db26d5-abb2-439b-bc15-d62d373c5db6"; - public static final String TEAM_LEADER_TYPE_NAME = "TeamLeader"; /* from Area 1 */ - /* PersonRole */ - - public static final String TEAM_LEADERSHIP_RELATIONSHIP_TYPE_GUID = "5ebc4fb2-b62a-4269-8f18-e9237a2119ca"; /* from Area 1 */ - public static final String TEAM_LEADERSHIP_RELATIONSHIP_TYPE_NAME = "TeamLeadership"; - /* End1 = TeamLeader; End 2 = Team */ - - public static final String IT_PROFILE_TYPE_GUID = "81394f85-6008-465b-926e-b3fae4668937"; - public static final String IT_PROFILE_TYPE_NAME = "ITProfile"; /* from Area 1 */ - /* ActorProfile */ - - public static final String IT_INFRASTRUCTURE_PROFILE_RELATIONSHIP_TYPE_GUID = "4c579e3d-a4ff-41c1-9931-33e6fc992f2b"; /* from Area 1 */ - public static final String IT_INFRASTRUCTURE_PROFILE_RELATIONSHIP_TYPE_NAME = "ITInfrastructureProfile"; - /* End1 = ITInfrastructure; End 2 = ITProfile */ - - public static final String ASSIGNMENT_SCOPE_RELATIONSHIP_TYPE_GUID = "e3fdafe3-692a-46c6-a595-c538cc189dd9"; /* from Area 1 */ - public static final String ASSIGNMENT_SCOPE_RELATIONSHIP_TYPE_NAME = "AssignmentScope"; - /* End1 = assignedActors - Referenceable; End 2 = assignedScope - Referenceable */ - - public static final String ASSIGNMENT_TYPE_PROPERTY_NAME = "assignmentType"; /* from Area 1 */ - - public static final String PROJECT_STATUS_PROPERTY_NAME = "projectStatus"; /* from Area 1 */ - public static final String TEAM_ROLE_PROPERTY_NAME = "teamRole"; /* from Area 1 */ - public static final String DEPENDENCY_SUMMARY_PROPERTY_NAME = "dependencySummary"; /* from Area 1 */ - - public static final String STAKEHOLDER_RELATIONSHIP_TYPE_GUID = "efd8a136-0aea-4668-b91a-30f947e38b82"; - public static final String STAKEHOLDER_RELATIONSHIP_TYPE_NAME = "Stakeholder"; /* from Area 1 */ - /* End1 = commissioned - Referenceable; End 2 = commissionedBy - Referenceable */ - - public static final String STAKEHOLDER_ROLE_PROPERTY_NAME = "stakeholderRole"; /* from Area 1 */ - - public static final String MEETING_TYPE_GUID = "6bf90c79-32f4-47ad-959c-8fff723fe744"; - public static final String MEETING_TYPE_NAME = "Meeting"; /* from Area 1 */ - /* Referenceable */ - - public static final String START_TIME_PROPERTY_NAME = "startTime"; /* from Area 1 */ - public static final String END_TIME_PROPERTY_NAME = "endTime"; /* from Area 1 */ - - - /** - * creationTime - */ - public static final String CREATION_TIME_PROPERTY_NAME = "creationTime"; /* from Area 1 */ - - - /** - * toDoType - */ - public static final String TO_DO_TYPE_PROPERTY_NAME = "toDoType"; /* from Area 1 */ - - /** - * priority - */ - public static final String PRIORITY_PROPERTY_NAME = "priority"; /* from Area 1 */ - public static final String IMPORTANCE_PROPERTY_NAME = "importance"; /* from Area 1 */ - - /** - * dueTime - */ - public static final String DUE_TIME_PROPERTY_NAME = "dueTime"; /* from Area 1 */ - - /** - * completionTime - */ - public static final String COMPLETION_TIME_PROPERTY_NAME = "completionTime"; /* from Area 1 */ - - - /** - * a0b7ba50-4c97-4b76-9a7d-c6a00e1be646 - */ - public static final String TO_DO_SOURCE_RELATIONSHIP_TYPE_GUID = "a0b7ba50-4c97-4b76-9a7d-c6a00e1be646"; - - /** - * ToDoSource - End1 = source - Referenceable; End 2 = To Do - */ - public static final String TO_DO_SOURCE_RELATIONSHIP_TYPE_NAME = "ToDoSource"; /* from Area 1 */ - - /** - * aca1277b-bf1c-42f5-9b3b-fbc2c9047325 - */ - public static final String ACTIONS_RELATIONSHIP_TYPE_GUID = "aca1277b-bf1c-42f5-9b3b-fbc2c9047325"; - - /** - * Actions - End1 = originator - Referenceable; End 2 = To Do - */ - public static final String ACTION_SPONSOR_RELATIONSHIP_TYPE_NAME = "ActionSponsor"; /* from Area 1 */ - - /** - * af2b5fab-8f83-4a2b-b749-1e6219f61f79 - */ - public static final String ACTION_ASSIGNMENT_RELATIONSHIP_TYPE_GUID = "af2b5fab-8f83-4a2b-b749-1e6219f61f79"; - - /** - * ActionAssignment - End1 = PersonRole; End 2 = To Do - */ - public static final String ACTION_ASSIGNMENT_RELATIONSHIP_TYPE_NAME = "ActionAssignment"; /* from Area 1 */ - - - public static final String COMMUNITY_TYPE_GUID = "ba846a7b-2955-40bf-952b-2793ceca090a"; - public static final String COMMUNITY_TYPE_NAME = "Community"; /* from Area 1 */ - /* Referenceable */ - - public static final String COMMUNITY_MEMBER_TYPE_GUID = "fbd42379-f6c3-4f09-b6f7-378565cda993"; - public static final String COMMUNITY_MEMBER_TYPE_NAME = "CommunityMember"; /* from Area 1 */ - /* PersonRole */ - - public static final String COMMUNITY_MEMBERSHIP_TYPE_ENUM_TYPE_GUID = "b0ef45bf-d12b-4b6f-add6-59c14648d750"; - public static final String COMMUNITY_MEMBERSHIP_TYPE_ENUM_TYPE_NAME = "CommunityMembershipType"; - - public static final int COMMUNITY_MEMBERSHIP_TYPE_CONTRIBUTOR = 0; - public static final int COMMUNITY_MEMBERSHIP_TYPE_ADMINISTRATOR = 1; - public static final int COMMUNITY_MEMBERSHIP_TYPE_LEADER = 2; - public static final int COMMUNITY_MEMBERSHIP_TYPE_OBSERVER = 3; - public static final int COMMUNITY_MEMBERSHIP_TYPE_OTHER = 99; - - public static final String COMMUNITY_MEMBERSHIP_TYPE_GUID = "7c7da1a3-01b3-473e-972e-606eff0cb112"; - public static final String COMMUNITY_MEMBERSHIP_TYPE_NAME = "CommunityMembership"; - /* End1 = Community; End 2 = CommunityMember */ - - public static final String MISSION_PROPERTY_NAME = "mission"; - public static final String MEMBERSHIP_TYPE_PROPERTY_NAME = "membershipType"; - - public static final String INFORMAL_TAG_TYPE_GUID = "ba846a7b-2955-40bf-952b-2793ceca090a"; - public static final String INFORMAL_TAG_TYPE_NAME = "InformalTag"; /* from Area 1 */ - - public static final String TAG_IS_PUBLIC_PROPERTY_NAME = "isPublic"; /* from InformalTag entity and AttachedTag relationship */ - public static final String TAG_NAME_PROPERTY_NAME = "tagName"; /* from InformalTag entity */ - public static final String TAG_DESCRIPTION_PROPERTY_NAME = "tagDescription"; /* from InformalTag entity */ - public static final String TAG_USER_PROPERTY_NAME = "createdBy"; /* From Audit Header */ - - public static final String REFERENCEABLE_TO_TAG_TYPE_GUID = "4b1641c4-3d1a-4213-86b2-d6968b6c65ab"; - public static final String REFERENCEABLE_TO_TAG_TYPE_NAME = "AttachedTag"; - /* End1 = Referenceable; End 2 = InformalTag */ - /* Also isPublic */ - - public static final String LIKE_TYPE_GUID = "deaa5ca0-47a0-483d-b943-d91c76744e01"; - public static final String LIKE_TYPE_NAME = "Like"; /* from Area 1 */ - - public static final String REFERENCEABLE_TO_LIKE_TYPE_GUID = "e2509715-a606-415d-a995-61d00503dad4"; - public static final String REFERENCEABLE_TO_LIKE_TYPE_NAME = "AttachedLike"; - /* End1 = Referenceable; End 2 = Like */ - - public static final String LIKE_IS_PUBLIC_PROPERTY_NAME = "isPublic"; /* from AttachedLike relationship*/ - - public static final String RATING_TYPE_GUID = "7299d721-d17f-4562-8286-bcd451814478"; - public static final String RATING_TYPE_NAME = "Rating"; /* from Area 1 */ - - public static final String STAR_RATING_ENUM_TYPE_GUID = "77fea3ef-6ec1-4223-8408-38567e9d3c93"; - public static final String STAR_RATING_ENUM_TYPE_NAME = "StarRating"; /* from Area 1 */ - - public static final String STARS_PROPERTY_NAME = "stars"; /* from Rating entity */ - /* StarRating enum */ - public static final String REVIEW_PROPERTY_NAME = "review"; /* from Rating entity */ - - public static final String REFERENCEABLE_TO_RATING_TYPE_GUID = "0aaad9e9-9cc5-4ad8-bc2e-c1099bab6344"; - public static final String REFERENCEABLE_TO_RATING_TYPE_NAME = "AttachedRating"; - /* End1 = Referenceable; End 2 = Rating */ - - - public static final String COMMENT_TEXT_PROPERTY_NAME = "text"; /* from Comment entity */ - - public static final String REFERENCEABLE_TO_COMMENT_TYPE_GUID = "0d90501b-bf29-4621-a207-0c8c953bdac9"; - public static final String REFERENCEABLE_TO_COMMENT_TYPE_NAME = "AttachedComment"; - /* End1 = Referenceable; End 2 = Comment */ - - public static final String ANSWER_RELATIONSHIP_TYPE_GUID = "ecf1a3ca-adc5-4747-82cf-10ec590c5c69"; - public static final String ANSWER_RELATIONSHIP_TYPE_NAME = "AcceptedAnswer"; - /* End1 = Comment; End 2 = Comment */ - - public static final String TEXT_PROPERTY_NAME = "text"; /* from NoteEntry entity */ - - public static final String REFERENCEABLE_TO_NOTE_LOG_TYPE_GUID = "4f798c0c-6769-4a2d-b489-d2714d89e0a4"; - public static final String REFERENCEABLE_TO_NOTE_LOG_TYPE_NAME = "AttachedNoteLog"; - /* End1 = Referenceable; End 2 = NoteLog */ - /* And isPublicProperty */ - - public static final String NOTE_LOG_TYPE_GUID = "646727c7-9ad4-46fa-b660-265489ad96c6"; - public static final String NOTE_LOG_TYPE_NAME = "NoteLog"; /* from Area 1 */ - /* Referenceable */ - - public static final String NOTE_LOG_ENTRIES_RELATIONSHIP_TYPE_GUID = "38edecc6-f385-4574-8144-524a44e3e712"; - public static final String NOTE_LOG_ENTRIES_RELATIONSHIP_TYPE_NAME = "AttachedNoteLogEntry"; - /* End1 = NoteLog; End 2 = NoteEntry */ - - public static final String NOTE_TYPE_GUID = "2a84d94c-ac6f-4be1-a72a-07dcec7b1fe3"; - public static final String NOTE_TYPE_NAME = "NoteEntry"; /* from Area 1 */ - /* Referenceable */ /* ============================================================================================================================*/ /* Area 2 - Assets */ /* ============================================================================================================================*/ - /** - * 114e9f8f-5ff3-4c32-bd37-a7eb42712253 - */ - public static final String CONNECTION_TYPE_GUID = "114e9f8f-5ff3-4c32-bd37-a7eb42712253"; - - /** - * Connection - inherits from Referenceable - */ - public static final String CONNECTION_TYPE_NAME = "Connection"; - - /** - * securedProperties - */ - public static final String SECURED_PROPERTIES_PROPERTY_NAME = "securedProperties"; /* from Connection entity */ - - /** - * configurationProperties - */ - public static final String CONFIGURATION_PROPERTIES_PROPERTY_NAME = "configurationProperties"; /* from Connection entity */ - - /** - * userId - */ - public static final String USER_ID_PROPERTY_NAME = "userId"; /* from Connection entity */ - - /** - * clearPassword - */ - public static final String CLEAR_PASSWORD_PROPERTY_NAME = "clearPassword"; /* from Connection entity */ - - /** - * encryptedPassword - */ - public static final String ENCRYPTED_PASSWORD_PROPERTY_NAME = "encryptedPassword"; /* from Connection entity */ - - /** - * recognizedAdditionalProperties - */ - public static final String RECOGNIZED_ADDITIONAL_PROPERTIES_PROPERTY_NAME = "recognizedAdditionalProperties"; /* from Connection entity */ - - /** - * recognizedSecuredProperties - */ - public static final String RECOGNIZED_SECURED_PROPERTIES_PROPERTY_NAME = "recognizedSecuredProperties"; /* from Connection entity */ - - /** - * recognizedConfigurationProperties - */ - public static final String RECOGNIZED_CONFIGURATION_PROPERTIES_PROPERTY_NAME = "recognizedConfigurationProperties"; /* from Connection entity */ - - /** - * 887a7132-d6bc-4b92-a483-e80b60c86fb2 - */ - public static final String CONNECTION_ENDPOINT_TYPE_GUID = "887a7132-d6bc-4b92-a483-e80b60c86fb2"; - - /** - * ConnectionEndpoint - End1 = Endpoint; End 2 = Connection - */ - public static final String CONNECTION_ENDPOINT_TYPE_NAME = "ConnectionEndpoint"; - - /** - * e542cfc1-0b4b-42b9-9921-f0a5a88aaf96 - */ - public static final String CONNECTION_CONNECTOR_TYPE_TYPE_GUID = "e542cfc1-0b4b-42b9-9921-f0a5a88aaf96"; - - /** - * ConnectionConnectorType - End1 = Connection; End 2 = ConnectorType - */ - public static final String CONNECTION_CONNECTOR_TYPE_TYPE_NAME = "ConnectionConnectorType"; - - /** - * 954421eb-33a6-462d-a8ca-b5709a1bd0d4 - */ - public static final String CONNECTOR_TYPE_TYPE_GUID = "954421eb-33a6-462d-a8ca-b5709a1bd0d4"; - - /** - * ConnectorType - inherits from Referenceable - */ - public static final String CONNECTOR_TYPE_TYPE_NAME = "ConnectorType"; /** * supportedAssetTypeName @@ -3282,10 +3378,6 @@ public static String getDescriptionGUIDForType(String typeName) */ public static final String EXPECTED_DATA_FORMAT = "expectedDataFormat"; /* from ConnectorType entity */ - /** - * connectorProviderClassName - */ - public static final String CONNECTOR_PROVIDER_PROPERTY_NAME = "connectorProviderClassName"; /* from ConnectorType entity */ /** * connectorFrameworkName @@ -3332,69 +3424,9 @@ public static String getDescriptionGUIDForType(String typeName) */ public static final String TARGET_TECHNOLOGY_VERSIONS = "targetTechnologyVersions"; /* from ConnectorType entity */ - /** - * recognizedAdditionalProperties - */ - public static final String RECOGNIZED_ADD_PROPS_PROPERTY_NAME = "recognizedAdditionalProperties"; /* from ConnectorType and ConnectorCategory entity */ - - /** - * recognizedSecuredProperties - */ - public static final String RECOGNIZED_SEC_PROPS_PROPERTY_NAME = "recognizedSecuredProperties"; /* from ConnectorType and ConnectorCategory entity */ - - /** - * recognizedConfigurationProperties - */ - public static final String RECOGNIZED_CONFIG_PROPS_PROPERTY_NAME = "recognizedConfigurationProperties"; /* from ConnectorType and ConnectorCategory entity */ - /** - * 82f9c664-e59d-484c-a8f3-17088c23a2f3 - */ - public static final String VIRTUAL_CONNECTION_TYPE_GUID = "82f9c664-e59d-484c-a8f3-17088c23a2f3"; - /** - * VirtualConnection - */ - public static final String VIRTUAL_CONNECTION_TYPE_NAME = "VirtualConnection"; - /** - * eb6dfdd2-8c6f-4f0d-a17d-f6ce4799f64f - */ - public static final String EMBEDDED_CONNECTION_TYPE_GUID = "eb6dfdd2-8c6f-4f0d-a17d-f6ce4799f64f"; - - /** - * EmbeddedConnection - End1 = VirtualConnection; End 2 = Connection - */ - public static final String EMBEDDED_CONNECTION_TYPE_NAME = "EmbeddedConnection"; - - /** - * position - */ - public static final String POSITION_PROPERTY_NAME = "position"; /* from EmbeddedConnection relationship */ - - /** - * arguments - */ - public static final String ARGUMENTS_PROPERTY_NAME = "arguments"; /* from EmbeddedConnection relationship */ - - /** - * e777d660-8dbe-453e-8b83-903771f054c0 - */ - public static final String ASSET_TO_CONNECTION_TYPE_GUID = "e777d660-8dbe-453e-8b83-903771f054c0"; - - /** - * ConnectionToAsset - End1 = Connection; End 2 = Asset - */ - public static final String ASSET_TO_CONNECTION_TYPE_NAME = "ConnectionToAsset"; - - public static final String CONNECTION_TO_ASSET_TYPE_GUID = "e777d660-8dbe-453e-8b83-903771f054c0"; - public static final String CONNECTION_TO_ASSET_TYPE_NAME = "ConnectionToAsset"; - /* End1 = Connection; End 2 = Asset */ - - /** - * assetSummary - */ - public static final String ASSET_SUMMARY_PROPERTY_NAME = "assetSummary"; /* from ConnectionToAsset relationship */ @@ -4709,14 +4741,7 @@ public static String getDescriptionGUIDForType(String typeName) /* Area 7 - Lineage */ /* ============================================================================================================================*/ - public static final String DIGITAL_SERVICE_TYPE_GUID = "f671e1fc-b204-4ee6-a4e2-da1633ecf50e"; - public static final String DIGITAL_SERVICE_TYPE_NAME = "DigitalService"; - - public static final String DIGITAL_SERVICE_DEPENDENCY_RELATIONSHIP_TYPE_GUID = "e8303911-ba1c-4640-974e-c4d57ee1b310"; - public static final String DIGITAL_SERVICE_DEPENDENCY_RELATIONSHIP_TYPE_NAME = "DigitalServiceDependency"; - public static final String DIGITAL_SERVICE_PRODUCT_RELATIONSHIP_TYPE_GUID = "51465a59-c785-406d-929c-def34596e9af"; - public static final String DIGITAL_SERVICE_PRODUCT_RELATIONSHIP_TYPE_NAME = "DigitalServiceProduct"; public static final String IMPLEMENTED_BY_RELATIONSHIP_TYPE_GUID = "28f63c94-aaef-4c84-98f7-d77aa605272e"; public static final String IMPLEMENTED_BY_RELATIONSHIP_TYPE_NAME = "ImplementedBy"; @@ -4764,10 +4789,7 @@ public static String getDescriptionGUIDForType(String typeName) /* Referenceable */ public static final String EXECUTION_DATE_PROPERTY_NAME = "executionDate"; /* from OpenDiscoveryAnalysisReport entity */ - public static final String DISCOVERY_SERVICE_STATUS_PROPERTY_NAME = "discoveryServiceStatus"; /* from OpenDiscoveryAnalysisReport entity */ - public static final String DISCOVERY_REQUEST_STATUS_ENUM_TYPE_GUID = "b2fdeddd-24eb-4e9c-a2a4-2693828d4a69"; - public static final String DISCOVERY_REQUEST_STATUS_ENUM_TYPE_NAME = "DiscoveryServiceRequestStatus"; public static final String REPORT_TO_ASSET_TYPE_GUID = "7eded424-f176-4258-9ae6-138a46b2845f"; /* from Area 6 */ public static final String REPORT_TO_ASSET_TYPE_NAME = "AssetDiscoveryReport"; diff --git a/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/types/OpenMetadataWikiPages.java b/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/types/OpenMetadataWikiPages.java index 509de52e94d..9e1e8ceb280 100644 --- a/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/types/OpenMetadataWikiPages.java +++ b/open-metadata-implementation/frameworks/open-metadata-framework/src/main/java/org/odpi/openmetadata/frameworks/openmetadata/types/OpenMetadataWikiPages.java @@ -174,6 +174,11 @@ public class OpenMetadataWikiPages */ public static final String MODEL_0137_ACTIONS_FOR_PEOPLE = "https://egeria-project.org/types/1/0137-Actions/"; + /** + * ... + */ + public static final String MODEL_0140_COMMUNITIES = "https://egeria-project.org/types/1/0140-Communities/"; + /** * ... */ diff --git a/open-metadata-implementation/repository-services/repository-services-apis/src/main/java/org/odpi/openmetadata/repositoryservices/ffdc/OMRSErrorCode.java b/open-metadata-implementation/repository-services/repository-services-apis/src/main/java/org/odpi/openmetadata/repositoryservices/ffdc/OMRSErrorCode.java index 591b56aa10b..a5f388ed3ce 100644 --- a/open-metadata-implementation/repository-services/repository-services-apis/src/main/java/org/odpi/openmetadata/repositoryservices/ffdc/OMRSErrorCode.java +++ b/open-metadata-implementation/repository-services/repository-services-apis/src/main/java/org/odpi/openmetadata/repositoryservices/ffdc/OMRSErrorCode.java @@ -775,6 +775,14 @@ public enum OMRSErrorCode implements ExceptionMessageSet "There was an error in the creation of an AttributeDefType.", "Fux the call to the AttributeDefType object to use a valid type."), + /** + * OMRS-PROPERTIES-400-007 - Data type {0} is not supported by method {1} + */ + BAD_DATA_TYPE(400, "OMRS-PROPERTIES-400-007", + "Data type {0} is not supported by method {1}", + "This method needs to be extended to support other data types.", + "Update this method to include the requested type."), + /** * OMRS-REST-CONNECTOR-400-001 - The connection passed in the cohort registration event does not contain the root URL for calling the server's REST API */ diff --git a/open-metadata-implementation/repository-services/repository-services-archive-utilities/src/main/java/org/odpi/openmetadata/repositoryservices/archiveutilities/OMRSArchiveHelper.java b/open-metadata-implementation/repository-services/repository-services-archive-utilities/src/main/java/org/odpi/openmetadata/repositoryservices/archiveutilities/OMRSArchiveHelper.java index a971fa368cb..782d6262566 100644 --- a/open-metadata-implementation/repository-services/repository-services-archive-utilities/src/main/java/org/odpi/openmetadata/repositoryservices/archiveutilities/OMRSArchiveHelper.java +++ b/open-metadata-implementation/repository-services/repository-services-archive-utilities/src/main/java/org/odpi/openmetadata/repositoryservices/archiveutilities/OMRSArchiveHelper.java @@ -3,11 +3,15 @@ package org.odpi.openmetadata.repositoryservices.archiveutilities; +import org.odpi.openmetadata.frameworks.openmetadata.types.DataType; +import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataProperty; import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataType; import org.odpi.openmetadata.repositoryservices.connectors.stores.archivestore.OpenMetadataArchiveBuilder; import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.instances.*; import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.typedefs.*; import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.utilities.OMRSRepositoryPropertiesUtilities; +import org.odpi.openmetadata.repositoryservices.ffdc.OMRSErrorCode; +import org.odpi.openmetadata.repositoryservices.ffdc.exception.OMRSLogicErrorException; import java.util.*; @@ -369,6 +373,213 @@ public EntityDef getDefaultEntityDef(String guid, } + /** + * Return an attribute with the name and description that is of type identified by the supplied definition. + * It is set up to be optional, + * indexable (useful for searches) but the value does not need to be unique. + * These are the typical values used for most open metadata attribute. + * They can be changed by the caller once the TypeDefAttribute is returned. + * + * @param propertyDefinition details of the attribute + * @return TypeDefAttribute + */ + public TypeDefAttribute getTypeDefAttribute(OpenMetadataProperty propertyDefinition) + { + final String methodName = "getTypeDefAttribute"; + + if (DataType.STRING.getName().equals(propertyDefinition.type)) + { + return getTypeDefAttribute(propertyDefinition.name, + propertyDefinition.description, + propertyDefinition.descriptionGUID, + PrimitiveDefCategory.OM_PRIMITIVE_TYPE_STRING); + } + else if (DataType.INT.getName().equals(propertyDefinition.type)) + { + return getTypeDefAttribute(propertyDefinition.name, + propertyDefinition.description, + propertyDefinition.descriptionGUID, + PrimitiveDefCategory.OM_PRIMITIVE_TYPE_INT); + } + else if (DataType.LONG.getName().equals(propertyDefinition.type)) + { + return getTypeDefAttribute(propertyDefinition.name, + propertyDefinition.description, + propertyDefinition.descriptionGUID, + PrimitiveDefCategory.OM_PRIMITIVE_TYPE_LONG); + } + else if (DataType.SHORT.getName().equals(propertyDefinition.type)) + { + return getTypeDefAttribute(propertyDefinition.name, + propertyDefinition.description, + propertyDefinition.descriptionGUID, + PrimitiveDefCategory.OM_PRIMITIVE_TYPE_SHORT); + } + else if (DataType.DATE.getName().equals(propertyDefinition.type)) + { + return getTypeDefAttribute(propertyDefinition.name, + propertyDefinition.description, + propertyDefinition.descriptionGUID, + PrimitiveDefCategory.OM_PRIMITIVE_TYPE_DATE); + } + else if (DataType.BOOLEAN.getName().equals(propertyDefinition.type)) + { + return getTypeDefAttribute(propertyDefinition.name, + propertyDefinition.description, + propertyDefinition.descriptionGUID, + PrimitiveDefCategory.OM_PRIMITIVE_TYPE_BOOLEAN); + } + else if (DataType.CHAR.getName().equals(propertyDefinition.type)) + { + return getTypeDefAttribute(propertyDefinition.name, + propertyDefinition.description, + propertyDefinition.descriptionGUID, + PrimitiveDefCategory.OM_PRIMITIVE_TYPE_CHAR); + } + else if (DataType.BYTE.getName().equals(propertyDefinition.type)) + { + return getTypeDefAttribute(propertyDefinition.name, + propertyDefinition.description, + propertyDefinition.descriptionGUID, + PrimitiveDefCategory.OM_PRIMITIVE_TYPE_BYTE); + } + else if (DataType.FLOAT.getName().equals(propertyDefinition.type)) + { + return getTypeDefAttribute(propertyDefinition.name, + propertyDefinition.description, + propertyDefinition.descriptionGUID, + PrimitiveDefCategory.OM_PRIMITIVE_TYPE_FLOAT); + } + else if (DataType.DOUBLE.getName().equals(propertyDefinition.type)) + { + return getTypeDefAttribute(propertyDefinition.name, + propertyDefinition.description, + propertyDefinition.descriptionGUID, + PrimitiveDefCategory.OM_PRIMITIVE_TYPE_DOUBLE); + } + else if (DataType.BIGINTEGER.getName().equals(propertyDefinition.type)) + { + return getTypeDefAttribute(propertyDefinition.name, + propertyDefinition.description, + propertyDefinition.descriptionGUID, + PrimitiveDefCategory.OM_PRIMITIVE_TYPE_BIGINTEGER); + } + else if (DataType.BIGDECIMAL.getName().equals(propertyDefinition.type)) + { + return getTypeDefAttribute(propertyDefinition.name, + propertyDefinition.description, + propertyDefinition.descriptionGUID, + PrimitiveDefCategory.OM_PRIMITIVE_TYPE_BIGDECIMAL); + } + else if (DataType.OBJECT.getName().equals(propertyDefinition.type)) + { + return getTypeDefAttribute(propertyDefinition.name, + propertyDefinition.description, + propertyDefinition.descriptionGUID, + PrimitiveDefCategory.OM_PRIMITIVE_TYPE_UNKNOWN); + } + else if (DataType.ARRAY_STRING.getName().equals(propertyDefinition.type)) + { + return getArrayStringTypeDefAttribute(propertyDefinition.name, + propertyDefinition.description, + propertyDefinition.descriptionGUID); + } + else if (DataType.ARRAY_INT.getName().equals(propertyDefinition.type)) + { + return getArrayIntTypeDefAttribute(propertyDefinition.name, + propertyDefinition.description, + propertyDefinition.descriptionGUID); + } + else if (DataType.MAP_STRING_BOOLEAN.getName().equals(propertyDefinition.type)) + { + return getMapStringBooleanTypeDefAttribute(propertyDefinition.name, + propertyDefinition.description, + propertyDefinition.descriptionGUID); + } + else if (DataType.MAP_STRING_INT.getName().equals(propertyDefinition.type)) + { + return getMapStringIntTypeDefAttribute(propertyDefinition.name, + propertyDefinition.description, + propertyDefinition.descriptionGUID); + } + else if (DataType.MAP_STRING_DOUBLE.getName().equals(propertyDefinition.type)) + { + return getMapStringDoubleTypeDefAttribute(propertyDefinition.name, + propertyDefinition.description, + propertyDefinition.descriptionGUID); + } + else if (DataType.MAP_STRING_DATE.getName().equals(propertyDefinition.type)) + { + return getMapStringDateTypeDefAttribute(propertyDefinition.name, + propertyDefinition.description, + propertyDefinition.descriptionGUID); + } + else if (DataType.MAP_STRING_STRING.getName().equals(propertyDefinition.type)) + { + return getMapStringStringTypeDefAttribute(propertyDefinition.name, + propertyDefinition.description, + propertyDefinition.descriptionGUID); + } + else if (DataType.MAP_STRING_LONG.getName().equals(propertyDefinition.type)) + { + return getMapStringLongTypeDefAttribute(propertyDefinition.name, + propertyDefinition.description, + propertyDefinition.descriptionGUID); + } + else if (DataType.MAP_STRING_OBJECT.getName().equals(propertyDefinition.type)) + { + return getMapStringStringTypeDefAttribute(propertyDefinition.name, + propertyDefinition.description, + propertyDefinition.descriptionGUID); + } + else + { + throw new OMRSLogicErrorException(OMRSErrorCode.BAD_DATA_TYPE.getMessageDefinition(propertyDefinition.type, + methodName), + this.getClass().getName(), + methodName); + } + + } + + + /** + * Return an attribute with the supplied name and description that is of type String. It is set up to be optional, + * indexable (useful for searches) but the value does not need to be unique. + * These are the typical values used for most open metadata attribute. + * They can be changed by the caller once the TypeDefAttribute is returned. + * + * @param attributeName name of the attribute + * @param attributeDescription short description for the attribute + * @param attributeDescriptionGUID guid of the glossary term that describes this attribute. + * @return TypeDefAttribute of type string + */ + public TypeDefAttribute getTypeDefAttribute(String attributeName, + String attributeDescription, + String attributeDescriptionGUID, + PrimitiveDefCategory primitiveDefCategory) + { + TypeDefAttribute attribute = new TypeDefAttribute(); + + attribute.setHeaderVersion(TypeDefElementHeader.CURRENT_TYPE_DEF_HEADER_VERSION); + attribute.setAttributeName(attributeName); + attribute.setAttributeDescription(attributeDescription); + attribute.setAttributeDescriptionGUID(attributeDescriptionGUID); + attribute.setAttributeType(this.archiveBuilder.getPrimitiveDef(primitiveDefCategory.getName())); + attribute.setAttributeCardinality(AttributeCardinality.AT_MOST_ONE); + attribute.setValuesMinCount(0); + attribute.setValuesMaxCount(1); + attribute.setIndexable(true); + attribute.setUnique(false); + attribute.setDefaultValue(null); + attribute.setExternalStandardMappings(null); + + attribute.setAttributeStatus(TypeDefAttributeStatus.ACTIVE_ATTRIBUTE); + + return attribute; + } + + /** * Return an attribute with the supplied name and description that is of type String. It is set up to be optional, * indexable (useful for searches) but the value does not need to be unique. @@ -918,6 +1129,24 @@ public TypeDefAttribute getMapStringIntTypeDefAttribute(String attributeNa } + /** + * Return an attribute with the supplied name, type and description. It is set up to be optional, + * indexable (useful for searches) but the value does not need to be unique. + * These are the typical values used for most open metadata attribute. + * They can be changed by the caller once the TypeDefAttribute is returned. + * + * @param propertyDescription details of the attribute + * @return TypeDefAttribute of type enum + */ + public TypeDefAttribute getEnumTypeDefAttribute(OpenMetadataProperty propertyDescription) + { + return this.getEnumTypeDefAttribute(propertyDescription.type, + propertyDescription.name, + propertyDescription.description, + propertyDescription.descriptionGUID); + } + + /** * Return an attribute with the supplied name, type and description. It is set up to be optional, * indexable (useful for searches) but the value does not need to be unique. @@ -928,7 +1157,7 @@ public TypeDefAttribute getMapStringIntTypeDefAttribute(String attributeNa * @param attributeName name of the attribute * @param attributeDescription short description for the attribute * @param attributeDescriptionGUID guid of the glossary term that describes this attribute. - * @return TypeDefAttribute of type string + * @return TypeDefAttribute of type enum */ public TypeDefAttribute getEnumTypeDefAttribute(String enumTypeName, String attributeName, diff --git a/open-metadata-implementation/user-security/token-controller/README.md b/open-metadata-implementation/user-security/token-controller/README.md index 5f20a88a6a6..b7682b77691 100644 --- a/open-metadata-implementation/user-security/token-controller/README.md +++ b/open-metadata-implementation/user-security/token-controller/README.md @@ -3,7 +3,7 @@ # Token Controller -The token-controller module provides a base class for the Server-side ReEST Service classes of +The token-controller module provides a base class for the Server-side REST Service classes of the view services. It provides a method to extract the userId from the incoming HTTP request's authorization header to add as the userId on the URL of other Egeria REST services it calls downstream. diff --git a/open-metadata-implementation/user-security/token-manager/src/main/java/org/odpi/openmetadata/tokenmanager/http/HTTPHeadersThreadLocal.java b/open-metadata-implementation/user-security/token-manager/src/main/java/org/odpi/openmetadata/tokenmanager/http/HTTPHeadersThreadLocal.java index 31c39096d43..9449175e48d 100644 --- a/open-metadata-implementation/user-security/token-manager/src/main/java/org/odpi/openmetadata/tokenmanager/http/HTTPHeadersThreadLocal.java +++ b/open-metadata-implementation/user-security/token-manager/src/main/java/org/odpi/openmetadata/tokenmanager/http/HTTPHeadersThreadLocal.java @@ -13,7 +13,7 @@ public class HTTPHeadersThreadLocal /** * HEADERS_THREAD_LOCAL is a ThreadLocal that holds a map of headers and their value */ - private static ThreadLocal> HEADERS_THREAD_LOCAL = new ThreadLocal<>(); + private static final ThreadLocal> HEADERS_THREAD_LOCAL = new ThreadLocal<>(); /** diff --git a/open-metadata-implementation/view-services/feedback-manager/feedback-manager-server/src/main/java/org/odpi/openmetadata/viewservices/feedbackmanager/handler/CollaborationManagerHandler.java b/open-metadata-implementation/view-services/feedback-manager/feedback-manager-server/src/main/java/org/odpi/openmetadata/viewservices/feedbackmanager/handler/CollaborationManagerHandler.java index 0f4ca34c9dc..85cbf394ffc 100644 --- a/open-metadata-implementation/view-services/feedback-manager/feedback-manager-server/src/main/java/org/odpi/openmetadata/viewservices/feedbackmanager/handler/CollaborationManagerHandler.java +++ b/open-metadata-implementation/view-services/feedback-manager/feedback-manager-server/src/main/java/org/odpi/openmetadata/viewservices/feedbackmanager/handler/CollaborationManagerHandler.java @@ -1967,7 +1967,7 @@ private ElementProperties getElementPropertiesForNote(NoteProperties properties, properties.getText()); elementProperties = propertyHelper.addStringProperty(elementProperties, - OpenMetadataProperty.TITLE.name, + OpenMetadataProperty.COURTESY_TITLE.name, properties.getTitle()); elementProperties = propertyHelper.addStringMapProperty(elementProperties, diff --git a/open-metadata-resources/open-metadata-archives/content-pack-helpers/src/main/java/org/odpi/openmetadata/samples/archiveutilities/GovernanceArchiveHelper.java b/open-metadata-resources/open-metadata-archives/content-pack-helpers/src/main/java/org/odpi/openmetadata/samples/archiveutilities/GovernanceArchiveHelper.java index 1fbb201d2a4..4f0e017d642 100644 --- a/open-metadata-resources/open-metadata-archives/content-pack-helpers/src/main/java/org/odpi/openmetadata/samples/archiveutilities/GovernanceArchiveHelper.java +++ b/open-metadata-resources/open-metadata-archives/content-pack-helpers/src/main/java/org/odpi/openmetadata/samples/archiveutilities/GovernanceArchiveHelper.java @@ -251,7 +251,7 @@ public void addCatalogTargetRelationship(String integrationConnecto InstanceProperties properties = archiveHelper.addStringPropertyToInstance(archiveRootName, null, OpenMetadataType.CATALOG_TARGET_NAME_PROPERTY_NAME, catalogTargetName, methodName); properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataType.CONNECTION_NAME_PROPERTY_NAME, connectionName, methodName); - properties = archiveHelper.addMapPropertyToInstance(archiveRootName, properties, OpenMetadataType.CONFIGURATION_PROPERTIES_PROPERTY_NAME, configurationProperties, methodName); + properties = archiveHelper.addMapPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.CONFIGURATION_PROPERTIES.name, configurationProperties, methodName); properties = archiveHelper.addStringMapPropertyToInstance(archiveRootName, properties, OpenMetadataType.TEMPLATES_PROPERTY_NAME, templates, methodName); properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataType.METADATA_SOURCE_QUALIFIED_NAME_PROPERTY_NAME, metadataSourceQualifiedName, methodName); diff --git a/open-metadata-resources/open-metadata-archives/content-pack-helpers/src/main/java/org/odpi/openmetadata/samples/archiveutilities/SimpleCatalogArchiveHelper.java b/open-metadata-resources/open-metadata-archives/content-pack-helpers/src/main/java/org/odpi/openmetadata/samples/archiveutilities/SimpleCatalogArchiveHelper.java index 97ce943472a..348c335befb 100644 --- a/open-metadata-resources/open-metadata-archives/content-pack-helpers/src/main/java/org/odpi/openmetadata/samples/archiveutilities/SimpleCatalogArchiveHelper.java +++ b/open-metadata-resources/open-metadata-archives/content-pack-helpers/src/main/java/org/odpi/openmetadata/samples/archiveutilities/SimpleCatalogArchiveHelper.java @@ -5,10 +5,7 @@ import org.odpi.openmetadata.frameworks.connectors.ConnectorProvider; import org.odpi.openmetadata.frameworks.connectors.mapper.OpenConnectorsValidValues; import org.odpi.openmetadata.frameworks.connectors.properties.beans.ConnectorType; -import org.odpi.openmetadata.frameworks.openmetadata.enums.ContactMethodType; -import org.odpi.openmetadata.frameworks.openmetadata.enums.GlossaryTermRelationshipStatus; -import org.odpi.openmetadata.frameworks.openmetadata.enums.MediaType; -import org.odpi.openmetadata.frameworks.openmetadata.enums.MediaUsage; +import org.odpi.openmetadata.frameworks.openmetadata.enums.*; import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataProperty; import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataType; import org.odpi.openmetadata.frameworks.openmetadata.refdata.DeployedImplementationType; @@ -1225,17 +1222,17 @@ public String addPersonRole(String suppliedTypeName, if (typeName == null) { - typeName = OpenMetadataType.PERSON_ROLE_TYPE_NAME; + typeName = OpenMetadataType.PERSON_ROLE.typeName; } InstanceProperties properties = archiveHelper.addStringPropertyToInstance(archiveRootName, null, OpenMetadataProperty.QUALIFIED_NAME.name, qualifiedName, methodName); properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.IDENTIFIER.name, identifier, methodName); properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.NAME.name, name, methodName); properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.DESCRIPTION.name, description, methodName); - properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataType.SCOPE_PROPERTY_NAME, scope, methodName); + properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.SCOPE.name, scope, methodName); if (setHeadCount) { - properties = archiveHelper.addIntPropertyToInstance(archiveRootName, properties, OpenMetadataType.HEAD_COUNT_PROPERTY_NAME, headCount, methodName); + properties = archiveHelper.addIntPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.HEAD_COUNT.name, headCount, methodName); } properties = archiveHelper.addStringMapPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.ADDITIONAL_PROPERTIES.name, additionalProperties, methodName); properties = archiveHelper.addPropertyMapToInstance(archiveRootName, properties, extendedProperties, methodName); @@ -1291,7 +1288,7 @@ public String addGovernanceRole(String suppliedTypeName, if (typeName == null) { - typeName = OpenMetadataType.PERSON_ROLE_TYPE_NAME; + typeName = OpenMetadataType.PERSON_ROLE.typeName; } InstanceProperties properties = archiveHelper.addStringPropertyToInstance(archiveRootName, null, OpenMetadataProperty.QUALIFIED_NAME.name, qualifiedName, methodName); @@ -1299,10 +1296,10 @@ public String addGovernanceRole(String suppliedTypeName, properties = archiveHelper.addIntPropertyToInstance(archiveRootName, properties, OpenMetadataType.DOMAIN_IDENTIFIER_PROPERTY_NAME, domainIdentifier, methodName); properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.NAME.name, name, methodName); properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.DESCRIPTION.name, description, methodName); - properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataType.SCOPE_PROPERTY_NAME, scope, methodName); + properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.SCOPE.name, scope, methodName); if (setHeadCount) { - properties = archiveHelper.addIntPropertyToInstance(archiveRootName, properties, OpenMetadataType.HEAD_COUNT_PROPERTY_NAME, headCount, methodName); + properties = archiveHelper.addIntPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.HEAD_COUNT.name, headCount, methodName); } properties = archiveHelper.addStringMapPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.ADDITIONAL_PROPERTIES.name, additionalProperties, methodName); properties = archiveHelper.addPropertyMapToInstance(archiveRootName, properties, extendedProperties, methodName); @@ -1340,7 +1337,7 @@ public void addPersonRoleAppointmentRelationship(String personQName, InstanceProperties properties = archiveHelper.addBooleanPropertyToInstance(archiveRootName, null, OpenMetadataProperty.IS_PUBLIC.name, isPublic, methodName); - archiveBuilder.addRelationship(archiveHelper.getRelationship(OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP_TYPE_NAME, + archiveBuilder.addRelationship(archiveHelper.getRelationship(OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP.typeName, idToGUIDMap.getGUID(guid1 + "_to_" + guid2 + "_person_role_appointment_relationship"), properties, InstanceStatus.ACTIVE, @@ -1364,7 +1361,7 @@ public void addPeerRelationship(String person1QName, EntityProxy end1 = archiveHelper.getEntityProxy(archiveBuilder.getEntity(guid1)); EntityProxy end2 = archiveHelper.getEntityProxy(archiveBuilder.getEntity(guid2)); - archiveBuilder.addRelationship(archiveHelper.getRelationship(OpenMetadataType.PEER_RELATIONSHIP_TYPE_NAME, + archiveBuilder.addRelationship(archiveHelper.getRelationship(OpenMetadataType.PEER_RELATIONSHIP.typeName, idToGUIDMap.getGUID(guid1 + "_to_" + guid2 + "_peer_relationship"), null, InstanceStatus.ACTIVE, @@ -1413,17 +1410,17 @@ public String addPerson(String qualifiedName, InstanceProperties properties = archiveHelper.addStringPropertyToInstance(archiveRootName, null, OpenMetadataProperty.QUALIFIED_NAME.name, qualifiedName, methodName); properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.NAME.name, name, methodName); - properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataType.PRONOUNS_PROPERTY_NAME, pronouns, methodName); + properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.PRONOUNS.name, pronouns, methodName); properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.DESCRIPTION.name, description, methodName); - properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataType.TITLE_PROPERTY_NAME, title, methodName); - properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataType.INITIALS_PROPERTY_NAME, initials, methodName); - properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataType.GIVEN_NAMES_PROPERTY_NAME, givenNames, methodName); - properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataType.SURNAME_PROPERTY_NAME, surname, methodName); - properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataType.FULL_NAME_PROPERTY_NAME, fullName, methodName); - properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataType.JOB_TITLE_PROPERTY_NAME, jobTitle, methodName); - properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataType.EMPLOYEE_NUMBER_PROPERTY_NAME, employeeNumber, methodName); - properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataType.EMPLOYEE_TYPE_PROPERTY_NAME, employeeType, methodName); - properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataType.PREFERRED_LANGUAGE_PROPERTY_NAME, preferredLanguage, methodName); + properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.COURTESY_TITLE.name, title, methodName); + properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.INITIALS.name, initials, methodName); + properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.GIVEN_NAMES.name, givenNames, methodName); + properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.SURNAME.name, surname, methodName); + properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.FULL_NAME.name, fullName, methodName); + properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.JOB_TITLE.name, jobTitle, methodName); + properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.EMPLOYEE_NUMBER.name, employeeNumber, methodName); + properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.EMPLOYEE_TYPE.name, employeeType, methodName); + properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.PREFERRED_LANGUAGE.name, preferredLanguage, methodName); properties = archiveHelper.addBooleanPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.IS_PUBLIC.name, isPublic, methodName); properties = archiveHelper.addStringMapPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.ADDITIONAL_PROPERTIES.name, additionalProperties, methodName); @@ -1468,13 +1465,13 @@ public String addTeam(String suppliedTypeName, String typeName = suppliedTypeName; if (typeName == null) { - typeName = OpenMetadataType.TEAM_TYPE_NAME; + typeName = OpenMetadataType.TEAM.typeName; } InstanceProperties properties = archiveHelper.addStringPropertyToInstance(archiveRootName, null, OpenMetadataProperty.QUALIFIED_NAME.name, qualifiedName, methodName); properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.NAME.name, name, methodName); properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.DESCRIPTION.name, description, methodName); - properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataType.TEAM_TYPE_PROPERTY_NAME, teamType, methodName); + properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.TEAM_TYPE.name, teamType, methodName); properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.IDENTIFIER.name, identifier, methodName); properties = archiveHelper.addStringMapPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.ADDITIONAL_PROPERTIES.name, additionalProperties, methodName); @@ -1513,9 +1510,9 @@ public void addTeamLeadershipRelationship(String personRoleQName, EntityProxy end1 = archiveHelper.getEntityProxy(archiveBuilder.getEntity(guid1)); EntityProxy end2 = archiveHelper.getEntityProxy(archiveBuilder.getEntity(guid2)); - InstanceProperties properties = archiveHelper.addStringPropertyToInstance(archiveRootName, null, OpenMetadataType.POSITION_PROPERTY_NAME, position, methodName); + InstanceProperties properties = archiveHelper.addStringPropertyToInstance(archiveRootName, null, OpenMetadataProperty.ROLE_POSITION.name, position, methodName); - archiveBuilder.addRelationship(archiveHelper.getRelationship(OpenMetadataType.TEAM_LEADERSHIP_RELATIONSHIP_TYPE_NAME, + archiveBuilder.addRelationship(archiveHelper.getRelationship(OpenMetadataType.TEAM_LEADERSHIP_RELATIONSHIP.typeName, idToGUIDMap.getGUID(guid1 + "_to_" + guid2 + "_team_leadership_relationship"), properties, InstanceStatus.ACTIVE, @@ -1543,9 +1540,9 @@ public void addTeamMembershipRelationship(String personRoleQName, EntityProxy end1 = archiveHelper.getEntityProxy(archiveBuilder.getEntity(guid1)); EntityProxy end2 = archiveHelper.getEntityProxy(archiveBuilder.getEntity(guid2)); - InstanceProperties properties = archiveHelper.addStringPropertyToInstance(archiveRootName, null, OpenMetadataType.POSITION_PROPERTY_NAME, position, methodName); + InstanceProperties properties = archiveHelper.addStringPropertyToInstance(archiveRootName, null, OpenMetadataProperty.ROLE_POSITION.name, position, methodName); - archiveBuilder.addRelationship(archiveHelper.getRelationship(OpenMetadataType.TEAM_MEMBERSHIP_RELATIONSHIP_TYPE_NAME, + archiveBuilder.addRelationship(archiveHelper.getRelationship(OpenMetadataType.TEAM_MEMBERSHIP_RELATIONSHIP.typeName, idToGUIDMap.getGUID(guid1 + "_to_" + guid2 + "_team_membership_relationship"), properties, InstanceStatus.ACTIVE, @@ -1573,9 +1570,9 @@ public void addTeamStructureRelationship(String superTeamQName, EntityProxy end1 = archiveHelper.getEntityProxy(archiveBuilder.getEntity(guid1)); EntityProxy end2 = archiveHelper.getEntityProxy(archiveBuilder.getEntity(guid2)); - InstanceProperties properties = archiveHelper.addBooleanPropertyToInstance(archiveRootName, null, OpenMetadataType.DELEGATION_ESCALATION_PROPERTY_NAME, delegationEscalationAuthority, methodName); + InstanceProperties properties = archiveHelper.addBooleanPropertyToInstance(archiveRootName, null, OpenMetadataProperty.DELEGATION_ESCALATION.name, delegationEscalationAuthority, methodName); - archiveBuilder.addRelationship(archiveHelper.getRelationship(OpenMetadataType.TEAM_STRUCTURE_RELATIONSHIP_TYPE_NAME, + archiveBuilder.addRelationship(archiveHelper.getRelationship(OpenMetadataType.TEAM_STRUCTURE_RELATIONSHIP.typeName, idToGUIDMap.getGUID(guid1 + "_to_" + guid2 + "_team_structure_relationship"), properties, InstanceStatus.ACTIVE, @@ -1607,7 +1604,7 @@ public String addITProfileToAsset(String assetGUID, properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.DESCRIPTION.name, description, methodName); properties = archiveHelper.addStringMapPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.ADDITIONAL_PROPERTIES.name, additionalProperties, methodName); - EntityDetail profile = archiveHelper.getEntityDetail(OpenMetadataType.IT_PROFILE_TYPE_NAME, + EntityDetail profile = archiveHelper.getEntityDetail(OpenMetadataType.IT_PROFILE.typeName, idToGUIDMap.getGUID(qualifiedName), properties, InstanceStatus.ACTIVE, @@ -1622,7 +1619,7 @@ public String addITProfileToAsset(String assetGUID, EntityProxy end1 = archiveHelper.getEntityProxy(assetEntity); EntityProxy end2 = archiveHelper.getEntityProxy(profile); - archiveBuilder.addRelationship(archiveHelper.getRelationship(OpenMetadataType.IT_INFRASTRUCTURE_PROFILE_RELATIONSHIP_TYPE_NAME, + archiveBuilder.addRelationship(archiveHelper.getRelationship(OpenMetadataType.IT_INFRASTRUCTURE_PROFILE_RELATIONSHIP.typeName, idToGUIDMap.getGUID(assetGUID + "_to_" + profile.getGUID() + "_it_infrastructure_profile_relationship"), properties, InstanceStatus.ACTIVE, @@ -1656,10 +1653,10 @@ public void addAssignmentScopeRelationship(String actorQName, EntityProxy end1 = archiveHelper.getEntityProxy(archiveBuilder.getEntity(guid1)); EntityProxy end2 = archiveHelper.getEntityProxy(archiveBuilder.getEntity(guid2)); - InstanceProperties properties = archiveHelper.addStringPropertyToInstance(archiveRootName, null, OpenMetadataType.ASSIGNMENT_TYPE_PROPERTY_NAME, assignmentType, methodName); + InstanceProperties properties = archiveHelper.addStringPropertyToInstance(archiveRootName, null, OpenMetadataProperty.ASSIGNMENT_TYPE.name, assignmentType, methodName); properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.DESCRIPTION.name, description, methodName); - archiveBuilder.addRelationship(archiveHelper.getRelationship(OpenMetadataType.ASSIGNMENT_SCOPE_RELATIONSHIP_TYPE_NAME, + archiveBuilder.addRelationship(archiveHelper.getRelationship(OpenMetadataType.ASSIGNMENT_SCOPE_RELATIONSHIP.typeName, idToGUIDMap.getGUID(guid1 + "_to_" + guid2 + "_assignment_scope_relationship"), properties, InstanceStatus.ACTIVE, @@ -1813,7 +1810,7 @@ public void addStakeHolderRelationship(String referenceableQName, EntityProxy end1 = archiveHelper.getEntityProxy(archiveBuilder.getEntity(guid1)); EntityProxy end2 = archiveHelper.getEntityProxy(archiveBuilder.getEntity(guid2)); - archiveBuilder.addRelationship(archiveHelper.getRelationship(OpenMetadataType.STAKEHOLDER_RELATIONSHIP_TYPE_NAME, + archiveBuilder.addRelationship(archiveHelper.getRelationship(OpenMetadataType.STAKEHOLDER_RELATIONSHIP.typeName, idToGUIDMap.getGUID(guid1 + "_to_" + guid2 + "_stakeholder_relationship"), null, InstanceStatus.ACTIVE, @@ -1841,7 +1838,7 @@ public void addProjectDependencyRelationship(String projectQName, EntityProxy end1 = archiveHelper.getEntityProxy(archiveBuilder.getEntity(guid1)); EntityProxy end2 = archiveHelper.getEntityProxy(archiveBuilder.getEntity(guid2)); - InstanceProperties properties = archiveHelper.addStringPropertyToInstance(archiveRootName, null, OpenMetadataType.DEPENDENCY_SUMMARY_PROPERTY_NAME, dependencySummary, methodName); + InstanceProperties properties = archiveHelper.addStringPropertyToInstance(archiveRootName, null, OpenMetadataProperty.DEPENDENCY_SUMMARY.name, dependencySummary, methodName); archiveBuilder.addRelationship(archiveHelper.getRelationship(OpenMetadataType.PROJECT_DEPENDENCY_RELATIONSHIP.typeName, idToGUIDMap.getGUID(guid1 + "_to_" + guid2 + "_project_dependency_relationship"), @@ -1872,7 +1869,7 @@ public void addProjectTeamRelationship(String personQName, EntityProxy end1 = archiveHelper.getEntityProxy(archiveBuilder.getEntity(guid1)); EntityProxy end2 = archiveHelper.getEntityProxy(archiveBuilder.getEntity(guid2)); - InstanceProperties properties = archiveHelper.addStringPropertyToInstance(archiveRootName, null, OpenMetadataType.TEAM_ROLE_PROPERTY_NAME, teamRole, methodName); + InstanceProperties properties = archiveHelper.addStringPropertyToInstance(archiveRootName, null, OpenMetadataProperty.TEAM_ROLE.name, teamRole, methodName); archiveBuilder.addRelationship(archiveHelper.getRelationship(OpenMetadataType.PROJECT_TEAM_RELATIONSHIP.typeName, idToGUIDMap.getGUID(guid1 + "_to_" + guid2 + "_project_team_relationship"), @@ -1933,13 +1930,13 @@ public String addCommunity(String suppliedTypeName, if (typeName == null) { - typeName = OpenMetadataType.COMMUNITY_TYPE_NAME; + typeName = OpenMetadataType.COMMUNITY.typeName; } InstanceProperties properties = archiveHelper.addStringPropertyToInstance(archiveRootName, null, OpenMetadataProperty.QUALIFIED_NAME.name, qualifiedName, methodName); properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.NAME.name, name, methodName); properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.DESCRIPTION.name, description, methodName); - properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataType.MISSION_PROPERTY_NAME, mission, methodName); + properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.MISSION.name, mission, methodName); properties = archiveHelper.addStringMapPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.ADDITIONAL_PROPERTIES.name, additionalProperties, methodName); properties = archiveHelper.addPropertyMapToInstance(archiveRootName, properties, extendedProperties, methodName); @@ -1968,7 +1965,7 @@ public void addCommunityMembershipRelationship(String communityQName, { final String methodName = "addCommunityMembershipRelationship"; - EnumElementDef enumElement = archiveHelper.getEnumElement(OpenMetadataType.COMMUNITY_MEMBERSHIP_TYPE_ENUM_TYPE_NAME, membershipType); + EnumElementDef enumElement = archiveHelper.getEnumElement(CommunityMembershipType.getOpenTypeName(), membershipType); String guid1 = idToGUIDMap.getGUID(communityQName); String guid2 = idToGUIDMap.getGUID(membershipRoleQName); @@ -1976,9 +1973,9 @@ public void addCommunityMembershipRelationship(String communityQName, EntityProxy end1 = archiveHelper.getEntityProxy(archiveBuilder.getEntity(guid1)); EntityProxy end2 = archiveHelper.getEntityProxy(archiveBuilder.getEntity(guid2)); - InstanceProperties properties = archiveHelper.addEnumPropertyToInstance(archiveRootName, null, OpenMetadataType.MEMBERSHIP_TYPE_PROPERTY_NAME, enumElement.getOrdinal(), enumElement.getValue(), enumElement.getDescription(), methodName); + InstanceProperties properties = archiveHelper.addEnumPropertyToInstance(archiveRootName, null, OpenMetadataProperty.MEMBERSHIP_TYPE.name, enumElement.getOrdinal(), enumElement.getValue(), enumElement.getDescription(), methodName); - archiveBuilder.addRelationship(archiveHelper.getRelationship(OpenMetadataType.COMMUNITY_MEMBERSHIP_TYPE_NAME, + archiveBuilder.addRelationship(archiveHelper.getRelationship(OpenMetadataType.COMMUNITY_MEMBERSHIP_RELATIONSHIP.typeName, idToGUIDMap.getGUID(guid1 + "_to_" + guid2 + "_community_membership_relationship"), properties, InstanceStatus.ACTIVE, @@ -2187,11 +2184,11 @@ public String addGovernanceDefinition(String suppliedTypeName, } InstanceProperties properties = archiveHelper.addStringPropertyToInstance(archiveRootName, null, OpenMetadataProperty.QUALIFIED_NAME.name, qualifiedName, methodName); - properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataType.TITLE_PROPERTY_NAME, title, methodName); + properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.TITLE.name, title, methodName); properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.SUMMARY.name, summary, methodName); properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.DESCRIPTION.name, description, methodName); - properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataType.SCOPE_PROPERTY_NAME, scope, methodName); - properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataType.PRIORITY_PROPERTY_NAME, priority, methodName); + properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.SCOPE.name, scope, methodName); + properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.PRIORITY.name, priority, methodName); properties = archiveHelper.addIntPropertyToInstance(archiveRootName, properties, OpenMetadataType.DOMAIN_IDENTIFIER_PROPERTY_NAME, domainIdentifier, methodName); properties = archiveHelper.addStringArrayPropertyToInstance(archiveRootName, properties, OpenMetadataType.IMPLICATIONS_PROPERTY_NAME, implications, methodName); properties = archiveHelper.addStringArrayPropertyToInstance(archiveRootName, properties, OpenMetadataType.OUTCOMES_PROPERTY_NAME, outcomes, methodName); @@ -2961,7 +2958,7 @@ public void addConceptBeadRelationshipEnd(String conceptBeadLinkGUID, EntityProxy end2 = archiveHelper.getEntityProxy(entityTwo); InstanceProperties properties = archiveHelper.addStringPropertyToInstance(archiveRootName, null, OpenMetadataType.ATTRIBUTE_NAME_PROPERTY_NAME, attributeName, methodName); - properties = archiveHelper.addIntPropertyToInstance(archiveRootName, properties, OpenMetadataType.POSITION_PROPERTY_NAME, position, methodName); + properties = archiveHelper.addIntPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.POSITION.name, position, methodName); properties = archiveHelper.addIntPropertyToInstance(archiveRootName, properties, OpenMetadataType.MIN_CARDINALITY_PROPERTY_NAME, minCardinality, methodName); properties = archiveHelper.addIntPropertyToInstance(archiveRootName, properties, OpenMetadataType.MAX_CARDINALITY_PROPERTY_NAME, maxCardinality, methodName); properties = archiveHelper.addEnumPropertyToInstance(archiveRootName, properties, OpenMetadataType.DECORATION_PROPERTY_NAME, conceptModelDecorationEnum.getOrdinal(), conceptModelDecorationEnum.getValue(), conceptModelDecorationEnum.getDescription(), methodName); @@ -3005,7 +3002,7 @@ public void addConceptBeadAttributeLink(String conceptBeadGUID, EntityProxy end1 = archiveHelper.getEntityProxy(entityOne); EntityProxy end2 = archiveHelper.getEntityProxy(entityTwo); - InstanceProperties properties = archiveHelper.addIntPropertyToInstance(archiveRootName, null, OpenMetadataType.POSITION_PROPERTY_NAME, position, methodName); + InstanceProperties properties = archiveHelper.addIntPropertyToInstance(archiveRootName, null, OpenMetadataProperty.POSITION.name, position, methodName); properties = archiveHelper.addIntPropertyToInstance(archiveRootName, properties, OpenMetadataType.MIN_CARDINALITY_PROPERTY_NAME, minCardinality, methodName); properties = archiveHelper.addIntPropertyToInstance(archiveRootName, properties, OpenMetadataType.MAX_CARDINALITY_PROPERTY_NAME, maxCardinality, methodName); properties = archiveHelper.addBooleanPropertyToInstance(archiveRootName, properties, OpenMetadataType.UNIQUE_VALUES_PROPERTY_NAME, uniqueValues, methodName); @@ -3596,9 +3593,9 @@ public void addConnectionForAsset(String assetGUID, EntityProxy end1 = archiveHelper.getEntityProxy(connectionEntity); EntityProxy end2 = archiveHelper.getEntityProxy(assetEntity); - InstanceProperties properties = archiveHelper.addStringPropertyToInstance(archiveRootName, null, OpenMetadataType.ASSET_SUMMARY_PROPERTY_NAME, assetSummary, methodName); + InstanceProperties properties = archiveHelper.addStringPropertyToInstance(archiveRootName, null, OpenMetadataProperty.ASSET_SUMMARY.name, assetSummary, methodName); - archiveBuilder.addRelationship(archiveHelper.getRelationship(OpenMetadataType.CONNECTION_TO_ASSET_TYPE_NAME, + archiveBuilder.addRelationship(archiveHelper.getRelationship(OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP.typeName, idToGUIDMap.getGUID(assetGUID + "_to_" + connectionGUID + "_asset_connection_relationship"), properties, InstanceStatus.ACTIVE, @@ -3994,7 +3991,7 @@ public String addAPIParameter(String typeName, InstanceProperties entityProperties = archiveHelper.addStringPropertyToInstance(archiveRootName, null, OpenMetadataProperty.QUALIFIED_NAME.name, qualifiedName, methodName); entityProperties = archiveHelper.addStringPropertyToInstance(archiveRootName, entityProperties, OpenMetadataProperty.DISPLAY_NAME.name, displayName, methodName); entityProperties = archiveHelper.addStringPropertyToInstance(archiveRootName, entityProperties, OpenMetadataProperty.DESCRIPTION.name, description, methodName); - entityProperties = archiveHelper.addIntPropertyToInstance(archiveRootName, entityProperties, OpenMetadataType.POSITION_PROPERTY_NAME, position, methodName); + entityProperties = archiveHelper.addIntPropertyToInstance(archiveRootName, entityProperties, OpenMetadataProperty.POSITION.name, position, methodName); entityProperties = archiveHelper.addStringPropertyToInstance(archiveRootName, entityProperties, OpenMetadataType.PARAMETER_TYPE_PROPERTY_NAME, parameterType, methodName); entityProperties = archiveHelper.addStringMapPropertyToInstance(archiveRootName, entityProperties, OpenMetadataProperty.ADDITIONAL_PROPERTIES.name, additionalProperties, methodName); @@ -4143,7 +4140,7 @@ public String addSchemaAttribute(String assetGUID, entityProperties = archiveHelper.addStringPropertyToInstance(archiveRootName, entityProperties, OpenMetadataProperty.DISPLAY_NAME.name, displayName, methodName); entityProperties = archiveHelper.addStringPropertyToInstance(archiveRootName, entityProperties, OpenMetadataProperty.DESCRIPTION.name, description, methodName); entityProperties = archiveHelper.addIntPropertyToInstance(archiveRootName, entityProperties, OpenMetadataType.LENGTH_PROPERTY_NAME, length, methodName); - entityProperties = archiveHelper.addIntPropertyToInstance(archiveRootName, entityProperties, OpenMetadataType.POSITION_PROPERTY_NAME, position, methodName); + entityProperties = archiveHelper.addIntPropertyToInstance(archiveRootName, entityProperties, OpenMetadataProperty.POSITION.name, position, methodName); entityProperties = archiveHelper.addStringMapPropertyToInstance(archiveRootName, entityProperties, OpenMetadataProperty.ADDITIONAL_PROPERTIES.name, additionalProperties, methodName); InstanceProperties classificationProperties = archiveHelper.addStringPropertyToInstance(archiveRootName, null, OpenMetadataType.SCHEMA_TYPE_NAME_PROPERTY_NAME, schemaTypeTypeName, methodName); @@ -4208,7 +4205,7 @@ public String addConnection(String qualifiedName, String anchorTypeName, String anchorDomainName) { - return this.addConnection(OpenMetadataType.CONNECTION_TYPE_NAME, + return this.addConnection(OpenMetadataType.CONNECTION.typeName, qualifiedName, displayName, description, @@ -4267,12 +4264,12 @@ public String addConnection(String typeName, InstanceProperties properties = archiveHelper.addStringPropertyToInstance(archiveRootName, null, OpenMetadataProperty.QUALIFIED_NAME.name, qualifiedName, methodName); properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.DISPLAY_NAME.name, displayName, methodName); properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.DESCRIPTION.name, description, methodName); - properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataType.USER_ID_PROPERTY_NAME, userId, methodName); - properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataType.CLEAR_PASSWORD_PROPERTY_NAME, clearPassword, methodName); - properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataType.ENCRYPTED_PASSWORD_PROPERTY_NAME, encryptedPassword, methodName); - properties = archiveHelper.addStringMapPropertyToInstance(archiveRootName, properties, OpenMetadataType.SECURED_PROPERTIES_PROPERTY_NAME, securedProperties, methodName); + properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.USER_ID.name, userId, methodName); + properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.CLEAR_PASSWORD.name, clearPassword, methodName); + properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.ENCRYPTED_PASSWORD.name, encryptedPassword, methodName); + properties = archiveHelper.addStringMapPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.SECURED_PROPERTIES.name, securedProperties, methodName); properties = archiveHelper.addStringMapPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.ADDITIONAL_PROPERTIES.name, additionalProperties, methodName); - properties = archiveHelper.addMapPropertyToInstance(archiveRootName, properties, OpenMetadataType.CONFIGURATION_PROPERTIES_PROPERTY_NAME, configurationProperties, methodName); + properties = archiveHelper.addMapPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.CONFIGURATION_PROPERTIES.name, configurationProperties, methodName); List entityClassifications = null; @@ -4298,7 +4295,7 @@ public String addConnection(String typeName, EntityProxy end1 = archiveHelper.getEntityProxy(connectionEntity); EntityProxy end2 = archiveHelper.getEntityProxy(connectorTypeEntity); - archiveBuilder.addRelationship(archiveHelper.getRelationship(OpenMetadataType.CONNECTION_CONNECTOR_TYPE_TYPE_NAME, + archiveBuilder.addRelationship(archiveHelper.getRelationship(OpenMetadataType.CONNECTION_CONNECTOR_TYPE_RELATIONSHIP.typeName, idToGUIDMap.getGUID(qualifiedName + "_connectorType_relationship"), null, InstanceStatus.ACTIVE, @@ -4313,7 +4310,7 @@ public String addConnection(String typeName, EntityProxy end1 = archiveHelper.getEntityProxy(endpointEntity); EntityProxy end2 = archiveHelper.getEntityProxy(connectionEntity); - archiveBuilder.addRelationship(archiveHelper.getRelationship(OpenMetadataType.CONNECTION_ENDPOINT_TYPE_NAME, + archiveBuilder.addRelationship(archiveHelper.getRelationship(OpenMetadataType.CONNECTION_ENDPOINT_RELATIONSHIP.typeName, idToGUIDMap.getGUID(qualifiedName + "_endpoint_relationship"), null, InstanceStatus.ACTIVE, @@ -4354,7 +4351,7 @@ public void addEmbeddedConnection(String parentConnectionGUID, methodName); properties = archiveHelper.addStringMapPropertyToInstance(archiveRootName, properties, - OpenMetadataType.ARGUMENTS_PROPERTY_NAME, + OpenMetadataProperty.ARGUMENTS.name, arguments, methodName); @@ -4364,7 +4361,7 @@ public void addEmbeddedConnection(String parentConnectionGUID, EntityProxy end1 = archiveHelper.getEntityProxy(parentEntity); EntityProxy end2 = archiveHelper.getEntityProxy(childEntity); - archiveBuilder.addRelationship(archiveHelper.getRelationship(OpenMetadataType.EMBEDDED_CONNECTION_TYPE_NAME, + archiveBuilder.addRelationship(archiveHelper.getRelationship(OpenMetadataType.EMBEDDED_CONNECTION_RELATIONSHIP.typeName, idToGUIDMap.getGUID(parentConnectionGUID + "_to_" + childConnectionGUID + "_embedded_connection_relationship"), properties, InstanceStatus.ACTIVE, @@ -4606,7 +4603,7 @@ protected String addConnectorType(String connectorCateg properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.SUPPORTED_DEPLOYED_IMPLEMENTATION_TYPE.name, deployedImplementationType, methodName); properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataType.SUPPORTED_ASSET_TYPE_PROPERTY_NAME, supportedAssetTypeName, methodName); properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataType.EXPECTED_DATA_FORMAT_PROPERTY_NAME, expectedDataFormat, methodName); - properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataType.CONNECTOR_PROVIDER_PROPERTY_NAME, connectorProviderClassName, methodName); + properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.CONNECTOR_PROVIDER_CLASS_NAME.name, connectorProviderClassName, methodName); if (connectorFrameworkName != null) { properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataType.CONNECTOR_FRAMEWORK_PROPERTY_NAME, connectorFrameworkName, methodName); @@ -4628,9 +4625,9 @@ protected String addConnectorType(String connectorCateg properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataType.TARGET_TECHNOLOGY_NAME_PROPERTY_NAME, targetTechnologyName, methodName); properties = archiveHelper.addStringArrayPropertyToInstance(archiveRootName, properties, OpenMetadataType.TARGET_TECHNOLOGY_INTERFACES_PROPERTY_NAME, targetTechnologyInterfaces, methodName); properties = archiveHelper.addStringArrayPropertyToInstance(archiveRootName, properties, OpenMetadataType.TARGET_TECHNOLOGY_VERSIONS_PROPERTY_NAME, targetTechnologyVersions, methodName); - properties = archiveHelper.addStringArrayPropertyToInstance(archiveRootName, properties, OpenMetadataType.RECOGNIZED_SECURED_PROPERTIES_PROPERTY_NAME, recognizedSecuredProperties, methodName); - properties = archiveHelper.addStringArrayPropertyToInstance(archiveRootName, properties, OpenMetadataType.RECOGNIZED_ADDITIONAL_PROPERTIES_PROPERTY_NAME, recognizedAdditionalProperties, methodName); - properties = archiveHelper.addStringArrayPropertyToInstance(archiveRootName, properties, OpenMetadataType.RECOGNIZED_CONFIGURATION_PROPERTIES_PROPERTY_NAME, recognizedConfigurationProperties, methodName); + properties = archiveHelper.addStringArrayPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.RECOGNIZED_SECURED_PROPERTIES.name, recognizedSecuredProperties, methodName); + properties = archiveHelper.addStringArrayPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.RECOGNIZED_ADDITIONAL_PROPERTIES.name, recognizedAdditionalProperties, methodName); + properties = archiveHelper.addStringArrayPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.RECOGNIZED_CONFIGURATION_PROPERTIES.name, recognizedConfigurationProperties, methodName); properties = archiveHelper.addStringMapPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.ADDITIONAL_PROPERTIES.name, additionalProperties, methodName); String guid = idToGUIDMap.getGUID(qualifiedName); @@ -4638,11 +4635,11 @@ protected String addConnectorType(String connectorCateg List classifications = new ArrayList<>(); classifications.add(this.getAnchorClassification(guid, - OpenMetadataType.CONNECTOR_TYPE_TYPE_NAME, - OpenMetadataType.CONNECTOR_TYPE_TYPE_NAME, + OpenMetadataType.CONNECTOR_TYPE.typeName, + OpenMetadataType.CONNECTOR_TYPE.typeName, methodName)); - connectorTypeEntity = archiveHelper.getEntityDetail(OpenMetadataType.CONNECTOR_TYPE_TYPE_NAME, + connectorTypeEntity = archiveHelper.getEntityDetail(OpenMetadataType.CONNECTOR_TYPE.typeName, guid, properties, InstanceStatus.ACTIVE, @@ -4714,9 +4711,9 @@ public String addConnectorCategory(String connectorTypeDirector properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.DESCRIPTION.name, description, methodName); properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataType.TARGET_TECHNOLOGY_SOURCE_PROPERTY_NAME, targetTechnologySource, methodName); properties = archiveHelper.addStringPropertyToInstance(archiveRootName, properties, OpenMetadataType.TARGET_TECHNOLOGY_NAME_PROPERTY_NAME, targetTechnologyName, methodName); - properties = archiveHelper.addBooleanMapPropertyToInstance(archiveRootName, properties, OpenMetadataType.RECOGNIZED_SECURED_PROPERTIES_PROPERTY_NAME, recognizedSecuredProperties, methodName); - properties = archiveHelper.addBooleanMapPropertyToInstance(archiveRootName, properties, OpenMetadataType.RECOGNIZED_ADDITIONAL_PROPERTIES_PROPERTY_NAME, recognizedAdditionalProperties, methodName); - properties = archiveHelper.addBooleanMapPropertyToInstance(archiveRootName, properties, OpenMetadataType.RECOGNIZED_CONFIGURATION_PROPERTIES_PROPERTY_NAME, recognizedConfigurationProperties, methodName); + properties = archiveHelper.addBooleanMapPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.RECOGNIZED_SECURED_PROPERTIES.name, recognizedSecuredProperties, methodName); + properties = archiveHelper.addBooleanMapPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.RECOGNIZED_ADDITIONAL_PROPERTIES.name, recognizedAdditionalProperties, methodName); + properties = archiveHelper.addBooleanMapPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.RECOGNIZED_CONFIGURATION_PROPERTIES.name, recognizedConfigurationProperties, methodName); properties = archiveHelper.addStringMapPropertyToInstance(archiveRootName, properties, OpenMetadataProperty.ADDITIONAL_PROPERTIES.name, additionalProperties, methodName); List classifications = new ArrayList<>(); diff --git a/open-metadata-resources/open-metadata-archives/core-content-pack/src/main/java/org/odpi/openmetadata/archiveutilities/openconnectors/base/ContentPackBaseArchiveWriter.java b/open-metadata-resources/open-metadata-archives/core-content-pack/src/main/java/org/odpi/openmetadata/archiveutilities/openconnectors/base/ContentPackBaseArchiveWriter.java index 3b871cd7610..e801c280bb1 100644 --- a/open-metadata-resources/open-metadata-archives/core-content-pack/src/main/java/org/odpi/openmetadata/archiveutilities/openconnectors/base/ContentPackBaseArchiveWriter.java +++ b/open-metadata-resources/open-metadata-archives/core-content-pack/src/main/java/org/odpi/openmetadata/archiveutilities/openconnectors/base/ContentPackBaseArchiveWriter.java @@ -550,7 +550,7 @@ protected void createSoftwareServerCatalogTemplate(String guid, } else { - connectionGUID = archiveHelper.addConnection(OpenMetadataType.VIRTUAL_CONNECTION_TYPE_NAME, + connectionGUID = archiveHelper.addConnection(OpenMetadataType.VIRTUAL_CONNECTION.typeName, qualifiedName + ":Connection", serverName + " connection", null, @@ -580,7 +580,7 @@ protected void createSoftwareServerCatalogTemplate(String guid, null, null); - String secretsStoreConnectionGUID = archiveHelper.addConnection(OpenMetadataType.CONNECTION_TYPE_NAME, + String secretsStoreConnectionGUID = archiveHelper.addConnection(OpenMetadataType.CONNECTION.typeName, qualifiedName + ":SecretsStoreConnection", serverName + " secrets store connection", null, diff --git a/open-metadata-resources/open-metadata-archives/core-content-pack/src/main/java/org/odpi/openmetadata/archiveutilities/openconnectors/core/CorePackArchiveWriter.java b/open-metadata-resources/open-metadata-archives/core-content-pack/src/main/java/org/odpi/openmetadata/archiveutilities/openconnectors/core/CorePackArchiveWriter.java index 68a7bb8c682..068ba152567 100644 --- a/open-metadata-resources/open-metadata-archives/core-content-pack/src/main/java/org/odpi/openmetadata/archiveutilities/openconnectors/core/CorePackArchiveWriter.java +++ b/open-metadata-resources/open-metadata-archives/core-content-pack/src/main/java/org/odpi/openmetadata/archiveutilities/openconnectors/core/CorePackArchiveWriter.java @@ -35,6 +35,7 @@ import org.odpi.openmetadata.frameworks.openmetadata.enums.*; import org.odpi.openmetadata.frameworks.openmetadata.mapper.OpenMetadataValidValues; import org.odpi.openmetadata.frameworks.openmetadata.refdata.*; +import org.odpi.openmetadata.frameworks.openmetadata.types.DataType; import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataProperty; import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataType; import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.instances.Classification; @@ -254,7 +255,7 @@ public void getArchiveContent() */ String projectStatusParentSetGUID = this.getParentSet(null, OpenMetadataType.PROJECT.typeName, - OpenMetadataType.PROJECT_STATUS_PROPERTY_NAME, + OpenMetadataProperty.PROJECT_STATUS.name, null); for (ProjectStatus projectStatus : ProjectStatus.values()) @@ -326,6 +327,11 @@ public void getArchiveContent() ByteOrdering.getOpenTypeName(), new ArrayList<>(Arrays.asList(ByteOrdering.values()))); + addOpenMetadataEnumValidNames(null, + OpenMetadataProperty.OPERATIONAL_STATUS.name, + OperationalStatus.getOpenTypeName(), + new ArrayList<>(Arrays.asList(OperationalStatus.values()))); + addOpenMetadataEnumValidNames(OpenMetadataType.CATALOG_TARGET_RELATIONSHIP_TYPE_NAME, OpenMetadataProperty.DELETE_METHOD.name, DeleteMethod.getOpenTypeName(), @@ -422,6 +428,10 @@ public void getArchiveContent() OpenMetadataProperty.STATUS_IDENTIFIER.name, new ArrayList<>(Arrays.asList(GovernanceClassificationStatus.values()))); + addOpenMetadataEnumValidIdentifiers(OpenMetadataType.SERVER_ASSET_USE_RELATIONSHIP.typeName, + OpenMetadataProperty.USE_TYPE.name, + new ArrayList<>(Arrays.asList(ServerAssetUseType.values()))); + addOpenMetadataEnumValidIdentifiers(null, OpenMetadataProperty.SEVERITY_IDENTIFIER.name, new ArrayList<>(Arrays.asList(ImpactSeverity.values()))); @@ -435,8 +445,8 @@ public void getArchiveContent() OpenMetadataProperty.RETENTION_BASIS_IDENTIFIER.name, new ArrayList<>(Arrays.asList(RetentionBasis.values()))); - addOpenMetadataEnumValidNames(OpenMetadataType.RATING_TYPE_NAME, - OpenMetadataType.STARS_PROPERTY_NAME, + addOpenMetadataEnumValidNames(OpenMetadataType.RATING.typeName, + OpenMetadataProperty.STARS.name, StarRating.getOpenTypeName(), new ArrayList<>(Arrays.asList(StarRating.values()))); @@ -967,7 +977,7 @@ protected void createEgeriaSoftwareServerCatalogTemplate(String } else { - connectionGUID = archiveHelper.addConnection(OpenMetadataType.VIRTUAL_CONNECTION_TYPE_NAME, + connectionGUID = archiveHelper.addConnection(OpenMetadataType.VIRTUAL_CONNECTION.typeName, qualifiedName + ":Connection", serverName + " connection", null, @@ -997,7 +1007,7 @@ protected void createEgeriaSoftwareServerCatalogTemplate(String null, null); - String secretsStoreConnectionGUID = archiveHelper.addConnection(OpenMetadataType.CONNECTION_TYPE_NAME, + String secretsStoreConnectionGUID = archiveHelper.addConnection(OpenMetadataType.CONNECTION.typeName, qualifiedName + ":SecretsStoreConnection", serverName + " secrets store connection", null, diff --git a/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive.java b/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive.java index 69783e4b3a8..6881585fa0a 100644 --- a/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive.java +++ b/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive.java @@ -218,7 +218,7 @@ private TypeDefPatch updateConnectorType() /* * Create the Patch */ - TypeDefPatch typeDefPatch = archiveBuilder.getPatchForType(OpenMetadataType.CONNECTOR_TYPE_TYPE_NAME); + TypeDefPatch typeDefPatch = archiveBuilder.getPatchForType(OpenMetadataType.CONNECTOR_TYPE.typeName); typeDefPatch.setUpdatedBy(originatorName); typeDefPatch.setUpdateTime(creationDate); @@ -229,16 +229,11 @@ private TypeDefPatch updateConnectorType() List properties = new ArrayList<>(); TypeDefAttribute property; - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.DEPLOYED_IMPLEMENTATION_TYPE.name, - OpenMetadataProperty.DEPLOYED_IMPLEMENTATION_TYPE.description, - OpenMetadataProperty.DEPLOYED_IMPLEMENTATION_TYPE.descriptionGUID); + property = archiveHelper.getTypeDefAttribute(OpenMetadataProperty.DEPLOYED_IMPLEMENTATION_TYPE); property.setAttributeStatus(TypeDefAttributeStatus.DEPRECATED_ATTRIBUTE); properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.SUPPORTED_DEPLOYED_IMPLEMENTATION_TYPE.name, - OpenMetadataProperty.SUPPORTED_DEPLOYED_IMPLEMENTATION_TYPE.description, - OpenMetadataProperty.SUPPORTED_DEPLOYED_IMPLEMENTATION_TYPE.descriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.SUPPORTED_DEPLOYED_IMPLEMENTATION_TYPE)); typeDefPatch.setPropertyDefinitions(properties); diff --git a/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive1_2.java b/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive1_2.java index fc464b9f9e7..35545b1129e 100644 --- a/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive1_2.java +++ b/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive1_2.java @@ -154,7 +154,6 @@ public void addStandardCollectionDefs() this.archiveBuilder.addCollectionDef(getMapStringObjectCollectionDef()); this.archiveBuilder.addCollectionDef(getArrayStringCollectionDef()); this.archiveBuilder.addCollectionDef(getArrayIntCollectionDef()); - } @@ -386,18 +385,7 @@ private EntityDef getReferenceableEntity() /* * Build the Entity */ - final String guid = OpenMetadataType.REFERENCEABLE.typeGUID; - final String name = OpenMetadataType.REFERENCEABLE.typeName; - final String description = OpenMetadataType.REFERENCEABLE.description; - final String descriptionGUID = OpenMetadataType.REFERENCEABLE.descriptionGUID; - final String descriptionWiki = OpenMetadataType.REFERENCEABLE.wikiURL; - - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, - name, - null, - description, - descriptionGUID, - descriptionWiki); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.REFERENCEABLE, null); /* * Build the attributes @@ -405,18 +393,15 @@ private EntityDef getReferenceableEntity() List properties = new ArrayList<>(); TypeDefAttribute property; - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.QUALIFIED_NAME.name, - OpenMetadataProperty.QUALIFIED_NAME.description, - OpenMetadataProperty.QUALIFIED_NAME.descriptionGUID); + property = archiveHelper.getTypeDefAttribute(OpenMetadataProperty.QUALIFIED_NAME); + property.setUnique(true); property.setValuesMaxCount(1); property.setValuesMinCount(1); property.setAttributeCardinality(AttributeCardinality.ONE_ONLY); properties.add(property); - property = archiveHelper.getMapStringStringTypeDefAttribute(OpenMetadataProperty.ADDITIONAL_PROPERTIES.name, - OpenMetadataProperty.ADDITIONAL_PROPERTIES.description, - OpenMetadataProperty.ADDITIONAL_PROPERTIES.descriptionGUID); - properties.add(property); + + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.ADDITIONAL_PROPERTIES)); entityDef.setPropertiesDefinition(properties); @@ -431,23 +416,8 @@ private EntityDef getReferenceableEntity() */ private EntityDef getAssetEntity() { - /* - * Build the Entity - */ - final String guid = OpenMetadataType.ASSET.typeGUID; - final String name = OpenMetadataType.ASSET.typeName; - final String description = OpenMetadataType.ASSET.description; - final String descriptionGUID = OpenMetadataType.ASSET.descriptionGUID; - final String descriptionWiki = OpenMetadataType.ASSET.wikiURL; - - final String superTypeName = OpenMetadataType.REFERENCEABLE.typeName; - - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID, - descriptionWiki); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.ASSET, + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName)); /* * Build the attributes @@ -455,44 +425,29 @@ private EntityDef getAssetEntity() List properties = new ArrayList<>(); TypeDefAttribute property; - /* Moved to Ownership classification */ - final String attribute3Name = OpenMetadataProperty.OWNER.name; - final String attribute3Description = OpenMetadataProperty.OWNER.description; - final String attribute3DescriptionGUID = OpenMetadataProperty.OWNER.descriptionGUID; /* Moved to Ownership classification */ final String attribute4Name = "ownerType"; final String attribute4Description = "Deprecated. Type of identifier used for owner property."; final String attribute4DescriptionGUID = null; - /* Moved to AssetZoneMembership classification */ - final String attribute5Name = OpenMetadataProperty.ZONE_MEMBERSHIP.name; - final String attribute5Description = OpenMetadataProperty.ZONE_MEMBERSHIP.description; - final String attribute5DescriptionGUID = OpenMetadataProperty.ZONE_MEMBERSHIP.descriptionGUID; /* Moved to LatestChange entity */ final String attribute6Name = "latestChange"; final String attribute6Description = "Description of the last change to the asset's metadata."; final String attribute6DescriptionGUID = null; - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.NAME.name, - OpenMetadataProperty.NAME.description, - OpenMetadataProperty.NAME.descriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.DESCRIPTION.name, - OpenMetadataProperty.DESCRIPTION.description, - OpenMetadataProperty.DESCRIPTION.descriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(attribute3Name, - attribute3Description, - attribute3DescriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.NAME)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.DESCRIPTION)); + /* Moved to Ownership classification */ + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.OWNER)); + property = archiveHelper.getEnumTypeDefAttribute("AssetOwnerType", attribute4Name, attribute4Description, attribute4DescriptionGUID); properties.add(property); - property = archiveHelper.getArrayStringTypeDefAttribute(attribute5Name, - attribute5Description, - attribute5DescriptionGUID); - properties.add(property); + + /* Moved to AssetZoneMembership classification */ + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.ZONE_MEMBERSHIP)); + property = archiveHelper.getStringTypeDefAttribute(attribute6Name, attribute6Description, attribute6DescriptionGUID); @@ -512,23 +467,8 @@ private EntityDef getAssetEntity() */ private EntityDef getInfrastructureEntity() { - /* - * Build the Entity - */ - final String guid = OpenMetadataType.INFRASTRUCTURE.typeGUID; - final String name = OpenMetadataType.INFRASTRUCTURE.typeName; - final String description = OpenMetadataType.INFRASTRUCTURE.description; - final String descriptionGUID = OpenMetadataType.INFRASTRUCTURE.descriptionGUID; - final String descriptionWiki = OpenMetadataType.INFRASTRUCTURE.wikiURL; - - final String superTypeName = OpenMetadataType.ASSET.typeName; - - return archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID, - descriptionWiki); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.INFRASTRUCTURE, + this.archiveBuilder.getEntityDef(OpenMetadataType.ASSET.typeName)); } @@ -539,43 +479,13 @@ private EntityDef getInfrastructureEntity() */ private EntityDef getProcessEntity() { - /* - * Build the Entity - */ - final String guid = OpenMetadataType.PROCESS.typeGUID; - final String name = OpenMetadataType.PROCESS.typeName; - final String description = OpenMetadataType.PROCESS.description; - final String descriptionGUID = OpenMetadataType.PROCESS.descriptionGUID; - final String descriptionWiki = OpenMetadataType.PROCESS.wikiURL; - - final String superTypeName = OpenMetadataType.ASSET.typeName; - - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID, - descriptionWiki); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.PROCESS, + this.archiveBuilder.getEntityDef(OpenMetadataType.ASSET.typeName)); - /* - * Build the attributes - */ List properties = new ArrayList<>(); - TypeDefAttribute property; - final String attribute2Name = OpenMetadataProperty.FORMULA.name; - final String attribute2Description = OpenMetadataProperty.FORMULA.description; - final String attribute2DescriptionGUID = OpenMetadataProperty.FORMULA.descriptionGUID; - - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.DISPLAY_NAME.name, - OpenMetadataProperty.DISPLAY_NAME.description, - OpenMetadataProperty.DISPLAY_NAME.descriptionGUID); - properties.add(property); - - property = archiveHelper.getStringTypeDefAttribute(attribute2Name, - attribute2Description, - attribute2DescriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.DISPLAY_NAME)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.FORMULA)); entityDef.setPropertiesDefinition(properties); @@ -602,15 +512,8 @@ private EntityDef getProcessEntity() */ private EntityDef getDataAssetEntity() { - /* - * Build the Entity - */ - return archiveHelper.getDefaultEntityDef(OpenMetadataType.DATA_ASSET.typeGUID, - OpenMetadataType.DATA_ASSET.typeName, - this.archiveBuilder.getEntityDef(OpenMetadataType.ASSET.typeName), - OpenMetadataType.DATA_ASSET.description, - OpenMetadataType.DATA_ASSET.descriptionGUID, - OpenMetadataType.DATA_ASSET.wikiURL); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.DATA_ASSET, + this.archiveBuilder.getEntityDef(OpenMetadataType.ASSET.typeName)); } @@ -622,15 +525,8 @@ private EntityDef getDataAssetEntity() */ private EntityDef getDataSetEntity() { - /* - * Build the Entity - */ - return archiveHelper.getDefaultEntityDef(OpenMetadataType.DATA_SET.typeGUID, - OpenMetadataType.DATA_SET.typeName, - this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_ASSET.typeName), - OpenMetadataType.DATA_SET.description, - OpenMetadataType.DATA_SET.descriptionGUID, - OpenMetadataType.DATA_SET.wikiURL); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.DATA_SET, + this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_ASSET.typeName)); } @@ -723,11 +619,8 @@ private EnumDef getMediaUsageEnum() private EntityDef getExternalReferenceEntity() { - EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.EXTERNAL_REFERENCE.typeGUID, - OpenMetadataType.EXTERNAL_REFERENCE.typeName, - this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), - OpenMetadataType.EXTERNAL_REFERENCE.description, - OpenMetadataType.EXTERNAL_REFERENCE.descriptionGUID); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.EXTERNAL_REFERENCE, + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName)); /* * Build the attributes @@ -735,26 +628,16 @@ private EntityDef getExternalReferenceEntity() List properties = new ArrayList<>(); TypeDefAttribute property; - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.DISPLAY_NAME.name, - OpenMetadataProperty.DISPLAY_NAME.description, - OpenMetadataProperty.DISPLAY_NAME.descriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.URL.name, - OpenMetadataProperty.URL.description, - OpenMetadataProperty.URL.descriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.DISPLAY_NAME)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.URL)); + property = archiveHelper.getStringTypeDefAttribute("version", "Version number of the external reference.", null); properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.DESCRIPTION.name, - OpenMetadataProperty.DESCRIPTION.description, - OpenMetadataProperty.DESCRIPTION.descriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.SOURCE_ORGANIZATION.name, - OpenMetadataProperty.SOURCE_ORGANIZATION.description, - OpenMetadataProperty.SOURCE_ORGANIZATION.descriptionGUID); - properties.add(property); + + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.DESCRIPTION)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.SOURCE_ORGANIZATION)); entityDef.setPropertiesDefinition(properties); @@ -764,11 +647,8 @@ private EntityDef getExternalReferenceEntity() private EntityDef getRelatedMediaEntity() { - EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.RELATED_MEDIA.typeGUID, - OpenMetadataType.RELATED_MEDIA.typeName, - this.archiveBuilder.getEntityDef(OpenMetadataType.EXTERNAL_REFERENCE.typeName), - OpenMetadataType.RELATED_MEDIA.description, - OpenMetadataType.RELATED_MEDIA.descriptionGUID); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.RELATED_MEDIA, + this.archiveBuilder.getEntityDef(OpenMetadataType.EXTERNAL_REFERENCE.typeName)); /* * Build the attributes @@ -780,11 +660,8 @@ private EntityDef getRelatedMediaEntity() "Types of recommended media usage.", null); properties.add(property); - property = archiveHelper.getEnumTypeDefAttribute(MediaType.getOpenTypeName(), - OpenMetadataProperty.MEDIA_TYPE.name, - OpenMetadataProperty.MEDIA_TYPE.description, - OpenMetadataProperty.MEDIA_TYPE.descriptionGUID); - properties.add(property); + + properties.add(archiveHelper.getEnumTypeDefAttribute(OpenMetadataProperty.MEDIA_TYPE)); entityDef.setPropertiesDefinition(properties); @@ -794,11 +671,8 @@ private EntityDef getRelatedMediaEntity() private RelationshipDef getExternalReferenceLinkRelationship() { - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.EXTERNAL_REFERENCE_LINK_RELATIONSHIP.typeGUID, - OpenMetadataType.EXTERNAL_REFERENCE_LINK_RELATIONSHIP.typeName, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.EXTERNAL_REFERENCE_LINK_RELATIONSHIP, null, - OpenMetadataType.EXTERNAL_REFERENCE_LINK_RELATIONSHIP.description, - OpenMetadataType.EXTERNAL_REFERENCE_LINK_RELATIONSHIP.descriptionGUID, ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -836,16 +710,9 @@ private RelationshipDef getExternalReferenceLinkRelationship() * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.REFERENCE_ID.name, - OpenMetadataProperty.REFERENCE_ID.description, - OpenMetadataProperty.REFERENCE_ID.descriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.DESCRIPTION.name, - OpenMetadataProperty.DESCRIPTION.description, - OpenMetadataProperty.DESCRIPTION.descriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.REFERENCE_ID)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.DESCRIPTION)); relationshipDef.setPropertiesDefinition(properties); @@ -894,16 +761,9 @@ private RelationshipDef getMediaReferenceRelationship() * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.MEDIA_ID.name, - OpenMetadataProperty.MEDIA_ID.description, - OpenMetadataProperty.MEDIA_ID.descriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.DESCRIPTION.name, - OpenMetadataProperty.DESCRIPTION.description, - OpenMetadataProperty.DESCRIPTION.descriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.MEDIA_ID)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.DESCRIPTION)); relationshipDef.setPropertiesDefinition(properties); @@ -964,43 +824,16 @@ private EnumDef getKeyPatternEnum() private EntityDef getExternalIdEntity() { - final String guid = OpenMetadataType.EXTERNAL_ID.typeGUID; - final String name = OpenMetadataType.EXTERNAL_ID.typeName; - final String description = OpenMetadataType.EXTERNAL_ID.description; - final String descriptionGUID = OpenMetadataType.EXTERNAL_ID.descriptionGUID; - final String descriptionWiki = OpenMetadataType.EXTERNAL_ID.wikiURL; - - final String superTypeName = OpenMetadataType.REFERENCEABLE.typeName; - - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID, - descriptionWiki); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.EXTERNAL_ID, + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName)); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - final String attribute1Name = OpenMetadataProperty.IDENTIFIER.name; - final String attribute1Description = OpenMetadataProperty.IDENTIFIER.description; - final String attribute1DescriptionGUID = OpenMetadataProperty.IDENTIFIER.descriptionGUID; - final String attribute2Name = OpenMetadataProperty.KEY_PATTERN.name; - final String attribute2Description = OpenMetadataProperty.KEY_PATTERN.description; - final String attribute2DescriptionGUID = OpenMetadataProperty.KEY_PATTERN.descriptionGUID; - - property = archiveHelper.getStringTypeDefAttribute(attribute1Name, - attribute1Description, - attribute1DescriptionGUID); - properties.add(property); - property = archiveHelper.getEnumTypeDefAttribute(OpenMetadataProperty.KEY_PATTERN.type, - attribute2Name, - attribute2Description, - attribute2DescriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.IDENTIFIER)); + properties.add(archiveHelper.getEnumTypeDefAttribute(OpenMetadataProperty.KEY_PATTERN)); entityDef.setPropertiesDefinition(properties); @@ -1049,13 +882,8 @@ private RelationshipDef getExternalIdScopeRelationship() * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.DESCRIPTION.name, - OpenMetadataProperty.DESCRIPTION.description, - OpenMetadataProperty.DESCRIPTION.descriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.DESCRIPTION)); relationshipDef.setPropertiesDefinition(properties); @@ -1104,20 +932,10 @@ private RelationshipDef getExternalIdLinkRelationship() * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.DESCRIPTION.name, - OpenMetadataProperty.DESCRIPTION.description, - OpenMetadataProperty.DESCRIPTION.descriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.USAGE.name, - OpenMetadataProperty.USAGE.description, - OpenMetadataProperty.USAGE.descriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.SOURCE.name, - OpenMetadataProperty.SOURCE.description, - OpenMetadataProperty.SOURCE.descriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.DESCRIPTION)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.USAGE)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.SOURCE)); relationshipDef.setPropertiesDefinition(properties); @@ -1198,12 +1016,8 @@ private void add0020PropertyFacets() private EntityDef getPropertyFacetEntity() { - EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.PROPERTY_FACET.typeGUID, - OpenMetadataType.PROPERTY_FACET.typeName, - this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), - OpenMetadataType.PROPERTY_FACET.description, - OpenMetadataType.PROPERTY_FACET.descriptionGUID, - OpenMetadataType.PROPERTY_FACET.wikiURL); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.PROPERTY_FACET, + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName)); /* * Build the attributes @@ -1219,14 +1033,9 @@ private EntityDef getPropertyFacetEntity() attribute1Description, attribute1DescriptionGUID); properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.DESCRIPTION.name, - OpenMetadataProperty.DESCRIPTION.description, - OpenMetadataProperty.DESCRIPTION.descriptionGUID); - properties.add(property); - property = archiveHelper.getMapStringStringTypeDefAttribute(OpenMetadataProperty.PROPERTIES.name, - OpenMetadataProperty.PROPERTIES.description, - OpenMetadataProperty.PROPERTIES.descriptionGUID); - properties.add(property); + + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.DESCRIPTION)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.PROPERTIES)); entityDef.setPropertiesDefinition(properties); @@ -1236,12 +1045,8 @@ private EntityDef getPropertyFacetEntity() private RelationshipDef getReferenceableFacetRelationship() { - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.REFERENCEABLE_FACET.typeGUID, - OpenMetadataType.REFERENCEABLE_FACET.typeName, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.REFERENCEABLE_FACET, null, - OpenMetadataType.REFERENCEABLE_FACET.description, - OpenMetadataType.REFERENCEABLE_FACET.descriptionGUID, - OpenMetadataType.REFERENCEABLE_FACET.wikiURL, ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -1279,12 +1084,8 @@ private RelationshipDef getReferenceableFacetRelationship() * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.SOURCE.name, - OpenMetadataProperty.SOURCE.description, - OpenMetadataProperty.SOURCE.descriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.SOURCE)); relationshipDef.setPropertiesDefinition(properties); @@ -1316,42 +1117,26 @@ private void add0025Locations() private EntityDef getLocationEntity() { - EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.LOCATION.typeGUID, - OpenMetadataType.LOCATION.typeName, - this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), - OpenMetadataType.LOCATION.description, - OpenMetadataType.LOCATION.descriptionGUID, - OpenMetadataType.LOCATION.wikiURL); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.LOCATION, + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName)); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.DISPLAY_NAME.name, - OpenMetadataProperty.DISPLAY_NAME.description, - OpenMetadataProperty.DISPLAY_NAME.descriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.DESCRIPTION.name, - OpenMetadataProperty.DESCRIPTION.description, - OpenMetadataProperty.DESCRIPTION.descriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.DISPLAY_NAME)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.DESCRIPTION)); entityDef.setPropertiesDefinition(properties); return entityDef; } - private RelationshipDef getNestedLocationRelationship() { - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.NESTED_LOCATION_RELATIONSHIP.typeGUID, - OpenMetadataType.NESTED_LOCATION_RELATIONSHIP.typeName, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.NESTED_LOCATION_RELATIONSHIP, null, - OpenMetadataType.NESTED_LOCATION_RELATIONSHIP.description, - OpenMetadataType.NESTED_LOCATION_RELATIONSHIP.descriptionGUID, - OpenMetadataType.NESTED_LOCATION_RELATIONSHIP.wikiURL, ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -1388,15 +1173,10 @@ private RelationshipDef getNestedLocationRelationship() return relationshipDef; } - private RelationshipDef getAdjacentLocationRelationship() { - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.ADJACENT_LOCATION_RELATIONSHIP.typeGUID, - OpenMetadataType.ADJACENT_LOCATION_RELATIONSHIP.typeName, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.ADJACENT_LOCATION_RELATIONSHIP, null, - OpenMetadataType.ADJACENT_LOCATION_RELATIONSHIP.description, - OpenMetadataType.ADJACENT_LOCATION_RELATIONSHIP.descriptionGUID, - OpenMetadataType.ADJACENT_LOCATION_RELATIONSHIP.wikiURL, ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -1433,15 +1213,10 @@ private RelationshipDef getAdjacentLocationRelationship() return relationshipDef; } - private RelationshipDef getAssetLocationRelationship() { - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.ASSET_LOCATION_RELATIONSHIP.typeGUID, - OpenMetadataType.ASSET_LOCATION_RELATIONSHIP.typeName, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.ASSET_LOCATION_RELATIONSHIP, null, - OpenMetadataType.ASSET_LOCATION_RELATIONSHIP.description, - OpenMetadataType.ASSET_LOCATION_RELATIONSHIP.descriptionGUID, - OpenMetadataType.ASSET_LOCATION_RELATIONSHIP.wikiURL, ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -1478,28 +1253,18 @@ private RelationshipDef getAssetLocationRelationship() return relationshipDef; } - private ClassificationDef getMobileAssetClassification() { - return archiveHelper.getClassificationDef(OpenMetadataType.MOBILE_ASSET_CLASSIFICATION.typeGUID, - OpenMetadataType.MOBILE_ASSET_CLASSIFICATION.typeName, + return archiveHelper.getClassificationDef(OpenMetadataType.MOBILE_ASSET_CLASSIFICATION, null, - OpenMetadataType.MOBILE_ASSET_CLASSIFICATION.description, - OpenMetadataType.MOBILE_ASSET_CLASSIFICATION.descriptionGUID, - OpenMetadataType.MOBILE_ASSET_CLASSIFICATION.wikiURL, this.archiveBuilder.getEntityDef(OpenMetadataType.ASSET.typeName), false); } - private ClassificationDef getFixedLocationClassification() { - ClassificationDef classificationDef = archiveHelper.getClassificationDef(OpenMetadataType.FIXED_LOCATION_CLASSIFICATION.typeGUID, - OpenMetadataType.FIXED_LOCATION_CLASSIFICATION.typeName, + ClassificationDef classificationDef = archiveHelper.getClassificationDef(OpenMetadataType.FIXED_LOCATION_CLASSIFICATION, null, - OpenMetadataType.FIXED_LOCATION_CLASSIFICATION.description, - OpenMetadataType.FIXED_LOCATION_CLASSIFICATION.descriptionGUID, - OpenMetadataType.FIXED_LOCATION_CLASSIFICATION.wikiURL, this.archiveBuilder.getEntityDef(OpenMetadataType.LOCATION.typeName), false); @@ -1513,33 +1278,22 @@ private ClassificationDef getFixedLocationClassification() final String attribute2Description = "Postal address of this location."; final String attribute2DescriptionGUID = null; - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.COORDINATES.name, - OpenMetadataProperty.COORDINATES.description, - OpenMetadataProperty.COORDINATES.descriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.COORDINATES)); property = archiveHelper.getStringTypeDefAttribute(attribute2Name, attribute2Description, attribute2DescriptionGUID); properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.TIME_ZONE.name, - OpenMetadataProperty.TIME_ZONE.description, - OpenMetadataProperty.TIME_ZONE.descriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.TIME_ZONE)); classificationDef.setPropertiesDefinition(properties); return classificationDef; } - private ClassificationDef getSecureLocationClassification() { - ClassificationDef classificationDef = archiveHelper.getClassificationDef(OpenMetadataType.SECURE_LOCATION_CLASSIFICATION.typeGUID, - OpenMetadataType.SECURE_LOCATION_CLASSIFICATION.typeName, + ClassificationDef classificationDef = archiveHelper.getClassificationDef(OpenMetadataType.SECURE_LOCATION_CLASSIFICATION, null, - OpenMetadataType.SECURE_LOCATION_CLASSIFICATION.description, - OpenMetadataType.SECURE_LOCATION_CLASSIFICATION.descriptionGUID, - OpenMetadataType.SECURE_LOCATION_CLASSIFICATION.wikiURL, this.archiveBuilder.getEntityDef(OpenMetadataType.LOCATION.typeName), false); @@ -1547,31 +1301,19 @@ private ClassificationDef getSecureLocationClassification() * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.DESCRIPTION.name, - OpenMetadataProperty.DESCRIPTION.description, - OpenMetadataProperty.DESCRIPTION.descriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.LEVEL.name, - OpenMetadataProperty.LEVEL.description, - OpenMetadataProperty.LEVEL.descriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.DESCRIPTION)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.LEVEL)); classificationDef.setPropertiesDefinition(properties); return classificationDef; } - private ClassificationDef getCyberLocationClassification() { - ClassificationDef classificationDef = archiveHelper.getClassificationDef(OpenMetadataType.CYBER_LOCATION_CLASSIFICATION.typeGUID, - OpenMetadataType.CYBER_LOCATION_CLASSIFICATION.typeName, + ClassificationDef classificationDef = archiveHelper.getClassificationDef(OpenMetadataType.CYBER_LOCATION_CLASSIFICATION, null, - OpenMetadataType.CYBER_LOCATION_CLASSIFICATION.description, - OpenMetadataType.CYBER_LOCATION_CLASSIFICATION.descriptionGUID, - OpenMetadataType.CYBER_LOCATION_CLASSIFICATION.wikiURL, this.archiveBuilder.getEntityDef(OpenMetadataType.LOCATION.typeName), false); @@ -1616,7 +1358,6 @@ private void add0030HostsAndPlatforms() this.archiveBuilder.addRelationshipDef(getHostOperatingPlatformRelationship()); } - private EnumDef getEndiannessEnum() { EnumDef enumDef = archiveHelper.getEmptyEnumDef(ByteOrdering.getOpenTypeGUID(), @@ -1648,45 +1389,22 @@ private EnumDef getEndiannessEnum() return enumDef; } - private EntityDef getITInfrastructureEntity() { - final String guid = OpenMetadataType.IT_INFRASTRUCTURE.typeGUID; - final String name = OpenMetadataType.IT_INFRASTRUCTURE.typeName; - final String description = OpenMetadataType.IT_INFRASTRUCTURE.description; - final String descriptionGUID = OpenMetadataType.IT_INFRASTRUCTURE.descriptionGUID; - final String descriptionWiki = OpenMetadataType.IT_INFRASTRUCTURE.wikiURL; - - final String superTypeName = OpenMetadataType.INFRASTRUCTURE.typeName; - - return archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID, - descriptionWiki); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.IT_INFRASTRUCTURE, + this.archiveBuilder.getEntityDef(OpenMetadataType.INFRASTRUCTURE.typeName)); } - private EntityDef getHostEntity() { - return archiveHelper.getDefaultEntityDef(OpenMetadataType.HOST.typeGUID, - OpenMetadataType.HOST.typeName, - this.archiveBuilder.getEntityDef(OpenMetadataType.IT_INFRASTRUCTURE.typeName), - OpenMetadataType.HOST.description, - OpenMetadataType.HOST.descriptionGUID, - OpenMetadataType.HOST.wikiURL); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.HOST, + this.archiveBuilder.getEntityDef(OpenMetadataType.IT_INFRASTRUCTURE.typeName)); } - private EntityDef getOperatingPlatformEntity() { - EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.OPERATING_PLATFORM.typeGUID, - OpenMetadataType.OPERATING_PLATFORM.typeName, - this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), - OpenMetadataType.OPERATING_PLATFORM.description, - OpenMetadataType.OPERATING_PLATFORM.descriptionGUID, - OpenMetadataType.OPERATING_PLATFORM.wikiURL); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.OPERATING_PLATFORM, + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName)); /* * Build the attributes @@ -1698,18 +1416,10 @@ private EntityDef getOperatingPlatformEntity() final String attribute4Description = "Definition of byte ordering."; final String attribute4DescriptionGUID = null; - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.NAME.name, - OpenMetadataProperty.NAME.description, - OpenMetadataProperty.NAME.descriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.DESCRIPTION.name, - OpenMetadataProperty.DESCRIPTION.description, - OpenMetadataProperty.DESCRIPTION.descriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.OPERATING_SYSTEM.name, - OpenMetadataProperty.OPERATING_SYSTEM.description, - OpenMetadataProperty.OPERATING_SYSTEM.descriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.NAME)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.DESCRIPTION)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.OPERATING_SYSTEM)); + property = archiveHelper.getStringTypeDefAttribute(attribute4Name, attribute4Description, attribute4DescriptionGUID); @@ -1720,7 +1430,6 @@ private EntityDef getOperatingPlatformEntity() return entityDef; } - private RelationshipDef getHostLocationRelationship() { final String guid = "f3066075-9611-4886-9244-32cc6eb07ea9"; @@ -1728,54 +1437,47 @@ private RelationshipDef getHostLocationRelationship() final String description = "Defines the location of a host."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = "Host"; final String end1AttributeName = "localHosts"; final String end1AttributeDescription = "Host sited at this location."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.HOST.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = "Location"; final String end2AttributeName = "locations"; final String end2AttributeDescription = "Locations for this host."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.LOCATION.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; } - private RelationshipDef getHostOperatingPlatformRelationship() { final String guid = "b9179df5-6e23-4581-a8b0-2919e6322b12"; @@ -1783,55 +1485,49 @@ private RelationshipDef getHostOperatingPlatformRelationship() final String description = "Identifies the operating platform for a host."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = "Host"; final String end1AttributeName = "hosts"; final String end1AttributeDescription = "Host supporting this operating platform."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.HOST.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = "OperatingPlatform"; final String end2AttributeName = "operatingPlatform"; final String end2AttributeDescription = "Type of platform supported by this host."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.AT_MOST_ONE; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.OPERATING_PLATFORM.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; } - /* * ------------------------------------------------------------------------------------------------------- */ @@ -1849,37 +1545,22 @@ private void add0035ComplexHosts() this.archiveBuilder.addRelationshipDef(getDeployedVirtualContainerRelationship()); } - private EntityDef getHostClusterEntity() { - return archiveHelper.getDefaultEntityDef(OpenMetadataType.HOST_CLUSTER.typeGUID, - OpenMetadataType.HOST_CLUSTER.typeName, - this.archiveBuilder.getEntityDef(OpenMetadataType.HOST.typeName), - OpenMetadataType.HOST_CLUSTER.description, - OpenMetadataType.HOST_CLUSTER.descriptionGUID, - OpenMetadataType.HOST_CLUSTER.wikiURL); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.HOST_CLUSTER, + this.archiveBuilder.getEntityDef(OpenMetadataType.HOST.typeName)); } - private EntityDef getVirtualContainerEntity() { - return archiveHelper.getDefaultEntityDef(OpenMetadataType.VIRTUAL_CONTAINER.typeGUID, - OpenMetadataType.VIRTUAL_CONTAINER.typeName, - this.archiveBuilder.getEntityDef(OpenMetadataType.HOST.typeName), - OpenMetadataType.VIRTUAL_CONTAINER.description, - OpenMetadataType.VIRTUAL_CONTAINER.descriptionGUID, - OpenMetadataType.VIRTUAL_CONTAINER.wikiURL); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.VIRTUAL_CONTAINER, + this.archiveBuilder.getEntityDef(OpenMetadataType.HOST.typeName)); } - private RelationshipDef getHostClusterMemberRelationship() { - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.HOST_CLUSTER_MEMBER_RELATIONSHIP.typeGUID, - OpenMetadataType.HOST_CLUSTER_MEMBER_RELATIONSHIP.typeName, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.HOST_CLUSTER_MEMBER_RELATIONSHIP, null, - OpenMetadataType.HOST_CLUSTER_MEMBER_RELATIONSHIP.description, - OpenMetadataType.HOST_CLUSTER_MEMBER_RELATIONSHIP.descriptionGUID, - OpenMetadataType.HOST_CLUSTER_MEMBER_RELATIONSHIP.wikiURL, ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -1887,41 +1568,35 @@ private RelationshipDef getHostClusterMemberRelationship() /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.HOST_CLUSTER.typeName; final String end1AttributeName = "hostCluster"; final String end1AttributeDescription = "Cluster managing this host."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.HOST_CLUSTER.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.HOST.typeName; final String end2AttributeName = "managedHosts"; final String end2AttributeDescription = "Member of the host cluster."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.HOST.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); - return relationshipDef; } - private RelationshipDef getDeployedVirtualContainerRelationship() { final String guid = "4b981d89-e356-4d9b-8f17-b3a8d5a86676"; @@ -1929,48 +1604,42 @@ private RelationshipDef getDeployedVirtualContainerRelationship() final String description = "Identifies the real host where a virtual container is deployed to."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = "Host"; final String end1AttributeName = "hosts"; final String end1AttributeDescription = "Deployed host for this container."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.HOST.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = "VirtualContainer"; final String end2AttributeName = "hostedContainers"; final String end2AttributeDescription = "Virtual containers deployed on this host."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.VIRTUAL_CONTAINER.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); @@ -1995,64 +1664,40 @@ private void add0037SoftwareServerPlatforms() this.archiveBuilder.addRelationshipDef(getSoftwareServerPlatformDeploymentRelationship()); } - private EnumDef getOperationalStatusEnum() { - final String guid = OpenMetadataType.OPERATIONAL_STATUS_ENUM_TYPE_GUID; - final String name = OpenMetadataType.OPERATIONAL_STATUS_ENUM_TYPE_NAME; - final String description = "Defines whether a component is operational."; - final String descriptionGUID = null; - - EnumDef enumDef = archiveHelper.getEmptyEnumDef(guid, name, description, descriptionGUID); + EnumDef enumDef = archiveHelper.getEmptyEnumDef(OperationalStatus.getOpenTypeGUID(), + OperationalStatus.getOpenTypeName(), + OperationalStatus.getOpenTypeDescription(), + OperationalStatus.getOpenTypeDescriptionGUID()); ArrayList elementDefs = new ArrayList<>(); EnumElementDef elementDef; - final int element1Ordinal = 0; - final String element1Value = "Disabled"; - final String element1Description = "The component is not operational."; - final String element1DescriptionGUID = null; + for (OperationalStatus enumValue : OperationalStatus.values()) + { + elementDef = archiveHelper.getEnumElementDef(enumValue.getOrdinal(), + enumValue.getName(), + enumValue.getDescription(), + enumValue.getDescriptionGUID()); - elementDef = archiveHelper.getEnumElementDef(element1Ordinal, - element1Value, - element1Description, - element1DescriptionGUID); - elementDefs.add(elementDef); - - final int element2Ordinal = 1; - final String element2Value = "Enabled"; - final String element2Description = "The component is operational."; - final String element2DescriptionGUID = null; + elementDefs.add(elementDef); - elementDef = archiveHelper.getEnumElementDef(element2Ordinal, - element2Value, - element2Description, - element2DescriptionGUID); - elementDefs.add(elementDef); + if (enumValue.isDefault()) + { + enumDef.setDefaultValue(elementDef); + } + } enumDef.setElementDefs(elementDefs); return enumDef; } - - private EntityDef getSoftwareServerPlatformEntity() { - final String guid = OpenMetadataType.SOFTWARE_SERVER_PLATFORM.typeGUID; - final String name = OpenMetadataType.SOFTWARE_SERVER_PLATFORM.typeName; - final String description = OpenMetadataType.SOFTWARE_SERVER_PLATFORM.description; - final String descriptionGUID = OpenMetadataType.SOFTWARE_SERVER_PLATFORM.descriptionGUID; - final String descriptionWiki = OpenMetadataType.SOFTWARE_SERVER_PLATFORM.wikiURL; - - final String superTypeName = OpenMetadataType.IT_INFRASTRUCTURE.typeName; - - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID, - descriptionWiki); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.SOFTWARE_SERVER_PLATFORM, + this.archiveBuilder.getEntityDef(OpenMetadataType.IT_INFRASTRUCTURE.typeName)); /* * Build the attributes @@ -2066,9 +1711,6 @@ private EntityDef getSoftwareServerPlatformEntity() final String attribute2Name = "version"; final String attribute2Description = "Version number of the software server platform."; final String attribute2DescriptionGUID = null; - final String attribute4Name = "userId"; - final String attribute4Description = "Server platform's authentication name."; - final String attribute4DescriptionGUID = null; property = archiveHelper.getStringTypeDefAttribute(attribute1Name, attribute1Description, @@ -2078,22 +1720,15 @@ private EntityDef getSoftwareServerPlatformEntity() attribute2Description, attribute2DescriptionGUID); properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.SOURCE.name, - OpenMetadataProperty.SOURCE.description, - OpenMetadataProperty.SOURCE.descriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(attribute4Name, - attribute4Description, - attribute4DescriptionGUID); - properties.add(property); + + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.SOURCE)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.USER_ID)); entityDef.setPropertiesDefinition(properties); return entityDef; } - - private RelationshipDef getSoftwareServerPlatformDeploymentRelationship() { final String guid = "b909eb3b-5205-4180-9f63-122a65b30738"; @@ -2101,48 +1736,42 @@ private RelationshipDef getSoftwareServerPlatformDeploymentRelationship() final String description = "Defines the host that a software server platform is deployed to."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = "Host"; final String end1AttributeName = "host"; final String end1AttributeDescription = "Supporting host."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.AT_MOST_ONE; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.HOST.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = "SoftwareServerPlatform"; final String end2AttributeName = "deployedServerPlatforms"; final String end2AttributeDescription = "Software server platforms deployed on this host."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.SOFTWARE_SERVER_PLATFORM.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -2198,23 +1827,10 @@ private void add0040SoftwareServers() this.archiveBuilder.addRelationshipDef(getServerEndpointRelationship()); } - private EntityDef getSoftwareServerEntity() { - final String guid = OpenMetadataType.SOFTWARE_SERVER.typeGUID; - final String name = OpenMetadataType.SOFTWARE_SERVER.typeName; - final String description = OpenMetadataType.SOFTWARE_SERVER.description; - final String descriptionGUID = OpenMetadataType.SOFTWARE_SERVER.descriptionGUID; - final String descriptionWiki = OpenMetadataType.SOFTWARE_SERVER.wikiURL; - - final String superTypeName = OpenMetadataType.IT_INFRASTRUCTURE.typeName; - - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID, - descriptionWiki); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.SOFTWARE_SERVER, + this.archiveBuilder.getEntityDef(OpenMetadataType.IT_INFRASTRUCTURE.typeName)); /* * Build the attributes @@ -2228,9 +1844,6 @@ private EntityDef getSoftwareServerEntity() final String attribute2Name = "version"; final String attribute2Description = "Version number of the software server."; final String attribute2DescriptionGUID = null; - final String attribute4Name = "userId"; - final String attribute4Description = "Server's authentication name."; - final String attribute4DescriptionGUID = null; property = archiveHelper.getStringTypeDefAttribute(attribute1Name, attribute1Description, @@ -2240,56 +1853,30 @@ private EntityDef getSoftwareServerEntity() attribute2Description, attribute2DescriptionGUID); properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.SOURCE.name, - OpenMetadataProperty.SOURCE.description, - OpenMetadataProperty.SOURCE.descriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(attribute4Name, - attribute4Description, - attribute4DescriptionGUID); - properties.add(property); + + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.SOURCE)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.USER_ID)); entityDef.setPropertiesDefinition(properties); return entityDef; } - private EntityDef getEndpointEntity() { - EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.ENDPOINT.typeGUID, - OpenMetadataType.ENDPOINT.typeName, - this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), - OpenMetadataType.ENDPOINT.description, - OpenMetadataType.ENDPOINT.descriptionGUID, - OpenMetadataType.ENDPOINT.wikiURL); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.ENDPOINT, + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName)); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.NAME.name, - OpenMetadataProperty.NAME.description, - OpenMetadataProperty.NAME.descriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.DESCRIPTION.name, - OpenMetadataProperty.DESCRIPTION.description, - OpenMetadataProperty.DESCRIPTION.descriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.NETWORK_ADDRESS.name, - OpenMetadataProperty.NETWORK_ADDRESS.description, - OpenMetadataProperty.NETWORK_ADDRESS.descriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.PROTOCOL.name, - OpenMetadataProperty.PROTOCOL.description, - OpenMetadataProperty.PROTOCOL.descriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.ENCRYPTION_METHOD.name, - OpenMetadataProperty.ENCRYPTION_METHOD.description, - OpenMetadataProperty.ENCRYPTION_METHOD.descriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.NAME)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.DESCRIPTION)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.NETWORK_ADDRESS)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.PROTOCOL)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.ENCRYPTION_METHOD)); entityDef.setPropertiesDefinition(properties); @@ -2304,48 +1891,43 @@ private RelationshipDef getSoftwareServerDeploymentRelationship() final String description = "Defines the platform that a software server is deployed to."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = "SoftwareServerPlatform"; final String end1AttributeName = "hostingPlatform"; final String end1AttributeDescription = "Supporting platform for the software server."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.AT_MOST_ONE; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.SOFTWARE_SERVER_PLATFORM.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = "SoftwareServer"; final String end2AttributeName = "deployedSoftwareServers"; final String end2AttributeDescription = "Software servers deployed on this platform."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.SOFTWARE_SERVER.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -2383,15 +1965,10 @@ private RelationshipDef getSoftwareServerDeploymentRelationship() return relationshipDef; } - private RelationshipDef getServerEndpointRelationship() { - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.SERVER_ENDPOINT_RELATIONSHIP.typeGUID, - OpenMetadataType.SERVER_ENDPOINT_RELATIONSHIP.typeName, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.SERVER_ENDPOINT_RELATIONSHIP, null, - OpenMetadataType.SERVER_ENDPOINT_RELATIONSHIP.description, - OpenMetadataType.SERVER_ENDPOINT_RELATIONSHIP.descriptionGUID, - OpenMetadataType.SERVER_ENDPOINT_RELATIONSHIP.wikiURL, ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -2445,23 +2022,10 @@ private void add0042SoftwareServerCapabilities() this.archiveBuilder.addRelationshipDef(getSoftwareServerSupportedCapabilityRelationship()); } - private EntityDef getSoftwareServerCapabilityEntity() { - final String guid = OpenMetadataType.SOFTWARE_SERVER_CAPABILITY.typeGUID; - final String name = OpenMetadataType.SOFTWARE_SERVER_CAPABILITY.typeName; - final String description = OpenMetadataType.SOFTWARE_SERVER_CAPABILITY.description; - final String descriptionGUID = OpenMetadataType.SOFTWARE_SERVER_CAPABILITY.descriptionGUID; - final String descriptionWiki = OpenMetadataType.SOFTWARE_SERVER_CAPABILITY.wikiURL; - - final String superTypeName = OpenMetadataType.REFERENCEABLE.typeName; - - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID, - descriptionWiki); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.SOFTWARE_SERVER_CAPABILITY, + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName)); /* * Build the attributes @@ -2490,7 +2054,6 @@ private EntityDef getSoftwareServerCapabilityEntity() return entityDef; } - private RelationshipDef getSoftwareServerSupportedCapabilityRelationship() { final String guid = "8b7d7da5-0668-4174-a43b-8f8c6c068dd0"; @@ -2498,48 +2061,42 @@ private RelationshipDef getSoftwareServerSupportedCapabilityRelationship() final String description = "Identifies a software capability that is deployed to a software server."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = "SoftwareServer"; final String end1AttributeName = "servers"; final String end1AttributeDescription = "Servers hosting this capability."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.SOFTWARE_SERVER.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.SOFTWARE_SERVER_CAPABILITY.typeName; final String end2AttributeName = "capabilities"; final String end2AttributeDescription = "Capabilities deployed on this software server."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.SOFTWARE_SERVER_CAPABILITY.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -2582,71 +2139,28 @@ private void add0045ServersAndAssets() private EnumDef getServerAssetUseTypeEnum() { - final String guid = "09439481-9489-467c-9ae5-178a6e0b6b5a"; - final String name = "ServerAssetUseType"; - final String description = "Defines how a software server capability may use an asset."; - final String descriptionGUID = null; - - EnumDef enumDef = archiveHelper.getEmptyEnumDef(guid, name, description, descriptionGUID); + EnumDef enumDef = archiveHelper.getEmptyEnumDef(ServerAssetUseType.getOpenTypeGUID(), + ServerAssetUseType.getOpenTypeName(), + ServerAssetUseType.getOpenTypeDescription(), + ServerAssetUseType.getOpenTypeDescriptionGUID()); ArrayList elementDefs = new ArrayList<>(); EnumElementDef elementDef; - final int element1Ordinal = 0; - final String element1Value = "Owns"; - final String element1Description = "The software server capability is accountable for the maintenance and protection of the asset."; - final String element1DescriptionGUID = null; - - elementDef = archiveHelper.getEnumElementDef(element1Ordinal, - element1Value, - element1Description, - element1DescriptionGUID); - elementDefs.add(elementDef); - enumDef.setDefaultValue(elementDef); - - final int element2Ordinal = 1; - final String element2Value = "Governs"; - final String element2Description = "The software server capability provides management or oversight of the asset."; - final String element2DescriptionGUID = null; - - elementDef = archiveHelper.getEnumElementDef(element2Ordinal, - element2Value, - element2Description, - element2DescriptionGUID); - elementDefs.add(elementDef); - - final int element3Ordinal = 2; - final String element3Value = "Maintains"; - final String element3Description = "The software server capability keeps the asset up-to-date."; - final String element3DescriptionGUID = null; - - elementDef = archiveHelper.getEnumElementDef(element3Ordinal, - element3Value, - element3Description, - element3DescriptionGUID); - elementDefs.add(elementDef); - - final int element4Ordinal = 3; - final String element4Value = "Uses"; - final String element4Description = "The software server capability consumes the content of the asset."; - final String element4DescriptionGUID = null; - - elementDef = archiveHelper.getEnumElementDef(element4Ordinal, - element4Value, - element4Description, - element4DescriptionGUID); - elementDefs.add(elementDef); + for (ServerAssetUseType enumValue : ServerAssetUseType.values()) + { + elementDef = archiveHelper.getEnumElementDef(enumValue.getOrdinal(), + enumValue.getName(), + enumValue.getDescription(), + enumValue.getDescriptionGUID()); - final int element5Ordinal = 99; - final String element5Value = "Other"; - final String element5Description = "Another usage."; - final String element5DescriptionGUID = null; + elementDefs.add(elementDef); - elementDef = archiveHelper.getEnumElementDef(element5Ordinal, - element5Value, - element5Description, - element5DescriptionGUID); - elementDefs.add(elementDef); + if (enumValue.isDefault()) + { + enumDef.setDefaultValue(elementDef); + } + } enumDef.setElementDefs(elementDefs); @@ -2661,48 +2175,42 @@ private RelationshipDef getServerAssetUseRelationship() final String description = "Defines that a server capability is using an asset."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.SOFTWARE_SERVER_CAPABILITY.typeName; final String end1AttributeName = "consumedBy"; final String end1AttributeDescription = "Capability consuming this asset."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.SOFTWARE_SERVER_CAPABILITY.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.ASSET.typeName; final String end2AttributeName = "consumedAsset"; final String end2AttributeDescription = "Asset that this software server capability is dependent on."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.ASSET.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -2741,26 +2249,12 @@ private void add0050ApplicationsAndProcesses() this.archiveBuilder.addClassificationDef(getWebserverClassification()); } - private EntityDef getApplicationEntity() { - final String guid = OpenMetadataType.APPLICATION.typeGUID; - final String name = OpenMetadataType.APPLICATION.typeName; - final String description = OpenMetadataType.APPLICATION.description; - final String descriptionGUID = OpenMetadataType.APPLICATION.descriptionGUID; - final String descriptionWiki = OpenMetadataType.APPLICATION.wikiURL; - - final String superTypeName = OpenMetadataType.SOFTWARE_SERVER_CAPABILITY.typeName; - - return archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID, - descriptionWiki); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.APPLICATION, + this.archiveBuilder.getEntityDef(OpenMetadataType.SOFTWARE_SERVER_CAPABILITY.typeName)); } - private RelationshipDef getRuntimeForProcessRelationship() { final String guid = "f6b5cf4f-7b88-47df-aeb0-d80d28ba1ec1"; @@ -2768,75 +2262,59 @@ private RelationshipDef getRuntimeForProcessRelationship() final String description = "Identifies the deployed application that supports a specific automated process."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = "Application"; final String end1AttributeName = "implementingApplication"; final String end1AttributeDescription = "Application that contains the process implementation."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.APPLICATION.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.PROCESS.typeName; final String end2AttributeName = "implementedProcesses"; final String end2AttributeDescription = "Processes that are implemented by this application."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.PROCESS.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; } - private ClassificationDef getApplicationServerClassification() { - return archiveHelper.getClassificationDef(OpenMetadataType.APPLICATION_SERVER_CLASSIFICATION.typeGUID, - OpenMetadataType.APPLICATION_SERVER_CLASSIFICATION.typeName, + return archiveHelper.getClassificationDef(OpenMetadataType.APPLICATION_SERVER_CLASSIFICATION, null, - OpenMetadataType.APPLICATION_SERVER_CLASSIFICATION.description, - OpenMetadataType.APPLICATION_SERVER_CLASSIFICATION.descriptionGUID, - OpenMetadataType.APPLICATION_SERVER_CLASSIFICATION.wikiURL, this.archiveBuilder.getEntityDef(OpenMetadataType.SOFTWARE_SERVER.typeName), false); } - private ClassificationDef getWebserverClassification() { - return archiveHelper.getClassificationDef(OpenMetadataType.WEBSERVER_CLASSIFICATION.typeGUID, - OpenMetadataType.WEBSERVER_CLASSIFICATION.typeName, + return archiveHelper.getClassificationDef(OpenMetadataType.WEBSERVER_CLASSIFICATION, null, - OpenMetadataType.WEBSERVER_CLASSIFICATION.description, - OpenMetadataType.WEBSERVER_CLASSIFICATION.descriptionGUID, - OpenMetadataType.WEBSERVER_CLASSIFICATION.wikiURL, this.archiveBuilder.getEntityDef(OpenMetadataType.SOFTWARE_SERVER.typeName), false); } @@ -2857,127 +2335,49 @@ private void add0055DataProcessingEngines() this.archiveBuilder.addClassificationDef(getDataVirtualizationEngineClassification()); } - private EntityDef getEngineEntity() { - final String guid = OpenMetadataType.ENGINE.typeGUID; - final String name = OpenMetadataType.ENGINE.typeName; - final String description = OpenMetadataType.ENGINE.description; - final String descriptionGUID = OpenMetadataType.ENGINE.descriptionGUID; - final String descriptionWiki = OpenMetadataType.ENGINE.wikiURL; - - final String superTypeName = OpenMetadataType.SOFTWARE_SERVER_CAPABILITY.typeName; - - return archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID, - descriptionWiki); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.ENGINE, + this.archiveBuilder.getEntityDef(OpenMetadataType.SOFTWARE_SERVER_CAPABILITY.typeName)); } - private ClassificationDef getWorkflowEngineClassification() { - final String guid = OpenMetadataType.WORKFLOW_ENGINE_CLASSIFICATION.typeGUID; - final String name = OpenMetadataType.WORKFLOW_ENGINE_CLASSIFICATION.typeName; - final String description = OpenMetadataType.WORKFLOW_ENGINE_CLASSIFICATION.description; - final String descriptionGUID = OpenMetadataType.WORKFLOW_ENGINE_CLASSIFICATION.descriptionGUID; - final String descriptionWiki = OpenMetadataType.WORKFLOW_ENGINE_CLASSIFICATION.wikiURL; - - final String linkedToEntity = OpenMetadataType.ENGINE.typeName; - - return archiveHelper.getClassificationDef(guid, - name, + return archiveHelper.getClassificationDef(OpenMetadataType.WORKFLOW_ENGINE_CLASSIFICATION, null, - description, - descriptionGUID, - descriptionWiki, - this.archiveBuilder.getEntityDef(linkedToEntity), + this.archiveBuilder.getEntityDef(OpenMetadataType.ENGINE.typeName), false); } - private ClassificationDef getReportingEngineClassification() { - final String guid = OpenMetadataType.REPORTING_ENGINE_CLASSIFICATION.typeGUID; - final String name = OpenMetadataType.REPORTING_ENGINE_CLASSIFICATION.typeName; - final String description = OpenMetadataType.REPORTING_ENGINE_CLASSIFICATION.description; - final String descriptionGUID = OpenMetadataType.REPORTING_ENGINE_CLASSIFICATION.descriptionGUID; - final String descriptionWiki = OpenMetadataType.REPORTING_ENGINE_CLASSIFICATION.wikiURL; - - final String linkedToEntity = OpenMetadataType.ENGINE.typeName; - - return archiveHelper.getClassificationDef(guid, - name, + return archiveHelper.getClassificationDef(OpenMetadataType.REPORTING_ENGINE_CLASSIFICATION, null, - description, - descriptionGUID, - descriptionWiki, - this.archiveBuilder.getEntityDef(linkedToEntity), + this.archiveBuilder.getEntityDef(OpenMetadataType.ENGINE.typeName), false); } - private ClassificationDef getAnalyticsEngineClassification() { - final String guid = OpenMetadataType.ANALYTICS_ENGINE.typeGUID; - final String name = OpenMetadataType.ANALYTICS_ENGINE.typeName; - final String description = OpenMetadataType.ANALYTICS_ENGINE.description; - final String descriptionGUID = OpenMetadataType.ANALYTICS_ENGINE.descriptionGUID; - final String descriptionWiki = OpenMetadataType.ANALYTICS_ENGINE.wikiURL; - - final String linkedToEntity = OpenMetadataType.ENGINE.typeName; - - return archiveHelper.getClassificationDef(guid, - name, + return archiveHelper.getClassificationDef(OpenMetadataType.ANALYTICS_ENGINE, null, - description, - descriptionGUID, - descriptionWiki, - this.archiveBuilder.getEntityDef(linkedToEntity), + this.archiveBuilder.getEntityDef(OpenMetadataType.ENGINE.typeName), false); } - private ClassificationDef getDataMovementEngineClassification() { - final String guid = OpenMetadataType.DATA_MOVEMENT_ENGINE.typeGUID; - final String name = OpenMetadataType.DATA_MOVEMENT_ENGINE.typeName; - final String description = OpenMetadataType.DATA_MOVEMENT_ENGINE.description; - final String descriptionGUID = OpenMetadataType.DATA_MOVEMENT_ENGINE.descriptionGUID; - final String descriptionWiki = OpenMetadataType.DATA_MOVEMENT_ENGINE.wikiURL; - - final String linkedToEntity = OpenMetadataType.ENGINE.typeName; - - return archiveHelper.getClassificationDef(guid, - name, + return archiveHelper.getClassificationDef(OpenMetadataType.DATA_MOVEMENT_ENGINE, null, - description, - descriptionGUID, - descriptionWiki, - this.archiveBuilder.getEntityDef(linkedToEntity), + this.archiveBuilder.getEntityDef(OpenMetadataType.ENGINE.typeName), false); } - private ClassificationDef getDataVirtualizationEngineClassification() { - final String guid = OpenMetadataType.DATA_VIRTUALIZATION_ENGINE.typeGUID; - final String name = OpenMetadataType.DATA_VIRTUALIZATION_ENGINE.typeName; - final String description = OpenMetadataType.DATA_VIRTUALIZATION_ENGINE.description; - final String descriptionGUID = OpenMetadataType.DATA_VIRTUALIZATION_ENGINE.descriptionGUID; - final String descriptionWiki = OpenMetadataType.DATA_VIRTUALIZATION_ENGINE.wikiURL; - - final String linkedToEntity = OpenMetadataType.ENGINE.typeName; - - return archiveHelper.getClassificationDef(guid, - name, + return archiveHelper.getClassificationDef(OpenMetadataType.DATA_VIRTUALIZATION_ENGINE, null, - description, - descriptionGUID, - descriptionWiki, - this.archiveBuilder.getEntityDef(linkedToEntity), + this.archiveBuilder.getEntityDef(OpenMetadataType.ENGINE.typeName), false); } @@ -2999,37 +2399,24 @@ private void add0070NetworksAndGateways() this.archiveBuilder.addRelationshipDef(getNetworkGatewayLinkRelationship()); } - private EntityDef getNetworkEntity() { - return archiveHelper.getDefaultEntityDef(OpenMetadataType.NETWORK.typeGUID, - OpenMetadataType.NETWORK.typeName, - this.archiveBuilder.getEntityDef(OpenMetadataType.IT_INFRASTRUCTURE.typeName), - OpenMetadataType.NETWORK.description, - OpenMetadataType.NETWORK.descriptionGUID, - OpenMetadataType.NETWORK.wikiURL); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.NETWORK, + this.archiveBuilder.getEntityDef(OpenMetadataType.IT_INFRASTRUCTURE.typeName)); } private EntityDef getNetworkGatewayEntity() { - return archiveHelper.getDefaultEntityDef(OpenMetadataType.NETWORK_GATEWAY.typeGUID, - OpenMetadataType.NETWORK_GATEWAY.typeName, - this.archiveBuilder.getEntityDef(OpenMetadataType.SOFTWARE_SERVER_CAPABILITY.typeName), - OpenMetadataType.NETWORK_GATEWAY.description, - OpenMetadataType.NETWORK_GATEWAY.descriptionGUID, - OpenMetadataType.NETWORK_GATEWAY.wikiURL); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.NETWORK_GATEWAY, + this.archiveBuilder.getEntityDef(OpenMetadataType.SOFTWARE_SERVER_CAPABILITY.typeName)); } private RelationshipDef getHostNetworkRelationship() { - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.HOST_NETWORK.typeGUID, - OpenMetadataType.HOST_NETWORK.typeName, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.HOST_NETWORK, null, - OpenMetadataType.HOST_NETWORK.description, - OpenMetadataType.HOST_NETWORK.descriptionGUID, - OpenMetadataType.HOST_NETWORK.wikiURL, ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -3055,7 +2442,6 @@ private RelationshipDef getHostNetworkRelationship() final String end2AttributeName = "networkConnections"; final String end2AttributeDescription = "Connections to different networks."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.NETWORK.typeName), end2AttributeName, @@ -3067,15 +2453,10 @@ private RelationshipDef getHostNetworkRelationship() return relationshipDef; } - private RelationshipDef getNetworkGatewayLinkRelationship() { - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.NETWORK_GATEWAY_LINK_RELATIONSHIP.typeGUID, - OpenMetadataType.NETWORK_GATEWAY_LINK_RELATIONSHIP.typeName, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.NETWORK_GATEWAY_LINK_RELATIONSHIP, null, - OpenMetadataType.NETWORK_GATEWAY_LINK_RELATIONSHIP.description, - OpenMetadataType.NETWORK_GATEWAY_LINK_RELATIONSHIP.descriptionGUID, - OpenMetadataType.NETWORK_GATEWAY_LINK_RELATIONSHIP.wikiURL, ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -3098,7 +2479,6 @@ private RelationshipDef getNetworkGatewayLinkRelationship() /* * Set up end 2. */ - final String end2EntityType = "Network"; final String end2AttributeName = "networkConnections"; final String end2AttributeDescription = "Connections to different networks."; final String end2AttributeDescriptionGUID = null; @@ -3132,12 +2512,8 @@ private void add0090CloudPlatformsAndServices() private ClassificationDef getCloudProviderClassification() { - ClassificationDef classificationDef = archiveHelper.getClassificationDef(OpenMetadataType.CLOUD_PROVIDER_CLASSIFICATION.typeGUID, - OpenMetadataType.CLOUD_PROVIDER_CLASSIFICATION.typeName, + ClassificationDef classificationDef = archiveHelper.getClassificationDef(OpenMetadataType.CLOUD_PROVIDER_CLASSIFICATION, null, - OpenMetadataType.CLOUD_PROVIDER_CLASSIFICATION.description, - OpenMetadataType.CLOUD_PROVIDER_CLASSIFICATION.descriptionGUID, - OpenMetadataType.CLOUD_PROVIDER_CLASSIFICATION.wikiURL, this.archiveBuilder.getEntityDef(OpenMetadataType.HOST.typeName), false); @@ -3145,12 +2521,8 @@ private ClassificationDef getCloudProviderClassification() * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.PROVIDER_NAME.name, - OpenMetadataProperty.PROVIDER_NAME.description, - OpenMetadataProperty.PROVIDER_NAME.descriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.PROVIDER_NAME)); classificationDef.setPropertiesDefinition(properties); @@ -3160,12 +2532,8 @@ private ClassificationDef getCloudProviderClassification() private ClassificationDef getCloudPlatformClassification() { - ClassificationDef classificationDef = archiveHelper.getClassificationDef(OpenMetadataType.CLOUD_PLATFORM_CLASSIFICATION.typeGUID, - OpenMetadataType.CLOUD_PLATFORM_CLASSIFICATION.typeName, + ClassificationDef classificationDef = archiveHelper.getClassificationDef(OpenMetadataType.CLOUD_PLATFORM_CLASSIFICATION, null, - OpenMetadataType.CLOUD_PLATFORM_CLASSIFICATION.description, - OpenMetadataType.CLOUD_PLATFORM_CLASSIFICATION.descriptionGUID, - OpenMetadataType.CLOUD_PLATFORM_CLASSIFICATION.wikiURL, this.archiveBuilder.getEntityDef(OpenMetadataType.SOFTWARE_SERVER_PLATFORM.typeName), false); @@ -3192,12 +2560,8 @@ private ClassificationDef getCloudPlatformClassification() private ClassificationDef getCloudTenantClassification() { - ClassificationDef classificationDef = archiveHelper.getClassificationDef(OpenMetadataType.CLOUD_TENANT_CLASSIFICATION.typeGUID, - OpenMetadataType.CLOUD_TENANT_CLASSIFICATION.typeName, + ClassificationDef classificationDef = archiveHelper.getClassificationDef(OpenMetadataType.CLOUD_TENANT_CLASSIFICATION, null, - OpenMetadataType.CLOUD_TENANT_CLASSIFICATION.description, - OpenMetadataType.CLOUD_TENANT_CLASSIFICATION.descriptionGUID, - OpenMetadataType.CLOUD_TENANT_CLASSIFICATION.wikiURL, this.archiveBuilder.getEntityDef(OpenMetadataType.SOFTWARE_SERVER.typeName), false); @@ -3211,10 +2575,7 @@ private ClassificationDef getCloudTenantClassification() final String attribute2Description = "Description of the type of tenant."; final String attribute2DescriptionGUID = null; - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.TENANT_NAME.name, - OpenMetadataProperty.TENANT_NAME.description, - OpenMetadataProperty.TENANT_NAME.descriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.TENANT_NAME)); property = archiveHelper.getStringTypeDefAttribute(attribute2Name, attribute2Description, attribute2DescriptionGUID); @@ -3228,12 +2589,8 @@ private ClassificationDef getCloudTenantClassification() private ClassificationDef getCloudServiceClassification() { - ClassificationDef classificationDef = archiveHelper.getClassificationDef(OpenMetadataType.CLOUD_SERVICE_CLASSIFICATION.typeGUID, - OpenMetadataType.CLOUD_SERVICE_CLASSIFICATION.typeName, + ClassificationDef classificationDef = archiveHelper.getClassificationDef(OpenMetadataType.CLOUD_SERVICE_CLASSIFICATION, null, - OpenMetadataType.CLOUD_SERVICE_CLASSIFICATION.description, - OpenMetadataType.CLOUD_SERVICE_CLASSIFICATION.descriptionGUID, - OpenMetadataType.CLOUD_SERVICE_CLASSIFICATION.wikiURL, this.archiveBuilder.getEntityDef(OpenMetadataType.SOFTWARE_SERVER_CAPABILITY.typeName), false); @@ -3247,10 +2604,8 @@ private ClassificationDef getCloudServiceClassification() final String attribute2Description = "Description of the type of the service."; final String attribute2DescriptionGUID = null; - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.OFFERING_NAME.name, - OpenMetadataProperty.OFFERING_NAME.description, - OpenMetadataProperty.OFFERING_NAME.descriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.OFFERING_NAME)); + property = archiveHelper.getStringTypeDefAttribute(attribute2Name, attribute2Description, attribute2DescriptionGUID); @@ -3302,7 +2657,6 @@ private void add0110Actors() this.archiveBuilder.addRelationshipDef(getProfileIdentityRelationship()); } - private EnumDef getContactMethodTypeEnum() { EnumDef enumDef = archiveHelper.getEmptyEnumDef(ContactMethodType.getOpenTypeGUID(), @@ -3334,91 +2688,53 @@ private EnumDef getContactMethodTypeEnum() return enumDef; } - private EntityDef getActorProfileEntity() { - EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.ACTOR_PROFILE.typeGUID, - OpenMetadataType.ACTOR_PROFILE.typeName, - this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), - OpenMetadataType.ACTOR_PROFILE.description, - OpenMetadataType.ACTOR_PROFILE.descriptionGUID, - OpenMetadataType.ACTOR_PROFILE.wikiURL); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.ACTOR_PROFILE, + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName)); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.NAME.name, - OpenMetadataProperty.NAME.description, - OpenMetadataProperty.NAME.descriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.DESCRIPTION.name, - OpenMetadataProperty.DESCRIPTION.description, - OpenMetadataProperty.DESCRIPTION.descriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.NAME)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.DESCRIPTION)); entityDef.setPropertiesDefinition(properties); return entityDef; } - private EntityDef getUserIdentityEntity() { - return archiveHelper.getDefaultEntityDef(OpenMetadataType.USER_IDENTITY.typeGUID, - OpenMetadataType.USER_IDENTITY.typeName, - this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), - OpenMetadataType.USER_IDENTITY.description, - OpenMetadataType.USER_IDENTITY.descriptionGUID, - OpenMetadataType.USER_IDENTITY.wikiURL); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.USER_IDENTITY, + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName)); } - private EntityDef getContactDetailsEntity() { - EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.CONTACT_DETAILS.typeGUID, - OpenMetadataType.CONTACT_DETAILS.typeName, - this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), - OpenMetadataType.CONTACT_DETAILS.description, - OpenMetadataType.CONTACT_DETAILS.descriptionGUID, - OpenMetadataType.CONTACT_DETAILS.wikiURL); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.CONTACT_DETAILS, + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName)); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - property = archiveHelper.getEnumTypeDefAttribute(ContactMethodType.getOpenTypeName(), - OpenMetadataProperty.CONTACT_METHOD_TYPE.name, - OpenMetadataProperty.CONTACT_METHOD_TYPE.description, - OpenMetadataProperty.CONTACT_METHOD_TYPE.descriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.CONTACT_METHOD_VALUE.name, - OpenMetadataProperty.CONTACT_METHOD_VALUE.description, - OpenMetadataProperty.CONTACT_METHOD_VALUE.descriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.CONTACT_METHOD_SERVICE.name, - OpenMetadataProperty.CONTACT_METHOD_SERVICE.description, - OpenMetadataProperty.CONTACT_METHOD_SERVICE.descriptionGUID); - properties.add(property); + properties.add(archiveHelper.getEnumTypeDefAttribute(OpenMetadataProperty.CONTACT_METHOD_TYPE)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.CONTACT_METHOD_VALUE)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.CONTACT_METHOD_SERVICE)); entityDef.setPropertiesDefinition(properties); return entityDef; } - private RelationshipDef getContactThroughRelationship() { - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.CONTACT_THROUGH_RELATIONSHIP.typeGUID, - OpenMetadataType.CONTACT_THROUGH_RELATIONSHIP.typeName, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.CONTACT_THROUGH_RELATIONSHIP, null, - OpenMetadataType.CONTACT_THROUGH_RELATIONSHIP.description, - OpenMetadataType.CONTACT_THROUGH_RELATIONSHIP.descriptionGUID, - OpenMetadataType.CONTACT_THROUGH_RELATIONSHIP.wikiURL, ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -3455,15 +2771,10 @@ private RelationshipDef getContactThroughRelationship() return relationshipDef; } - private RelationshipDef getProfileIdentityRelationship() { - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.PROFILE_IDENTITY_RELATIONSHIP.typeGUID, - OpenMetadataType.PROFILE_IDENTITY_RELATIONSHIP.typeName, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.PROFILE_IDENTITY_RELATIONSHIP, null, - OpenMetadataType.PROFILE_IDENTITY_RELATIONSHIP.description, - OpenMetadataType.PROFILE_IDENTITY_RELATIONSHIP.descriptionGUID, - OpenMetadataType.PROFILE_IDENTITY_RELATIONSHIP.wikiURL, ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -3519,94 +2830,37 @@ private void add0112People() this.archiveBuilder.addRelationshipDef(getPeerRelationship()); } - private EntityDef getPersonEntity() { - EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.PERSON.typeGUID, - OpenMetadataType.PERSON.typeName, - this.archiveBuilder.getEntityDef(OpenMetadataType.ACTOR_PROFILE.typeName), - OpenMetadataType.PERSON.description, - OpenMetadataType.PERSON.descriptionGUID, - OpenMetadataType.PERSON.wikiURL); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.PERSON, + this.archiveBuilder.getEntityDef(OpenMetadataType.ACTOR_PROFILE.typeName)); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - - final String attribute1Name = "fullName"; - final String attribute1Description = "Full or official name of the individual (if different from known name)."; - final String attribute1DescriptionGUID = null; - - final String attribute2Name = "jobTitle"; - final String attribute2Description = "Role or level in the organization."; - final String attribute2DescriptionGUID = null; - - final String attribute3Name = OpenMetadataProperty.IS_PUBLIC.name; - final String attribute3Description = "Is the profile visible to other collaborators?"; - final String attribute3DescriptionGUID = null; - - property = archiveHelper.getStringTypeDefAttribute(attribute1Name, - attribute1Description, - attribute1DescriptionGUID); - properties.add(property); - - property = archiveHelper.getStringTypeDefAttribute(attribute2Name, - attribute2Description, - attribute2DescriptionGUID); - properties.add(property); - property = archiveHelper.getBooleanTypeDefAttribute(attribute3Name, - attribute3Description, - attribute3DescriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.FULL_NAME)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.JOB_TITLE)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.IS_PUBLIC)); entityDef.setPropertiesDefinition(properties); return entityDef; } - private EntityDef getContributionRecordEntity() { - final String guid = "ac406bf8-e53e-49f1-9088-2af28cccd285"; - final String name = "ContributionRecord"; - final String description = "A record of the contribution of an individual."; - final String descriptionGUID = null; - - final String superTypeName = OpenMetadataType.REFERENCEABLE.typeName; - - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.CONTRIBUTION_RECORD, + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName)); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - - - final String attribute1Name = OpenMetadataProperty.IS_PUBLIC.name; - final String attribute1Description = "Is the contribution visible to other collaborators?"; - final String attribute1DescriptionGUID = null; - final String attribute2Name = "karmaPoints"; - final String attribute2Description = "Points capturing a person's engagement with open metadata."; - final String attribute2DescriptionGUID = null; - - property = archiveHelper.getBooleanTypeDefAttribute(attribute1Name, - attribute1Description, - attribute1DescriptionGUID); - properties.add(property); - - property = archiveHelper.getLongTypeDefAttribute(attribute2Name, - attribute2Description, - attribute2DescriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.IS_PUBLIC)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.KARMA_POINTS)); entityDef.setPropertiesDefinition(properties); @@ -3615,235 +2869,148 @@ private EntityDef getContributionRecordEntity() private EntityDef getPersonRoleEntity() { - final String guid = "ac406bf8-e53e-49f1-9088-2af28bcbd285"; - final String name = "PersonRole"; - final String description = "A role performed by one or more individuals."; - final String descriptionGUID = null; - - final String superTypeName = OpenMetadataType.REFERENCEABLE.typeName; - - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.PERSON_ROLE, + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName)); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - - final String attribute3Name = "scope"; - final String attribute3Description = "Breadth of responsibility."; - final String attribute3DescriptionGUID = null; - - final String attribute4Name = "headCount"; - final String attribute4Description = "Number of people that can be appointed to the role."; - final String attribute4DescriptionGUID = null; - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.NAME.name, - OpenMetadataProperty.NAME.description, - OpenMetadataProperty.NAME.descriptionGUID); - properties.add(property); - - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.DESCRIPTION.name, - OpenMetadataProperty.DESCRIPTION.description, - OpenMetadataProperty.DESCRIPTION.descriptionGUID); - properties.add(property); - - property = archiveHelper.getStringTypeDefAttribute(attribute3Name, - attribute3Description, - attribute3DescriptionGUID); - properties.add(property); - - property = archiveHelper.getIntTypeDefAttribute(attribute4Name, - attribute4Description, - attribute4DescriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.NAME)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.DESCRIPTION)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.SCOPE)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.HEAD_COUNT)); entityDef.setPropertiesDefinition(properties); return entityDef; } - private RelationshipDef getPersonRoleAppointmentRelationship() { - final String guid = "4a316abe-bcce-4d11-ad5a-4bfb4079b80b"; - final String name = "PersonRoleAppointment"; - final String description = "Relationship identifying a person's roles."; - final String descriptionGUID = null; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, - name, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.PERSON_ROLE_APPOINTMENT_RELATIONSHIP, null, - description, - descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = "Person"; final String end1AttributeName = "rolePerformers"; final String end1AttributeDescription = "A person performing this role."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.PERSON.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = "PersonRole"; final String end2AttributeName = "performsRoles"; final String end2AttributeDescription = "A role performed by this person."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.PERSON_ROLE.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - - final String attribute1Name = OpenMetadataProperty.IS_PUBLIC.name; - final String attribute1Description = "Is the appointment visible to more than the role owner and appointee?"; - final String attribute1DescriptionGUID = null; - property = archiveHelper.getBooleanTypeDefAttribute(attribute1Name, - attribute1Description, - attribute1DescriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.IS_PUBLIC)); relationshipDef.setPropertiesDefinition(properties); return relationshipDef; } - private RelationshipDef getPersonalContributionRelationship() { - final String guid = "4a316abe-eeee-4d11-ad5a-4bfb4079b80b"; - final String name = "PersonalContribution"; - final String description = "Relationship identifying a person's contribution record."; - final String descriptionGUID = null; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, - name, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.PERSONAL_CONTRIBUTION_RELATIONSHIP, null, - description, - descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = "Person"; final String end1AttributeName = "contributor"; final String end1AttributeDescription = "The person behind the contribution."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.AT_MOST_ONE; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.PERSON.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = "ContributionRecord"; final String end2AttributeName = "contributionRecord"; final String end2AttributeDescription = "The record of activity by this person."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.AT_MOST_ONE; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.CONTRIBUTION_RECORD.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; } - private RelationshipDef getPeerRelationship() { - final String guid = "4a316abe-bccd-4d11-ad5a-4bfb4079b80b"; - final String name = "Peer"; - final String description = "Relationship identifying a person's peer network."; - final String descriptionGUID = null; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, - name, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.PEER_RELATIONSHIP, null, - description, - descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = "Person"; final String end1AttributeName = "peers"; final String end1AttributeDescription = "List of this person's peer network."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.PERSON.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = "Person"; final String end2AttributeName = "peers"; final String end2AttributeDescription = "List of this person's peer network."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.PERSON.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -3868,37 +3035,17 @@ private void add0115Teams() this.archiveBuilder.addRelationshipDef(getTeamStructureRelationship()); } - private EntityDef getTeamEntity() { - final String guid = "36db26d5-aba2-439b-bc15-d62d373c5db6"; - final String name = "Team"; - final String description = "Group of people working together."; - final String descriptionGUID = null; - - final String superTypeName = "ActorProfile"; - - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(OpenMetadataType.ACTOR_PROFILE.typeName), - description, - descriptionGUID); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.TEAM, + this.archiveBuilder.getEntityDef(OpenMetadataType.ACTOR_PROFILE.typeName)); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - final String attribute1Name = "teamType"; - final String attribute1Description = "Type of team, such as department."; - final String attribute1DescriptionGUID = null; - - - property = archiveHelper.getStringTypeDefAttribute(attribute1Name, - attribute1Description, - attribute1DescriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.TEAM_TYPE)); entityDef.setPropertiesDefinition(properties); @@ -3907,85 +3054,50 @@ private EntityDef getTeamEntity() private EntityDef getTeamLeaderEntity() { - final String guid = "36db26d5-abb2-439b-bc15-d62d373c5db6"; - final String name = "TeamLeader"; - final String description = "Person leading a team."; - final String descriptionGUID = null; - - final String superTypeName = "PersonRole"; - - return archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.TEAM_LEADER, + this.archiveBuilder.getEntityDef(OpenMetadataType.PERSON_ROLE.typeName)); } private EntityDef getTeamMemberEntity() { - final String guid = "46db26d5-abb2-538b-bc15-d62d373c5db6"; - final String name = "TeamMember"; - final String description = "Person assigned to a team."; - final String descriptionGUID = null; - - final String superTypeName = "PersonRole"; - - return archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.TEAM_MEMBER, + this.archiveBuilder.getEntityDef(OpenMetadataType.PERSON_ROLE.typeName)); } private RelationshipDef getTeamStructureRelationship() { - final String guid = "5ebc4fb2-b62a-4269-8f18-e9237a2229ca"; - final String name = "TeamStructure"; - final String description = "Relationship identifying a team hierarchy."; - final String descriptionGUID = null; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, - name, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.TEAM_STRUCTURE_RELATIONSHIP, null, - description, - descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = "Team"; final String end1AttributeName = "superTeam"; final String end1AttributeDescription = "The aggregating team."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.AT_MOST_ONE; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.TEAM.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef1(relationshipEndDef); - /* * Set up end 2. */ - final String end2EntityType = "Team"; final String end2AttributeName = "subTeam"; final String end2AttributeDescription = "The teams where work is delegated to."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.TEAM.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -3994,13 +3106,9 @@ private RelationshipDef getTeamStructureRelationship() List properties = new ArrayList<>(); TypeDefAttribute property; - final String attribute1Name = "delegationEscalationAuthority"; - final String attribute1Description = "Can delegations and escalations flow on this relationship."; - final String attribute1DescriptionGUID = null; - - property = archiveHelper.getBooleanTypeDefAttribute(attribute1Name, - attribute1Description, - attribute1DescriptionGUID); + property = archiveHelper.getBooleanTypeDefAttribute(OpenMetadataProperty.DELEGATION_ESCALATION.name, + OpenMetadataProperty.DELEGATION_ESCALATION.description, + OpenMetadataProperty.DELEGATION_ESCALATION.descriptionGUID); properties.add(property); relationshipDef.setPropertiesDefinition(properties); @@ -4008,79 +3116,54 @@ private RelationshipDef getTeamStructureRelationship() return relationshipDef; } - private RelationshipDef getTeamLeadershipRelationship() { - final String guid = "5ebc4fb2-b62a-4269-8f18-e9237a2119ca"; - final String name = "TeamLeadership"; - final String description = "Relationship identifying the leaders of teams."; - final String descriptionGUID = null; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, - name, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.TEAM_LEADERSHIP_RELATIONSHIP, null, - description, - descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = "TeamLeader"; final String end1AttributeName = "teamLeaders"; final String end1AttributeDescription = "The leaders of the team."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.TEAM_LEADER.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); - /* * Set up end 2. */ - final String end2EntityType = "Team"; final String end2AttributeName = "leadsTeam"; final String end2AttributeDescription = "The team lead by this team leader."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.AT_MOST_ONE; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.TEAM.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef2(relationshipEndDef); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - final String attribute1Name = "position"; - final String attribute1Description = "Details of the type of leadership position, eg deputy."; - final String attribute1DescriptionGUID = null; - - property = archiveHelper.getStringTypeDefAttribute(attribute1Name, - attribute1Description, - attribute1DescriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.ROLE_POSITION)); relationshipDef.setPropertiesDefinition(properties); return relationshipDef; } - private RelationshipDef getTeamMembershipRelationship() { final String guid = "1ebc4fb2-b62a-4269-8f18-e9237a2119ca"; @@ -4088,64 +3171,50 @@ private RelationshipDef getTeamMembershipRelationship() final String description = "Relationship identifying the members of teams."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = "TeamMember"; final String end1AttributeName = "teamMembers"; final String end1AttributeDescription = "The members of the team."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.TEAM_MEMBER.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = "Team"; final String end2AttributeName = "memberOfTeam"; final String end2AttributeDescription = "The team that this person is a member of."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.AT_MOST_ONE; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.TEAM.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef2(relationshipEndDef); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - - final String attribute1Name = "position"; - final String attribute1Description = "Details of the type of membership position, if any."; - final String attribute1DescriptionGUID = null; - property = archiveHelper.getStringTypeDefAttribute(attribute1Name, - attribute1Description, - attribute1DescriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.ROLE_POSITION)); relationshipDef.setPropertiesDefinition(properties); @@ -4168,18 +3237,8 @@ private void add0117EngineProfiles() private EntityDef getITProfileEntity() { - final String guid = "81394f85-6008-465b-926e-b3fae4668937"; - final String name = "ITProfile"; - final String description = "Descriptive details about a processing engine or other IT infrastructure."; - final String descriptionGUID = null; - - final String superTypeName = "ActorProfile"; - - return archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(OpenMetadataType.ACTOR_PROFILE.typeName), - description, - descriptionGUID); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.IT_PROFILE, + this.archiveBuilder.getEntityDef(OpenMetadataType.ACTOR_PROFILE.typeName)); } @@ -4207,12 +3266,10 @@ private void add0120Collections() private EnumDef getOrderByEnum() { - final String guid = OrderBy.getOpenTypeGUID(); - final String name = OrderBy.getOpenTypeName(); - final String description = OrderBy.getOpenTypeDescription(); - final String descriptionGUID = OrderBy.getOpenTypeDescriptionGUID(); - - EnumDef enumDef = archiveHelper.getEmptyEnumDef(guid, name, description, descriptionGUID); + EnumDef enumDef = archiveHelper.getEmptyEnumDef(OrderBy.getOpenTypeGUID(), + OrderBy.getOpenTypeName(), + OrderBy.getOpenTypeDescription(), + OrderBy.getOpenTypeDescriptionGUID()); ArrayList elementDefs = new ArrayList<>(); EnumElementDef elementDef; @@ -4240,35 +3297,16 @@ private EnumDef getOrderByEnum() private EntityDef getCollectionEntity() { - final String guid = OpenMetadataType.COLLECTION.typeGUID; - final String name = OpenMetadataType.COLLECTION.typeName; - final String description = OpenMetadataType.COLLECTION.description; - final String descriptionGUID = OpenMetadataType.COLLECTION.descriptionGUID; - final String descriptionWiki = OpenMetadataType.COLLECTION.wikiURL; - - final String superTypeName = OpenMetadataType.REFERENCEABLE.typeName; - - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID, - descriptionWiki); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.COLLECTION, + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName)); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.NAME.name, - OpenMetadataProperty.NAME.description, - OpenMetadataProperty.NAME.descriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.DESCRIPTION.name, - OpenMetadataProperty.DESCRIPTION.description, - OpenMetadataProperty.DESCRIPTION.descriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.NAME)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.DESCRIPTION)); entityDef.setPropertiesDefinition(properties); @@ -4278,71 +3316,47 @@ private EntityDef getCollectionEntity() private RelationshipDef getCollectionMembershipRelationship() { - final String guid = OpenMetadataType.COLLECTION_MEMBERSHIP_RELATIONSHIP.typeGUID; - final String name = OpenMetadataType.COLLECTION_MEMBERSHIP_RELATIONSHIP.typeName; - final String description = OpenMetadataType.COLLECTION_MEMBERSHIP_RELATIONSHIP.description; - final String descriptionGUID = OpenMetadataType.COLLECTION_MEMBERSHIP_RELATIONSHIP.descriptionGUID; - final String descriptionWiki = OpenMetadataType.COLLECTION_MEMBERSHIP_RELATIONSHIP.wikiURL; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, - name, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.COLLECTION_MEMBERSHIP_RELATIONSHIP, null, - description, - descriptionGUID, - descriptionWiki, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.COLLECTION.typeName; final String end1AttributeName = "foundInCollections"; final String end1AttributeDescription = "Collections that link to this element."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.COLLECTION.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.REFERENCEABLE.typeName; final String end2AttributeName = "collectionMembers"; final String end2AttributeDescription = "Members of this collection."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - final String attribute1Name = OpenMetadataProperty.MEMBERSHIP_RATIONALE.name; - final String attribute1Description = OpenMetadataProperty.MEMBERSHIP_RATIONALE.description; - final String attribute1DescriptionGUID = OpenMetadataProperty.MEMBERSHIP_RATIONALE.descriptionGUID; - - property = archiveHelper.getStringTypeDefAttribute(attribute1Name, - attribute1Description, - attribute1DescriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.MEMBERSHIP_RATIONALE)); relationshipDef.setPropertiesDefinition(properties); @@ -4352,55 +3366,39 @@ private RelationshipDef getCollectionMembershipRelationship() private RelationshipDef getResourceListRelationship() { - final String guid = OpenMetadataType.RESOURCE_LIST_RELATIONSHIP.typeGUID; - final String name = OpenMetadataType.RESOURCE_LIST_RELATIONSHIP.typeName; - final String description = OpenMetadataType.RESOURCE_LIST_RELATIONSHIP.description; - final String descriptionGUID = OpenMetadataType.RESOURCE_LIST_RELATIONSHIP.descriptionGUID; - final String descriptionWiki = OpenMetadataType.RESOURCE_LIST_RELATIONSHIP.wikiURL; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, - name, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.RESOURCE_LIST_RELATIONSHIP, null, - description, - descriptionGUID, - descriptionWiki, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.REFERENCEABLE.typeName; final String end1AttributeName = "resourceListAnchors"; final String end1AttributeDescription = "Referenceable objects that are using the linked to resource."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.REFERENCEABLE.typeName; final String end2AttributeName = "supportingResources"; final String end2AttributeDescription = "Resources identified as of interest to the anchor."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -4447,68 +3445,29 @@ private RelationshipDef getResourceListRelationship() private ClassificationDef getFolderClassification() { - final String guid = OpenMetadataType.FOLDER.typeGUID; - final String name = OpenMetadataType.FOLDER.typeName; - final String description = OpenMetadataType.FOLDER.description; - final String descriptionGUID = OpenMetadataType.FOLDER.descriptionGUID; - - final String linkedToEntity = OpenMetadataType.COLLECTION.typeName; - - ClassificationDef classificationDef = archiveHelper.getClassificationDef(guid, - name, + ClassificationDef classificationDef = archiveHelper.getClassificationDef(OpenMetadataType.FOLDER, null, - description, - descriptionGUID, - this.archiveBuilder.getEntityDef( - linkedToEntity), + this.archiveBuilder.getEntityDef(OpenMetadataType.COLLECTION.typeName), false); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - final String attribute1Name = "orderBy"; - final String attribute1Description = "Definition for how elements in the collection should be ordered."; - final String attribute1DescriptionGUID = null; - final String attribute2Name = "orderPropertyName"; - final String attribute2Description = "Name of property to use for ordering."; - final String attribute2DescriptionGUID = null; - - property = archiveHelper.getEnumTypeDefAttribute("OrderBy", - attribute1Name, - attribute1Description, - attribute1DescriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(attribute2Name, - attribute2Description, - attribute2DescriptionGUID); - properties.add(property); + properties.add(archiveHelper.getEnumTypeDefAttribute(OpenMetadataProperty.COLLECTION_ORDER)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.ORDER_BY_PROPERTY_NAME)); classificationDef.setPropertiesDefinition(properties); return classificationDef; } - private ClassificationDef getSetClassification() { - final String guid = OpenMetadataType.RESULTS_SET.typeGUID; - final String name = OpenMetadataType.RESULTS_SET.typeName; - final String description = OpenMetadataType.RESULTS_SET.description; - final String descriptionGUID = OpenMetadataType.RESULTS_SET.descriptionGUID; - final String descriptionWiki = OpenMetadataType.RESULTS_SET.wikiURL; - - final String linkedToEntity = OpenMetadataType.COLLECTION.typeName; - - return archiveHelper.getClassificationDef(guid, - name, - null, - description, - descriptionGUID, - descriptionWiki, - this.archiveBuilder.getEntityDef(linkedToEntity), + return archiveHelper.getClassificationDef(OpenMetadataType.RESULTS_SET, + null, + this.archiveBuilder.getEntityDef(OpenMetadataType.COLLECTION.typeName), false); } @@ -4538,20 +3497,8 @@ private void add0130Projects() private EntityDef getProjectEntity() { - final String guid = OpenMetadataType.PROJECT.typeGUID; - final String name = OpenMetadataType.PROJECT.typeName; - final String description = OpenMetadataType.PROJECT.description; - final String descriptionGUID = OpenMetadataType.PROJECT.descriptionGUID; - final String descriptionWiki = OpenMetadataType.PROJECT.wikiURL; - - final String superTypeName = OpenMetadataType.REFERENCEABLE.typeName; - - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID, - descriptionWiki); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.PROJECT, + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName)); /* * Build the attributes @@ -4598,74 +3545,46 @@ private EntityDef getProjectEntity() private EntityDef getProjectManagerEntity() { - final String guid = OpenMetadataType.PROJECT_MANAGER.typeGUID; - final String name = OpenMetadataType.PROJECT_MANAGER.typeName; - final String description = OpenMetadataType.PROJECT_MANAGER.description; - final String descriptionGUID = OpenMetadataType.PROJECT_MANAGER.descriptionGUID; - final String descriptionWiki = OpenMetadataType.PROJECT_MANAGER.wikiURL; - - final String superTypeName = "PersonRole"; - - return archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID, - descriptionWiki); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.PROJECT_MANAGER, + this.archiveBuilder.getEntityDef(OpenMetadataType.PERSON_ROLE.typeName)); } private RelationshipDef getProjectHierarchyRelationship() { - final String guid = OpenMetadataType.PROJECT_HIERARCHY_RELATIONSHIP.typeGUID; - final String name = OpenMetadataType.PROJECT_HIERARCHY_RELATIONSHIP.typeName; - final String description = OpenMetadataType.PROJECT_HIERARCHY_RELATIONSHIP.description; - final String descriptionGUID = OpenMetadataType.PROJECT_HIERARCHY_RELATIONSHIP.descriptionGUID; - final String descriptionWiki = OpenMetadataType.PROJECT_HIERARCHY_RELATIONSHIP.wikiURL; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, - name, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.PROJECT_HIERARCHY_RELATIONSHIP, null, - description, - descriptionGUID, - descriptionWiki, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.PROJECT.typeName; final String end1AttributeName = "managingProject"; final String end1AttributeDescription = "Project that oversees this project."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.AT_MOST_ONE; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.PROJECT.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.PROJECT.typeName; final String end2AttributeName = "managedProject"; final String end2AttributeDescription = "Project that this project is responsible for managing."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.PROJECT.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -4674,71 +3593,47 @@ private RelationshipDef getProjectHierarchyRelationship() private RelationshipDef getProjectDependencyRelationship() { - final String guid = OpenMetadataType.PROJECT_DEPENDENCY_RELATIONSHIP.typeGUID; - final String name = OpenMetadataType.PROJECT_DEPENDENCY_RELATIONSHIP.typeName; - final String description = OpenMetadataType.PROJECT_DEPENDENCY_RELATIONSHIP.description; - final String descriptionGUID = OpenMetadataType.PROJECT_DEPENDENCY_RELATIONSHIP.descriptionGUID; - final String descriptionWiki = OpenMetadataType.PROJECT_DEPENDENCY_RELATIONSHIP.wikiURL; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, - name, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.PROJECT_DEPENDENCY_RELATIONSHIP, null, - description, - descriptionGUID, - descriptionWiki, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.PROJECT.typeName; final String end1AttributeName = "dependentProject"; final String end1AttributeDescription = "Projects that are dependent on this project."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.PROJECT.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.PROJECT.typeName; final String end2AttributeName = "dependsOnProjects"; final String end2AttributeDescription = "Projects that are delivering resources or outcomes needed by this project."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.PROJECT.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - - final String attribute1Name = "dependencySummary"; - final String attribute1Description = "Reasons for the project dependency."; - final String attribute1DescriptionGUID = null; - property = archiveHelper.getDateTypeDefAttribute(attribute1Name, - attribute1Description, - attribute1DescriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.DEPENDENCY_SUMMARY)); relationshipDef.setPropertiesDefinition(properties); @@ -4748,49 +3643,33 @@ private RelationshipDef getProjectDependencyRelationship() private RelationshipDef getProjectTeamRelationship() { - final String guid = OpenMetadataType.PROJECT_TEAM_RELATIONSHIP.typeGUID; - final String name = OpenMetadataType.PROJECT_TEAM_RELATIONSHIP.typeName; - final String description = OpenMetadataType.PROJECT_TEAM_RELATIONSHIP.description; - final String descriptionGUID = OpenMetadataType.PROJECT_TEAM_RELATIONSHIP.descriptionGUID; - final String descriptionWiki = OpenMetadataType.PROJECT_TEAM_RELATIONSHIP.wikiURL; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, - name, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.PROJECT_TEAM_RELATIONSHIP, null, - description, - descriptionGUID, - descriptionWiki, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.PROJECT.typeName; final String end1AttributeName = "projectFocus"; final String end1AttributeDescription = "Projects that a team is working on."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.PROJECT.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = "ActorProfile"; final String end2AttributeName = "supportingActors"; final String end2AttributeDescription = "People and teams supporting this project."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.ACTOR_PROFILE.typeName), end2AttributeName, @@ -4803,16 +3682,8 @@ private RelationshipDef getProjectTeamRelationship() * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - - final String attribute1Name = "teamRole"; - final String attribute1Description = "Description of the role of the team in the project."; - final String attribute1DescriptionGUID = null; - property = archiveHelper.getDateTypeDefAttribute(attribute1Name, - attribute1Description, - attribute1DescriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.TEAM_ROLE)); relationshipDef.setPropertiesDefinition(properties); @@ -4827,48 +3698,42 @@ private RelationshipDef getProjectScopeRelationship() final String description = "The documentation, assets and definitions that are affected by the project."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.PROJECT.typeName; final String end1AttributeName = "impactingProjects"; final String end1AttributeDescription = "The projects that are making changes to these elements."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.PROJECT.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.REFERENCEABLE.typeName; final String end2AttributeName = "projectScope"; final String end2AttributeDescription = "The elements that are being changed by this project."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -4899,76 +3764,48 @@ private RelationshipDef getProjectScopeRelationship() */ private ClassificationDef getTaskClassification() { - final String guid = OpenMetadataType.TASK_CLASSIFICATION.typeGUID; - final String name = OpenMetadataType.TASK_CLASSIFICATION.typeName; - final String description = OpenMetadataType.TASK_CLASSIFICATION.description; - final String descriptionGUID = OpenMetadataType.TASK_CLASSIFICATION.descriptionGUID; - final String descriptionWiki = OpenMetadataType.TASK_CLASSIFICATION.wikiURL; - - final String linkedToEntity = OpenMetadataType.PROJECT.typeName; - - return archiveHelper.getClassificationDef(guid, - name, + return archiveHelper.getClassificationDef(OpenMetadataType.TASK_CLASSIFICATION, null, - description, - descriptionGUID, - descriptionWiki, - this.archiveBuilder.getEntityDef(linkedToEntity), + this.archiveBuilder.getEntityDef(OpenMetadataType.PROJECT.typeName), false); } private RelationshipDef getProjectManagementRelationship() { - final String guid = OpenMetadataType.PROJECT_MANAGEMENT_RELATIONSHIP.typeGUID; - final String name = OpenMetadataType.PROJECT_MANAGEMENT_RELATIONSHIP.typeName; - final String description = OpenMetadataType.PROJECT_MANAGEMENT_RELATIONSHIP.description; - final String descriptionGUID = OpenMetadataType.PROJECT_MANAGEMENT_RELATIONSHIP.descriptionGUID; - final String descriptionWiki = OpenMetadataType.PROJECT_MANAGEMENT_RELATIONSHIP.wikiURL; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, - name, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.PROJECT_MANAGEMENT_RELATIONSHIP, null, - description, - descriptionGUID, - descriptionWiki, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.PROJECT.typeName; final String end1AttributeName = "projectsManaged"; final String end1AttributeDescription = "The projects that are being managed by this project manager."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.PROJECT.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.PROJECT_MANAGER.typeName; final String end2AttributeName = "projectManagers"; final String end2AttributeDescription = "The roles for managing this project."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.PROJECT_MANAGER.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -4976,21 +3813,9 @@ private RelationshipDef getProjectManagementRelationship() private ClassificationDef getCampaignClassification() { - final String guid = OpenMetadataType.CAMPAIGN_CLASSIFICATION.typeGUID; - final String name = OpenMetadataType.CAMPAIGN_CLASSIFICATION.typeName; - final String description = OpenMetadataType.CAMPAIGN_CLASSIFICATION.description; - final String descriptionGUID = OpenMetadataType.CAMPAIGN_CLASSIFICATION.descriptionGUID; - final String descriptionWiki = OpenMetadataType.CAMPAIGN_CLASSIFICATION.wikiURL; - - final String linkedToEntity = OpenMetadataType.COLLECTION.typeName; - - return archiveHelper.getClassificationDef(guid, - name, + return archiveHelper.getClassificationDef(OpenMetadataType.CAMPAIGN_CLASSIFICATION, null, - description, - descriptionGUID, - descriptionWiki, - this.archiveBuilder.getEntityDef(linkedToEntity), + this.archiveBuilder.getEntityDef(OpenMetadataType.COLLECTION.typeName), false); } @@ -5012,61 +3837,19 @@ private void add0135Meetings() private EntityDef getMeetingEntity() { - final String guid = "6bf90c79-32f4-47ad-959c-8fff723fe744"; - final String name = "Meeting"; - final String description = "Two or more people come together to discuss a topic, agree and action or exchange information."; - final String descriptionGUID = null; - - final String superTypeName = OpenMetadataType.REFERENCEABLE.typeName; - - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.MEETING, + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName)); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - - final String attribute1Name = "title"; - final String attribute1Description = "Title of the meeting."; - final String attribute1DescriptionGUID = null; - final String attribute2Name = "startTime"; - final String attribute2Description = "Start time of the meeting."; - final String attribute2DescriptionGUID = null; - final String attribute3Name = "endTime"; - final String attribute3Description = "End time of the meeting."; - final String attribute3DescriptionGUID = null; - final String attribute4Name = "objective"; - final String attribute4Description = "Reason for the meeting and intended outcome."; - final String attribute4DescriptionGUID = null; - final String attribute5Name = "minutes"; - final String attribute5Description = "Description of what happened at the meeting."; - final String attribute5DescriptionGUID = null; - property = archiveHelper.getStringTypeDefAttribute(attribute1Name, - attribute1Description, - attribute1DescriptionGUID); - properties.add(property); - property = archiveHelper.getDateTypeDefAttribute(attribute2Name, - attribute2Description, - attribute2DescriptionGUID); - properties.add(property); - property = archiveHelper.getDateTypeDefAttribute(attribute3Name, - attribute3Description, - attribute3DescriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(attribute4Name, - attribute4Description, - attribute4DescriptionGUID); - properties.add(property); - property = archiveHelper.getArrayStringTypeDefAttribute(attribute5Name, - attribute5Description, - attribute5DescriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.TITLE)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.START_TIME)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.END_TIME)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.OBJECTIVE)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.MINUTES)); entityDef.setPropertiesDefinition(properties); @@ -5075,53 +3858,39 @@ private EntityDef getMeetingEntity() private RelationshipDef getMeetingsRelationship() { - final String guid = "a05f918e-e7e2-419d-8016-5b37406df63a"; - final String name = "Meetings"; - final String description = "A meeting about a specific project, deliverable, situation or plan of action."; - final String descriptionGUID = null; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, - name, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.MEETINGS, null, - description, - descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = "Meeting"; final String end1AttributeName = "meetings"; final String end1AttributeDescription = "Related meetings."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.MEETING.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.REFERENCEABLE.typeName; final String end2AttributeName = "meetingOwner"; final String end2AttributeDescription = "Person, project, community or team that called the meeting."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.AT_MOST_ONE; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -5132,7 +3901,7 @@ private RelationshipDef getMeetingsRelationship() */ /** - * 0135 Meetings defines how to record meetings and todos. + * 0137 - Actions for People */ private void add0137Actions() { @@ -5180,64 +3949,21 @@ private EnumDef getToDoStatusEnum() private EntityDef getToDoEntity() { - EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.TO_DO.typeGUID, - OpenMetadataType.TO_DO.typeName, - this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), - OpenMetadataType.TO_DO.description, - OpenMetadataType.TO_DO.descriptionGUID, - OpenMetadataType.TO_DO.wikiURL); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.TO_DO, + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName)); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - final String attribute3Name = "creationTime"; - final String attribute3Description = "When the requested action was identified."; - final String attribute3DescriptionGUID = null; - final String attribute4Name = OpenMetadataProperty.PRIORITY.name; - final String attribute4Description = OpenMetadataProperty.PRIORITY.description; - final String attribute4DescriptionGUID = OpenMetadataProperty.PRIORITY.descriptionGUID; - final String attribute5Name = "dueTime"; - final String attribute5Description = "When the requested action needs to be completed."; - final String attribute5DescriptionGUID = null; - final String attribute6Name = OpenMetadataProperty.TO_DO_STATUS.name; - final String attribute6Description = OpenMetadataProperty.TO_DO_STATUS.description; - final String attribute6DescriptionGUID = OpenMetadataProperty.TO_DO_STATUS.descriptionGUID; - final String attribute7Name = "completionTime"; - final String attribute7Description = "When the requested action was completed."; - final String attribute7DescriptionGUID = null; - - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.NAME.name, - OpenMetadataProperty.NAME.description, - OpenMetadataProperty.NAME.descriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.DESCRIPTION.name, - OpenMetadataProperty.DESCRIPTION.description, - OpenMetadataProperty.DESCRIPTION.descriptionGUID); - properties.add(property); - property = archiveHelper.getDateTypeDefAttribute(attribute3Name, - attribute3Description, - attribute3DescriptionGUID); - properties.add(property); - property = archiveHelper.getIntTypeDefAttribute(attribute4Name, - attribute4Description, - attribute4DescriptionGUID); - properties.add(property); - property = archiveHelper.getDateTypeDefAttribute(attribute5Name, - attribute5Description, - attribute5DescriptionGUID); - properties.add(property); - property = archiveHelper.getEnumTypeDefAttribute(ToDoStatus.getOpenTypeName(), - attribute6Name, - attribute6Description, - attribute6DescriptionGUID); - properties.add(property); - property = archiveHelper.getDateTypeDefAttribute(attribute7Name, - attribute7Description, - attribute7DescriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.NAME)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.DESCRIPTION)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.CREATION_TIME)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.PRIORITY)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.DUE_TIME)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.COMPLETION_TIME)); + properties.add(archiveHelper.getEnumTypeDefAttribute(OpenMetadataProperty.TO_DO_STATUS)); entityDef.setPropertiesDefinition(properties); @@ -5247,53 +3973,39 @@ private EntityDef getToDoEntity() private RelationshipDef getToDoSourceRelationship() { - final String guid = "a0b7ba50-4c97-4b76-9a7d-c6a00e1be646"; - final String name = "ToDoSource"; - final String description = "The source of the to do, such as a person, meeting or a governance action."; - final String descriptionGUID = null; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, - name, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.TO_DO_SOURCE_RELATIONSHIP, null, - description, - descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.REFERENCEABLE.typeName; final String end1AttributeName = "actionSource"; final String end1AttributeDescription = "Source of the to do request."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.AT_MOST_ONE; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = "ToDo"; final String end2AttributeName = "actions"; final String end2AttributeDescription = "Requests to perform actions related to this element."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.TO_DO.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -5302,53 +4014,39 @@ private RelationshipDef getToDoSourceRelationship() private RelationshipDef getActionSponsorRelationship() { - final String guid = "aca1277b-bf1c-42f5-9b3b-fbc2c9047325"; - final String name = "ActionSponsor"; - final String description = "Identifies the sponsor that requires the action (ToDo) to be completed."; - final String descriptionGUID = null; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, - name, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.ACTION_SPONSOR_RELATIONSHIP, null, - description, - descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.REFERENCEABLE.typeName; final String end1AttributeName = "toDoSponsor"; final String end1AttributeDescription = "Element such as person, team, rule, incident, project, that is driving the need for the action."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = "ToDo"; final String end2AttributeName = "trackedActions"; final String end2AttributeDescription = "Actions that need to be completed."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.TO_DO.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -5356,53 +4054,39 @@ private RelationshipDef getActionSponsorRelationship() private RelationshipDef getActionAssignment() { - final String guid = "af2b5fab-8f83-4a2b-b749-1e6219f61f79"; - final String name = "ActionAssignment"; - final String description = "A person who has been assigned to complete the to do (action)."; - final String descriptionGUID = null; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, - name, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.ACTION_ASSIGNMENT_RELATIONSHIP, null, - description, - descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = "PersonRole"; final String end1AttributeName = "assignedResources"; final String end1AttributeDescription = "One or more people assigned to complete the action (to do)."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.PERSON_ROLE.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = "ToDo"; final String end2AttributeName = "toDoList"; final String end2AttributeDescription = "List of toDos assigned to this person's role."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.TO_DO.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -5412,7 +4096,6 @@ private RelationshipDef getActionAssignment() * ------------------------------------------------------------------------------------------------------- */ - /** * 0140 Communities describe communities of people who have similar interests. */ @@ -5426,208 +4109,103 @@ private void add0140Communities() this.archiveBuilder.addRelationshipDef(getCommunityMembershipRelationship()); } - private EnumDef getCommunityMembershipTypeEnum() { - final String guid = "b0ef45bf-d12b-4b6f-add6-59c14648d750"; - final String name = "CommunityMembershipType"; - final String description = "Type of membership to a community."; - final String descriptionGUID = null; - - EnumDef enumDef = archiveHelper.getEmptyEnumDef(guid, name, description, descriptionGUID); - + EnumDef enumDef = archiveHelper.getEmptyEnumDef(CommunityMembershipType.getOpenTypeGUID(), + CommunityMembershipType.getOpenTypeName(), + CommunityMembershipType.getOpenTypeDescription(), + CommunityMembershipType.getOpenTypeDescriptionGUID()); ArrayList elementDefs = new ArrayList<>(); EnumElementDef elementDef; - final int element1Ordinal = 0; - final String element1Value = "Contributor"; - final String element1Description = "Participant in the community."; - final String element1DescriptionGUID = null; - - elementDef = archiveHelper.getEnumElementDef(element1Ordinal, - element1Value, - element1Description, - element1DescriptionGUID); - elementDefs.add(elementDef); - - final int element2Ordinal = 1; - final String element2Value = "Administrator"; - final String element2Description = "Administrator of the community."; - final String element2DescriptionGUID = null; - - elementDef = archiveHelper.getEnumElementDef(element2Ordinal, - element2Value, - element2Description, - element2DescriptionGUID); - elementDefs.add(elementDef); - - final int element3Ordinal = 2; - final String element3Value = "Leader"; - final String element3Description = "Leader of the community."; - final String element3DescriptionGUID = null; - - elementDef = archiveHelper.getEnumElementDef(element3Ordinal, - element3Value, - element3Description, - element3DescriptionGUID); - elementDefs.add(elementDef); - - final int element4Ordinal = 3; - final String element4Value = "Observer"; - final String element4Description = "Observer of the community."; - final String element4DescriptionGUID = null; - - elementDef = archiveHelper.getEnumElementDef(element4Ordinal, - element4Value, - element4Description, - element4DescriptionGUID); - elementDefs.add(elementDef); + for (GovernanceDomain enumValue : GovernanceDomain.values()) + { + elementDef = archiveHelper.getEnumElementDef(enumValue.getOrdinal(), + enumValue.getName(), + enumValue.getDescription(), + enumValue.getDescriptionGUID()); - final int element99Ordinal = 99; - final String element99Value = "Other"; - final String element99Description = "Another role in the community."; - final String element99DescriptionGUID = null; + elementDefs.add(elementDef); - elementDef = archiveHelper.getEnumElementDef(element99Ordinal, - element99Value, - element99Description, - element99DescriptionGUID); - elementDefs.add(elementDef); + if (enumValue.isDefault()) + { + enumDef.setDefaultValue(elementDef); + } + } enumDef.setElementDefs(elementDefs); return enumDef; } - private EntityDef getCommunityEntity() { - final String guid = "fbd42379-f6c3-4f08-b6f7-378565cda993"; - final String name = "Community"; - final String description = "A group of people with a common interest or skill."; - final String descriptionGUID = null; - - final String superTypeName = OpenMetadataType.REFERENCEABLE.typeName; - - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.COMMUNITY, + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName)); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - - final String attribute3Name = "mission"; - final String attribute3Description = "Purpose of the community."; - final String attribute3DescriptionGUID = null; - - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.NAME.name, - OpenMetadataProperty.NAME.description, - OpenMetadataProperty.NAME.descriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.DESCRIPTION.name, - OpenMetadataProperty.DESCRIPTION.description, - OpenMetadataProperty.DESCRIPTION.descriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(attribute3Name, - attribute3Description, - attribute3DescriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.NAME)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.DESCRIPTION)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.MISSION)); entityDef.setPropertiesDefinition(properties); return entityDef; } - private EntityDef getCommunityMemberEntity() { - final String guid = "fbd42379-f6c3-4f09-b6f7-378565cda993"; - final String name = "CommunityMember"; - final String description = "A person who has joined a community."; - final String descriptionGUID = null; - - final String superTypeName = "PersonRole"; - - return archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.COMMUNITY_MEMBER, + this.archiveBuilder.getEntityDef(OpenMetadataType.PERSON_ROLE.typeName)); } - private RelationshipDef getCommunityMembershipRelationship() { - final String guid = "7c7da1a3-01b3-473e-972e-606eff0cb112"; - final String name = "CommunityMembership"; - final String description = "Associates an actor profile with a community."; - final String descriptionGUID = null; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, - name, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.COMMUNITY_MEMBERSHIP_RELATIONSHIP, null, - description, - descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = "Community"; final String end1AttributeName = "memberOfCommunity"; final String end1AttributeDescription = "Communities that the person is a member of."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.AT_MOST_ONE; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.COMMUNITY.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = "CommunityMember"; final String end2AttributeName = "communityMembers"; final String end2AttributeDescription = "Members of the community."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.COMMUNITY_MEMBER.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - - final String attribute1Name = "membershipType"; - final String attribute1Description = "Type of membership to the community."; - final String attribute1DescriptionGUID = null; - property = archiveHelper.getEnumTypeDefAttribute("CommunityMembershipType", - attribute1Name, - attribute1Description, - attribute1DescriptionGUID); - properties.add(property); + properties.add(archiveHelper.getEnumTypeDefAttribute(OpenMetadataProperty.MEMBERSHIP_TYPE)); relationshipDef.setPropertiesDefinition(properties); @@ -5725,78 +4303,37 @@ private EnumDef getCommentTypeEnum() return enumDef; } - private EntityDef getRatingEntity() { - EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.RATING.typeGUID, - OpenMetadataType.RATING.typeName, - null, - OpenMetadataType.RATING.description, - OpenMetadataType.RATING.descriptionGUID, - OpenMetadataType.RATING.wikiURL); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.RATING, null); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - - final String attribute1Name = "anchorGUID"; - final String attribute1Description = "Optional identifier of the referenceable that this rating is connected to (either directly or indirectly)."; - final String attribute1DescriptionGUID = null; - property = archiveHelper.getStringTypeDefAttribute(attribute1Name, - attribute1Description, - attribute1DescriptionGUID); - properties.add(property); - property = archiveHelper.getEnumTypeDefAttribute("StarRating", - OpenMetadataProperty.STARS.name, - OpenMetadataProperty.STARS.description, - OpenMetadataProperty.STARS.descriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.REVIEW.name, - OpenMetadataProperty.REVIEW.description, - OpenMetadataProperty.REVIEW.descriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.ANCHOR_GUID)); + properties.add(archiveHelper.getEnumTypeDefAttribute(OpenMetadataProperty.STARS)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.REVIEW)); entityDef.setPropertiesDefinition(properties); return entityDef; } - private EntityDef getCommentEntity() { - EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.COMMENT.typeGUID, - OpenMetadataType.COMMENT.typeName, - this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), - OpenMetadataType.COMMENT.description, - OpenMetadataType.COMMENT.descriptionGUID, - OpenMetadataType.COMMENT.wikiURL); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.COMMENT, + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName)); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - - final String attribute1Name = "anchorGUID"; - final String attribute1Description = "Optional identifier of the referenceable that this comment is connected to (either directly or indirectly)."; - final String attribute1DescriptionGUID = null; - property = archiveHelper.getStringTypeDefAttribute(attribute1Name, - attribute1Description, - attribute1DescriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.TEXT.name, - OpenMetadataProperty.TEXT.description, - OpenMetadataProperty.TEXT.descriptionGUID); - properties.add(property); - property = archiveHelper.getEnumTypeDefAttribute("CommentType", - OpenMetadataProperty.TYPE.name, - OpenMetadataProperty.TYPE.description, - OpenMetadataProperty.TYPE.descriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.ANCHOR_GUID)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.TEXT)); + properties.add(archiveHelper.getEnumTypeDefAttribute(OpenMetadataProperty.TYPE)); entityDef.setPropertiesDefinition(properties); @@ -5806,27 +4343,14 @@ private EntityDef getCommentEntity() private EntityDef getLikeEntity() { - EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.LIKE.typeGUID, - OpenMetadataType.LIKE.typeName, - null, - OpenMetadataType.LIKE.description, - OpenMetadataType.LIKE.descriptionGUID, - OpenMetadataType.LIKE.wikiURL); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.LIKE, null); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - - final String attribute1Name = "anchorGUID"; - final String attribute1Description = "Optional identifier of the referenceable that this comment is connected to (either directly or indirectly)."; - final String attribute1DescriptionGUID = null; - property = archiveHelper.getStringTypeDefAttribute(attribute1Name, - attribute1Description, - attribute1DescriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.ANCHOR_GUID)); entityDef.setPropertiesDefinition(properties); @@ -5836,31 +4360,16 @@ private EntityDef getLikeEntity() private EntityDef getInformalTagEntity() { - EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.INFORMAL_TAG.typeGUID, - OpenMetadataType.INFORMAL_TAG.typeName, - null, - OpenMetadataType.INFORMAL_TAG.description, - OpenMetadataType.INFORMAL_TAG.descriptionGUID, - OpenMetadataType.INFORMAL_TAG.wikiURL); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.INFORMAL_TAG, null); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - property = archiveHelper.getBooleanTypeDefAttribute(OpenMetadataProperty.IS_PUBLIC.name, - OpenMetadataProperty.IS_PUBLIC.description, - OpenMetadataProperty.IS_PUBLIC.descriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.TAG_NAME.name, - OpenMetadataProperty.TAG_NAME.description, - OpenMetadataProperty.TAG_NAME.descriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.TAG_DESCRIPTION.name, - OpenMetadataProperty.TAG_DESCRIPTION.description, - OpenMetadataProperty.TAG_DESCRIPTION.descriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.IS_PUBLIC)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.TAG_NAME)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.TAG_DESCRIPTION)); entityDef.setPropertiesDefinition(properties); @@ -5870,12 +4379,8 @@ private EntityDef getInformalTagEntity() private RelationshipDef getAttachedRatingRelationship() { - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.ATTACHED_RATING_RELATIONSHIP.typeGUID, - OpenMetadataType.ATTACHED_RATING_RELATIONSHIP.typeName, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.ATTACHED_RATING_RELATIONSHIP, null, - OpenMetadataType.ATTACHED_RATING_RELATIONSHIP.description, - OpenMetadataType.ATTACHED_RATING_RELATIONSHIP.descriptionGUID, - OpenMetadataType.ATTACHED_RATING_RELATIONSHIP.wikiURL, ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -5883,46 +4388,38 @@ private RelationshipDef getAttachedRatingRelationship() /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.REFERENCEABLE.typeName; final String end1AttributeName = "ratingAnchor"; final String end1AttributeDescription = "Element that is rated."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.AT_MOST_ONE; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.RATING.typeName; final String end2AttributeName = "starRatings"; final String end2AttributeDescription = "Accumulated ratings."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.RATING.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - property = archiveHelper.getBooleanTypeDefAttribute(OpenMetadataProperty.IS_PUBLIC.name, - OpenMetadataProperty.IS_PUBLIC.description, - OpenMetadataProperty.IS_PUBLIC.descriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.IS_PUBLIC)); relationshipDef.setPropertiesDefinition(properties); @@ -5932,12 +4429,8 @@ private RelationshipDef getAttachedRatingRelationship() private RelationshipDef getAttachedCommentRelationship() { - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.ATTACHED_COMMENT_RELATIONSHIP.typeGUID, - OpenMetadataType.ATTACHED_COMMENT_RELATIONSHIP.typeName, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.ATTACHED_COMMENT_RELATIONSHIP, null, - OpenMetadataType.ATTACHED_COMMENT_RELATIONSHIP.description, - OpenMetadataType.ATTACHED_COMMENT_RELATIONSHIP.descriptionGUID, - OpenMetadataType.ATTACHED_COMMENT_RELATIONSHIP.wikiURL, ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -5945,46 +4438,38 @@ private RelationshipDef getAttachedCommentRelationship() /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.REFERENCEABLE.typeName; final String end1AttributeName = "commentAnchor"; final String end1AttributeDescription = "Element that this comment relates."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.AT_MOST_ONE; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.COMMENT.typeName; final String end2AttributeName = "comments"; final String end2AttributeDescription = "Accumulated comments."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.COMMENT.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - property = archiveHelper.getBooleanTypeDefAttribute(OpenMetadataProperty.IS_PUBLIC.name, - OpenMetadataProperty.IS_PUBLIC.description, - OpenMetadataProperty.IS_PUBLIC.descriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.IS_PUBLIC)); relationshipDef.setPropertiesDefinition(properties); @@ -5994,12 +4479,8 @@ private RelationshipDef getAttachedCommentRelationship() private RelationshipDef getAttachedLikeRelationship() { - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.ATTACHED_LIKE_RELATIONSHIP.typeGUID, - OpenMetadataType.ATTACHED_LIKE_RELATIONSHIP.typeName, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.ATTACHED_LIKE_RELATIONSHIP, null, - OpenMetadataType.ATTACHED_LIKE_RELATIONSHIP.description, - OpenMetadataType.ATTACHED_LIKE_RELATIONSHIP.descriptionGUID, - OpenMetadataType.ATTACHED_LIKE_RELATIONSHIP.wikiURL, ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -6007,46 +4488,37 @@ private RelationshipDef getAttachedLikeRelationship() /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.REFERENCEABLE.typeName; final String end1AttributeName = "likeAnchor"; final String end1AttributeDescription = "Element that is liked."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.AT_MOST_ONE; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef1(relationshipEndDef); - /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.LIKE.typeName; final String end2AttributeName = "likes"; final String end2AttributeDescription = "Accumulated likes."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.LIKE.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - property = archiveHelper.getBooleanTypeDefAttribute(OpenMetadataProperty.IS_PUBLIC.name, - OpenMetadataProperty.IS_PUBLIC.description, - OpenMetadataProperty.IS_PUBLIC.descriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.IS_PUBLIC)); relationshipDef.setPropertiesDefinition(properties); @@ -6056,12 +4528,8 @@ private RelationshipDef getAttachedLikeRelationship() private RelationshipDef getAcceptedAnswerRelationship() { - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.ACCEPTED_ANSWER_RELATIONSHIP.typeGUID, - OpenMetadataType.ACCEPTED_ANSWER_RELATIONSHIP.typeName, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.ACCEPTED_ANSWER_RELATIONSHIP, null, - OpenMetadataType.ACCEPTED_ANSWER_RELATIONSHIP.description, - OpenMetadataType.ACCEPTED_ANSWER_RELATIONSHIP.descriptionGUID, - OpenMetadataType.ACCEPTED_ANSWER_RELATIONSHIP.wikiURL, ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -6069,46 +4537,38 @@ private RelationshipDef getAcceptedAnswerRelationship() /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.COMMENT.typeName; final String end1AttributeName = "answeredQuestions"; final String end1AttributeDescription = "Questions that now has an accepted answer."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.COMMENT.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.COMMENT.typeName; final String end2AttributeName = "acceptedAnswers"; final String end2AttributeDescription = "Accumulated answers."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.COMMENT.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - property = archiveHelper.getBooleanTypeDefAttribute(OpenMetadataProperty.IS_PUBLIC.name, - OpenMetadataProperty.IS_PUBLIC.description, - OpenMetadataProperty.IS_PUBLIC.descriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.IS_PUBLIC)); relationshipDef.setPropertiesDefinition(properties); @@ -6118,12 +4578,8 @@ private RelationshipDef getAcceptedAnswerRelationship() private RelationshipDef getAttachedTagRelationship() { - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.ATTACHED_TAG_RELATIONSHIP.typeGUID, - OpenMetadataType.ATTACHED_TAG_RELATIONSHIP.typeName, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.ATTACHED_TAG_RELATIONSHIP, null, - OpenMetadataType.ATTACHED_TAG_RELATIONSHIP.description, - OpenMetadataType.ATTACHED_TAG_RELATIONSHIP.descriptionGUID, - OpenMetadataType.ATTACHED_TAG_RELATIONSHIP.wikiURL, ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -6131,46 +4587,38 @@ private RelationshipDef getAttachedTagRelationship() /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.REFERENCEABLE.typeName; final String end1AttributeName = "taggedElement"; final String end1AttributeDescription = "Element that is tagged."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.INFORMAL_TAG.typeName; final String end2AttributeName = "tags"; final String end2AttributeDescription = "Accumulated tags."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.INFORMAL_TAG.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - property = archiveHelper.getBooleanTypeDefAttribute(OpenMetadataProperty.IS_PUBLIC.name, - OpenMetadataProperty.IS_PUBLIC.description, - OpenMetadataProperty.IS_PUBLIC.descriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.IS_PUBLIC)); relationshipDef.setPropertiesDefinition(properties); @@ -6188,168 +4636,89 @@ private RelationshipDef getAttachedTagRelationship() private void add0155CrowdSourcing() { this.archiveBuilder.addEnumDef(getCrowdSourcingRoleEnum()); - this.archiveBuilder.addEntityDef(getCrowdSourcingContributorEntity()); - this.archiveBuilder.addRelationshipDef(getCrowdSourcingContributionRelationship()); } private EnumDef getCrowdSourcingRoleEnum() { - final String guid = "0ded50c2-17cc-4ecf-915e-908e66dbb27f"; - final String name = "CrowdSourcingRole"; - final String description = "Type of contributor to new information and/or assets."; - final String descriptionGUID = null; - - EnumDef enumDef = archiveHelper.getEmptyEnumDef(guid, name, description, descriptionGUID); + EnumDef enumDef = archiveHelper.getEmptyEnumDef(CrowdSourcingRole.getOpenTypeGUID(), + CrowdSourcingRole.getOpenTypeName(), + CrowdSourcingRole.getOpenTypeDescription(), + CrowdSourcingRole.getOpenTypeDescriptionGUID()); ArrayList elementDefs = new ArrayList<>(); EnumElementDef elementDef; - final int element1Ordinal = 0; - final String element1Value = "Proposer"; - final String element1Description = "Actor that creates the initial version."; - final String element1DescriptionGUID = null; - - elementDef = archiveHelper.getEnumElementDef(element1Ordinal, - element1Value, - element1Description, - element1DescriptionGUID); - elementDefs.add(elementDef); - - final int element2Ordinal = 1; - final String element2Value = "Reviewer"; - final String element2Description = "Actor that provided feedback."; - final String element2DescriptionGUID = null; - - elementDef = archiveHelper.getEnumElementDef(element2Ordinal, - element2Value, - element2Description, - element2DescriptionGUID); - elementDefs.add(elementDef); - - final int element3Ordinal = 2; - final String element3Value = "Supporter"; - final String element3Description = "Actor that agrees with the definition."; - final String element3DescriptionGUID = null; - - elementDef = archiveHelper.getEnumElementDef(element3Ordinal, - element3Value, - element3Description, - element3DescriptionGUID); - elementDefs.add(elementDef); - - final int element4Ordinal = 3; - final String element4Value = "Approver"; - final String element4Description = "Actor that declares the definition should be used."; - final String element4DescriptionGUID = null; - - elementDef = archiveHelper.getEnumElementDef(element4Ordinal, - element4Value, - element4Description, - element4DescriptionGUID); - elementDefs.add(elementDef); + for (KeyPattern enumValue : KeyPattern.values()) + { + elementDef = archiveHelper.getEnumElementDef(enumValue.getOrdinal(), + enumValue.getName(), + enumValue.getDescription(), + enumValue.getDescriptionGUID()); - final int element5Ordinal = 99; - final String element5Value = "Other"; - final String element5Description = "Another role."; - final String element5DescriptionGUID = null; + elementDefs.add(elementDef); - elementDef = archiveHelper.getEnumElementDef(element5Ordinal, - element5Value, - element5Description, - element5DescriptionGUID); - elementDefs.add(elementDef); + if (enumValue.isDefault()) + { + enumDef.setDefaultValue(elementDef); + } + } enumDef.setElementDefs(elementDefs); return enumDef; } - private EntityDef getCrowdSourcingContributorEntity() { - final String guid = "3a84c94c-ac6f-4be1-a72a-07dcec7b1fe3"; - final String name = "CrowdSourcingContributor"; - final String description = "Person contributing new content."; - final String descriptionGUID = null; - - final String superTypeName = "PersonRole"; - - return archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.CROWD_SOURCING_CONTRIBUTOR, + this.archiveBuilder.getEntityDef(OpenMetadataType.PERSON_ROLE.typeName)); } private RelationshipDef getCrowdSourcingContributionRelationship() { - final String guid = "4db83564-b200-4956-94a4-c95a5c30e65a"; - final String name = "CrowdSourcingContribution"; - final String description = "Defines one of the actors contributing content to a new description or asset."; - final String descriptionGUID = null; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, - name, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.CROWD_SOURCING_CONTRIBUTION, null, - description, - descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.REFERENCEABLE.typeName; final String end1AttributeName = "contributions"; final String end1AttributeDescription = "Items that this person has contributed."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); - /* * Set up end 2. */ - final String end2EntityType = "CrowdSourcingContributor"; final String end2AttributeName = "contributors"; final String end2AttributeDescription = "Person contributing content."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.CROWD_SOURCING_CONTRIBUTOR.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - - final String attribute1Name = "roleType"; - final String attribute1Description = "Type of contribution."; - final String attribute1DescriptionGUID = null; - property = archiveHelper.getEnumTypeDefAttribute("CrowdSourcingRole", - attribute1Name, - attribute1Description, - attribute1DescriptionGUID); - properties.add(property); + properties.add(archiveHelper.getEnumTypeDefAttribute(OpenMetadataProperty.ROLE_TYPE)); relationshipDef.setPropertiesDefinition(properties); @@ -6379,60 +4748,33 @@ private void add0160Notes() private EntityDef getNoteEntryEntity() { - EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.NOTE_ENTRY.typeGUID, - OpenMetadataType.NOTE_ENTRY.typeName, - this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), - OpenMetadataType.NOTE_ENTRY.description, - OpenMetadataType.NOTE_ENTRY.descriptionGUID, - OpenMetadataType.NOTE_ENTRY.wikiURL); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.NOTE_ENTRY, + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName)); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - final String attribute3Name = OpenMetadataProperty.IS_PUBLIC.name; - final String attribute3Description = "Is the note visible to more than the note log authors?"; - final String attribute3DescriptionGUID = null; - - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.TITLE.name, - OpenMetadataProperty.TITLE.description, - OpenMetadataProperty.TITLE.descriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.TEXT.name, - OpenMetadataProperty.TEXT.description, - OpenMetadataProperty.TEXT.descriptionGUID); - properties.add(property); - property = archiveHelper.getBooleanTypeDefAttribute(attribute3Name, - attribute3Description, - attribute3DescriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.TITLE)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.TEXT)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.IS_PUBLIC)); entityDef.setPropertiesDefinition(properties); return entityDef; } - private EntityDef getNoteLogAuthorEntity() { - return archiveHelper.getDefaultEntityDef(OpenMetadataType.NOTE_LOG_AUTHOR.typeGUID, - OpenMetadataType.NOTE_LOG_AUTHOR.typeName, - this.archiveBuilder.getEntityDef(OpenMetadataType.PERSON_ROLE_TYPE_NAME), - OpenMetadataType.NOTE_LOG_AUTHOR.description, - OpenMetadataType.NOTE_LOG_AUTHOR.descriptionGUID, - OpenMetadataType.NOTE_LOG_AUTHOR.wikiURL); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.NOTE_LOG_AUTHOR, + this.archiveBuilder.getEntityDef(OpenMetadataType.PERSON_ROLE.typeName)); } - private EntityDef getNoteLogEntity() { - EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.NOTE_LOG.typeGUID, - OpenMetadataType.NOTE_LOG.typeName, - this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), - OpenMetadataType.NOTE_LOG.description, - OpenMetadataType.NOTE_LOG.descriptionGUID); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.NOTE_LOG, + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName)); /* * Build the attributes @@ -6463,15 +4805,10 @@ private EntityDef getNoteLogEntity() return entityDef; } - private RelationshipDef getAttachedNoteLogRelationship() { - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.ATTACHED_NOTE_LOG_RELATIONSHIP.typeGUID, - OpenMetadataType.ATTACHED_NOTE_LOG_RELATIONSHIP.typeName, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.ATTACHED_NOTE_LOG_RELATIONSHIP, null, - OpenMetadataType.ATTACHED_NOTE_LOG_RELATIONSHIP.description, - OpenMetadataType.ATTACHED_NOTE_LOG_RELATIONSHIP.descriptionGUID, - OpenMetadataType.ATTACHED_NOTE_LOG_RELATIONSHIP.wikiURL, ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -6479,65 +4816,48 @@ private RelationshipDef getAttachedNoteLogRelationship() /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.REFERENCEABLE.typeName; final String end1AttributeName = "describes"; final String end1AttributeDescription = "Subject of the note log."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.NOTE_LOG.typeName; final String end2AttributeName = "noteLogs"; final String end2AttributeDescription = "Log of related notes."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.NOTE_LOG.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* * Build the attributes - */ - List properties = new ArrayList<>(); - TypeDefAttribute property; - - final String attribute1Name = OpenMetadataProperty.IS_PUBLIC.name; - final String attribute1Description = "Is the attached note log visible to more than the originator?"; - final String attribute1DescriptionGUID = null; + */ + List properties = new ArrayList<>(); - property = archiveHelper.getBooleanTypeDefAttribute(attribute1Name, - attribute1Description, - attribute1DescriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.IS_PUBLIC)); relationshipDef.setPropertiesDefinition(properties); return relationshipDef; } - private RelationshipDef getNoteLogAuthorshipRelationship() { - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.NOTE_LOG_AUTHORSHIP_RELATIONSHIP.typeGUID, - OpenMetadataType.NOTE_LOG_AUTHORSHIP_RELATIONSHIP.typeName, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.NOTE_LOG_AUTHORSHIP_RELATIONSHIP, null, - OpenMetadataType.NOTE_LOG_AUTHORSHIP_RELATIONSHIP.description, - OpenMetadataType.NOTE_LOG_AUTHORSHIP_RELATIONSHIP.descriptionGUID, - OpenMetadataType.NOTE_LOG_AUTHORSHIP_RELATIONSHIP.wikiURL, ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -6545,48 +4865,39 @@ private RelationshipDef getNoteLogAuthorshipRelationship() /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.NOTE_LOG_AUTHOR.typeName; final String end1AttributeName = "authors"; final String end1AttributeDescription = "Person contributing to the note log."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.NOTE_LOG_AUTHOR.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.NOTE_LOG.typeName; final String end2AttributeName = "authoredNoteLogs"; final String end2AttributeDescription = "Note log containing contributions."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.NOTE_LOG.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; } - private RelationshipDef getAttachedNoteLogEntryRelationship() { - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.ATTACHED_NOTE_LOG_ENTRY_RELATIONSHIP.typeGUID, - OpenMetadataType.ATTACHED_NOTE_LOG_ENTRY_RELATIONSHIP.typeName, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.ATTACHED_NOTE_LOG_ENTRY_RELATIONSHIP, null, - OpenMetadataType.ATTACHED_NOTE_LOG_ENTRY_RELATIONSHIP.description, - OpenMetadataType.ATTACHED_NOTE_LOG_ENTRY_RELATIONSHIP.descriptionGUID, - OpenMetadataType.ATTACHED_NOTE_LOG_ENTRY_RELATIONSHIP.wikiURL, ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -6594,34 +4905,30 @@ private RelationshipDef getAttachedNoteLogEntryRelationship() /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.NOTE_LOG.typeName; final String end1AttributeName = "logs"; final String end1AttributeDescription = "Logs that this entry relates."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.NOTE_LOG.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.NOTE_ENTRY.typeName; final String end2AttributeName = "entries"; final String end2AttributeDescription = "Accumulated notes."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.NOTE_ENTRY.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -6675,157 +4982,56 @@ private void add0201ConnectorsAndConnections() this.archiveBuilder.addRelationshipDef(getConnectionConnectorTypeRelationship()); } - private EntityDef getConnectionEntity() { - final String guid = "114e9f8f-5ff3-4c32-bd37-a7eb42712253"; - final String name = "Connection"; - final String description = "A set of properties to identify and configure a connector instance."; - final String descriptionGUID = null; - - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), - description, - descriptionGUID); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.CONNECTION, + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName)); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - - final String attribute3Name = "securedProperties"; - final String attribute3Description = "Private properties accessible only to the connector."; - final String attribute3DescriptionGUID = null; - final String attribute4Name = "configurationProperties"; - final String attribute4Description = "Specific configuration properties used to configure the behaviour of the connector."; - final String attribute4DescriptionGUID = null; - final String attribute5Name = "userId"; - final String attribute5Description = "User identity that the connector should use."; - final String attribute5DescriptionGUID = null; - final String attribute6Name = "clearPassword"; - final String attribute6Description = "Password for the userId in clear text."; - final String attribute6DescriptionGUID = null; - final String attribute7Name = "encryptedPassword"; - final String attribute7Description = "Encrypted password that the connector needs to decrypt before use."; - final String attribute7DescriptionGUID = null; - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.DISPLAY_NAME.name, - OpenMetadataProperty.DISPLAY_NAME.description, - OpenMetadataProperty.DISPLAY_NAME.descriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.DESCRIPTION.name, - OpenMetadataProperty.DESCRIPTION.description, - OpenMetadataProperty.DESCRIPTION.descriptionGUID); - properties.add(property); - property = archiveHelper.getMapStringObjectTypeDefAttribute(attribute3Name, - attribute3Description, - attribute3DescriptionGUID); - properties.add(property); - property = archiveHelper.getMapStringObjectTypeDefAttribute(attribute4Name, - attribute4Description, - attribute4DescriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(attribute5Name, - attribute5Description, - attribute5DescriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(attribute6Name, - attribute6Description, - attribute6DescriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(attribute7Name, - attribute7Description, - attribute7DescriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.DISPLAY_NAME)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.DESCRIPTION)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.SECURED_PROPERTIES)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.CONFIGURATION_PROPERTIES)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.USER_ID)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.CLEAR_PASSWORD)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.ENCRYPTED_PASSWORD)); entityDef.setPropertiesDefinition(properties); return entityDef; } - private EntityDef getConnectorTypeEntity() { - final String guid = "954421eb-33a6-462d-a8ca-b5709a1bd0d4"; - final String name = "ConnectorType"; - final String description = "A set of properties describing a type of connector."; - final String descriptionGUID = null; - - final String superTypeName = OpenMetadataType.REFERENCEABLE.typeName; - - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.CONNECTOR_TYPE, + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName)); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - - final String attribute3Name = "connectorProviderClassName"; - final String attribute3Description = "Name of the Java class that implements this connector type's open connector framework (OCF) connector provider."; - final String attribute3DescriptionGUID = null; - final String attribute4Name = "recognizedAdditionalProperties"; - final String attribute4Description = "List of additional connection property names supported by the connector implementation."; - final String attribute4DescriptionGUID = null; - final String attribute5Name = "recognizedSecuredProperties"; - final String attribute5Description = "List of secured connection property names supported by the connector implementation."; - final String attribute5DescriptionGUID = null; - final String attribute6Name = "recognizedConfigurationProperties"; - final String attribute6Description = "List of secured connection property names supported by the connector implementation."; - final String attribute6DescriptionGUID = null; - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.DISPLAY_NAME.name, - OpenMetadataProperty.DISPLAY_NAME.description, - OpenMetadataProperty.DISPLAY_NAME.descriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.DESCRIPTION.name, - OpenMetadataProperty.DESCRIPTION.description, - OpenMetadataProperty.DESCRIPTION.descriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(attribute3Name, - attribute3Description, - attribute3DescriptionGUID); - properties.add(property); - property = archiveHelper.getArrayStringTypeDefAttribute(attribute4Name, - attribute4Description, - attribute4DescriptionGUID); - properties.add(property); - property = archiveHelper.getArrayStringTypeDefAttribute(attribute5Name, - attribute5Description, - attribute5DescriptionGUID); - properties.add(property); - property = archiveHelper.getArrayStringTypeDefAttribute(attribute6Name, - attribute6Description, - attribute6DescriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.DISPLAY_NAME)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.DESCRIPTION)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.CONNECTOR_PROVIDER_CLASS_NAME)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.RECOGNIZED_ADDITIONAL_PROPERTIES)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.RECOGNIZED_SECURED_PROPERTIES)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.RECOGNIZED_CONFIGURATION_PROPERTIES)); entityDef.setPropertiesDefinition(properties); return entityDef; } - private RelationshipDef getConnectionEndpointRelationship() { - final String guid = "887a7132-d6bc-4b92-a483-e80b60c86fb2"; - final String name = "ConnectionEndpoint"; - final String description = "A link between a connection and the endpoint that the connector should use."; - final String descriptionGUID = null; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, - name, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.CONNECTION_ENDPOINT_RELATIONSHIP, null, - description, - descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -6843,16 +5049,14 @@ private RelationshipDef getConnectionEndpointRelationship() RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef1(relationshipEndDef); - /* * Set up end 2. */ - final String end2EntityType = "Connection"; final String end2AttributeName = "connections"; final String end2AttributeDescription = "Connections to this endpoint."; final String end2AttributeDescriptionGUID = null; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.CONNECTION.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, @@ -6862,56 +5066,41 @@ private RelationshipDef getConnectionEndpointRelationship() return relationshipDef; } - private RelationshipDef getConnectionConnectorTypeRelationship() { - final String guid = "e542cfc1-0b4b-42b9-9921-f0a5a88aaf96"; - final String name = "ConnectionConnectorType"; - final String description = "A link between a connection and the connector type that should be used."; - final String descriptionGUID = null; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, - name, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.CONNECTION_CONNECTOR_TYPE_RELATIONSHIP, null, - description, - descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = "Connection"; final String end1AttributeName = "connections"; final String end1AttributeDescription = "Connections using this connector type."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.CONNECTION.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = "ConnectorType"; final String end2AttributeName = "connectorType"; final String end2AttributeDescription = "Type of connector to use for the asset."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.AT_MOST_ONE; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.CONNECTOR_TYPE.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -6934,165 +5123,105 @@ private void add0205ConnectionLinkage() this.archiveBuilder.addRelationshipDef(getConnectionToAssetRelationship()); } - private EntityDef getVirtualConnectionEntity() { - final String guid = "82f9c664-e59d-484c-a8f3-17088c23a2f3"; - final String name = "VirtualConnection"; - final String description = "A connector for a virtual resource that needs to retrieve data from multiple places."; - final String descriptionGUID = null; - - final String superTypeName = "Connection"; - - return archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.VIRTUAL_CONNECTION, + this.archiveBuilder.getEntityDef(OpenMetadataType.CONNECTION.typeName)); } - private RelationshipDef getEmbeddedConnectionRelationship() { - final String guid = "eb6dfdd2-8c6f-4f0d-a17d-f6ce4799f64f"; - final String name = "EmbeddedConnection"; - final String description = "A link between a virtual connection and one of the connections it depends on."; - final String descriptionGUID = null; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, - name, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.EMBEDDED_CONNECTION_RELATIONSHIP, null, - description, - descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = "VirtualConnection"; final String end1AttributeName = "supportingVirtualConnections"; final String end1AttributeDescription = "Virtual connections using this connection."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.VIRTUAL_CONNECTION.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = "Connection"; final String end2AttributeName = "embeddedConnections"; final String end2AttributeDescription = "Connections embedded in this virtual connection."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.CONNECTION.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - - final String attribute2Name = "arguments"; - final String attribute2Description = "Additional arguments needed by the virtual connector when using each connection."; - final String attribute2DescriptionGUID = null; - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.DISPLAY_NAME.name, - OpenMetadataProperty.DISPLAY_NAME.description, - OpenMetadataProperty.DISPLAY_NAME.descriptionGUID); - properties.add(property); - property = archiveHelper.getMapStringObjectTypeDefAttribute(attribute2Name, - attribute2Description, - attribute2DescriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.DISPLAY_NAME)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.ARGUMENTS)); relationshipDef.setPropertiesDefinition(properties); return relationshipDef; } - private RelationshipDef getConnectionToAssetRelationship() { - final String guid = "e777d660-8dbe-453e-8b83-903771f054c0"; - final String name = "ConnectionToAsset"; - final String description = "Link between a connection and the description of the asset it can be used to access."; - final String descriptionGUID = null; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, - name, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.CONNECTION_TO_ASSET_RELATIONSHIP, null, - description, - descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = "Connection"; final String end1AttributeName = "connections"; final String end1AttributeDescription = "Connections to this asset."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.CONNECTION.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.ASSET.typeName; final String end2AttributeName = "asset"; final String end2AttributeDescription = "Asset that can be accessed with this connection."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.AT_MOST_ONE; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.ASSET.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef2(relationshipEndDef); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - final String attribute1Name = "assetSummary"; - final String attribute1Description = "Description of the asset that is retrieved through this connection."; - final String attribute1DescriptionGUID = null; - - property = archiveHelper.getStringTypeDefAttribute(attribute1Name, - attribute1Description, - attribute1DescriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.ASSET_SUMMARY)); relationshipDef.setPropertiesDefinition(properties); @@ -7116,146 +5245,80 @@ private void add0210DataStores() this.archiveBuilder.addClassificationDef(getDataStoreEncodingClassification()); } - private EntityDef getDataStoreEntity() { - EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.DATA_STORE.typeGUID, - OpenMetadataType.DATA_STORE.typeName, - this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_ASSET.typeName), - OpenMetadataType.DATA_STORE.description, - OpenMetadataType.DATA_STORE.descriptionGUID, - OpenMetadataType.DATA_STORE.wikiURL); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.DATA_STORE, + this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_ASSET.typeName)); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - property = archiveHelper.getDateTypeDefAttribute(OpenMetadataProperty.STORE_CREATE_TIME.name, - OpenMetadataProperty.STORE_CREATE_TIME.description, - OpenMetadataProperty.STORE_CREATE_TIME.descriptionGUID); - properties.add(property); - property = archiveHelper.getDateTypeDefAttribute(OpenMetadataProperty.STORE_UPDATE_TIME.name, - OpenMetadataProperty.STORE_UPDATE_TIME.description, - OpenMetadataProperty.STORE_UPDATE_TIME.descriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.STORE_CREATE_TIME)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.STORE_UPDATE_TIME)); entityDef.setPropertiesDefinition(properties); return entityDef; } - private RelationshipDef getDataContentForDataSetRelationship() { - final String guid = OpenMetadataType.DATA_CONTENT_FOR_DATA_SET_RELATIONSHIP.typeGUID; - final String name = OpenMetadataType.DATA_CONTENT_FOR_DATA_SET_RELATIONSHIP.typeName; - final String description = OpenMetadataType.DATA_CONTENT_FOR_DATA_SET_RELATIONSHIP.description; - final String descriptionGUID = OpenMetadataType.DATA_CONTENT_FOR_DATA_SET_RELATIONSHIP.descriptionGUID; - final String descriptionWiki = OpenMetadataType.DATA_CONTENT_FOR_DATA_SET_RELATIONSHIP.wikiURL; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.BOTH; - - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, - name, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.DATA_CONTENT_FOR_DATA_SET_RELATIONSHIP, null, - description, - descriptionGUID, - descriptionWiki, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.ASSET.typeName; final String end1AttributeName = "dataContent"; final String end1AttributeDescription = "Assets supporting a data set."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.ASSET.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.DATA_SET.typeName; final String end2AttributeName = "supportedDataSets"; final String end2AttributeDescription = "Data sets that use this asset."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_SET.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; } - private ClassificationDef getDataStoreEncodingClassification() { - final String guid = "f08e48b5-6b66-40f5-8ff6-c2bfe527330b"; - final String name = "DataStoreEncoding"; - final String description = "Description for how data is organized and represented in a data store."; - final String descriptionGUID = null; - - final String linkedToEntity = OpenMetadataType.DATA_STORE.typeName; - - ClassificationDef classificationDef = archiveHelper.getClassificationDef(guid, - name, + ClassificationDef classificationDef = archiveHelper.getClassificationDef(OpenMetadataType.DATA_STORE_ENCODING_CLASSIFICATION, null, - description, - descriptionGUID, - this.archiveBuilder.getEntityDef(linkedToEntity), + this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_STORE.typeName), false); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - - final String attribute1Name = OpenMetadataProperty.ENCODING.name; - final String attribute1Description = OpenMetadataProperty.ENCODING.description; - final String attribute1DescriptionGUID = OpenMetadataProperty.ENCODING.descriptionGUID; - final String attribute2Name = OpenMetadataProperty.ENCODING_LANGUAGE.name; - final String attribute2Description = OpenMetadataProperty.ENCODING_LANGUAGE.description; - final String attribute2DescriptionGUID = OpenMetadataProperty.ENCODING_LANGUAGE.descriptionGUID; - final String attribute3Name = OpenMetadataProperty.ENCODING_DESCRIPTION.name; - final String attribute3Description = OpenMetadataProperty.ENCODING_DESCRIPTION.description; - final String attribute3DescriptionGUID = OpenMetadataProperty.ENCODING_DESCRIPTION.descriptionGUID; - final String attribute4Name = OpenMetadataProperty.ENCODING_PROPERTIES.name; - final String attribute4Description = OpenMetadataProperty.ENCODING_PROPERTIES.description; - final String attribute4DescriptionGUID = OpenMetadataProperty.ENCODING_PROPERTIES.descriptionGUID; - property = archiveHelper.getStringTypeDefAttribute(attribute1Name, - attribute1Description, - attribute1DescriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(attribute2Name, - attribute2Description, - attribute2DescriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(attribute3Name, - attribute3Description, - attribute3DescriptionGUID); - properties.add(property); - property = archiveHelper.getMapStringStringTypeDefAttribute(attribute4Name, - attribute4Description, - attribute4DescriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.ENCODING)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.ENCODING_LANGUAGE)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.ENCODING_DESCRIPTION)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.ENCODING_PROPERTIES)); classificationDef.setPropertiesDefinition(properties); @@ -7281,26 +5344,16 @@ private void add0212DeployedAPIs() this.archiveBuilder.addClassificationDef(getPublisherInterfaceClassification()); } - private EntityDef getDeployedAPIEntity() { - return archiveHelper.getDefaultEntityDef(OpenMetadataType.DEPLOYED_API.typeGUID, - OpenMetadataType.DEPLOYED_API.typeName, - this.archiveBuilder.getEntityDef(OpenMetadataType.ASSET.typeName), - OpenMetadataType.DEPLOYED_API.description, - OpenMetadataType.DEPLOYED_API.descriptionGUID, - OpenMetadataType.DEPLOYED_API.wikiURL); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.DEPLOYED_API, + this.archiveBuilder.getEntityDef(OpenMetadataType.ASSET.typeName)); } - private RelationshipDef getAPIEndpointRelationship() { - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.API_ENDPOINT_RELATIONSHIP.typeGUID, - OpenMetadataType.API_ENDPOINT_RELATIONSHIP.typeName, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.API_ENDPOINT_RELATIONSHIP, null, - OpenMetadataType.API_ENDPOINT_RELATIONSHIP.description, - OpenMetadataType.API_ENDPOINT_RELATIONSHIP.descriptionGUID, - OpenMetadataType.API_ENDPOINT_RELATIONSHIP.wikiURL, ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -7337,57 +5390,31 @@ private RelationshipDef getAPIEndpointRelationship() return relationshipDef; } - private ClassificationDef getRequestResponseInterfaceClassification() { - final String guid = "14a29330-e830-4343-a41e-d57e2cec82f8"; - final String name = "RequestResponseInterface"; - final String description = "Identifies an API that supports a request response interaction style."; - final String descriptionGUID = null; - - return archiveHelper.getClassificationDef(guid, - name, + return archiveHelper.getClassificationDef(OpenMetadataType.REQUEST_RESPONSE_INTERFACE_CLASSIFICATION, null, - description, - descriptionGUID, this.archiveBuilder.getEntityDef(OpenMetadataType.DEPLOYED_API.typeName), false); } - private ClassificationDef getListenerInterfaceClassification() { - final String guid = "4099d2ed-2a5e-4c44-8443-9de4e378a4ba"; - final String name = "ListenerInterface"; - final String description = "Identifies an API that listens for incoming events and processes them."; - final String descriptionGUID = null; - - return archiveHelper.getClassificationDef(guid, - name, + return archiveHelper.getClassificationDef(OpenMetadataType.LISTENER_INTERFACE_CLASSIFICATION, null, - description, - descriptionGUID, this.archiveBuilder.getEntityDef(OpenMetadataType.DEPLOYED_API.typeName), false); } - private ClassificationDef getPublisherInterfaceClassification() { - final String guid = "4fdedcd5-b186-4bee-887a-02fa29a10750"; - final String name = "PublisherInterface"; - final String description = "Identifies an API that sends out events to other listening components."; - final String descriptionGUID = null; - - return archiveHelper.getClassificationDef(guid, - name, + return archiveHelper.getClassificationDef(OpenMetadataType.PUBLISHER_INTERFACE_CLASSIFICATION, null, - description, - descriptionGUID, this.archiveBuilder.getEntityDef(OpenMetadataType.DEPLOYED_API.typeName), false); } + /* * ------------------------------------------------------------------------------------------------------- */ @@ -7403,23 +5430,15 @@ private void add0215SoftwareComponents() private EntityDef getDeployedSoftwareComponentEntity() { - EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.DEPLOYED_SOFTWARE_COMPONENT.typeGUID, - OpenMetadataType.DEPLOYED_SOFTWARE_COMPONENT.typeName, - this.archiveBuilder.getEntityDef(OpenMetadataType.PROCESS.typeName), - OpenMetadataType.DEPLOYED_SOFTWARE_COMPONENT.description, - OpenMetadataType.DEPLOYED_SOFTWARE_COMPONENT.descriptionGUID, - OpenMetadataType.DEPLOYED_SOFTWARE_COMPONENT.wikiURL); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.DEPLOYED_SOFTWARE_COMPONENT, + this.archiveBuilder.getEntityDef(OpenMetadataType.PROCESS.typeName)); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.IMPLEMENTATION_LANGUAGE.name, - OpenMetadataProperty.IMPLEMENTATION_LANGUAGE.description, - OpenMetadataProperty.IMPLEMENTATION_LANGUAGE.descriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.IMPLEMENTATION_LANGUAGE)); entityDef.setPropertiesDefinition(properties); @@ -7450,371 +5469,197 @@ private void add0220FilesAndFolders() this.archiveBuilder.addClassificationDef(getFileSystemClassification()); } - private EntityDef getFileFolderEntity() { - final String guid = OpenMetadataType.FILE_FOLDER.typeGUID; - final String name = OpenMetadataType.FILE_FOLDER.typeName; - final String description = OpenMetadataType.FILE_FOLDER.description; - final String descriptionGUID = OpenMetadataType.FILE_FOLDER.descriptionGUID; - final String descriptionWiki = OpenMetadataType.FILE_FOLDER.wikiURL; - - final String superTypeName = OpenMetadataType.DATA_STORE.typeName; - - return archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID, - descriptionWiki); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.FILE_FOLDER, + this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_STORE.typeName)); } - private EntityDef getDataFolderEntity() { - final String guid = OpenMetadataType.DATA_FOLDER.typeGUID; - final String name = OpenMetadataType.DATA_FOLDER.typeName; - final String description = OpenMetadataType.DATA_FOLDER.description; - final String descriptionGUID = OpenMetadataType.DATA_FOLDER.descriptionGUID; - final String descriptionWiki = OpenMetadataType.DATA_FOLDER.wikiURL; - - final String superTypeName = OpenMetadataType.FILE_FOLDER.typeName; - - return archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID, - descriptionWiki); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.DATA_FOLDER, + this.archiveBuilder.getEntityDef(OpenMetadataType.FILE_FOLDER.typeName)); } - private EntityDef getDataFileEntity() { - final String guid = OpenMetadataType.DATA_FILE.typeGUID; - final String name = OpenMetadataType.DATA_FILE.typeName; - final String description = OpenMetadataType.DATA_FILE.description; - final String descriptionGUID = OpenMetadataType.DATA_FILE.descriptionGUID; - final String descriptionWiki = OpenMetadataType.DATA_FILE.wikiURL; - - final String superTypeName = OpenMetadataType.DATA_STORE.typeName; - - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID, - descriptionWiki); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.DATA_FILE, + this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_STORE.typeName)); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - final String attribute1Name = OpenMetadataProperty.FILE_TYPE.name; - final String attribute1Description = OpenMetadataProperty.FILE_TYPE.description; - final String attribute1DescriptionGUID = OpenMetadataProperty.FILE_TYPE.descriptionGUID; - - - property = archiveHelper.getStringTypeDefAttribute(attribute1Name, - attribute1Description, - attribute1DescriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.FILE_TYPE)); entityDef.setPropertiesDefinition(properties); return entityDef; } - private EntityDef getCSVFileEntity() { - final String guid = "2ccb2117-9cee-47ca-8150-9b3a543adcec"; - final String name = "CSVFile"; - final String description = "A description of a comma separated value (CSV) file"; - final String descriptionGUID = null; - - final String superTypeName = OpenMetadataType.DATA_FILE.typeName; - - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.CSV_FILE, + this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_FILE.typeName)); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - - final String attribute1Name = "delimiterCharacter"; - final String attribute1Description = "Character used between each column."; - final String attribute1DescriptionGUID = null; - final String attribute2Name = "quoteCharacter"; - final String attribute2Description = "The character used to group the content of the column that contains one or more delimiter characters."; - final String attribute2DescriptionGUID = null; - - - property = archiveHelper.getStringTypeDefAttribute(attribute1Name, - attribute1Description, - attribute1DescriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(attribute2Name, - attribute2Description, - attribute2DescriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.DELIMITER_CHARACTER)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.QUOTE_CHARACTER)); entityDef.setPropertiesDefinition(properties); return entityDef; } - private EntityDef getAvroFileEntity() { - final String guid = OpenMetadataType.AVRO_FILE.typeGUID; - final String name = OpenMetadataType.AVRO_FILE.typeName; - final String description = OpenMetadataType.AVRO_FILE.description; - final String descriptionGUID = OpenMetadataType.AVRO_FILE.descriptionGUID; - final String descriptionWiki = OpenMetadataType.AVRO_FILE.wikiURL; - - final String superTypeName = OpenMetadataType.DATA_FILE.typeName; - - return archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID, - descriptionWiki); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.AVRO_FILE, + this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_FILE.typeName)); } - private EntityDef getJSONFileEntity() { - final String guid = OpenMetadataType.JSON_FILE.typeGUID; - final String name = OpenMetadataType.JSON_FILE.typeName; - final String description = OpenMetadataType.JSON_FILE.description; - final String descriptionGUID = OpenMetadataType.JSON_FILE.descriptionGUID; - final String descriptionWiki = OpenMetadataType.JSON_FILE.wikiURL; - - final String superTypeName = OpenMetadataType.DATA_FILE.typeName; - - return archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID, - descriptionWiki); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.JSON_FILE, + this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_FILE.typeName)); } - private RelationshipDef getFolderHierarchyRelationship() { - final String guid = "48ac9028-45dd-495d-b3e1-622685b54a01"; - final String name = "FolderHierarchy"; - final String description = "A nested relationship between two file folders."; - final String descriptionGUID = null; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, - name, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.FOLDER_HIERARCHY_RELATIONSHIP, null, - description, - descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = "FileFolder"; final String end1AttributeName = "parentFolder"; final String end1AttributeDescription = "Parent folder."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.AT_MOST_ONE; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.FILE_FOLDER.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef1(relationshipEndDef); - /* * Set up end 2. */ - final String end2EntityType = "FileFolder"; final String end2AttributeName = "nestedFolder"; final String end2AttributeDescription = "Folders embedded in this folder."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.FILE_FOLDER.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; } - private RelationshipDef getNestedFileRelationship() { - final String guid = "4cb88900-1446-4eb6-acea-29cd9da45e63"; - final String name = "NestedFile"; - final String description = "The link between a data file and its containing folder."; - final String descriptionGUID = null; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, - name, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.NESTED_FILE_RELATIONSHIP, null, - description, - descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = "FileFolder"; final String end1AttributeName = "homeFolder"; final String end1AttributeDescription = "Identifies the containing folder of this datafile."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.FILE_FOLDER.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); - /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.DATA_FILE.typeName; final String end2AttributeName = "nestedFiles"; final String end2AttributeDescription = "Files stored in this folder."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_FILE.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; } - private RelationshipDef getLinkedFileRelationship() { - final String guid = "970a3405-fde1-4039-8249-9aa5f56d5151"; - final String name = "LinkedFile"; - final String description = "A data file that is linked to a file folder (rather than stored in it)."; - final String descriptionGUID = null; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, - name, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.LINKED_FILE_RELATIONSHIP, null, - description, - descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = "FileFolder"; final String end1AttributeName = "linkedFolders"; final String end1AttributeDescription = "Folders that this file is linked to."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.FILE_FOLDER.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.DATA_FILE.typeName; final String end2AttributeName = "linkedFiles"; final String end2AttributeDescription = "Files linked to the folder."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_FILE.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; } - private ClassificationDef getFileSystemClassification() { - final String guid = "cab5ba1d-cfd3-4fca-857d-c07711fc4157"; - final String name = "FileSystem"; - final String description = "A capability that supports a store of files organized into a hierarchy of file folders."; - final String descriptionGUID = null; - - final String linkedToEntity = OpenMetadataType.SOFTWARE_SERVER_CAPABILITY.typeName; - - ClassificationDef classificationDef = archiveHelper.getClassificationDef(guid, - name, + ClassificationDef classificationDef = archiveHelper.getClassificationDef(OpenMetadataType.FILE_SYSTEM_CLASSIFICATION, null, - description, - descriptionGUID, - this.archiveBuilder.getEntityDef( - linkedToEntity), + this.archiveBuilder.getEntityDef(OpenMetadataType.SOFTWARE_SERVER_CAPABILITY.typeName), false); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - - final String attribute1Name = "format"; - final String attribute1Description = "Format of the file system."; - final String attribute1DescriptionGUID = null; - final String attribute2Name = "encryption"; - final String attribute2Description = "Level of encryption used on the filesystem (if any)."; - final String attribute2DescriptionGUID = null; - property = archiveHelper.getStringTypeDefAttribute(attribute1Name, - attribute1Description, - attribute1DescriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(attribute2Name, - attribute2Description, - attribute2DescriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.FORMAT)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.ENCRYPTION)); classificationDef.setPropertiesDefinition(properties); @@ -7842,84 +5687,41 @@ private void add0221DocumentStores() this.archiveBuilder.addClassificationDef(getContentManagerClassification()); } - private EntityDef getMediaFileEntity() { - EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.MEDIA_FILE.typeGUID, - OpenMetadataType.MEDIA_FILE.typeName, - this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_FILE.typeName), - OpenMetadataType.MEDIA_FILE.description, - OpenMetadataType.MEDIA_FILE.descriptionGUID, - OpenMetadataType.MEDIA_FILE.wikiURL); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.MEDIA_FILE, + this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_FILE.typeName)); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - - final String attribute1Name = OpenMetadataProperty.EMBEDDED_METADATA.name; - final String attribute1Description = OpenMetadataProperty.EMBEDDED_METADATA.description; - final String attribute1DescriptionGUID = OpenMetadataProperty.EMBEDDED_METADATA.descriptionGUID; - - - property = archiveHelper.getMapStringStringTypeDefAttribute(attribute1Name, - attribute1Description, - attribute1DescriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.EMBEDDED_METADATA)); entityDef.setPropertiesDefinition(properties); return entityDef; } - private EntityDef getMediaCollectionEntity() { - final String guid = "0075d603-1627-41c5-8cae-f5458d1247fe"; - final String name = "MediaCollection"; - final String description = "A group of related media files."; - final String descriptionGUID = null; - - final String superTypeName = OpenMetadataType.DATA_SET.typeName; - - return archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.MEDIA_COLLECTION, + this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_SET.typeName)); } - private EntityDef getDocumentEntity() { - return archiveHelper.getDefaultEntityDef(OpenMetadataType.DOCUMENT.typeGUID, - OpenMetadataType.DOCUMENT.typeName, - this.archiveBuilder.getEntityDef(OpenMetadataType.MEDIA_FILE.typeName), - OpenMetadataType.DOCUMENT.description, - OpenMetadataType.DOCUMENT.descriptionGUID, - OpenMetadataType.DOCUMENT.wikiURL); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.DOCUMENT, + this.archiveBuilder.getEntityDef(OpenMetadataType.MEDIA_FILE.typeName)); } - private EntityDef getDocumentStoreEntity() { - final String guid = "37156790-feac-4e1a-a42e-88858ae6f8e1"; - final String name = "DocumentStore"; - final String description = "Identifies a data store as one that contains documents."; - final String descriptionGUID = null; - - final String superTypeName = OpenMetadataType.DATA_STORE.typeName; - - return archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.DOCUMENT_STORE, + this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_STORE.typeName)); } - private RelationshipDef getGroupedMediaRelationship() { final String guid = "7d881574-461d-475c-ab44-077451528cb8"; @@ -7927,14 +5729,12 @@ private RelationshipDef getGroupedMediaRelationship() final String description = "Links a media file into a data set."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -7945,85 +5745,67 @@ private RelationshipDef getGroupedMediaRelationship() final String end1AttributeName = "dataSetMembership"; final String end1AttributeDescription = "Identifies the data sets this media file belongs to."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.MEDIA_FILE.typeName; final String end2AttributeName = "dataSetMembers"; final String end2AttributeDescription = "Media files that make up this media collection."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.MEDIA_FILE.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; } - private RelationshipDef getLinkedMediaRelationship() { - final String guid = "cee3a190-fc8d-4e53-908a-f1b9689581e0"; - final String name = "LinkedMedia"; - final String description = "Links a media file to another media file and describes relationship."; - final String descriptionGUID = null; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, - name, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.LINKED_MEDIA_RELATIONSHIP, null, - description, - descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.MEDIA_FILE.typeName; final String end1AttributeName = "linkedMediaFiles"; final String end1AttributeDescription = "Link to related media files."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.MEDIA_FILE.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.MEDIA_FILE.typeName; final String end2AttributeName = "linkedMediaFiles"; final String end2AttributeDescription = "Link to related media files."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.MEDIA_FILE.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -8042,7 +5824,6 @@ private RelationshipDef getLinkedMediaRelationship() return relationshipDef; } - private ClassificationDef getContentManagerClassification() { final String guid = "fa4df7b5-cb6d-475c-889e-8f3b7ca564d3"; @@ -8050,14 +5831,12 @@ private ClassificationDef getContentManagerClassification() final String description = "Identifies a server as a manager of controlled documents and related media."; final String descriptionGUID = null; - final String linkedToEntity = "SoftwareServer"; - return archiveHelper.getClassificationDef(guid, name, null, description, descriptionGUID, - this.archiveBuilder.getEntityDef(linkedToEntity), + this.archiveBuilder.getEntityDef(OpenMetadataType.SOFTWARE_SERVER.typeName), false); } @@ -8071,21 +5850,11 @@ private void add0222GraphStores() this.archiveBuilder.addEntityDef(getGraphStoreEntity()); } - private EntityDef getGraphStoreEntity() { - final String guid = "86de3633-eec8-4bf9-aad1-e92df1ca2024"; - final String name = "GraphStore"; - final String description = "Identifies a data store as one that contains one or more graphs."; - final String descriptionGUID = null; + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.GRAPH_STORE, + this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_STORE.typeName)); - final String superTypeName = OpenMetadataType.DATA_STORE.typeName; - - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID); /* * Build the attributes */ @@ -8121,84 +5890,38 @@ private void add0223EventsAndLogs() this.archiveBuilder.addEntityDef(getTopicEntity()); this.archiveBuilder.addEntityDef(getLogFileEntity()); - this.archiveBuilder.addRelationshipDef(getTopicSubscribersRelationship()); this.archiveBuilder.addClassificationDef(getNotificationManagerClassification()); } - private EntityDef getSubscriberListEntity() { - final String guid = "69751093-35f9-42b1-944b-ba6251ff513d"; - final String name = "SubscriberList"; - final String description = "A data set containing a list of endpoints registered to receive events from a topic."; - final String descriptionGUID = null; - - final String superTypeName = OpenMetadataType.DATA_SET.typeName; - - return archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.SUBSCRIBER_LIST, + this.archiveBuilder.getEntityDef(OpenMetadataType.COLLECTION.typeName)); } - private EntityDef getTopicEntity() { - final String guid = OpenMetadataType.TOPIC.typeGUID; - final String name = OpenMetadataType.TOPIC.typeName; - final String description = OpenMetadataType.TOPIC.description; - final String descriptionGUID = OpenMetadataType.TOPIC.descriptionGUID; - final String descriptionWiki = OpenMetadataType.TOPIC.wikiURL; - - final String superTypeName = OpenMetadataType.DATA_SET.typeName; - - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID, - descriptionWiki); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.TOPIC, + this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_SET.typeName)); /* * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - - final String attribute1Name = OpenMetadataProperty.TOPIC_TYPE.name; - final String attribute1Description = OpenMetadataProperty.TOPIC_TYPE.description; - final String attribute1DescriptionGUID = OpenMetadataProperty.TOPIC_TYPE.descriptionGUID; - property = archiveHelper.getStringTypeDefAttribute(attribute1Name, - attribute1Description, - attribute1DescriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.TOPIC_TYPE)); entityDef.setPropertiesDefinition(properties); return entityDef; } - private EntityDef getLogFileEntity() { - final String guid = OpenMetadataType.LOG_FILE.typeGUID; - final String name = OpenMetadataType.LOG_FILE.typeName; - final String description = OpenMetadataType.LOG_FILE.description; - final String descriptionGUID = OpenMetadataType.LOG_FILE.descriptionGUID; - final String descriptionWiki = OpenMetadataType.LOG_FILE.wikiURL; - - final String superTypeName = OpenMetadataType.DATA_FILE.typeName; - - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID, - descriptionWiki); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.LOG_FILE, + this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_FILE.typeName)); /* * Build the attributes @@ -8220,7 +5943,6 @@ private EntityDef getLogFileEntity() return entityDef; } - private RelationshipDef getTopicSubscribersRelationship() { final String guid = "bc91a28c-afb9-41a7-8eb2-fc8b5271fe9e"; @@ -8228,14 +5950,12 @@ private RelationshipDef getTopicSubscribersRelationship() final String description = "Links the list of subscribers to a topic."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -8246,30 +5966,27 @@ private RelationshipDef getTopicSubscribersRelationship() final String end1AttributeName = "subscribers"; final String end1AttributeDescription = "The endpoints subscribed to this topic."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = "Topic"; final String end2AttributeName = "topics"; final String end2AttributeDescription = "The topics used by this subscriber list."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.TOPIC.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -8283,14 +6000,12 @@ private ClassificationDef getNotificationManagerClassification() final String description = "Identifies a server capability that is distributing events from a topic to its subscriber list."; final String descriptionGUID = null; - final String linkedToEntity = OpenMetadataType.SOFTWARE_SERVER_CAPABILITY.typeName; - return archiveHelper.getClassificationDef(guid, name, null, description, descriptionGUID, - this.archiveBuilder.getEntityDef(linkedToEntity), + this.archiveBuilder.getEntityDef(OpenMetadataType.SOFTWARE_SERVER_CAPABILITY.typeName), false); } @@ -8328,11 +6043,9 @@ private EntityDef getDatabaseEntity() final String description = "A data store containing relational data."; final String descriptionGUID = null; - final String superTypeName = OpenMetadataType.DATA_STORE.typeName; - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, name, - this.archiveBuilder.getEntityDef(superTypeName), + this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_STORE.typeName), description, descriptionGUID); @@ -8443,11 +6156,9 @@ private EntityDef getEnterpriseAccessLayerEntity() final String description = "Repository services for the Open Metadata Access Services (OMAS) supporting federated queries and aggregated events from the connected cohorts."; final String descriptionGUID = null; - final String superTypeName = OpenMetadataType.SOFTWARE_SERVER_CAPABILITY.typeName; - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, name, - this.archiveBuilder.getEntityDef(superTypeName), + this.archiveBuilder.getEntityDef(OpenMetadataType.SOFTWARE_SERVER_CAPABILITY.typeName), description, descriptionGUID); @@ -8487,11 +6198,9 @@ private EntityDef getCohortMemberEntity() final String description = "A capability enabling a server to access an open metadata repository cohort."; final String descriptionGUID = null; - final String superTypeName = OpenMetadataType.SOFTWARE_SERVER_CAPABILITY.typeName; - return archiveHelper.getDefaultEntityDef(guid, name, - this.archiveBuilder.getEntityDef(superTypeName), + this.archiveBuilder.getEntityDef(OpenMetadataType.SOFTWARE_SERVER_CAPABILITY.typeName), description, descriptionGUID); } @@ -8504,11 +6213,9 @@ private EntityDef getMetadataRepositoryCohortEntity() final String description = "A group of collaborating open metadata repositories."; final String descriptionGUID = null; - final String superTypeName = OpenMetadataType.REFERENCEABLE.typeName; - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, name, - this.archiveBuilder.getEntityDef(superTypeName), + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), description, descriptionGUID); @@ -8544,11 +6251,9 @@ private EntityDef getMetadataCollectionEntity() final String description = "A data set containing metadata."; final String descriptionGUID = null; - final String superTypeName = OpenMetadataType.DATA_SET.typeName; - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, name, - this.archiveBuilder.getEntityDef(superTypeName), + this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_SET.typeName), description, descriptionGUID); @@ -8582,11 +6287,9 @@ private EntityDef getMetadataRepositoryEntity() final String description = "A data store containing metadata."; final String descriptionGUID = null; - final String superTypeName = OpenMetadataType.DATA_STORE.typeName; - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, name, - this.archiveBuilder.getEntityDef(superTypeName), + this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_STORE.typeName), description, descriptionGUID); @@ -8618,11 +6321,9 @@ private EntityDef getCohortRegistryStoreEntity() final String description = "A data store containing cohort membership registration details."; final String descriptionGUID = null; - final String superTypeName = OpenMetadataType.DATA_STORE.typeName; - return archiveHelper.getDefaultEntityDef(guid, name, - this.archiveBuilder.getEntityDef(superTypeName), + this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_STORE.typeName), description, descriptionGUID); } @@ -8635,14 +6336,12 @@ private RelationshipDef getMetadataCohortPeerRelationship() final String description = "A metadata repository's registration with an open metadata cohort."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -8653,13 +6352,12 @@ private RelationshipDef getMetadataCohortPeerRelationship() final String end1AttributeName = "registeredWithCohorts"; final String end1AttributeDescription = "Identifies which cohorts this cohort member is registered with."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); @@ -8670,13 +6368,12 @@ private RelationshipDef getMetadataCohortPeerRelationship() final String end2AttributeName = "cohortMembership"; final String end2AttributeDescription = "Members of this cohort."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -8707,14 +6404,12 @@ private RelationshipDef getCohortMemberMetadataCollectionRelationship() final String description = "The local metadata collection associated with a cohort peer."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -8725,13 +6420,12 @@ private RelationshipDef getCohortMemberMetadataCollectionRelationship() final String end1AttributeName = "cohortMember"; final String end1AttributeDescription = "Cohort registry representing this metadata collection on the metadata highway."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.AT_MOST_ONE; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef1(relationshipEndDef); @@ -8742,13 +6436,12 @@ private RelationshipDef getCohortMemberMetadataCollectionRelationship() final String end2AttributeName = "localMetadataCollection"; final String end2AttributeDescription = "Metadata to exchange with the cohorts."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.AT_MOST_ONE; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -8878,11 +6571,9 @@ private EntityDef getReferenceCodeTableEntity() final String description = "A data set containing code values and their translations."; final String descriptionGUID = null; - final String superTypeName = OpenMetadataType.DATA_SET.typeName; - return archiveHelper.getDefaultEntityDef(guid, name, - this.archiveBuilder.getEntityDef(superTypeName), + this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_SET.typeName), description, descriptionGUID); } @@ -8895,11 +6586,9 @@ private EntityDef getReferenceCodeMappingTableEntity() final String description = "A data set containing mappings between code values from different data sets."; final String descriptionGUID = null; - final String superTypeName = OpenMetadataType.DATA_SET.typeName; - return archiveHelper.getDefaultEntityDef(guid, name, - this.archiveBuilder.getEntityDef(superTypeName), + this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_SET.typeName), description, descriptionGUID); } @@ -8943,11 +6632,9 @@ private EntityDef getFormEntity() final String description = "A collection of data items used to request activity."; final String descriptionGUID = null; - final String superTypeName = OpenMetadataType.DATA_SET.typeName; - return archiveHelper.getDefaultEntityDef(guid, name, - this.archiveBuilder.getEntityDef(superTypeName), + this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_SET.typeName), description, descriptionGUID); } @@ -8960,11 +6647,9 @@ private EntityDef getDeployedReportEntity() final String description = "A collection if data items that describe a situation. This is an instance of a report."; final String descriptionGUID = null; - final String superTypeName = OpenMetadataType.DATA_SET.typeName; - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, name, - this.archiveBuilder.getEntityDef(superTypeName), + this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_SET.typeName), description, descriptionGUID); @@ -9128,12 +6813,11 @@ private EntityDef getPortEntity() final String name = "Port"; final String description = "An interface where data flows in and/or out of the process."; final String descriptionGUID = null; - final String superTypeName = OpenMetadataType.REFERENCEABLE.typeName; EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, name, - this.archiveBuilder.getEntityDef(superTypeName), + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), description, descriptionGUID); @@ -9227,14 +6911,12 @@ private RelationshipDef getPortDelegationRelationship() final String description = "A relationship between a more granular and a more abstract port"; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -9245,13 +6927,12 @@ private RelationshipDef getPortDelegationRelationship() final String end1AttributeName = "delegatingFrom"; final String end1AttributeDescription = "Higher level Port"; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* @@ -9261,13 +6942,12 @@ private RelationshipDef getPortDelegationRelationship() final String end2AttributeName = "delegatingTo"; final String end2AttributeDescription = "Lower level port"; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.AT_MOST_ONE; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef2(relationshipEndDef); @@ -9288,31 +6968,27 @@ private RelationshipDef getProcessPortRelationship() final String description = "A link between a process and one of its ports."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.PROCESS.typeName; final String end1AttributeName = "owningProcess"; final String end1AttributeDescription = "Process linked to the port"; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.AT_MOST_ONE; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.PROCESS.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef1(relationshipEndDef); @@ -9323,13 +6999,12 @@ private RelationshipDef getProcessPortRelationship() final String end2AttributeName = "ports"; final String end2AttributeDescription = "Port to the process"; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); @@ -9386,11 +7061,9 @@ private EntityDef getGlossaryEntity() final String description = "A collection of related glossary terms."; final String descriptionGUID = null; - final String superTypeName = OpenMetadataType.REFERENCEABLE.typeName; - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, name, - this.archiveBuilder.getEntityDef(superTypeName), + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), description, descriptionGUID); @@ -9450,14 +7123,13 @@ private RelationshipDef getExternalSourcedGlossaryRelationship() final String description = "Link between an open metadata glossary and a related glossary stored outside of the open metadata ecosystem."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -9468,13 +7140,12 @@ private RelationshipDef getExternalSourcedGlossaryRelationship() final String end1AttributeName = "localGlossary"; final String end1AttributeDescription = "Local glossary that relates to this external glossary."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); @@ -9485,13 +7156,12 @@ private RelationshipDef getExternalSourcedGlossaryRelationship() final String end2AttributeName = "externalGlossaryLink"; final String end2AttributeDescription = "Link to a related external glossary."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -9604,11 +7274,9 @@ private EntityDef getGlossaryCategoryEntity() final String description = "A collection of related glossary terms."; final String descriptionGUID = null; - final String superTypeName = OpenMetadataType.REFERENCEABLE.typeName; - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, name, - this.archiveBuilder.getEntityDef(superTypeName), + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), description, descriptionGUID); @@ -9640,14 +7308,12 @@ private RelationshipDef getCategoryAnchorRelationship() final String description = "Connects a glossary category with its owning glossary."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -9658,13 +7324,12 @@ private RelationshipDef getCategoryAnchorRelationship() final String end1AttributeName = "anchor"; final String end1AttributeDescription = "Owning glossary for this category."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.AT_MOST_ONE; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef1(relationshipEndDef); @@ -9675,13 +7340,12 @@ private RelationshipDef getCategoryAnchorRelationship() final String end2AttributeName = "categories"; final String end2AttributeDescription = "Categories owned by this glossary."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -9695,14 +7359,12 @@ private RelationshipDef getCategoryHierarchyLinkRelationship() final String description = "Relationship between two glossary categories used to create nested categories."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -9713,13 +7375,12 @@ private RelationshipDef getCategoryHierarchyLinkRelationship() final String end1AttributeName = "superCategory"; final String end1AttributeDescription = "Identifies the parent category."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.AT_MOST_ONE; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef1(relationshipEndDef); @@ -9730,13 +7391,12 @@ private RelationshipDef getCategoryHierarchyLinkRelationship() final String end2AttributeName = "subcategories"; final String end2AttributeDescription = "Glossary categories nested inside this category."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -9750,14 +7410,12 @@ private RelationshipDef getLibraryCategoryReferenceRelationship() final String description = "Links a glossary category to a corresponding category in an external glossary."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -9768,13 +7426,12 @@ private RelationshipDef getLibraryCategoryReferenceRelationship() final String end1AttributeName = "localCategories"; final String end1AttributeDescription = "Related local glossary categories."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); @@ -9785,13 +7442,12 @@ private RelationshipDef getLibraryCategoryReferenceRelationship() final String end2AttributeName = "externalGlossaryCategories"; final String end2AttributeDescription = "Links to related external glossaries."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -9837,14 +7493,12 @@ private ClassificationDef getSubjectAreaClassification() final String description = "Identifies an element as part of a subject area definition."; final String descriptionGUID = null; - final String linkedToEntity = OpenMetadataType.REFERENCEABLE.typeName; - ClassificationDef classificationDef = archiveHelper.getClassificationDef(guid, name, null, description, descriptionGUID, - this.archiveBuilder.getEntityDef(linkedToEntity), + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), false); /* @@ -9983,34 +7637,30 @@ private RelationshipDef getTermAnchorRelationship() /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.GLOSSARY_TYPE_NAME; final String end1AttributeName = "anchor"; final String end1AttributeDescription = "Owning glossary."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.AT_MOST_ONE; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.GLOSSARY_TYPE_NAME), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.GLOSSARY_TERM.typeName; final String end2AttributeName = "terms"; final String end2AttributeDescription = "Terms owned by this glossary."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.GLOSSARY_TERM.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -10032,34 +7682,30 @@ private RelationshipDef getTermCategorizationRelationship() /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.GLOSSARY_CATEGORY_TYPE_NAME; final String end1AttributeName = "categories"; final String end1AttributeDescription = "Glossary categories that this term is linked to."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.GLOSSARY_CATEGORY_TYPE_NAME), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.GLOSSARY_TERM.typeName; final String end2AttributeName = "terms"; final String end2AttributeDescription = "Glossary terms linked to this category."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.GLOSSARY_TERM.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -10103,17 +7749,15 @@ private RelationshipDef getLibraryTermReferenceRelationship() /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.GLOSSARY_TERM.typeName; final String end1AttributeName = "localTerms"; final String end1AttributeDescription = "Related local glossary terms."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.GLOSSARY_TERM.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); @@ -10124,13 +7768,12 @@ private RelationshipDef getLibraryTermReferenceRelationship() final String end2AttributeName = "externalGlossaryTerms"; final String end2AttributeDescription = "Links to related external glossaries."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -10318,48 +7961,42 @@ private RelationshipDef getRelatedTermRelationship() final String description = "Link between similar glossary terms."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = "GlossaryTerm"; final String end1AttributeName = "seeAlso"; final String end1AttributeDescription = "Related glossary terms."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.GLOSSARY_TERM.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = "GlossaryTerm"; final String end2AttributeName = "seeAlso"; final String end2AttributeDescription = "Related glossary terms."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.GLOSSARY_TERM.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -10410,48 +8047,42 @@ private RelationshipDef getSynonymRelationship() final String description = "Link between glossary terms that have the same meaning."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = "GlossaryTerm"; final String end1AttributeName = "synonyms"; final String end1AttributeDescription = "Glossary terms with the same meaning."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.GLOSSARY_TERM.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = "GlossaryTerm"; final String end2AttributeName = "synonyms"; final String end2AttributeDescription = "Glossary terms with the same meaning."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.GLOSSARY_TERM.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -10503,48 +8134,42 @@ private RelationshipDef getAntonymRelationship() final String description = "Link between glossary terms that have the opposite meaning."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = "GlossaryTerm"; final String end1AttributeName = "antonyms"; final String end1AttributeDescription = "Glossary terms with the opposite meaning."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.GLOSSARY_TERM.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = "GlossaryTerm"; final String end2AttributeName = "antonyms"; final String end2AttributeDescription = "Glossary terms with the opposite meaning."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.GLOSSARY_TERM.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -10595,48 +8220,42 @@ private RelationshipDef getPreferredTermRelationship() final String description = "Link to an alternative term that the organization prefer is used."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = "GlossaryTerm"; final String end1AttributeName = "alternateTerms"; final String end1AttributeDescription = "Alternative glossary terms."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.GLOSSARY_TERM.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = "GlossaryTerm"; final String end2AttributeName = "preferredTerms"; final String end2AttributeDescription = "Related glossary terms."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.GLOSSARY_TERM.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -10687,48 +8306,42 @@ private RelationshipDef getReplacementTermRelationship() final String description = "Link to a glossary term that is replacing an obsolete glossary term."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = "GlossaryTerm"; final String end1AttributeName = "replacedTerms"; final String end1AttributeDescription = "Replaced glossary terms."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.GLOSSARY_TERM.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = "GlossaryTerm"; final String end2AttributeName = "replacementTerms"; final String end2AttributeDescription = "Replacement glossary terms."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.GLOSSARY_TERM.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -10779,48 +8392,42 @@ private RelationshipDef getTranslationRelationship() final String description = "Link between glossary terms that provide different natural language translation of the same concept."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = "GlossaryTerm"; final String end1AttributeName = "translations"; final String end1AttributeDescription = "Translations of glossary term."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.GLOSSARY_TERM.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = "GlossaryTerm"; final String end2AttributeName = "translations"; final String end2AttributeDescription = "Translations of glossary term."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.GLOSSARY_TERM.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -10871,48 +8478,42 @@ private RelationshipDef getISARelationshipRelationship() final String description = "Link between a more general glossary term and a more specific definition."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = "GlossaryTerm"; final String end1AttributeName = "classifies"; final String end1AttributeDescription = "More specific glossary terms."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.GLOSSARY_TERM.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = "GlossaryTerm"; final String end2AttributeName = "isA"; final String end2AttributeDescription = "More general glossary terms."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.GLOSSARY_TERM.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -10963,48 +8564,42 @@ private RelationshipDef getValidValueRelationship() final String description = "Link between glossary terms where one defines one of the data values for the another."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = "GlossaryTerm"; final String end1AttributeName = "validValueFor"; final String end1AttributeDescription = "Glossary terms for data items that can be set to this value."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.GLOSSARY_TERM.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = "GlossaryTerm"; final String end2AttributeName = "validValues"; final String end2AttributeDescription = "Glossary terms for data values that can be used with data items represented by this glossary term."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.GLOSSARY_TERM.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -11078,34 +8673,30 @@ private RelationshipDef getUsedInContextRelationship() /* * Set up end 1. */ - final String end1EntityType = "GlossaryTerm"; final String end1AttributeName = "contextRelevantTerms"; final String end1AttributeDescription = "Glossary terms used in this specific context."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.GLOSSARY_TERM.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = "GlossaryTerm"; final String end2AttributeName = "usedInContexts"; final String end2AttributeDescription = "Glossary terms describing the contexts where this term is used."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.GLOSSARY_TERM.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -11254,34 +8845,30 @@ private RelationshipDef getSemanticAssignmentRelationship() /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.REFERENCEABLE.typeName; final String end1AttributeName = "assignedElements"; final String end1AttributeDescription = "Elements identified as managing data that has the same meaning as this glossary term."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.GLOSSARY_TERM_TYPE_NAME; final String end2AttributeName = "meaning"; final String end2AttributeDescription = "Semantic definition for this element."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.GLOSSARY_TERM.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -11356,48 +8943,42 @@ private RelationshipDef getTermHASARelationshipRelationship() final String description = "Defines the relationship between a spine object and a spine attribute."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = "GlossaryTerm"; final String end1AttributeName = "objects"; final String end1AttributeDescription = "Objects where this attribute may occur."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.GLOSSARY_TERM.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = "GlossaryTerm"; final String end2AttributeName = "attributes"; final String end2AttributeDescription = "Typical attributes for this object."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.GLOSSARY_TERM.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -11441,48 +9022,42 @@ private RelationshipDef getTermISATYPEOFRelationshipRelationship() final String description = "Defines an inheritance relationship between two spine objects."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = "GlossaryTerm"; final String end1AttributeName = "supertypes"; final String end1AttributeDescription = "Supertypes for this object."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.GLOSSARY_TERM.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = "GlossaryTerm"; final String end2AttributeName = "subtypes"; final String end2AttributeDescription = "Subtypes for this object."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.GLOSSARY_TERM.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -11526,48 +9101,42 @@ private RelationshipDef getTermTYPEDBYRelationshipRelationship() final String description = "Defines the relationship between a spine attribute and its type."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = "GlossaryTerm"; final String end1AttributeName = "attributesTypedBy"; final String end1AttributeDescription = "Attributes of this type."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.GLOSSARY_TERM.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = "GlossaryTerm"; final String end2AttributeName = "types"; final String end2AttributeDescription = "Types for this attribute."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.GLOSSARY_TERM.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -11788,118 +9357,28 @@ private void add0401GovernanceDefinitions() private EnumDef getGovernanceDomainEnum() { - final String guid = "baa31998-f3cb-47b0-9123-674a701e87bc"; - final String name = "GovernanceDomain"; - final String description = "Defines the governance domains that open metadata seeks to unite."; - final String descriptionGUID = null; - - EnumDef enumDef = archiveHelper.getEmptyEnumDef(guid, name, description, descriptionGUID); + EnumDef enumDef = archiveHelper.getEmptyEnumDef(GovernanceDomain.getOpenTypeGUID(), + GovernanceDomain.getOpenTypeName(), + GovernanceDomain.getOpenTypeDescription(), + GovernanceDomain.getOpenTypeDescriptionGUID()); ArrayList elementDefs = new ArrayList<>(); EnumElementDef elementDef; - final int element1Ordinal = 0; - final String element1Value = "All"; - final String element1Description = "Relevant to all governance domains."; - final String element1DescriptionGUID = null; - - elementDef = archiveHelper.getEnumElementDef(element1Ordinal, - element1Value, - element1Description, - element1DescriptionGUID); - - elementDefs.add(elementDef); - - final int element2Ordinal = 1; - final String element2Value = "Data"; - final String element2Description = "The data (information) governance domain."; - final String element2DescriptionGUID = null; - - elementDef = archiveHelper.getEnumElementDef(element2Ordinal, - element2Value, - element2Description, - element2DescriptionGUID); - elementDefs.add(elementDef); - - final int element3Ordinal = 2; - final String element3Value = "Privacy"; - final String element3Description = "The data privacy domain."; - final String element3DescriptionGUID = null; - - elementDef = archiveHelper.getEnumElementDef(element3Ordinal, - element3Value, - element3Description, - element3DescriptionGUID); - elementDefs.add(elementDef); - - final int element4Ordinal = 3; - final String element4Value = "Security"; - final String element4Description = "The security governance domain."; - final String element4DescriptionGUID = null; - - elementDef = archiveHelper.getEnumElementDef(element4Ordinal, - element4Value, - element4Description, - element4DescriptionGUID); - elementDefs.add(elementDef); - - final int element5Ordinal = 4; - final String element5Value = OpenMetadataType.IT_INFRASTRUCTURE.typeName; - final String element5Description = "The IT infrastructure governance domain."; - final String element5DescriptionGUID = null; - - elementDef = archiveHelper.getEnumElementDef(element5Ordinal, - element5Value, - element5Description, - element5DescriptionGUID); - elementDefs.add(elementDef); - - final int element6Ordinal = 5; - final String element6Value = "SoftwareDevelopment"; - final String element6Description = "The software development lifecycle governance domain."; - final String element6DescriptionGUID = null; - - elementDef = archiveHelper.getEnumElementDef(element6Ordinal, - element6Value, - element6Description, - element6DescriptionGUID); - - elementDefs.add(elementDef); - - final int element7Ordinal = 6; - final String element7Value = "Corporate"; - final String element7Description = "The corporate governance domain."; - final String element7DescriptionGUID = null; - - elementDef = archiveHelper.getEnumElementDef(element7Ordinal, - element7Value, - element7Description, - element7DescriptionGUID); - - elementDefs.add(elementDef); - - final int element8Ordinal = 7; - final String element8Value = "AssetManagement"; - final String element8Description = "The physical asset management governance domain."; - final String element8DescriptionGUID = null; - - elementDef = archiveHelper.getEnumElementDef(element8Ordinal, - element8Value, - element8Description, - element8DescriptionGUID); - - elementDefs.add(elementDef); + for (GovernanceDomain enumValue : GovernanceDomain.values()) + { + elementDef = archiveHelper.getEnumElementDef(enumValue.getOrdinal(), + enumValue.getName(), + enumValue.getDescription(), + enumValue.getDescriptionGUID()); - final int element99Ordinal = 99; - final String element99Value = "Other"; - final String element99Description = "Another governance domain."; - final String element99DescriptionGUID = null; + elementDefs.add(elementDef); - elementDef = archiveHelper.getEnumElementDef(element99Ordinal, - element99Value, - element99Description, - element99DescriptionGUID); - elementDefs.add(elementDef); + if (enumValue.isDefault()) + { + enumDef.setDefaultValue(elementDef); + } + } enumDef.setElementDefs(elementDefs); @@ -11914,11 +9393,9 @@ private EntityDef getGovernanceDefinitionEntity() final String description = "Defines an aspect of the governance program."; final String descriptionGUID = null; - final String superTypeName = OpenMetadataType.REFERENCEABLE.typeName; - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, name, - this.archiveBuilder.getEntityDef(superTypeName), + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), description, descriptionGUID); @@ -11950,22 +9427,11 @@ private EntityDef getGovernanceDefinitionEntity() final String attribute9Description = "Actual results."; final String attribute9DescriptionGUID = null; - property = archiveHelper.getStringTypeDefAttribute(attribute1Name, - attribute1Description, - attribute1DescriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.SUMMARY.name, - OpenMetadataProperty.SUMMARY.description, - OpenMetadataProperty.SUMMARY.descriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.DESCRIPTION.name, - OpenMetadataProperty.DESCRIPTION.description, - OpenMetadataProperty.DESCRIPTION.descriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(attribute4Name, - attribute4Description, - attribute4DescriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.TITLE)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.SUMMARY)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.DESCRIPTION)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.SCOPE)); + property = archiveHelper.getEnumTypeDefAttribute("GovernanceDomain", attribute5Name, attribute5Description, @@ -12241,14 +9707,12 @@ private RelationshipDef getGovernancePolicyLinkRelationship() final String description = "Links related governance policies together."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -12259,13 +9723,12 @@ private RelationshipDef getGovernancePolicyLinkRelationship() final String end1AttributeName = "linkingPolicies"; final String end1AttributeDescription = "Policies that are dependent on this policy."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); @@ -12276,13 +9739,12 @@ private RelationshipDef getGovernancePolicyLinkRelationship() final String end2AttributeName = "linkedPolicies"; final String end2AttributeDescription = "Policies that further define aspects of this policy."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -12309,14 +9771,12 @@ private RelationshipDef getGovernanceResponseRelationship() final String description = "Links a governance policy to a governance driver that it is supporting."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -12327,13 +9787,12 @@ private RelationshipDef getGovernanceResponseRelationship() final String end1AttributeName = "drivers"; final String end1AttributeDescription = "Drivers that justify this policy."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); @@ -12344,13 +9803,12 @@ private RelationshipDef getGovernanceResponseRelationship() final String end2AttributeName = "policies"; final String end2AttributeDescription = "Governance policies that support this governance driver."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -12502,14 +9960,12 @@ private RelationshipDef getGovernanceImplementationRelationship() final String description = "A link between a governance control and the governance driver it is implementing."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -12520,13 +9976,12 @@ private RelationshipDef getGovernanceImplementationRelationship() final String end1AttributeName = "policies"; final String end1AttributeDescription = "The policies that are supported by this control."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); @@ -12537,13 +9992,12 @@ private RelationshipDef getGovernanceImplementationRelationship() final String end2AttributeName = "implementations"; final String end2AttributeDescription = "The governance controls that implement this policy."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -12574,14 +10028,12 @@ private RelationshipDef getGovernanceControlLinkRelationship() final String description = "A link between two related governance controls."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -12592,13 +10044,12 @@ private RelationshipDef getGovernanceControlLinkRelationship() final String end1AttributeName = "linkingControls"; final String end1AttributeDescription = "Governance controls that ate dependent on this control."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); @@ -12609,13 +10060,12 @@ private RelationshipDef getGovernanceControlLinkRelationship() final String end2AttributeName = "linkedControls"; final String end2AttributeDescription = "Governance controls that support the implementation of this control."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -12655,11 +10105,9 @@ private EntityDef getGovernanceConfidentialityLevelEntity() final String description = "A definition of a confidentiality level."; final String descriptionGUID = null; - final String superTypeName = OpenMetadataType.REFERENCEABLE.typeName; - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, name, - this.archiveBuilder.getEntityDef(superTypeName), + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), description, descriptionGUID); @@ -12931,15 +10379,12 @@ private ClassificationDef getConfidenceClassification() final String description = "Defines the level of confidence that should be placed in the accuracy of related data items."; final String descriptionGUID = null; - final String linkedToEntity = OpenMetadataType.REFERENCEABLE.typeName; - ClassificationDef classificationDef = archiveHelper.getClassificationDef(guid, name, null, description, descriptionGUID, - this.archiveBuilder.getEntityDef( - linkedToEntity), + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), false); /* @@ -13144,8 +10589,6 @@ private ClassificationDef getSecurityTagsClassification() final String description = "Defines labels and properties used by a security engine."; final String descriptionGUID = null; - final String linkedToEntity = OpenMetadataType.REFERENCEABLE.typeName; - ClassificationDef classificationDef = archiveHelper.getClassificationDef(guid, name, null, @@ -13209,14 +10652,12 @@ private ClassificationDef getAssetZoneMembershipClassification() final String description = "Defines the asset's membership of the governance zones."; final String descriptionGUID = null; - final String linkedToEntity = OpenMetadataType.ASSET.typeName; - ClassificationDef classificationDef = archiveHelper.getClassificationDef(guid, name, null, description, descriptionGUID, - this.archiveBuilder.getEntityDef(linkedToEntity), + this.archiveBuilder.getEntityDef(OpenMetadataType.ASSET.typeName), false); /* @@ -13247,11 +10688,9 @@ private EntityDef getGovernanceZoneEntity() final String description = "Defines a collection of assets that are suitable for a particular usage or are governed by a particular process."; final String descriptionGUID = null; - final String superTypeName = OpenMetadataType.REFERENCEABLE.typeName; - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, name, - this.archiveBuilder.getEntityDef(superTypeName), + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), description, descriptionGUID); @@ -13291,14 +10730,12 @@ private RelationshipDef getZoneGovernanceRelationship() final String description = "Links a governance zone to a governance definition that applies to all of the members of the zone."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -13309,13 +10746,12 @@ private RelationshipDef getZoneGovernanceRelationship() final String end1AttributeName = "governedZones"; final String end1AttributeDescription = "The collections of assets governed by this definition."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); @@ -13326,13 +10762,12 @@ private RelationshipDef getZoneGovernanceRelationship() final String end2AttributeName = "governedBy"; final String end2AttributeDescription = "Governance definitions for this zone."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); @@ -13347,14 +10782,12 @@ private RelationshipDef getZoneHierarchyRelationship() final String description = "Creates a controlling hierarchy for governance zones."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -13365,13 +10798,12 @@ private RelationshipDef getZoneHierarchyRelationship() final String end1AttributeName = "inheritsFromZone"; final String end1AttributeDescription = "The zone that provides additional governance requirements."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.AT_MOST_ONE; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef1(relationshipEndDef); @@ -13382,13 +10814,12 @@ private RelationshipDef getZoneHierarchyRelationship() final String end2AttributeName = "controlsZone"; final String end2AttributeDescription = "The zones that are also governed in the same way."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); @@ -13454,14 +10885,12 @@ private RelationshipDef getGovernanceRuleImplementationRelationship() final String description = "Identifies the implementation of a governance rule."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -13519,14 +10948,12 @@ private RelationshipDef getGovernanceProcessImplementationRelationship() final String description = "Identifies the implementation of a governance process."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -13537,30 +10964,27 @@ private RelationshipDef getGovernanceProcessImplementationRelationship() final String end1AttributeName = "implementsGovernanceProcesses"; final String end1AttributeDescription = "The processes that are implemented by this component."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.PROCESS.typeName; final String end2AttributeName = "implementations"; final String end2AttributeDescription = "The processes that implement this governance process."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.PROCESS.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -13821,11 +11245,9 @@ private EntityDef getBusinessCapabilityEntity() final String description = "Describes a function, capability or skill set."; final String descriptionGUID = null; - final String superTypeName = OpenMetadataType.REFERENCEABLE.typeName; - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, name, - this.archiveBuilder.getEntityDef(superTypeName), + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), description, descriptionGUID); @@ -13896,14 +11318,12 @@ private ClassificationDef getAssetOriginClassification() final String description = "Describes the origin of an asset."; final String descriptionGUID = null; - final String linkedToEntity = OpenMetadataType.ASSET.typeName; - ClassificationDef classificationDef = archiveHelper.getClassificationDef(guid, name, null, description, descriptionGUID, - this.archiveBuilder.getEntityDef(linkedToEntity), + this.archiveBuilder.getEntityDef(OpenMetadataType.ASSET.typeName), false); /* @@ -13949,15 +11369,12 @@ private RelationshipDef getOrganizationCapabilityRelationship() final String description = "Describes the relationship between a team and the business capabilities it supports."; final String descriptionGUID = null; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -13968,30 +11385,27 @@ private RelationshipDef getOrganizationCapabilityRelationship() final String end1AttributeName = "supportsBusinessCapabilities"; final String end1AttributeDescription = "The business capabilities that this team supports."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = "Team"; final String end2AttributeName = "supportingTeams"; final String end2AttributeDescription = "The teams that support this business capability."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.TEAM.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -14005,15 +11419,12 @@ private RelationshipDef getResponsibilityStaffContactRelationship() final String description = "Identifies a person, team or engine assigned to a governance responsibility."; final String descriptionGUID = null; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -14024,7 +11435,6 @@ private RelationshipDef getResponsibilityStaffContactRelationship() final String end1AttributeName = "contactFor"; final String end1AttributeDescription = "The governance responsibilities that this team or person is assigned to."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, @@ -14037,11 +11447,9 @@ private RelationshipDef getResponsibilityStaffContactRelationship() /* * Set up end 2. */ - final String end2EntityType = "ActorProfile"; final String end2AttributeName = "assignedStaff"; final String end2AttributeDescription = "The people, teams and/or engines that are supporting this governance responsibility."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.ACTOR_PROFILE.typeName), end2AttributeName, @@ -14078,15 +11486,12 @@ private RelationshipDef getBusinessCapabilityControlsRelationship() final String description = "Identifies a business capability that supports a governance control."; final String descriptionGUID = null; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -14097,13 +11502,12 @@ private RelationshipDef getBusinessCapabilityControlsRelationship() final String end1AttributeName = "implementsControls"; final String end1AttributeDescription = "The governance controls that this business capability supports."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); @@ -14114,13 +11518,12 @@ private RelationshipDef getBusinessCapabilityControlsRelationship() final String end2AttributeName = "affectedBusinessCapabilities"; final String end2AttributeDescription = "The business capabilities that implement or support this governance responsibility."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -14163,11 +11566,9 @@ private EntityDef getProjectCharterEntity() final String description = "Describes the goals, scope and authority of a project."; final String descriptionGUID = null; - final String superTypeName = OpenMetadataType.REFERENCEABLE.typeName; - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, name, - this.archiveBuilder.getEntityDef(superTypeName), + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), description, descriptionGUID); @@ -14214,32 +11615,27 @@ private RelationshipDef getProjectCharterLinkRelationship() final String description = "Links a Project with its Charter."; final String descriptionGUID = null; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = "Project"; final String end1AttributeName = "projects"; final String end1AttributeDescription = "The projects guided by this charter."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.PROJECT.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); @@ -14250,13 +11646,12 @@ private RelationshipDef getProjectCharterLinkRelationship() final String end2AttributeName = "charter"; final String end2AttributeDescription = "The charter guiding this project."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.AT_MOST_ONE; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -14342,14 +11737,12 @@ private ClassificationDef getAssetOwnershipClassification() final String description = "Describes the ownership of an asset."; final String descriptionGUID = null; - final String linkedToEntity = OpenMetadataType.ASSET.typeName; - ClassificationDef classificationDef = archiveHelper.getClassificationDef(guid, name, null, description, descriptionGUID, - this.archiveBuilder.getEntityDef(linkedToEntity), + this.archiveBuilder.getEntityDef(OpenMetadataType.ASSET.typeName), false); /* @@ -14438,49 +11831,42 @@ private RelationshipDef getGovernanceRoleAssignmentRelationship() final String description = "Identifies a person assigned to perform a specific responsibility for a specific resource."; final String descriptionGUID = null; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.REFERENCEABLE.typeName; final String end1AttributeName = "governanceAssignments"; final String end1AttributeDescription = "The resources assigned to this person."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = "PersonRole"; final String end2AttributeName = "governedByRoles"; final String end2AttributeDescription = "The roles assigned to this element."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.PERSON_ROLE.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -14495,14 +11881,12 @@ private RelationshipDef getGovernanceResponsibilityAssignmentRelationship() final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -14513,13 +11897,12 @@ private RelationshipDef getGovernanceResponsibilityAssignmentRelationship() final String end1AttributeName = "performedByRoles"; final String end1AttributeDescription = "The roles assigned to this responsibility."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); @@ -14530,13 +11913,12 @@ private RelationshipDef getGovernanceResponsibilityAssignmentRelationship() final String end2AttributeName = "governanceResponsibilities"; final String end2AttributeDescription = "The responsibilities performed by this role."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -14566,11 +11948,9 @@ private EntityDef getGovernanceMetricEntity() final String description = "A definition for how the effectiveness of the governance program is measured."; final String descriptionGUID = null; - final String superTypeName = OpenMetadataType.REFERENCEABLE.typeName; - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, name, - this.archiveBuilder.getEntityDef(superTypeName), + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), description, descriptionGUID); @@ -14618,15 +11998,12 @@ private RelationshipDef getGovernanceDefinitionMetricRelationship() final String description = "Link between a governance definition and a governance metric used to measure this definition."; final String descriptionGUID = null; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -14637,13 +12014,12 @@ private RelationshipDef getGovernanceDefinitionMetricRelationship() final String end1AttributeName = "metrics"; final String end1AttributeDescription = "The metrics that measure the landscape against this governance definition."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); @@ -14654,13 +12030,12 @@ private RelationshipDef getGovernanceDefinitionMetricRelationship() final String end2AttributeName = "measuredDefinitions"; final String end2AttributeDescription = "The governance definitions that are measured by this metric."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -14691,15 +12066,12 @@ private RelationshipDef getGovernanceResultsRelationship() final String description = "Link between a governance metric and a data set used to gather measurements from the landscape."; final String descriptionGUID = null; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -14710,30 +12082,27 @@ private RelationshipDef getGovernanceResultsRelationship() final String end1AttributeName = "metrics"; final String end1AttributeDescription = "The governance metrics that are captured in this data set."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.DATA_SET.typeName; final String end2AttributeName = "measurements"; final String end2AttributeDescription = "The data set that captures the measurements for this governance metric."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_SET.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -14764,15 +12133,12 @@ private ClassificationDef getGovernanceMeasurementsDataSetClassification() final String description = "A data file containing measurements for a governance metric."; final String descriptionGUID = null; - final String linkedToEntity = OpenMetadataType.DATA_SET.typeName; - ClassificationDef classificationDef = archiveHelper.getClassificationDef(guid, name, null, description, descriptionGUID, - this.archiveBuilder.getEntityDef( - linkedToEntity), + this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_SET.typeName), false); /* @@ -14813,15 +12179,12 @@ private ClassificationDef getExceptionBacklogClassification() final String description = "A data set containing exceptions that need to be resolved"; final String descriptionGUID = null; - final String linkedToEntity = OpenMetadataType.DATA_SET.typeName; - ClassificationDef classificationDef = archiveHelper.getClassificationDef(guid, name, null, description, descriptionGUID, - this.archiveBuilder.getEntityDef( - linkedToEntity), + this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_SET.typeName), false); /* @@ -14864,15 +12227,12 @@ private ClassificationDef getAuditLogClassification() final String description = "A data set of related audit log records."; final String descriptionGUID = null; - final String linkedToEntity = OpenMetadataType.DATA_SET.typeName; - ClassificationDef classificationDef = archiveHelper.getClassificationDef(guid, name, null, description, descriptionGUID, - this.archiveBuilder.getEntityDef( - linkedToEntity), + this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_SET.typeName), false); /* @@ -14911,15 +12271,12 @@ private ClassificationDef getMeteringLogClassification() final String description = "A data set containing records that can be used to identify usage of resources."; final String descriptionGUID = null; - final String linkedToEntity = OpenMetadataType.DATA_SET.typeName; - ClassificationDef classificationDef = archiveHelper.getClassificationDef(guid, name, null, description, descriptionGUID, - this.archiveBuilder.getEntityDef( - linkedToEntity), + this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_SET.typeName), false); /* @@ -14995,14 +12352,12 @@ private ClassificationDef getControlPointClassification() final String description = "A task in a process where a person must make a decision on the right action to take."; final String descriptionGUID = null; - final String linkedToEntity = OpenMetadataType.REFERENCEABLE.typeName; - return archiveHelper.getClassificationDef(guid, name, null, description, descriptionGUID, - this.archiveBuilder.getEntityDef(linkedToEntity), + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), false); } @@ -15014,14 +12369,12 @@ private ClassificationDef getVerificationPointClassification() final String description = "A governance rule that tests if a required condition is true or raises an exception if not."; final String descriptionGUID = null; - final String linkedToEntity = OpenMetadataType.REFERENCEABLE.typeName; - return archiveHelper.getClassificationDef(guid, name, null, description, descriptionGUID, - this.archiveBuilder.getEntityDef(linkedToEntity), + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), false); } @@ -15033,14 +12386,12 @@ private ClassificationDef getEnforcementPointClassification() final String description = "A governance rule that ensures a required condition is true."; final String descriptionGUID = null; - final String linkedToEntity = OpenMetadataType.REFERENCEABLE.typeName; - return archiveHelper.getClassificationDef(guid, name, null, description, descriptionGUID, - this.archiveBuilder.getEntityDef(linkedToEntity), + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), false); } @@ -15100,31 +12451,27 @@ private RelationshipDef getLicenseRelationship() final String description = "Link between an asset and its license."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.REFERENCEABLE.typeName; final String end1AttributeName = "licensed"; final String end1AttributeDescription = "Items licensed by this type of license."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); @@ -15135,13 +12482,12 @@ private RelationshipDef getLicenseRelationship() final String end2AttributeName = "licenses"; final String end2AttributeDescription = "The types of licenses that apply."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -15266,31 +12612,27 @@ private RelationshipDef getCertificationRelationship() final String description = "An awarded certification of a specific type."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.REFERENCEABLE.typeName; final String end1AttributeName = "certifies"; final String end1AttributeDescription = "Items certified by this type of certification."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); @@ -15301,13 +12643,12 @@ private RelationshipDef getCertificationRelationship() final String end2AttributeName = "certifications"; final String end2AttributeDescription = "The types of certifications that apply."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -15384,14 +12725,12 @@ private RelationshipDef getRegulationCertificationTypeRelationship() final String description = "Identifies a certification required by a regulation."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -15402,13 +12741,12 @@ private RelationshipDef getRegulationCertificationTypeRelationship() final String end1AttributeName = "relatedRegulations"; final String end1AttributeDescription = "Regulations that require this type of certification."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); @@ -15419,13 +12757,12 @@ private RelationshipDef getRegulationCertificationTypeRelationship() final String end2AttributeName = "requiredCertifications"; final String end2AttributeDescription = "The certifications required by this regulation."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -15835,14 +13172,12 @@ private RelationshipDef getSchemaTypeSnippetRelationship() final String description = "Link between a schema type and an implementation snippet."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -16332,14 +13667,12 @@ private RelationshipDef getBoundedSchemaElementTypeRelationship() final String description = "The type of the element within the bounded schema type."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -16350,13 +13683,12 @@ private RelationshipDef getBoundedSchemaElementTypeRelationship() final String end1AttributeName = "usedInBoundedSchemaType"; final String end1AttributeDescription = "Use of this element as part of a more complex type."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.AT_MOST_ONE; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef1(relationshipEndDef); @@ -16366,13 +13698,12 @@ private RelationshipDef getBoundedSchemaElementTypeRelationship() final String end2AttributeName = "boundedSchemaElementType"; final String end2AttributeDescription = "The structure of the element within this type."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.AT_MOST_ONE; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.SCHEMA_TYPE.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -16445,14 +13776,12 @@ private RelationshipDef getLinkedTypeRelationship() final String description = "Link between a link element and its type."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -16463,13 +13792,12 @@ private RelationshipDef getLinkedTypeRelationship() final String end1AttributeName = "linkedBy"; final String end1AttributeDescription = "External links to this type."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); @@ -16479,13 +13807,12 @@ private RelationshipDef getLinkedTypeRelationship() final String end2AttributeName = "linkedType"; final String end2AttributeDescription = "Types for this attribute."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.AT_MOST_ONE; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.SCHEMA_TYPE.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -16499,31 +13826,27 @@ private RelationshipDef getSchemaLinkToTypeRelationship() final String description = "Link between a schema attribute and a schema link."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.SCHEMA_ATTRIBUTE.typeName; final String end1AttributeName = "usedIn"; final String end1AttributeDescription = "Attributes of this type."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.AT_MOST_ONE; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.SCHEMA_ATTRIBUTE.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef1(relationshipEndDef); @@ -16534,13 +13857,12 @@ private RelationshipDef getSchemaLinkToTypeRelationship() final String end2AttributeName = "externalType"; final String end2AttributeDescription = "External type for this attribute."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.AT_MOST_ONE; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -16586,14 +13908,12 @@ private RelationshipDef getMapFromElementTypeRelationship() final String description = "Defines the type of the key for a map schema type."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -16604,13 +13924,12 @@ private RelationshipDef getMapFromElementTypeRelationship() final String end1AttributeName = "parentMapFrom"; final String end1AttributeDescription = "Used in map."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); @@ -16620,13 +13939,12 @@ private RelationshipDef getMapFromElementTypeRelationship() final String end2AttributeName = "mapFromElement"; final String end2AttributeDescription = "Key for this attribute."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.AT_MOST_ONE; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.SCHEMA_TYPE.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -16640,14 +13958,12 @@ private RelationshipDef getMapToElementTypeRelationship() final String description = "Defines the type of value for a map schema type."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -16658,13 +13974,12 @@ private RelationshipDef getMapToElementTypeRelationship() final String end1AttributeName = "parentMapTo"; final String end1AttributeDescription = "Used in map."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); @@ -16674,13 +13989,12 @@ private RelationshipDef getMapToElementTypeRelationship() final String end2AttributeName = "mapToElement"; final String end2AttributeDescription = "Value for this map."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.AT_MOST_ONE; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.SCHEMA_TYPE.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -16709,11 +14023,9 @@ private EntityDef getDerivedSchemaAttributeEntity() final String description = "An attribute that is made up of values from another attribute."; final String descriptionGUID = null; - final String superTypeName = OpenMetadataType.SCHEMA_ATTRIBUTE.typeName; - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, name, - this.archiveBuilder.getEntityDef(superTypeName), + this.archiveBuilder.getEntityDef(OpenMetadataType.SCHEMA_ATTRIBUTE.typeName), description, descriptionGUID); @@ -16766,14 +14078,12 @@ private RelationshipDef getSchemaQueryImplementationRelationship() final String description = "Details of how a derived schema attribute is calculated."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -16784,30 +14094,27 @@ private RelationshipDef getSchemaQueryImplementationRelationship() final String end1AttributeName = "usedBy"; final String end1AttributeDescription = "Use of an attribute to derive another attribute."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.SCHEMA_ATTRIBUTE.typeName; final String end2AttributeName = "queryTarget"; final String end2AttributeDescription = "Used to derive this attribute."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.SCHEMA_ATTRIBUTE.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -16916,11 +14223,9 @@ private EntityDef getDocumentSchemaAttributeEntity() final String description = "A schema attribute for a hierarchical data structure."; final String descriptionGUID = null; - final String superTypeName = OpenMetadataType.SCHEMA_ATTRIBUTE.typeName; - return archiveHelper.getDefaultEntityDef(guid, name, - this.archiveBuilder.getEntityDef(superTypeName), + this.archiveBuilder.getEntityDef(OpenMetadataType.SCHEMA_ATTRIBUTE.typeName), description, descriptionGUID); } @@ -17044,11 +14349,9 @@ private EntityDef getObjectAttributeEntity() final String description = "An attribute in an object schema type."; final String descriptionGUID = null; - final String superTypeName = OpenMetadataType.SCHEMA_ATTRIBUTE.typeName; - return archiveHelper.getDefaultEntityDef(guid, name, - this.archiveBuilder.getEntityDef(superTypeName), + this.archiveBuilder.getEntityDef(OpenMetadataType.SCHEMA_ATTRIBUTE.typeName), description, descriptionGUID); } @@ -17071,112 +14374,60 @@ private void add0533GraphSchemas() private EntityDef getGraphSchemaTypeEntity() { - final String guid = OpenMetadataType.GRAPH_SCHEMA_TYPE.typeGUID; - final String name = OpenMetadataType.GRAPH_SCHEMA_TYPE.typeName; - final String description = OpenMetadataType.GRAPH_SCHEMA_TYPE.description; - final String descriptionGUID = OpenMetadataType.GRAPH_SCHEMA_TYPE.descriptionGUID; - final String descriptionWiki = OpenMetadataType.GRAPH_SCHEMA_TYPE.wikiURL; - - final String superTypeName = OpenMetadataType.SCHEMA_TYPE_TYPE_NAME; - - return archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID, - descriptionWiki); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.GRAPH_SCHEMA_TYPE, + this.archiveBuilder.getEntityDef(OpenMetadataType.SCHEMA_TYPE_TYPE_NAME)); } private EntityDef getGraphVertexEntity() { - final String guid = OpenMetadataType.GRAPH_VERTEX.typeGUID; - final String name = OpenMetadataType.GRAPH_VERTEX.typeName; - final String description = OpenMetadataType.GRAPH_VERTEX.description; - final String descriptionGUID = OpenMetadataType.GRAPH_VERTEX.descriptionGUID; - final String descriptionWiki = OpenMetadataType.GRAPH_VERTEX.wikiURL; - - final String superTypeName = OpenMetadataType.SCHEMA_ATTRIBUTE.typeName; - - return archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID, - descriptionWiki); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.GRAPH_VERTEX, + this.archiveBuilder.getEntityDef(OpenMetadataType.SCHEMA_ATTRIBUTE.typeName)); } private EntityDef getGraphEdgeEntity() { - final String guid = OpenMetadataType.GRAPH_EDGE.typeGUID; - final String name = OpenMetadataType.GRAPH_EDGE.typeName; - final String description = OpenMetadataType.GRAPH_EDGE.description; - final String descriptionGUID = OpenMetadataType.GRAPH_EDGE.descriptionGUID; - final String descriptionWiki = OpenMetadataType.GRAPH_EDGE.wikiURL; - - final String superTypeName = OpenMetadataType.SCHEMA_ATTRIBUTE.typeName; - - return archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID, - descriptionWiki); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.GRAPH_EDGE, + this.archiveBuilder.getEntityDef(OpenMetadataType.SCHEMA_ATTRIBUTE.typeName)); } private RelationshipDef getGraphEdgeLinkRelationship() { - final String guid = OpenMetadataType.GRAPH_EDGE_LINK_RELATIONSHIP.typeGUID; - final String name = OpenMetadataType.GRAPH_EDGE_LINK_RELATIONSHIP.typeName; - final String description = OpenMetadataType.GRAPH_EDGE_LINK_RELATIONSHIP.description; - final String descriptionGUID = OpenMetadataType.GRAPH_EDGE_LINK_RELATIONSHIP.descriptionGUID; - final String descriptionWiki = OpenMetadataType.GRAPH_EDGE_LINK_RELATIONSHIP.wikiURL; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, - name, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.GRAPH_EDGE_LINK_RELATIONSHIP, null, - description, - descriptionGUID, - descriptionWiki, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.GRAPH_EDGE.typeName; final String end1AttributeName = "edges"; final String end1AttributeDescription = "Edges for this vertex."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.GRAPH_EDGE.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.GRAPH_VERTEX.typeName; final String end2AttributeName = "vertices"; final String end2AttributeDescription = "Vertices for this edge."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.GRAPH_VERTEX.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -17299,11 +14550,9 @@ private EntityDef getRelationalTableEntity() final String description = "A table within a relational database schema type."; final String descriptionGUID = null; - final String superTypeName = OpenMetadataType.SCHEMA_ATTRIBUTE.typeName; - return archiveHelper.getDefaultEntityDef(guid, name, - this.archiveBuilder.getEntityDef(superTypeName), + this.archiveBuilder.getEntityDef(OpenMetadataType.SCHEMA_ATTRIBUTE.typeName), description, descriptionGUID); } @@ -17408,18 +14657,9 @@ private ClassificationDef getPrimaryKeyClassification() * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - - property = archiveHelper.getEnumTypeDefAttribute(KeyPattern.getOpenTypeName(), - OpenMetadataProperty.KEY_PATTERN.name, - OpenMetadataProperty.KEY_PATTERN.description, - OpenMetadataProperty.KEY_PATTERN.descriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.NAME.name, - OpenMetadataProperty.NAME.description, - OpenMetadataProperty.NAME.descriptionGUID); - properties.add(property); + properties.add(archiveHelper.getEnumTypeDefAttribute(OpenMetadataProperty.KEY_PATTERN)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.NAME)); classificationDef.setPropertiesDefinition(properties); @@ -17471,14 +14711,12 @@ private RelationshipDef getForeignKeyRelationship() final String description = "The primary key for another column is stored in a relational column from another table to enable them to be joined."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -17489,13 +14727,12 @@ private RelationshipDef getForeignKeyRelationship() final String end1AttributeName = "primaryKey"; final String end1AttributeDescription = "Relational column holding the primary key."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.AT_MOST_ONE; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef1(relationshipEndDef); /* @@ -17505,13 +14742,12 @@ private RelationshipDef getForeignKeyRelationship() final String end2AttributeName = "foreignKey"; final String end2AttributeDescription = "Use of primary key from another table to enable table joins."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -17649,14 +14885,12 @@ private RelationshipDef getAPIOperationsRelationship() final String description = "Link between an API and its operations."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -17667,13 +14901,12 @@ private RelationshipDef getAPIOperationsRelationship() final String end1AttributeName = "usedInAPI"; final String end1AttributeDescription = "API that this operation belongs to."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.AT_MOST_ONE; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef1(relationshipEndDef); @@ -17684,13 +14917,12 @@ private RelationshipDef getAPIOperationsRelationship() final String end2AttributeName = "containsOperations"; final String end2AttributeDescription = "Operations for this API type."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -17704,14 +14936,12 @@ private RelationshipDef getAPIHeaderRelationship() final String description = "Link between an API operation and its header."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -17722,13 +14952,12 @@ private RelationshipDef getAPIHeaderRelationship() final String end1AttributeName = "usedAsAPIHeader"; final String end1AttributeDescription = "API operations using this structure as the header."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); @@ -17738,13 +14967,12 @@ private RelationshipDef getAPIHeaderRelationship() final String end2AttributeName = "apiHeader"; final String end2AttributeDescription = "Header structure for this API operation."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.SCHEMA_TYPE.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -17758,14 +14986,12 @@ private RelationshipDef getAPIRequestRelationship() final String description = "Link between an API operation and its request structure."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -17776,13 +15002,12 @@ private RelationshipDef getAPIRequestRelationship() final String end1AttributeName = "usedAsAPIRequest"; final String end1AttributeDescription = "API operations using this structure as the request body."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.AT_MOST_ONE; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef1(relationshipEndDef); @@ -17792,13 +15017,12 @@ private RelationshipDef getAPIRequestRelationship() final String end2AttributeName = "apiRequest"; final String end2AttributeDescription = "Request structure for this API operation."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.AT_MOST_ONE; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.SCHEMA_TYPE.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -17812,14 +15036,12 @@ private RelationshipDef getAPIResponseRelationship() final String description = "Link between an API operation and its response structure."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -17830,13 +15052,12 @@ private RelationshipDef getAPIResponseRelationship() final String end1AttributeName = "usedAsAPIResponse"; final String end1AttributeDescription = "API operations using this structure as the response."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.AT_MOST_ONE; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef1(relationshipEndDef); @@ -17846,13 +15067,12 @@ private RelationshipDef getAPIResponseRelationship() final String end2AttributeName = "apiResponse"; final String end2AttributeDescription = "Response structure for this API operation."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.AT_MOST_ONE; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.SCHEMA_TYPE.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -18015,34 +15235,30 @@ private RelationshipDef getDataClassHierarchyRelationship() /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.DATA_CLASS.typeName; final String end1AttributeName = "superDataClass"; final String end1AttributeDescription = "Data class that is the more abstract."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.AT_MOST_ONE; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_CLASS.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.DATA_CLASS.typeName; final String end2AttributeName = "subDataClasses"; final String end2AttributeDescription = "Data classes that are more concrete."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_CLASS.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -18064,34 +15280,30 @@ private RelationshipDef getDataClassCompositionRelationship() /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.DATA_CLASS.typeName; final String end1AttributeName = "partOfDataClasses"; final String end1AttributeDescription = "Data classes that includes other data classes in its definition."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_CLASS.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.DATA_CLASS.typeName; final String end2AttributeName = "madeOfDataClasses"; final String end2AttributeDescription = "Data classes that provide part of another data class's definitions."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_CLASS.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -18113,34 +15325,30 @@ private RelationshipDef getDataClassAssignmentRelationship() /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.REFERENCEABLE.typeName; final String end1AttributeName = "elementsAssignedToDataClass"; final String end1AttributeDescription = "Elements identified as managing data values that match the specification of a data class."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.DATA_CLASS.typeName; final String end2AttributeName = "dataClassesAssignedToElement"; final String end2AttributeDescription = "Logical data type for this element."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_CLASS.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -18221,44 +15429,19 @@ private void add0545ReferenceData() this.archiveBuilder.addRelationshipDef(getValidValuesImplementationRelationship()); } - private ClassificationDef getReferenceDataClassification() { - final String guid = OpenMetadataType.REFERENCE_DATA_CLASSIFICATION.typeGUID; - final String name = OpenMetadataType.REFERENCE_DATA_CLASSIFICATION.typeName; - final String description = OpenMetadataType.REFERENCE_DATA_CLASSIFICATION.description; - final String descriptionGUID = OpenMetadataType.REFERENCE_DATA_CLASSIFICATION.descriptionGUID; - final String descriptionWiki = OpenMetadataType.REFERENCE_DATA_CLASSIFICATION.wikiURL; - - final String linkedToEntity = OpenMetadataType.ASSET.typeName; - - return archiveHelper.getClassificationDef(guid, - name, + return archiveHelper.getClassificationDef(OpenMetadataType.REFERENCE_DATA_CLASSIFICATION, null, - description, - descriptionGUID, - descriptionWiki, - this.archiveBuilder.getEntityDef(linkedToEntity), + this.archiveBuilder.getEntityDef(OpenMetadataType.ASSET.typeName), false); } private EntityDef getValidValueDefinitionEntity() { - final String guid = OpenMetadataType.VALID_VALUE_DEFINITION.typeGUID; - final String name = OpenMetadataType.VALID_VALUE_DEFINITION.typeName; - final String description = OpenMetadataType.VALID_VALUE_DEFINITION.description; - final String descriptionGUID = OpenMetadataType.VALID_VALUE_DEFINITION.descriptionGUID; - final String descriptionWiki = OpenMetadataType.VALID_VALUE_DEFINITION.wikiURL; - - final String superTypeName = OpenMetadataType.REFERENCEABLE.typeName; - - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID, - descriptionWiki); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.VALID_VALUE_DEFINITION, + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName)); /* * Build the attributes @@ -18302,74 +15485,46 @@ private EntityDef getValidValueDefinitionEntity() private EntityDef getValidValuesSetEntity() { - final String guid = OpenMetadataType.VALID_VALUE_SET.typeGUID; - final String name = OpenMetadataType.VALID_VALUE_SET.typeName; - final String description = OpenMetadataType.VALID_VALUE_SET.description; - final String descriptionGUID = OpenMetadataType.VALID_VALUE_SET.descriptionGUID; - final String descriptionWiki = OpenMetadataType.VALID_VALUE_SET.wikiURL; - - final String superTypeName = OpenMetadataType.VALID_VALUE_DEFINITION.typeName; - - return archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID, - descriptionWiki); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.VALID_VALUE_SET, + this.archiveBuilder.getEntityDef(OpenMetadataType.VALID_VALUE_DEFINITION.typeName)); } private RelationshipDef getValidValuesAssignmentRelationship() { - final String guid = OpenMetadataType.VALID_VALUES_ASSIGNMENT_RELATIONSHIP.typeGUID; - final String name = OpenMetadataType.VALID_VALUES_ASSIGNMENT_RELATIONSHIP.typeName; - final String description = OpenMetadataType.VALID_VALUES_ASSIGNMENT_RELATIONSHIP.description; - final String descriptionGUID = OpenMetadataType.VALID_VALUES_ASSIGNMENT_RELATIONSHIP.descriptionGUID; - final String descriptionWiki = OpenMetadataType.VALID_VALUES_ASSIGNMENT_RELATIONSHIP.wikiURL; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, - name, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.VALID_VALUES_ASSIGNMENT_RELATIONSHIP, null, - description, - descriptionGUID, - descriptionWiki, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.REFERENCEABLE.typeName; final String end1AttributeName = "validValuesConsumer"; final String end1AttributeDescription = "The valid values set that this element belongs to."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.VALID_VALUE_DEFINITION.typeName; final String end2AttributeName = "validValues"; final String end2AttributeDescription = "A definition of the valid values for this element."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.AT_MOST_ONE; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.VALID_VALUE_DEFINITION.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -18395,55 +15550,39 @@ private RelationshipDef getValidValuesAssignmentRelationship() private RelationshipDef getValidValuesMemberRelationship() { - final String guid = OpenMetadataType.VALID_VALUE_MEMBER_RELATIONSHIP.typeGUID; - final String name = OpenMetadataType.VALID_VALUE_MEMBER_RELATIONSHIP.typeName; - final String description = OpenMetadataType.VALID_VALUE_MEMBER_RELATIONSHIP.description; - final String descriptionGUID = OpenMetadataType.VALID_VALUE_MEMBER_RELATIONSHIP.descriptionGUID; - final String descriptionWiki = OpenMetadataType.VALID_VALUE_MEMBER_RELATIONSHIP.wikiURL; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, - name, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.VALID_VALUE_MEMBER_RELATIONSHIP, null, - description, - descriptionGUID, - descriptionWiki, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.VALID_VALUE_SET.typeName; final String end1AttributeName = "validValuesSet"; final String end1AttributeDescription = "The valid values set that this element belongs to."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.VALID_VALUE_SET.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.VALID_VALUE_DEFINITION.typeName; final String end2AttributeName = "memberOfValidValuesSet"; final String end2AttributeDescription = "Description of a single valid value."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.VALID_VALUE_DEFINITION.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -18452,56 +15591,39 @@ private RelationshipDef getValidValuesMemberRelationship() private RelationshipDef getValidValuesImplementationRelationship() { - final String guid = OpenMetadataType.VALID_VALUES_IMPL_RELATIONSHIP.typeGUID; - - final String name = OpenMetadataType.VALID_VALUES_IMPL_RELATIONSHIP.typeName; - final String description = OpenMetadataType.VALID_VALUES_IMPL_RELATIONSHIP.description; - final String descriptionGUID = OpenMetadataType.VALID_VALUES_IMPL_RELATIONSHIP.descriptionGUID; - final String descriptionWiki = OpenMetadataType.VALID_VALUES_IMPL_RELATIONSHIP.wikiURL; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, - name, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.VALID_VALUES_IMPL_RELATIONSHIP, null, - description, - descriptionGUID, - descriptionWiki, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.VALID_VALUE_DEFINITION.typeName; final String end1AttributeName = "validValues"; final String end1AttributeDescription = "The valid values set that this element implements."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.VALID_VALUE_DEFINITION.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.ASSET.typeName; final String end2AttributeName = "validValuesImplementation"; final String end2AttributeDescription = "The asset where the valid values are implemented."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.ASSET.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -18544,11 +15666,9 @@ private EntityDef getDesignModelElementEntity() final String description = "An abstract, but well-formed representation of a concept, activity, architecture or other design element."; final String descriptionGUID = null; - final String superTypeName = OpenMetadataType.REFERENCEABLE.typeName; - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, name, - this.archiveBuilder.getEntityDef(superTypeName), + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), description, descriptionGUID); @@ -18618,11 +15738,9 @@ private EntityDef getDesignModelEntity() final String description = "A curated collection of design model elements."; final String descriptionGUID = null; - final String superTypeName = OpenMetadataType.ASSET.typeName; - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, name, - this.archiveBuilder.getEntityDef(superTypeName), + this.archiveBuilder.getEntityDef(OpenMetadataType.ASSET.typeName), description, descriptionGUID); @@ -18686,14 +15804,12 @@ private RelationshipDef getDesignModelElementOwnershipRelationship() final String description = "Links design model elements to their owning model."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -18704,13 +15820,12 @@ private RelationshipDef getDesignModelElementOwnershipRelationship() final String end1AttributeName = "owningModel"; final String end1AttributeDescription = "Owning model."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.AT_MOST_ONE; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef1(relationshipEndDef); @@ -18721,13 +15836,12 @@ private RelationshipDef getDesignModelElementOwnershipRelationship() final String end2AttributeName = "elementsInModel"; final String end2AttributeDescription = "List of elements that belong to this model."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -18741,14 +15855,12 @@ private RelationshipDef getDesignModelGroupOwnershipRelationship() final String description = "Links a model to a design model group."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -18759,13 +15871,12 @@ private RelationshipDef getDesignModelGroupOwnershipRelationship() final String end1AttributeName = "anchorModel"; final String end1AttributeDescription = "Model that owns this group."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.AT_MOST_ONE; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef1(relationshipEndDef); @@ -18776,13 +15887,12 @@ private RelationshipDef getDesignModelGroupOwnershipRelationship() final String end2AttributeName = "groupsInModel"; final String end2AttributeDescription = "List of groups that belong to this model."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -18796,14 +15906,12 @@ private RelationshipDef getDesignModelGroupHierarchyRelationship() final String description = "Links a model's groups into a hierarchy."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -18814,13 +15922,12 @@ private RelationshipDef getDesignModelGroupHierarchyRelationship() final String end1AttributeName = "parentModelGroup"; final String end1AttributeDescription = "Link parent group."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.AT_MOST_ONE; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef1(relationshipEndDef); @@ -18831,13 +15938,12 @@ private RelationshipDef getDesignModelGroupHierarchyRelationship() final String end2AttributeName = "childModelGroups"; final String end2AttributeDescription = "The groups nested in this group."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -18851,14 +15957,12 @@ private RelationshipDef getDesignModelGroupMembershipRelationship() final String description = "Links a design model element to a group."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -18869,13 +15973,12 @@ private RelationshipDef getDesignModelGroupMembershipRelationship() final String end1AttributeName = "memberOfModelGroups"; final String end1AttributeDescription = "Link to a list of groups this element is a member of."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); @@ -18886,13 +15989,12 @@ private RelationshipDef getDesignModelGroupMembershipRelationship() final String end2AttributeName = "elementsInGroup"; final String end2AttributeDescription = "List of elements that belong to this group."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -18917,11 +16019,9 @@ private EntityDef getDesignModelScopeEntity() final String description = "A selection of design model element needed for a project."; final String descriptionGUID = null; - final String superTypeName = OpenMetadataType.REFERENCEABLE.typeName; - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, name, - this.archiveBuilder.getEntityDef(superTypeName), + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), description, descriptionGUID); @@ -18975,14 +16075,12 @@ private RelationshipDef getDesignModelElementsInScopeRelationship() final String description = "Links a model to an implementation."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -18993,13 +16091,12 @@ private RelationshipDef getDesignModelElementsInScopeRelationship() final String end1AttributeName = "usedInScope"; final String end1AttributeDescription = "Link to a scope where this element is used."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); @@ -19010,13 +16107,12 @@ private RelationshipDef getDesignModelElementsInScopeRelationship() final String end2AttributeName = "inScopeModelElements"; final String end2AttributeDescription = "List of elements that belong to this scope."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -19040,31 +16136,27 @@ private RelationshipDef geDesignModelImplementationRelationship() final String description = "Links a concept model to an implementation."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.REFERENCEABLE.typeName; final String end1AttributeName = "implementationFollowingModel"; final String end1AttributeDescription = "Definition of an implementation of the model."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); @@ -19075,13 +16167,12 @@ private RelationshipDef geDesignModelImplementationRelationship() final String end2AttributeName = "modelDescribingBehavior"; final String end2AttributeDescription = "Descriptive abstraction."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -19369,14 +16460,12 @@ private RelationshipDef getConceptBeadRelationshipEndRelationship() final String description = "Links one end of a concept bead link relationship to a concept bead."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -19387,13 +16476,12 @@ private RelationshipDef getConceptBeadRelationshipEndRelationship() final String end1AttributeName = "relationships"; final String end1AttributeDescription = "The relationships that the concept bead can be a part of."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); @@ -19404,13 +16492,12 @@ private RelationshipDef getConceptBeadRelationshipEndRelationship() final String end2AttributeName = "endBeads"; final String end2AttributeDescription = "The concept beads that are linked via this relationship."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -19492,14 +16579,12 @@ private RelationshipDef getConceptBeadAttributeLinkRelationship() final String description = "Links a concept bead to its attributes."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -19510,13 +16595,12 @@ private RelationshipDef getConceptBeadAttributeLinkRelationship() final String end1AttributeName = "parentBead"; final String end1AttributeDescription = "Concept bead that this attribute belongs to."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.AT_MOST_ONE; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef1(relationshipEndDef); @@ -19527,13 +16611,12 @@ private RelationshipDef getConceptBeadAttributeLinkRelationship() final String end2AttributeName = "attributes"; final String end2AttributeDescription = "Attribute detail for the concept bead."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -19653,11 +16736,9 @@ private EntityDef getDesignPatternEntity() final String description = "A description of a common solution with details of the problems it solves and its pros and cons."; final String descriptionGUID = null; - final String superTypeName = OpenMetadataType.REFERENCEABLE.typeName; - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, name, - this.archiveBuilder.getEntityDef(superTypeName), + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), description, descriptionGUID); @@ -19738,14 +16819,12 @@ private RelationshipDef getRelatedPatternRelationship() final String description = "Links design patterns together."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -19756,13 +16835,12 @@ private RelationshipDef getRelatedPatternRelationship() final String end1AttributeName = "relatedDesignPattern"; final String end1AttributeDescription = "Another design pattern that operates in similar contexts."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); @@ -19773,13 +16851,12 @@ private RelationshipDef getRelatedPatternRelationship() final String end2AttributeName = "relatedDesignPattern"; final String end2AttributeDescription = "Another design pattern that operates in similar contexts."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -19818,14 +16895,12 @@ private RelationshipDef getPortSchemaRelationship() { final String description = "A link between a Port and a SchemaType"; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -19836,13 +16911,12 @@ private RelationshipDef getPortSchemaRelationship() { final String end1AttributeName = "port"; final String end1AttributeDescription = "Port"; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.AT_MOST_ONE; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef1(relationshipEndDef); @@ -19852,13 +16926,12 @@ private RelationshipDef getPortSchemaRelationship() { final String end2AttributeName = "schemaType"; final String end2AttributeDescription = "Schema Type"; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.AT_MOST_ONE; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.SCHEMA_TYPE.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef2(relationshipEndDef); @@ -19879,14 +16952,12 @@ private RelationshipDef getLineageMappingRelationship() final String description = "A link between two schema attributes."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -19908,17 +16979,15 @@ private RelationshipDef getLineageMappingRelationship() /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.SCHEMA_ATTRIBUTE.typeName; final String end2AttributeName = "targetElement"; final String end2AttributeDescription = "Target Attribute."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.SCHEMA_ATTRIBUTE.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); @@ -19997,12 +17066,8 @@ private void add0602OpenDiscoveryServices() private EntityDef getOpenDiscoveryServiceEntity() { - return archiveHelper.getDefaultEntityDef(OpenMetadataType.OPEN_DISCOVERY_SERVICE.typeGUID, - OpenMetadataType.OPEN_DISCOVERY_SERVICE.typeName, - this.archiveBuilder.getEntityDef(OpenMetadataType.DEPLOYED_SOFTWARE_COMPONENT.typeName), - OpenMetadataType.OPEN_DISCOVERY_SERVICE.description, - OpenMetadataType.OPEN_DISCOVERY_SERVICE.descriptionGUID, - OpenMetadataType.OPEN_DISCOVERY_SERVICE.wikiURL); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.OPEN_DISCOVERY_SERVICE, + this.archiveBuilder.getEntityDef(OpenMetadataType.DEPLOYED_SOFTWARE_COMPONENT.typeName)); } @@ -20022,20 +17087,8 @@ private void add0603OpenDiscoveryPipelines() private EntityDef getOpenDiscoveryPipelineEntity() { - final String guid = OpenMetadataType.OPEN_DISCOVERY_PIPELINE.typeGUID; - final String name = OpenMetadataType.OPEN_DISCOVERY_PIPELINE.typeName; - final String description = OpenMetadataType.OPEN_DISCOVERY_PIPELINE.description; - final String descriptionGUID = OpenMetadataType.OPEN_DISCOVERY_PIPELINE.descriptionGUID; - final String descriptionWiki = OpenMetadataType.OPEN_DISCOVERY_PIPELINE.wikiURL; - - final String superTypeName = OpenMetadataType.OPEN_DISCOVERY_SERVICE.typeName; - - return archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID, - descriptionWiki); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.OPEN_DISCOVERY_PIPELINE, + this.archiveBuilder.getEntityDef(OpenMetadataType.OPEN_DISCOVERY_SERVICE.typeName)); } @@ -20142,11 +17195,9 @@ private EntityDef getOpenDiscoveryAnalysisReportEntity() final String description = "A set of results from an open discovery service."; final String descriptionGUID = null; - final String superTypeName = OpenMetadataType.REFERENCEABLE.typeName; - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, name, - this.archiveBuilder.getEntityDef(superTypeName), + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), description, descriptionGUID); @@ -20208,14 +17259,12 @@ private RelationshipDef getDiscoveryEngineReportRelationship() final String description = "A discovery analysis report created by a discovery engine."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -20226,13 +17275,12 @@ private RelationshipDef getDiscoveryEngineReportRelationship() final String end1AttributeName = "sourceDiscoveryEngine"; final String end1AttributeDescription = "The discovery engine that produced the report."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.AT_MOST_ONE; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef1(relationshipEndDef); @@ -20243,13 +17291,12 @@ private RelationshipDef getDiscoveryEngineReportRelationship() final String end2AttributeName = "discoveryEngineAnalysisReports"; final String end2AttributeDescription = "The reports produced by this discovery engine."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -20264,14 +17311,12 @@ private RelationshipDef getDiscoveryInvocationReportRelationship() final String description = "An analysis report from a discovery service."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -20282,13 +17327,12 @@ private RelationshipDef getDiscoveryInvocationReportRelationship() final String end1AttributeName = "sourceDiscoveryService"; final String end1AttributeDescription = "The discovery service that produced the report."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.AT_MOST_ONE; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef1(relationshipEndDef); @@ -20299,13 +17343,12 @@ private RelationshipDef getDiscoveryInvocationReportRelationship() final String end2AttributeName = "serviceDiscoveryAnalysisReports"; final String end2AttributeDescription = "The reports produced by this discovery service."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -20320,31 +17363,27 @@ private RelationshipDef getAssetDiscoveryReportRelationship() final String description = "An analysis report from a discovery service."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.ASSET.typeName; final String end1AttributeName = "discoveryReportTarget"; final String end1AttributeDescription = "The asset that is analyzed in the report."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.AT_MOST_ONE; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.ASSET.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef1(relationshipEndDef); @@ -20355,13 +17394,12 @@ private RelationshipDef getAssetDiscoveryReportRelationship() final String end2AttributeName = "assetDiscoveryAnalysisReports"; final String end2AttributeDescription = "The reports produced about this asset."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -20387,19 +17425,8 @@ private void add0610Annotations() private EntityDef getAnnotationEntity() { - final String guid = OpenMetadataType.ANNOTATION.typeGUID; - final String name = OpenMetadataType.ANNOTATION.typeName; - final String description = OpenMetadataType.ANNOTATION.description; - final String descriptionGUID = OpenMetadataType.ANNOTATION.descriptionGUID; - final String descriptionWiki = OpenMetadataType.ANNOTATION.wikiURL; - - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, - name, - null, - description, - descriptionGUID, - descriptionWiki); - + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.ANNOTATION, + null); /* * Build the attributes */ @@ -20478,31 +17505,27 @@ private RelationshipDef getDiscoveredAnnotationRelationship() final String description = "The annotations that make up a discovery analysis report."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.ANNOTATION.typeName; final String end1AttributeName = "reportedAnnotations"; final String end1AttributeDescription = "The annotations providing the contents for the report."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.ANNOTATION.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); @@ -20513,13 +17536,12 @@ private RelationshipDef getDiscoveredAnnotationRelationship() final String end2AttributeName = "fromAnalysisReport"; final String end2AttributeDescription = "The report that the annotations belong to."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.AT_MOST_ONE; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -20528,55 +17550,39 @@ private RelationshipDef getDiscoveredAnnotationRelationship() private RelationshipDef getAnnotationExtensionRelationship() { - final String guid = OpenMetadataType.ANNOTATION_EXTENSION_RELATIONSHIP.typeGUID; - final String name = OpenMetadataType.ANNOTATION_EXTENSION_RELATIONSHIP.typeName; - final String description = OpenMetadataType.ANNOTATION_EXTENSION_RELATIONSHIP.description; - final String descriptionGUID = OpenMetadataType.ANNOTATION_EXTENSION_RELATIONSHIP.descriptionGUID; - final String descriptionWiki = OpenMetadataType.ANNOTATION_EXTENSION_RELATIONSHIP.wikiURL; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, - name, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.ANNOTATION_EXTENSION_RELATIONSHIP, null, - description, - descriptionGUID, - descriptionWiki, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.ANNOTATION.typeName; final String end1AttributeName = "extendedAnnotations"; final String end1AttributeDescription = "The annotations being extended."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.ANNOTATION.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.ANNOTATION.typeName; final String end2AttributeName = "annotationExtensions"; final String end2AttributeDescription = "The annotations providing additional information."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.ANNOTATION.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -20629,18 +17635,8 @@ private EnumDef getAnnotationStatusEnum() private EntityDef getAnnotationReviewEntity() { - final String guid = OpenMetadataType.ANNOTATION_REVIEW.typeGUID; - final String name = OpenMetadataType.ANNOTATION_REVIEW.typeName; - final String description = OpenMetadataType.ANNOTATION_REVIEW.description; - final String descriptionGUID = OpenMetadataType.ANNOTATION_REVIEW.descriptionGUID; - final String descriptionWiki = OpenMetadataType.ANNOTATION_REVIEW.wikiURL; - - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, - name, - null, - description, - descriptionGUID, - descriptionWiki); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.ANNOTATION_REVIEW, + null); /* * Build the attributes @@ -20676,55 +17672,39 @@ private EntityDef getAnnotationReviewEntity() private RelationshipDef getAnnotationReviewLinkRelationship() { - final String guid = OpenMetadataType.ANNOTATION_REVIEW_LINK_RELATIONSHIP.typeGUID; - final String name = OpenMetadataType.ANNOTATION_REVIEW_LINK_RELATIONSHIP.typeName; - final String description = OpenMetadataType.ANNOTATION_REVIEW_LINK_RELATIONSHIP.description; - final String descriptionGUID = OpenMetadataType.ANNOTATION_REVIEW_LINK_RELATIONSHIP.descriptionGUID; - final String descriptionWiki = OpenMetadataType.ANNOTATION_REVIEW_LINK_RELATIONSHIP.wikiURL; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, - name, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.ANNOTATION_REVIEW_LINK_RELATIONSHIP, null, - description, - descriptionGUID, - descriptionWiki, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.ANNOTATION.typeName; final String end1AttributeName = "reviewedAnnotations"; final String end1AttributeDescription = "The annotations being reviewed."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.ANNOTATION.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.ANNOTATION_REVIEW.typeName; final String end2AttributeName = "annotationReviews"; final String end2AttributeDescription = "The feedback about the annotations."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.ANNOTATION_REVIEW.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -20771,20 +17751,8 @@ private void add0615SchemaExtraction() private EntityDef getSchemaAnalysisAnnotationEntity() { - final String guid = OpenMetadataType.SCHEMA_ANALYSIS_ANNOTATION.typeGUID; - final String name = OpenMetadataType.SCHEMA_ANALYSIS_ANNOTATION.typeName; - final String description = OpenMetadataType.SCHEMA_ANALYSIS_ANNOTATION.description; - final String descriptionGUID = OpenMetadataType.SCHEMA_ANALYSIS_ANNOTATION.descriptionGUID; - final String descriptionWiki = OpenMetadataType.SCHEMA_ANALYSIS_ANNOTATION.wikiURL; - - final String superTypeName = OpenMetadataType.ANNOTATION.typeName; - - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID, - descriptionWiki); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.SCHEMA_ANALYSIS_ANNOTATION, + this.archiveBuilder.getEntityDef(OpenMetadataType.ANNOTATION.typeName)); /* * Build the attributes @@ -20897,31 +17865,27 @@ private RelationshipDef getSchemaTypeDefinitionRelationship() final String description = "Link between schema analysis annotation and the identified schema type definition."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = "SchemaAnalysisAnnotation"; final String end1AttributeName = "deployedSchemaTypes"; final String end1AttributeDescription = "The analysis of the schema type for deployed assets."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.SCHEMA_ANALYSIS_ANNOTATION.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); @@ -20931,13 +17895,12 @@ private RelationshipDef getSchemaTypeDefinitionRelationship() final String end2AttributeName = "schemaTypeDefinition"; final String end2AttributeDescription = "Official schema type definition."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.AT_MOST_ONE; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.SCHEMA_TYPE.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -20951,48 +17914,42 @@ private RelationshipDef getDiscoveredDataFieldRelationship() final String description = "Data field detected in asset during schema analysis."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.SCHEMA_ANALYSIS_ANNOTATION.typeName; final String end1AttributeName = "schemaAnalysisAnnotation"; final String end1AttributeDescription = "The annotation collecting the results of the schema analysis."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.AT_MOST_ONE; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.SCHEMA_ANALYSIS_ANNOTATION.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.DATA_FIELD.typeName; final String end2AttributeName = "discoveredDataFields"; final String end2AttributeDescription = "The data fields discovered during schema analysis."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_FIELD.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -21023,48 +17980,42 @@ private RelationshipDef getSchemaAttributeDefinitionRelationship() final String description = "Link between data field analysis and the identified schema attribute definition."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.DATA_FILE.typeName; final String end1AttributeName = "deployedSchemaAttributes"; final String end1AttributeDescription = "The analysis of the equivalent data fields from deployed assets."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_FIELD.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.SCHEMA_ATTRIBUTE.typeName; final String end2AttributeName = "schemaAttributeDefinition"; final String end2AttributeDescription = "Official schema attribute definition."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.AT_MOST_ONE; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.SCHEMA_ATTRIBUTE.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -21078,48 +18029,42 @@ private RelationshipDef getDiscoveredNestedDataFieldRelationship() final String description = "Nested data fields under a single parent node."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.DATA_FIELD.typeName; final String end1AttributeName = "parentDataField"; final String end1AttributeDescription = "Parent node."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.AT_MOST_ONE; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_FIELD.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.DATA_FIELD.typeName; final String end2AttributeName = "nestedDataFields"; final String end2AttributeDescription = "Nested data fields."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_FIELD.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -21151,48 +18096,42 @@ private RelationshipDef getDataClassDefinitionRelationship() final String description = "Link between schema analysis and the identified data class for a data field."; final String descriptionGUID = null; - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, name, null, description, descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.DATA_FIELD.typeName; final String end1AttributeName = "deployedDataClasses"; final String end1AttributeDescription = "The mapped data fields from deployed assets."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_FIELD.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = "DataClass"; final String end2AttributeName = "dataClassDefinition"; final String end2AttributeDescription = "Official data class definition."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.AT_MOST_ONE; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_CLASS.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -21233,74 +18172,46 @@ private void add0617DataFieldAnalysis() private EntityDef getDataFieldAnnotationEntity() { - final String guid = OpenMetadataType.DATA_FIELD_ANNOTATION.typeGUID; - final String name = OpenMetadataType.DATA_FIELD_ANNOTATION.typeName; - final String description = OpenMetadataType.DATA_FIELD_ANNOTATION.description; - final String descriptionGUID = OpenMetadataType.DATA_FIELD_ANNOTATION.descriptionGUID; - final String descriptionWiki = OpenMetadataType.DATA_FIELD_ANNOTATION.wikiURL; - - final String superTypeName = OpenMetadataType.ANNOTATION.typeName; - - return archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID, - descriptionWiki); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.DATA_FIELD_ANNOTATION, + this.archiveBuilder.getEntityDef(OpenMetadataType.ANNOTATION.typeName)); } private RelationshipDef getDataFieldAnalysisRelationship() { - final String guid = OpenMetadataType.DATA_FIELD_ANALYSIS_RELATIONSHIP.typeGUID; - final String name = OpenMetadataType.DATA_FIELD_ANALYSIS_RELATIONSHIP.typeName; - final String description = OpenMetadataType.DATA_FIELD_ANALYSIS_RELATIONSHIP.description; - final String descriptionGUID = OpenMetadataType.DATA_FIELD_ANALYSIS_RELATIONSHIP.descriptionGUID; - final String descriptionWiki = OpenMetadataType.DATA_FIELD_ANALYSIS_RELATIONSHIP.wikiURL; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, - name, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.DATA_FIELD_ANALYSIS_RELATIONSHIP, null, - description, - descriptionGUID, - descriptionWiki, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.DATA_FIELD_ANNOTATION.typeName; final String end1AttributeName = "dataFieldAnnotations"; final String end1AttributeDescription = "The annotations for this data field."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_FIELD_ANNOTATION.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.DATA_FIELD.typeName; final String end2AttributeName = "annotatedDataFields"; final String end2AttributeDescription = "Data fields with addition properties attached."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_FIELD.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -21327,20 +18238,8 @@ private void add0620DataProfiling() private EntityDef getDataProfileAnnotationEntity() { - final String guid = OpenMetadataType.RESOURCE_PROFILE_ANNOTATION.typeGUID; - final String name = OpenMetadataType.RESOURCE_PROFILE_ANNOTATION.typeName; - final String description = OpenMetadataType.RESOURCE_PROFILE_ANNOTATION.description; - final String descriptionGUID = OpenMetadataType.RESOURCE_PROFILE_ANNOTATION.descriptionGUID; - final String descriptionWiki = OpenMetadataType.RESOURCE_PROFILE_ANNOTATION.wikiURL; - - final String superTypeName = OpenMetadataType.DATA_FIELD_ANNOTATION.typeName; - - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID, - descriptionWiki); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.RESOURCE_PROFILE_ANNOTATION, + this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_FIELD_ANNOTATION.typeName)); /* * Build the attributes */ @@ -21490,74 +18389,46 @@ private EntityDef getDataProfileAnnotationEntity() private EntityDef getResourceProfileLogAnnotationEntity() { - final String guid = OpenMetadataType.RESOURCE_PROFILE_LOG_ANNOTATION.typeGUID; - final String name = OpenMetadataType.RESOURCE_PROFILE_LOG_ANNOTATION.typeName; - final String description = OpenMetadataType.RESOURCE_PROFILE_LOG_ANNOTATION.description; - final String descriptionGUID = OpenMetadataType.RESOURCE_PROFILE_LOG_ANNOTATION.descriptionGUID; - final String descriptionWiki = OpenMetadataType.RESOURCE_PROFILE_LOG_ANNOTATION.wikiURL; - - final String superTypeName = OpenMetadataType.DATA_FIELD_ANNOTATION.typeName; - - return archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID, - descriptionWiki); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.RESOURCE_PROFILE_LOG_ANNOTATION, + this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_FIELD_ANNOTATION.typeName)); } private RelationshipDef getResourceProfileLogFileRelationship() { - final String guid = OpenMetadataType.RESOURCE_PROFILE_DATA_RELATIONSHIP.typeGUID; - final String name = OpenMetadataType.RESOURCE_PROFILE_DATA_RELATIONSHIP.typeName; - final String description = OpenMetadataType.RESOURCE_PROFILE_DATA_RELATIONSHIP.description; - final String descriptionGUID = OpenMetadataType.RESOURCE_PROFILE_DATA_RELATIONSHIP.descriptionGUID; - final String descriptionWiki = OpenMetadataType.RESOURCE_PROFILE_DATA_RELATIONSHIP.wikiURL; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, - name, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.RESOURCE_PROFILE_DATA_RELATIONSHIP, null, - description, - descriptionGUID, - descriptionWiki, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.RESOURCE_PROFILE_LOG_ANNOTATION.typeName; final String end1AttributeName = "resourceProfileAnnotations"; final String end1AttributeDescription = "The annotations that refer to this log file."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.RESOURCE_PROFILE_LOG_ANNOTATION.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.ASSET.typeName; final String end2AttributeName = "resourceProfileLogs"; final String end2AttributeDescription = "Location of the profile information."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.ASSET.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; @@ -21580,20 +18451,8 @@ private void add0625DataClassDiscovery() private EntityDef getDataClassAnnotationEntity() { - final String guid = OpenMetadataType.DATA_CLASS_ANNOTATION.typeGUID; - final String name = OpenMetadataType.DATA_CLASS_ANNOTATION.typeName; - final String description = OpenMetadataType.DATA_CLASS_ANNOTATION.description; - final String descriptionGUID = OpenMetadataType.DATA_CLASS_ANNOTATION.descriptionGUID; - final String descriptionWiki = OpenMetadataType.DATA_CLASS_ANNOTATION.wikiURL; - - final String superTypeName = OpenMetadataType.DATA_FIELD_ANNOTATION.typeName; - - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID, - descriptionWiki); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.DATA_CLASS_ANNOTATION, + this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_FIELD_ANNOTATION.typeName)); /* * Build the attributes @@ -21645,20 +18504,8 @@ private void add0630SemanticDiscovery() private EntityDef getSemanticAnnotationEntity() { - final String guid = OpenMetadataType.SEMANTIC_ANNOTATION.typeGUID; - final String name = OpenMetadataType.SEMANTIC_ANNOTATION.typeName; - final String description = OpenMetadataType.SEMANTIC_ANNOTATION.description; - final String descriptionGUID = OpenMetadataType.SEMANTIC_ANNOTATION.descriptionGUID; - final String descriptionWiki = OpenMetadataType.SEMANTIC_ANNOTATION.wikiURL; - - final String superTypeName = OpenMetadataType.DATA_FIELD_ANNOTATION.typeName; - - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID, - descriptionWiki); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.SEMANTIC_ANNOTATION, + this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_FIELD_ANNOTATION.typeName)); /* * Build the attributes @@ -21718,20 +18565,8 @@ private void add0635ClassificationDiscovery() private EntityDef getClassificationAnnotationEntity() { - final String guid = OpenMetadataType.CLASSIFICATION_ANNOTATION.typeGUID; - final String name = OpenMetadataType.CLASSIFICATION_ANNOTATION.typeName; - final String description = OpenMetadataType.CLASSIFICATION_ANNOTATION.description; - final String descriptionGUID = OpenMetadataType.CLASSIFICATION_ANNOTATION.descriptionGUID; - final String descriptionWiki = OpenMetadataType.CLASSIFICATION_ANNOTATION.wikiURL; - - final String superTypeName = OpenMetadataType.DATA_FIELD_ANNOTATION.typeName; - - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID, - descriptionWiki); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.CLASSIFICATION_ANNOTATION, + this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_FIELD_ANNOTATION.typeName)); /* * Build the attributes @@ -21770,20 +18605,8 @@ private void add0640QualityScores() private EntityDef getQualityAnnotationEntity() { - final String guid = OpenMetadataType.QUALITY_ANNOTATION.typeGUID; - final String name = OpenMetadataType.QUALITY_ANNOTATION.typeName; - final String description = OpenMetadataType.QUALITY_ANNOTATION.description; - final String descriptionGUID = OpenMetadataType.QUALITY_ANNOTATION.descriptionGUID; - final String descriptionWiki = OpenMetadataType.QUALITY_ANNOTATION.wikiURL; - - final String superTypeName = OpenMetadataType.DATA_FIELD_ANNOTATION.typeName; - - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID, - descriptionWiki); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.QUALITY_ANNOTATION, + this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_FIELD_ANNOTATION.typeName)); /* * Build the attributes @@ -21831,20 +18654,8 @@ private void add0650RelationshipDiscovery() private EntityDef getRelationshipAdviceAnnotationEntity() { - final String guid = OpenMetadataType.RELATIONSHIP_ADVICE_ANNOTATION.typeGUID; - final String name = OpenMetadataType.RELATIONSHIP_ADVICE_ANNOTATION.typeName; - final String description = OpenMetadataType.RELATIONSHIP_ADVICE_ANNOTATION.description; - final String descriptionGUID = OpenMetadataType.RELATIONSHIP_ADVICE_ANNOTATION.descriptionGUID; - final String descriptionWiki = OpenMetadataType.RELATIONSHIP_ADVICE_ANNOTATION.wikiURL; - - final String superTypeName = OpenMetadataType.DATA_FIELD_ANNOTATION.typeName; - - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID, - descriptionWiki); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.RELATIONSHIP_ADVICE_ANNOTATION, + this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_FIELD_ANNOTATION.typeName)); /* * Build the attributes */ @@ -21882,55 +18693,39 @@ private EntityDef getRelationshipAdviceAnnotationEntity() private RelationshipDef getRelationshipAnnotationRelationship() { - final String guid = OpenMetadataType.RELATIONSHIP_ANNOTATION_RELATIONSHIP.typeGUID; - final String name = OpenMetadataType.RELATIONSHIP_ANNOTATION_RELATIONSHIP.typeName; - final String description = OpenMetadataType.RELATIONSHIP_ANNOTATION_RELATIONSHIP.description; - final String descriptionGUID = OpenMetadataType.RELATIONSHIP_ANNOTATION_RELATIONSHIP.descriptionGUID; - final String descriptionWiki = OpenMetadataType.RELATIONSHIP_ANNOTATION_RELATIONSHIP.wikiURL; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, - name, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.RELATIONSHIP_ANNOTATION_RELATIONSHIP, null, - description, - descriptionGUID, - descriptionWiki, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.REFERENCEABLE.typeName; final String end1AttributeName = "relatedFromObjectAnnotations"; final String end1AttributeDescription = "The referenceables linked from."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = OpenMetadataType.REFERENCEABLE.typeName; final String end2AttributeName = "relatedToObjectAnnotations"; final String end2AttributeDescription = "The referenceables linked to."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.AT_MOST_ONE; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.AT_MOST_ONE); relationshipDef.setEndDef2(relationshipEndDef); /* @@ -22023,21 +18818,8 @@ private void add0660ResourceMeasures() private EntityDef getResourceMeasureAnnotationEntity() { - final String guid = OpenMetadataType.RESOURCE_MEASURE_ANNOTATION.typeGUID; - - final String name = OpenMetadataType.RESOURCE_MEASURE_ANNOTATION.typeName; - final String description = OpenMetadataType.RESOURCE_MEASURE_ANNOTATION.description; - final String descriptionGUID = OpenMetadataType.RESOURCE_MEASURE_ANNOTATION.descriptionGUID; - final String descriptionWiki = OpenMetadataType.RESOURCE_MEASURE_ANNOTATION.wikiURL; - - final String superTypeName = OpenMetadataType.ANNOTATION.typeName; - - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID, - descriptionWiki); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.RESOURCE_MEASURE_ANNOTATION, + this.archiveBuilder.getEntityDef(OpenMetadataType.ANNOTATION.typeName)); /* * Build the attributes @@ -22062,21 +18844,8 @@ private EntityDef getResourceMeasureAnnotationEntity() private EntityDef getDataSourcePhysicalStatusAnnotationEntity() { - final String guid = OpenMetadataType.RESOURCE_PHYSICAL_STATUS_ANNOTATION.typeGUID; - - final String name = OpenMetadataType.RESOURCE_PHYSICAL_STATUS_ANNOTATION.typeName; - final String description = OpenMetadataType.RESOURCE_PHYSICAL_STATUS_ANNOTATION.description; - final String descriptionGUID = OpenMetadataType.RESOURCE_PHYSICAL_STATUS_ANNOTATION.descriptionGUID; - final String descriptionWiki = OpenMetadataType.RESOURCE_PHYSICAL_STATUS_ANNOTATION.wikiURL; - - final String superTypeName = OpenMetadataType.RESOURCE_MEASURE_ANNOTATION.typeName; - - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID, - descriptionWiki); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.RESOURCE_PHYSICAL_STATUS_ANNOTATION, + this.archiveBuilder.getEntityDef(OpenMetadataType.RESOURCE_MEASURE_ANNOTATION.typeName)); /* * Build the attributes */ @@ -22135,21 +18904,8 @@ private void add0690RequestForAction() private EntityDef getRequestForActionAnnotationEntity() { - final String guid = OpenMetadataType.REQUEST_FOR_ACTION_ANNOTATION.typeGUID; - - final String name = OpenMetadataType.REQUEST_FOR_ACTION_ANNOTATION.typeName; - final String description = OpenMetadataType.REQUEST_FOR_ACTION_ANNOTATION.description; - final String descriptionGUID = OpenMetadataType.REQUEST_FOR_ACTION_ANNOTATION.descriptionGUID; - final String wikiURL = OpenMetadataType.REQUEST_FOR_ACTION_ANNOTATION.wikiURL; - - final String superTypeName = OpenMetadataType.DATA_FIELD_ANNOTATION.typeName; - - EntityDef entityDef = archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID, - wikiURL); + EntityDef entityDef = archiveHelper.getDefaultEntityDef(OpenMetadataType.REQUEST_FOR_ACTION_ANNOTATION, + this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_FIELD_ANNOTATION.typeName)); /* * Build the attributes diff --git a/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive1_7.java b/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive1_7.java index 002c431b04b..f32e9eb9a27 100644 --- a/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive1_7.java +++ b/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive1_7.java @@ -1352,13 +1352,9 @@ private RelationshipDef getDigitalServiceDependencyRelationship() List properties = new ArrayList<>(); TypeDefAttribute property; - final String attribute1Name = "delegationEscalationAuthority"; - final String attribute1Description = "Can delegations and escalations flow on this relationship."; - final String attribute1DescriptionGUID = null; - - property = archiveHelper.getBooleanTypeDefAttribute(attribute1Name, - attribute1Description, - attribute1DescriptionGUID); + property = archiveHelper.getBooleanTypeDefAttribute(OpenMetadataProperty.DELEGATION_ESCALATION.name, + OpenMetadataProperty.DELEGATION_ESCALATION.description, + OpenMetadataProperty.DELEGATION_ESCALATION.descriptionGUID); properties.add(property); relationshipDef.setPropertiesDefinition(properties); diff --git a/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive2_4.java b/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive2_4.java index 32b38c9aee5..6c0599984a1 100644 --- a/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive2_4.java +++ b/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive2_4.java @@ -486,8 +486,8 @@ private ClassificationDef addAnchorsClassification() linkedToEntities.add(this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName)); linkedToEntities.add(this.archiveBuilder.getEntityDef(OpenMetadataType.ANNOTATION.typeName)); linkedToEntities.add(this.archiveBuilder.getEntityDef(OpenMetadataType.ANNOTATION_REVIEW.typeName)); - linkedToEntities.add(this.archiveBuilder.getEntityDef(OpenMetadataType.LIKE_TYPE_NAME)); - linkedToEntities.add(this.archiveBuilder.getEntityDef(OpenMetadataType.RATING_TYPE_NAME)); + linkedToEntities.add(this.archiveBuilder.getEntityDef(OpenMetadataType.LIKE.typeName)); + linkedToEntities.add(this.archiveBuilder.getEntityDef(OpenMetadataType.RATING.typeName)); ClassificationDef classificationDef = archiveHelper.getClassificationDef(guid, name, diff --git a/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive3_11.java b/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive3_11.java index a98f231c3db..b222827684f 100644 --- a/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive3_11.java +++ b/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive3_11.java @@ -497,7 +497,7 @@ private TypeDefPatch updatePersonRole() /* * Create the Patch */ - TypeDefPatch typeDefPatch = archiveBuilder.getPatchForType(OpenMetadataType.PERSON_ROLE_TYPE_NAME); + TypeDefPatch typeDefPatch = archiveBuilder.getPatchForType(OpenMetadataType.PERSON_ROLE.typeName); typeDefPatch.setUpdatedBy(originatorName); typeDefPatch.setUpdateTime(creationDate); @@ -524,7 +524,7 @@ private TypeDefPatch updateTeam() /* * Create the Patch */ - TypeDefPatch typeDefPatch = archiveBuilder.getPatchForType(OpenMetadataType.TEAM_TYPE_NAME); + TypeDefPatch typeDefPatch = archiveBuilder.getPatchForType(OpenMetadataType.TEAM.typeName); typeDefPatch.setUpdatedBy(originatorName); typeDefPatch.setUpdateTime(creationDate); @@ -696,19 +696,9 @@ private TypeDefPatch deprecateProjectStatusAttribute() private RelationshipDef getStakeholderRelationship() { - final String guid = "efd8a136-0aea-4668-b91a-30f947e38b82"; - final String name = "Stakeholder"; - final String description = "Identifies the Actor Profiles that commissioned work (such as a project or a community) or a capability, service or assets."; - final String descriptionGUID = null; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, - name, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.STAKEHOLDER_RELATIONSHIP, null, - description, - descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -810,19 +800,9 @@ private TypeDefPatch deprecateGovernanceRoleAssignment() private RelationshipDef getAssignmentScopeRelationship() { - final String guid = "e3fdafe3-692a-46c6-a595-c538cc189dd9"; - final String name = "AssignmentScope"; - final String description = "Links a profile, role or project to the elements that they are responsible for managing."; - final String descriptionGUID = null; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, - name, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.ASSIGNMENT_SCOPE_RELATIONSHIP, null, - description, - descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; @@ -862,20 +842,9 @@ private RelationshipDef getAssignmentScopeRelationship() * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - - final String attribute1Name = "assignmentType"; - final String attribute1Description = "What is the scope or nature of the assignment."; - final String attribute1DescriptionGUID = null; - property = archiveHelper.getStringTypeDefAttribute(attribute1Name, - attribute1Description, - attribute1DescriptionGUID); - properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.DESCRIPTION.name, - OpenMetadataProperty.DESCRIPTION.description, - OpenMetadataProperty.DESCRIPTION.descriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.ASSIGNMENT_TYPE)); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.DESCRIPTION)); relationshipDef.setPropertiesDefinition(properties); diff --git a/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive3_13.java b/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive3_13.java index e6e98fa0967..8e74cf11a11 100644 --- a/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive3_13.java +++ b/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive3_13.java @@ -284,12 +284,8 @@ private void addArea1Actors() private EntityDef getActorEntity() { - return archiveHelper.getDefaultEntityDef(OpenMetadataType.ACTOR.typeGUID, - OpenMetadataType.ACTOR.typeName, - this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName), - OpenMetadataType.ACTOR.description, - OpenMetadataType.ACTOR.descriptionGUID, - OpenMetadataType.ACTOR.wikiURL); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.ACTOR, + this.archiveBuilder.getEntityDef(OpenMetadataType.REFERENCEABLE.typeName)); } @@ -328,7 +324,7 @@ private TypeDefPatch updatePersonRole() /* * Create the Patch */ - TypeDefPatch typeDefPatch = archiveBuilder.getPatchForType(OpenMetadataType.PERSON_ROLE_TYPE_NAME); + TypeDefPatch typeDefPatch = archiveBuilder.getPatchForType(OpenMetadataType.PERSON_ROLE.typeName); typeDefPatch.setUpdatedBy(originatorName); typeDefPatch.setUpdateTime(creationDate); @@ -383,16 +379,8 @@ private TypeDefPatch updateToDo() * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - - final String attribute1Name = "toDoType"; - final String attribute1Description = "Type of to do - typically managed in a valid value set and used in stewardship automation."; - final String attribute1DescriptionGUID = null; - property = archiveHelper.getStringTypeDefAttribute(attribute1Name, - attribute1Description, - attribute1DescriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.TO_DO_TYPE)); typeDefPatch.setPropertyDefinitions(properties); @@ -405,9 +393,7 @@ private TypeDefPatch updateActionAssignment() /* * Create the Patch */ - final String typeName = "ActionAssignment"; - - TypeDefPatch typeDefPatch = archiveBuilder.getPatchForType(typeName); + TypeDefPatch typeDefPatch = archiveBuilder.getPatchForType(OpenMetadataType.ACTION_ASSIGNMENT_RELATIONSHIP.typeName); typeDefPatch.setUpdatedBy(originatorName); typeDefPatch.setUpdateTime(creationDate); @@ -490,12 +476,8 @@ private TypeDefPatch updateDataFileEntity() * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.FILE_NAME.name, - OpenMetadataProperty.FILE_NAME.description, - OpenMetadataProperty.FILE_NAME.descriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.FILE_NAME)); typeDefPatch.setPropertyDefinitions(properties); @@ -506,12 +488,8 @@ private TypeDefPatch updateDataFileEntity() private EntityDef getParquetFileEntity() { - return archiveHelper.getDefaultEntityDef(OpenMetadataType.PARQUET_FILE.typeGUID, - OpenMetadataType.PARQUET_FILE.typeName, - this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_FILE.typeName), - OpenMetadataType.PARQUET_FILE.description, - OpenMetadataType.PARQUET_FILE.descriptionGUID, - OpenMetadataType.PARQUET_FILE.wikiURL); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.PARQUET_FILE, + this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_FILE.typeName)); } @@ -528,12 +506,8 @@ private void add0223DataFeed() private EntityDef getDataFeedEntity() { - return archiveHelper.getDefaultEntityDef(OpenMetadataType.DATA_FEED.typeGUID, - OpenMetadataType.DATA_FEED.typeName, - this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_ASSET.typeName), - OpenMetadataType.DATA_FEED.description, - OpenMetadataType.DATA_FEED.descriptionGUID, - OpenMetadataType.DATA_FEED.wikiURL); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.DATA_FEED, + this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_ASSET.typeName)); } @@ -851,7 +825,6 @@ private RelationshipDef getAgreementActorRelationship() final String end2AttributeName = "agreementActors"; final String end2AttributeDescription = "The actors that are named in the agreement."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.ACTOR.typeName), end2AttributeName, diff --git a/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive3_4.java b/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive3_4.java index 81b1a153132..cccef4c0363 100644 --- a/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive3_4.java +++ b/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive3_4.java @@ -440,53 +440,39 @@ private void update0115ITProfile() private RelationshipDef addITInfrastructureProfileRelationship() { - final String guid = "4c579e3d-a4ff-41c1-9931-33e6fc992f2b"; - final String name = "ITInfrastructureProfile"; - final String description = "Link between an ITProfile and the asset for the piece of infrastructure it describes."; - final String descriptionGUID = null; - - final ClassificationPropagationRule classificationPropagationRule = ClassificationPropagationRule.NONE; - - RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(guid, - name, + RelationshipDef relationshipDef = archiveHelper.getBasicRelationshipDef(OpenMetadataType.IT_INFRASTRUCTURE_PROFILE_RELATIONSHIP, null, - description, - descriptionGUID, - classificationPropagationRule); + ClassificationPropagationRule.NONE); RelationshipEndDef relationshipEndDef; /* * Set up end 1. */ - final String end1EntityType = OpenMetadataType.ASSET.typeName; final String end1AttributeName = "describedByProfile"; final String end1AttributeDescription = "The IT infrastructure that is described by the IT profile."; final String end1AttributeDescriptionGUID = null; - final RelationshipEndCardinality end1Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end1EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.ASSET.typeName), end1AttributeName, end1AttributeDescription, end1AttributeDescriptionGUID, - end1Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef1(relationshipEndDef); /* * Set up end 2. */ - final String end2EntityType = "ITProfile"; final String end2AttributeName = "usedByAsset"; final String end2AttributeDescription = "Description of the user identifies used by the asset."; final String end2AttributeDescriptionGUID = null; - final RelationshipEndCardinality end2Cardinality = RelationshipEndCardinality.ANY_NUMBER; - relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(end2EntityType), + relationshipEndDef = archiveHelper.getRelationshipEndDef(this.archiveBuilder.getEntityDef(OpenMetadataType.IT_PROFILE.typeName), end2AttributeName, end2AttributeDescription, end2AttributeDescriptionGUID, - end2Cardinality); + RelationshipEndCardinality.ANY_NUMBER); relationshipDef.setEndDef2(relationshipEndDef); return relationshipDef; diff --git a/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive3_5.java b/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive3_5.java index e90a4fa6531..111ab3cbecb 100644 --- a/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive3_5.java +++ b/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive3_5.java @@ -1000,9 +1000,7 @@ private TypeDefPatch updatePersonEntity() /* * Create the Patch */ - final String typeName = "Person"; - - TypeDefPatch typeDefPatch = archiveBuilder.getPatchForType(typeName); + TypeDefPatch typeDefPatch = archiveBuilder.getPatchForType(OpenMetadataType.PERSON.typeName); typeDefPatch.setUpdatedBy(originatorName); typeDefPatch.setUpdateTime(creationDate); @@ -1013,57 +1011,33 @@ private TypeDefPatch updatePersonEntity() List properties = new ArrayList<>(); TypeDefAttribute property; - final String attribute1Name = "title"; - final String attribute1Description = "The courtesy title for the person."; - final String attribute1DescriptionGUID = null; - final String attribute2Name = "givenNames"; - final String attribute2Description = "The name strings that are the part of a person's name that is not their surname."; - final String attribute2DescriptionGUID = null; - final String attribute3Name = "surname"; - final String attribute3Description = "The family name of the person."; - final String attribute3DescriptionGUID = null; - final String attribute4Name = "employeeNumber"; - final String attribute4Description = "The unique identifier of the person used by their employer."; - final String attribute4DescriptionGUID = null; - final String attribute5Name = "employeeType"; - final String attribute5Description = "Code used by employer typically to describe the type of employment contract."; - final String attribute5DescriptionGUID = null; - final String attribute6Name = "preferredLanguage"; - final String attribute6Description = "Spoken or written language preferred by the person."; - final String attribute6DescriptionGUID = null; - final String attribute7Name = "initials"; - final String attribute7Description = "First letter of each of the person's given names."; - final String attribute7DescriptionGUID = null; - - - - property = archiveHelper.getStringTypeDefAttribute(attribute1Name, - attribute1Description, - attribute1DescriptionGUID); + property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.COURTESY_TITLE.name, + OpenMetadataProperty.COURTESY_TITLE.description, + OpenMetadataProperty.COURTESY_TITLE.descriptionGUID); properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(attribute2Name, - attribute2Description, - attribute2DescriptionGUID); + property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.GIVEN_NAMES.name, + OpenMetadataProperty.GIVEN_NAMES.description, + OpenMetadataProperty.GIVEN_NAMES.descriptionGUID); properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(attribute3Name, - attribute3Description, - attribute3DescriptionGUID); + property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.SURNAME.name, + OpenMetadataProperty.SURNAME.description, + OpenMetadataProperty.SURNAME.descriptionGUID); properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(attribute4Name, - attribute4Description, - attribute4DescriptionGUID); + property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.EMPLOYEE_NUMBER.name, + OpenMetadataProperty.EMPLOYEE_NUMBER.description, + OpenMetadataProperty.EMPLOYEE_NUMBER.descriptionGUID); properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(attribute5Name, - attribute5Description, - attribute5DescriptionGUID); + property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.EMPLOYEE_TYPE.name, + OpenMetadataProperty.EMPLOYEE_TYPE.description, + OpenMetadataProperty.EMPLOYEE_TYPE.descriptionGUID); properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(attribute6Name, - attribute6Description, - attribute6DescriptionGUID); + property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.PREFERRED_LANGUAGE.name, + OpenMetadataProperty.PREFERRED_LANGUAGE.description, + OpenMetadataProperty.PREFERRED_LANGUAGE.descriptionGUID); properties.add(property); - property = archiveHelper.getStringTypeDefAttribute(attribute7Name, - attribute7Description, - attribute7DescriptionGUID); + property = archiveHelper.getStringTypeDefAttribute(OpenMetadataProperty.INITIALS.name, + OpenMetadataProperty.INITIALS.description, + OpenMetadataProperty.INITIALS.descriptionGUID); properties.add(property); typeDefPatch.setPropertyDefinitions(properties); @@ -1072,7 +1046,6 @@ private TypeDefPatch updatePersonEntity() } - /** * Changing end 2 from ProjectManager to PersonRole to allow any role to manage projects. */ diff --git a/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive4_0.java b/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive4_0.java index 4797dae855e..73c3c5a0483 100644 --- a/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive4_0.java +++ b/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive4_0.java @@ -494,20 +494,8 @@ private void add0220DataFileCollectionDataSet() private EntityDef getDataFileCollectionDataSetEntity() { - final String guid = OpenMetadataType.DATA_FILE_COLLECTION.typeGUID; - final String name = OpenMetadataType.DATA_FILE_COLLECTION.typeName; - final String description = OpenMetadataType.DATA_FILE_COLLECTION.description; - final String descriptionGUID = OpenMetadataType.DATA_FILE_COLLECTION.descriptionGUID; - final String descriptionWiki = OpenMetadataType.DATA_FILE_COLLECTION.wikiURL; - - final String superTypeName = OpenMetadataType.DATA_SET.typeName; - - return archiveHelper.getDefaultEntityDef(guid, - name, - this.archiveBuilder.getEntityDef(superTypeName), - description, - descriptionGUID, - descriptionWiki); + return archiveHelper.getDefaultEntityDef(OpenMetadataType.DATA_FILE_COLLECTION, + this.archiveBuilder.getEntityDef(OpenMetadataType.DATA_SET.typeName)); } /* diff --git a/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive5_0.java b/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive5_0.java index 97b64c15f9d..20e73175693 100644 --- a/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive5_0.java +++ b/open-metadata-resources/open-metadata-archives/open-metadata-types/src/main/java/org/odpi/openmetadata/opentypes/OpenMetadataTypesArchive5_0.java @@ -604,7 +604,7 @@ private TypeDefPatch updateActionsRelationship() /* * Create the Patch */ - final String typeName = OpenMetadataType.ACTION_SPONSOR_RELATIONSHIP_TYPE_NAME; + final String typeName = OpenMetadataType.ACTION_SPONSOR_RELATIONSHIP.typeName; TypeDefPatch typeDefPatch = archiveBuilder.getPatchForType(typeName); @@ -892,9 +892,7 @@ private TypeDefPatch updateConnectorType() /* * Create the Patch */ - final String typeName = OpenMetadataType.CONNECTOR_TYPE_TYPE_NAME; - - TypeDefPatch typeDefPatch = archiveBuilder.getPatchForType(typeName); + TypeDefPatch typeDefPatch = archiveBuilder.getPatchForType(OpenMetadataType.CONNECTOR_TYPE.typeName); typeDefPatch.setUpdatedBy(originatorName); typeDefPatch.setUpdateTime(creationDate); @@ -903,16 +901,8 @@ private TypeDefPatch updateConnectorType() * Build the attributes */ List properties = new ArrayList<>(); - TypeDefAttribute property; - - final String attribute1Name = OpenMetadataProperty.DEPLOYED_IMPLEMENTATION_TYPE.name; - final String attribute1Description = OpenMetadataProperty.DEPLOYED_IMPLEMENTATION_TYPE.description; - final String attribute1DescriptionGUID = OpenMetadataProperty.DEPLOYED_IMPLEMENTATION_TYPE.descriptionGUID; - property = archiveHelper.getStringTypeDefAttribute(attribute1Name, - attribute1Description, - attribute1DescriptionGUID); - properties.add(property); + properties.add(archiveHelper.getTypeDefAttribute(OpenMetadataProperty.DEPLOYED_IMPLEMENTATION_TYPE)); typeDefPatch.setPropertyDefinitions(properties); @@ -979,10 +969,10 @@ private ClassificationDef getDataScopeClassification() final String attribute6Name = OpenMetadataType.MAX_HEIGHT_PROPERTY_NAME; final String attribute6Description = "If the height above ground is relevant, this is the highest height that the data covers."; final String attribute6DescriptionGUID = null; - final String attribute7Name = OpenMetadataType.START_TIME_PROPERTY_NAME; + final String attribute7Name = OpenMetadataProperty.START_TIME.name; final String attribute7Description = "If the data is bound by time, this is the start time."; final String attribute7DescriptionGUID = null; - final String attribute8Name = OpenMetadataType.END_TIME_PROPERTY_NAME; + final String attribute8Name = OpenMetadataProperty.END_TIME.name; final String attribute8Description = "If the data is bound by time, this is the end time."; final String attribute8DescriptionGUID = null; diff --git a/open-metadata-resources/open-metadata-samples/governance-action-samples/src/main/java/org/odpi/openmetadata/samples/governanceactions/clinicaltrials/CocoClinicalTrialQualityDimension.java b/open-metadata-resources/open-metadata-samples/governance-action-samples/src/main/java/org/odpi/openmetadata/samples/governanceactions/clinicaltrials/CocoClinicalTrialQualityDimension.java index 4dfd78b3b46..da4ae43715f 100644 --- a/open-metadata-resources/open-metadata-samples/governance-action-samples/src/main/java/org/odpi/openmetadata/samples/governanceactions/clinicaltrials/CocoClinicalTrialQualityDimension.java +++ b/open-metadata-resources/open-metadata-samples/governance-action-samples/src/main/java/org/odpi/openmetadata/samples/governanceactions/clinicaltrials/CocoClinicalTrialQualityDimension.java @@ -3,7 +3,7 @@ package org.odpi.openmetadata.samples.governanceactions.clinicaltrials; -import org.odpi.openmetadata.frameworks.openmetadata.enums.DataType; +import org.odpi.openmetadata.frameworks.openmetadata.types.DataType; import org.odpi.openmetadata.frameworks.surveyaction.measurements.SurveyMetric; import java.util.ArrayList; diff --git a/open-metadata-resources/open-metadata-samples/sample-metadata/coco-metadata-archives/src/main/java/org/odpi/openmetadata/samples/archiveutilities/businesssystems/CocoBusinessSystemsArchiveWriter.java b/open-metadata-resources/open-metadata-samples/sample-metadata/coco-metadata-archives/src/main/java/org/odpi/openmetadata/samples/archiveutilities/businesssystems/CocoBusinessSystemsArchiveWriter.java index e1f875d7fe9..46122240e1b 100644 --- a/open-metadata-resources/open-metadata-samples/sample-metadata/coco-metadata-archives/src/main/java/org/odpi/openmetadata/samples/archiveutilities/businesssystems/CocoBusinessSystemsArchiveWriter.java +++ b/open-metadata-resources/open-metadata-samples/sample-metadata/coco-metadata-archives/src/main/java/org/odpi/openmetadata/samples/archiveutilities/businesssystems/CocoBusinessSystemsArchiveWriter.java @@ -98,7 +98,7 @@ private void addSystems() Map extendedProperties = new HashMap<>(); extendedProperties.put(OpenMetadataProperty.DEPLOYED_IMPLEMENTATION_TYPE.name, systemDefinition.getSystemType().getPreferredValue()); - extendedProperties.put(OpenMetadataType.USER_ID_PROPERTY_NAME, systemDefinition.getUserId()); + extendedProperties.put(OpenMetadataProperty.USER_ID.name, systemDefinition.getUserId()); String serverGUID = archiveHelper.addAsset(OpenMetadataType.SOFTWARE_SERVER.typeName, diff --git a/open-metadata-resources/open-metadata-samples/sample-metadata/coco-metadata-archives/src/main/java/org/odpi/openmetadata/samples/archiveutilities/governanceprogram/CocoGovernanceProgramArchiveWriter.java b/open-metadata-resources/open-metadata-samples/sample-metadata/coco-metadata-archives/src/main/java/org/odpi/openmetadata/samples/archiveutilities/governanceprogram/CocoGovernanceProgramArchiveWriter.java index a27aaf6660a..d80b7a1d348 100644 --- a/open-metadata-resources/open-metadata-samples/sample-metadata/coco-metadata-archives/src/main/java/org/odpi/openmetadata/samples/archiveutilities/governanceprogram/CocoGovernanceProgramArchiveWriter.java +++ b/open-metadata-resources/open-metadata-samples/sample-metadata/coco-metadata-archives/src/main/java/org/odpi/openmetadata/samples/archiveutilities/governanceprogram/CocoGovernanceProgramArchiveWriter.java @@ -4,6 +4,7 @@ import org.odpi.openmetadata.archiveutilities.openconnectors.core.CorePackArchiveWriter; +import org.odpi.openmetadata.frameworks.openmetadata.enums.CommunityMembershipType; import org.odpi.openmetadata.frameworks.openmetadata.refdata.CollectionType; import org.odpi.openmetadata.frameworks.openmetadata.refdata.ResourceUse; import org.odpi.openmetadata.frameworks.openmetadata.types.OpenMetadataType; @@ -286,7 +287,7 @@ private void writeCommunities() { String leaderRoleQName = "Leader: " + communityDefinition.getQualifiedName(); - archiveHelper.addPersonRole(OpenMetadataType.COMMUNITY_MEMBER_TYPE_NAME, + archiveHelper.addPersonRole(OpenMetadataType.COMMUNITY_MEMBER.typeName, leaderRoleQName, "Community Leader", null, @@ -297,7 +298,7 @@ private void writeCommunities() null, null); - archiveHelper.addCommunityMembershipRelationship(communityDefinition.getQualifiedName(), leaderRoleQName, OpenMetadataType.COMMUNITY_MEMBERSHIP_TYPE_LEADER); + archiveHelper.addCommunityMembershipRelationship(communityDefinition.getQualifiedName(), leaderRoleQName, CommunityMembershipType.LEADER.getOrdinal()); for (PersonDefinition leader : communityDefinition.getLeaders()) { @@ -309,7 +310,7 @@ private void writeCommunities() { String memberRoleQName = "Member: " + communityDefinition.getQualifiedName(); - archiveHelper.addPersonRole(OpenMetadataType.COMMUNITY_MEMBER_TYPE_NAME, + archiveHelper.addPersonRole(OpenMetadataType.COMMUNITY_MEMBER.typeName, memberRoleQName, "CommunityMember", null, @@ -320,7 +321,7 @@ private void writeCommunities() null, null); - archiveHelper.addCommunityMembershipRelationship(communityDefinition.getQualifiedName(), memberRoleQName, OpenMetadataType.COMMUNITY_MEMBERSHIP_TYPE_CONTRIBUTOR); + archiveHelper.addCommunityMembershipRelationship(communityDefinition.getQualifiedName(), memberRoleQName, CommunityMembershipType.CONTRIBUTOR.getOrdinal()); for (PersonDefinition member : communityDefinition.getMembers()) { diff --git a/open-metadata-resources/open-metadata-samples/sample-metadata/coco-metadata-archives/src/main/java/org/odpi/openmetadata/samples/archiveutilities/organization/CocoOrganizationArchiveWriter.java b/open-metadata-resources/open-metadata-samples/sample-metadata/coco-metadata-archives/src/main/java/org/odpi/openmetadata/samples/archiveutilities/organization/CocoOrganizationArchiveWriter.java index cdbacd9befd..e8a8795bff7 100644 --- a/open-metadata-resources/open-metadata-samples/sample-metadata/coco-metadata-archives/src/main/java/org/odpi/openmetadata/samples/archiveutilities/organization/CocoOrganizationArchiveWriter.java +++ b/open-metadata-resources/open-metadata-samples/sample-metadata/coco-metadata-archives/src/main/java/org/odpi/openmetadata/samples/archiveutilities/organization/CocoOrganizationArchiveWriter.java @@ -479,7 +479,7 @@ private void writeTeams() archiveHelper.addTeamStructureRelationship(superTeamQName, deptDefinition.getQualifiedName(), true); String leadershipRoleQName = "TeamLeader:" + deptDefinition.getQualifiedName(); - archiveHelper.addPersonRole(OpenMetadataType.TEAM_LEADER_TYPE_NAME, + archiveHelper.addPersonRole(OpenMetadataType.TEAM_LEADER.typeName, leadershipRoleQName, leadershipRoleQName, null, @@ -503,7 +503,7 @@ private void writeTeams() } String membershipRoleQName = "TeamMembers:" + deptDefinition.getQualifiedName(); - archiveHelper.addPersonRole(OpenMetadataType.TEAM_MEMBER_TYPE_NAME, + archiveHelper.addPersonRole(OpenMetadataType.TEAM_MEMBER.typeName, membershipRoleQName, membershipRoleQName, null,