Skip to content

Commit

Permalink
Merge pull request #8573 from mandy-chessell/oak2025
Browse files Browse the repository at this point in the history 
Update types for models 0310, 0320, 0330
  • Loading branch information
@mandy-chessell
mandy-chessell authored Jan 5, 2025
2 parents bdfc759 + 98411ff commit 2a1d298
Show file tree
Hide file tree
Showing 38 changed files with 530 additions and 780 deletions.
2 changes: 1 addition & 1 deletion EgeriaContentPacksGUIDMap.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/APIsContentPack.omarchive
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/ApacheAtlasContentPack.omarchive
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/ApacheKafkaContentPack.omarchive
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/CoreContentPack.omarchive
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/ObservabilityContentPack.omarchive
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/OpenMetadataTypes.omarchive
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/PostgresContentPack.omarchive
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/UnityCatalogContentPack.omarchive
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .../org/odpi/openmetadata/accessservices/assetconsumer/server/AssetConsumerRESTServices.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2161,7 +2161,7 @@ public GUIDListResponse getAssetsByMeaning(String serverName,
List<EntityDetail> attachedEntities = handler.getAttachedEntities(userId,
termGUID,
guidParameterName,
OpenMetadataType.GLOSSARY_TERM_TYPE_NAME,
OpenMetadataType.GLOSSARY_TERM.typeName,
OpenMetadataType.SEMANTIC_ASSIGNMENT.typeGUID,
OpenMetadataType.SEMANTIC_ASSIGNMENT.typeName,
OpenMetadataType.REFERENCEABLE.typeName,
Expand Down
162 changes: 81 additions & 81 deletions ...a/org/odpi/openmetadata/accessservices/assetmanager/handlers/GlossaryExchangeHandler.java
View file

Large diffs are not rendered by default.

4 changes: 0 additions & 4 deletions ...in/java/org/odpi/openmetadata/accessservices/digitalservice/client/CollectionsClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1341,10 +1341,6 @@ private ElementProperties getElementProperties(CollectionMembershipProperties co
OpenMetadataProperty.CONFIDENCE.name,
collectionMembershipProperties.getConfidence());

elementProperties = propertyHelper.addStringProperty(elementProperties,
OpenMetadataType.CREATED_BY_PROPERTY_NAME,
collectionMembershipProperties.getCreatedBy());

elementProperties = propertyHelper.addStringProperty(elementProperties,
OpenMetadataProperty.STEWARD.name,
collectionMembershipProperties.getSteward());
Expand Down
2 changes: 1 addition & 1 deletion ...tadata/adapters/connectors/dynamicarchivers/glossary/GlossaryDynamicArchiverProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public GlossaryDynamicArchiverProvider()

actionTargetType.setName(DynamicGlossaryArchiveRequestParameter.GLOSSARY_NAME.getName());
actionTargetType.setDescription(DynamicGlossaryArchiveRequestParameter.GLOSSARY_NAME.getDescription());
actionTargetType.setTypeName(OpenMetadataType.GLOSSARY_TYPE_NAME);
actionTargetType.setTypeName(OpenMetadataType.GLOSSARY.typeName);

super.supportedActionTargetTypes.add(actionTargetType);

Expand Down
6 changes: 0 additions & 6 deletions ...src/main/java/org/odpi/openmetadata/commonservices/generichandlers/CollectionHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -517,12 +517,6 @@ public void updateCollectionMembership(String userId,
confidence,
methodName);

properties = repositoryHelper.addStringPropertyToInstance(serviceName,
properties,
OpenMetadataType.CREATED_BY_PROPERTY_NAME,
createdBy,
methodName);

properties = repositoryHelper.addStringPropertyToInstance(serviceName,
properties,
OpenMetadataProperty.STEWARD.name,
Expand Down
18 changes: 9 additions & 9 deletions ...s/src/main/java/org/odpi/openmetadata/commonservices/generichandlers/GlossaryBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ public GlossaryBuilder(String qualifiedName,
{
super(qualifiedName,
null,
OpenMetadataType.GLOSSARY_TYPE_GUID,
OpenMetadataType.GLOSSARY_TYPE_NAME,
OpenMetadataType.GLOSSARY.typeGUID,
OpenMetadataType.GLOSSARY.typeName,
null,
repositoryHelper,
serviceName,
Expand Down Expand Up @@ -120,8 +120,8 @@ public GlossaryBuilder(String qualifiedName,
{
super(qualifiedName,
null,
OpenMetadataType.GLOSSARY_TYPE_GUID,
OpenMetadataType.GLOSSARY_TYPE_NAME,
OpenMetadataType.GLOSSARY.typeGUID,
OpenMetadataType.GLOSSARY.typeName,
null,
repositoryHelper,
serviceName,
Expand All @@ -143,8 +143,8 @@ public GlossaryBuilder(String qualifiedName,
String serviceName,
String serverName)
{
super(OpenMetadataType.GLOSSARY_TYPE_GUID,
OpenMetadataType.GLOSSARY_TYPE_NAME,
super(OpenMetadataType.GLOSSARY.typeGUID,
OpenMetadataType.GLOSSARY.typeName,
repositoryHelper,
serviceName,
serverName);
Expand Down Expand Up @@ -177,7 +177,7 @@ public InstanceProperties getInstanceProperties(String methodName) throws Inval

properties = repositoryHelper.addStringPropertyToInstance(serviceName,
properties,
OpenMetadataType.LANGUAGE_PROPERTY_NAME,
OpenMetadataProperty.LANGUAGE.name,
language,
methodName);

Expand Down Expand Up @@ -263,7 +263,7 @@ InstanceProperties getTaxonomyProperties(String organizingPrinciple,
{
properties = repositoryHelper.addStringPropertyToInstance(serviceName,
null,
OpenMetadataType.ORGANIZING_PRINCIPLE_PROPERTY_NAME,
OpenMetadataProperty.ORGANIZING_PRINCIPLE.name,
organizingPrinciple,
methodName);

Expand Down Expand Up @@ -291,7 +291,7 @@ InstanceProperties getCanonicalVocabularyProperties(String scope,
{
properties = repositoryHelper.addStringPropertyToInstance(serviceName,
null,
OpenMetadataType.SCOPE_PROPERTY_NAME,
OpenMetadataProperty.SCOPE.name,
scope,
methodName);

Expand Down
16 changes: 8 additions & 8 deletions ...in/java/org/odpi/openmetadata/commonservices/generichandlers/GlossaryCategoryBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ public class GlossaryCategoryBuilder extends ReferenceableBuilder
{
super(qualifiedName,
additionalProperties,
OpenMetadataType.GLOSSARY_CATEGORY_TYPE_GUID,
OpenMetadataType.GLOSSARY_CATEGORY_TYPE_NAME,
OpenMetadataType.GLOSSARY_CATEGORY.typeGUID,
OpenMetadataType.GLOSSARY_CATEGORY.typeName,
extendedProperties,
repositoryHelper,
serviceName,
Expand Down Expand Up @@ -77,8 +77,8 @@ public GlossaryCategoryBuilder(String qualifiedName,
{
super(qualifiedName,
null,
OpenMetadataType.GLOSSARY_CATEGORY_TYPE_GUID,
OpenMetadataType.GLOSSARY_CATEGORY_TYPE_NAME,
OpenMetadataType.GLOSSARY_CATEGORY.typeGUID,
OpenMetadataType.GLOSSARY_CATEGORY.typeName,
null,
repositoryHelper,
serviceName,
Expand All @@ -100,8 +100,8 @@ public GlossaryCategoryBuilder(String qualifiedName,
String serviceName,
String serverName)
{
super(OpenMetadataType.GLOSSARY_CATEGORY_TYPE_GUID,
OpenMetadataType.GLOSSARY_CATEGORY_TYPE_NAME,
super(OpenMetadataType.GLOSSARY_CATEGORY.typeGUID,
OpenMetadataType.GLOSSARY_CATEGORY.typeName,
repositoryHelper,
serviceName,
serverName);
Expand All @@ -125,7 +125,7 @@ public void setRootCategory(String userId,
null,
InstanceProvenanceType.LOCAL_COHORT,
userId,
OpenMetadataType.ROOT_CATEGORY_CLASSIFICATION_TYPE_NAME,
OpenMetadataType.ROOT_CATEGORY_CLASSIFICATION.typeName,
typeName,
ClassificationOrigin.ASSIGNED,
null,
Expand All @@ -134,7 +134,7 @@ public void setRootCategory(String userId,
}
catch (Exception error)
{
errorHandler.handleUnsupportedAnchorsType(error, methodName, OpenMetadataType.ROOT_CATEGORY_CLASSIFICATION_TYPE_NAME);
errorHandler.handleUnsupportedAnchorsType(error, methodName, OpenMetadataType.ROOT_CATEGORY_CLASSIFICATION.typeName);
}
}

Expand Down
Loading

0 comments on commit 2a1d298

Please sign in to comment.