Skip to content

Commit

Permalink
Merge pull request #8586 from mandy-chessell/oak2025
Browse files Browse the repository at this point in the history 
Fix getGovernanceActionProcessGraph
  • Loading branch information
@mandy-chessell
mandy-chessell authored Jan 18, 2025
2 parents e850e92 + 6ea14da commit 776b3d2
Show file tree
Hide file tree
Showing 89 changed files with 2,955 additions and 3,261 deletions.
2 changes: 1 addition & 1 deletion EgeriaContentPacksGUIDMap.json
View file

Large diffs are not rendered by default.

6 changes: 0 additions & 6 deletions application.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,6 @@ authentication.source=platform
# Authentication mode
authentication.mode=token

################################################
### Additional demo users configuration for when authentication.source=demo
### This file is located in the resources folder of the user-authn module and built into its runtime jar
################################################
spring.config.import=classpath:demo-users.yml

################################################
### Comma separated list of header names to extract from incoming HTTP requests and add to thread local.
### The default value is null and adds no headers.
Expand Down
6 changes: 0 additions & 6 deletions container.application.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,6 @@ authentication.source=platform
# Authentication mode
authentication.mode=token

################################################
### Additional demo users configuration for when authentication.source=demo
### This file is located in the resources folder of the user-authn module and built into its runtime jar
################################################
spring.config.import=classpath:demo-users.yml

################################################
### Comma separated list of header names to extract from incoming HTTP requests and add to thread local.
### The default value is null and adds no headers.
Expand Down
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.

4 changes: 2 additions & 2 deletions .../org/odpi/openmetadata/accessservices/assetconsumer/server/AssetConsumerRESTServices.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2162,8 +2162,8 @@ public GUIDListResponse getAssetsByMeaning(String serverName,
termGUID,
guidParameterName,
OpenMetadataType.GLOSSARY_TERM.typeName,
OpenMetadataType.SEMANTIC_ASSIGNMENT.typeGUID,
OpenMetadataType.SEMANTIC_ASSIGNMENT.typeName,
OpenMetadataType.SEMANTIC_ASSIGNMENT_RELATIONSHIP.typeGUID,
OpenMetadataType.SEMANTIC_ASSIGNMENT_RELATIONSHIP.typeName,
OpenMetadataType.REFERENCEABLE.typeName,
null,
null,
Expand Down
4 changes: 2 additions & 2 deletions ...i/openmetadata/accessservices/assetmanager/client/exchange/StewardshipExchangeClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1088,7 +1088,7 @@ public List<MetadataElementSummary> getSecurityTaggedElements(String userId,
final String methodName = "getSecurityTaggedElements";

return super.getClassifiedElements(userId,
OpenMetadataType.SECURITY_TAGS_CLASSIFICATION_TYPE_NAME,
OpenMetadataType.SECURITY_TAGS_CLASSIFICATION.typeName,
null,
startFrom,
pageSize,
Expand Down Expand Up @@ -1748,7 +1748,7 @@ public List<RelatedMetadataElementSummary> getSemanticAssignees(String userId,
return super.getRelatedElements(userId,
glossaryTermGUID,
2,
OpenMetadataType.SEMANTIC_ASSIGNMENT.typeName,
OpenMetadataType.SEMANTIC_ASSIGNMENT_RELATIONSHIP.typeName,
startFrom,
pageSize,
effectiveTime,
Expand Down
4 changes: 2 additions & 2 deletions ...pi/openmetadata/accessservices/assetmanager/converters/GovernanceDefinitionConverter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public B getNewBean(Class<B> beanClass,
governanceDefinitionProperties.setTitle(this.removeTitle(instanceProperties));
governanceDefinitionProperties.setScope(this.removeScope(instanceProperties));
governanceDefinitionProperties.setDomainIdentifier(this.removeDomainIdentifier(instanceProperties));
governanceDefinitionProperties.setPriority(this.removePriority(instanceProperties));
governanceDefinitionProperties.setPriority(this.removeImportance(instanceProperties));
governanceDefinitionProperties.setOutcomes(this.removeOutcomes(instanceProperties));
governanceDefinitionProperties.setResults(this.removeResults(instanceProperties));

Expand Down Expand Up @@ -191,7 +191,7 @@ public B getNewComplexBean(Class<B> beanClass,
governanceDefinitionProperties.setTitle(this.removeTitle(instanceProperties));
governanceDefinitionProperties.setScope(this.removeScope(instanceProperties));
governanceDefinitionProperties.setDomainIdentifier(this.removeDomainIdentifier(instanceProperties));
governanceDefinitionProperties.setPriority(this.removePriority(instanceProperties));
governanceDefinitionProperties.setPriority(this.removeImportance(instanceProperties));
governanceDefinitionProperties.setOutcomes(this.removeOutcomes(instanceProperties));
governanceDefinitionProperties.setResults(this.removeResults(instanceProperties));

Expand Down
4 changes: 2 additions & 2 deletions ...a/org/odpi/openmetadata/accessservices/assetmanager/handlers/GlossaryExchangeHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2372,7 +2372,7 @@ public String createControlledGlossaryTerm(String userId,
invalidParameterHandler.validateObject(initialStatus, initialStatusParameterName, methodName);
invalidParameterHandler.validateName(glossaryTermProperties.getQualifiedName(), qualifiedNameParameterName, methodName);

String typeName = OpenMetadataType.CONTROLLED_GLOSSARY_TERM_TYPE_NAME;
String typeName = OpenMetadataType.CONTROLLED_GLOSSARY_TERM.typeName;

if (glossaryTermProperties.getTypeName() != null)
{
Expand Down Expand Up @@ -2418,7 +2418,7 @@ public String createControlledGlossaryTerm(String userId,
this.updateRevisionHistory(userId,
glossaryTermGUID,
glossaryTermProperties.getQualifiedName(),
OpenMetadataType.CONTROLLED_GLOSSARY_TERM_TYPE_NAME,
OpenMetadataType.CONTROLLED_GLOSSARY_TERM.typeName,
revisionHistoryTitle,
updateDescription);
}
Expand Down
4 changes: 2 additions & 2 deletions ...odpi/openmetadata/accessservices/assetmanager/server/StewardshipExchangeRESTServices.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3079,7 +3079,7 @@ public GovernanceDefinitionsResponse getGovernedByDefinitions(String
elementGUID,
elementGUIDParameterName,
OpenMetadataType.REFERENCEABLE.typeName,
OpenMetadataType.GOVERNANCE_DEFINITION_TYPE_NAME,
OpenMetadataType.GOVERNANCE_DEFINITION.typeName,
startFrom,
pageSize,
forLineage,
Expand All @@ -3093,7 +3093,7 @@ public GovernanceDefinitionsResponse getGovernedByDefinitions(String
elementGUID,
elementGUIDParameterName,
OpenMetadataType.REFERENCEABLE.typeName,
OpenMetadataType.GOVERNANCE_DEFINITION_TYPE_NAME,
OpenMetadataType.GOVERNANCE_DEFINITION.typeName,
startFrom,
pageSize,
forLineage,
Expand Down
2 changes: 1 addition & 1 deletion ...g/odpi/openmetadata/accessservices/datamanager/listener/DataManagerOMRSTopicListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ private void processRelationshipEvent(DataManagerOutboundEventType eventType,
if ((repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.DATA_CONTENT_FOR_DATA_SET_RELATIONSHIP.typeName)) ||
(repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.ASSET_TO_SCHEMA_TYPE_TYPE_NAME)) ||
(repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.SERVER_ENDPOINT_RELATIONSHIP.typeName)) ||
(repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.SEMANTIC_ASSIGNMENT.typeName)) ||
(repositoryHelper.isTypeOf(sourceName, instanceTypeName, OpenMetadataType.SEMANTIC_ASSIGNMENT_RELATIONSHIP.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.CONNECTION_TO_ASSET_RELATIONSHIP.typeName)) ||
Expand Down
28 changes: 14 additions & 14 deletions ...penmetadata/accessservices/governanceprogram/server/GovernanceDefinitionRESTServices.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,8 +303,8 @@ public VoidResponse setGovernanceDefinitionStatus(String se
requestBody.getExternalSourceName(),
definitionGUID,
guidParameterName,
OpenMetadataType.GOVERNANCE_DEFINITION_TYPE_GUID,
OpenMetadataType.GOVERNANCE_DEFINITION_TYPE_NAME,
OpenMetadataType.GOVERNANCE_DEFINITION.typeGUID,
OpenMetadataType.GOVERNANCE_DEFINITION.typeName,
false,
false,
getInstanceStatus(requestBody.getStatus()),
Expand Down Expand Up @@ -449,10 +449,10 @@ public VoidResponse linkPeerDefinitions(String serverName,
handler.setupPeerRelationship(userId,
definitionOneGUID,
definitionOneGUIDParameterName,
OpenMetadataType.GOVERNANCE_DEFINITION_TYPE_NAME,
OpenMetadataType.GOVERNANCE_DEFINITION.typeName,
definitionTwoGUID,
definitionTwoGUIDParameterName,
OpenMetadataType.GOVERNANCE_DEFINITION_TYPE_NAME,
OpenMetadataType.GOVERNANCE_DEFINITION.typeName,
requestBody.getRelationshipName(),
properties.getDescription(),
properties.getEffectiveFrom(),
Expand All @@ -467,10 +467,10 @@ else if (requestBody.getProperties() == null)
handler.setupPeerRelationship(userId,
definitionOneGUID,
definitionOneGUIDParameterName,
OpenMetadataType.GOVERNANCE_DEFINITION_TYPE_NAME,
OpenMetadataType.GOVERNANCE_DEFINITION.typeName,
definitionTwoGUID,
definitionTwoGUIDParameterName,
OpenMetadataType.GOVERNANCE_DEFINITION_TYPE_NAME,
OpenMetadataType.GOVERNANCE_DEFINITION.typeName,
requestBody.getRelationshipName(),
null,
null,
Expand Down Expand Up @@ -541,10 +541,10 @@ public VoidResponse unlinkPeerDefinitions(String serverName,
handler.clearDefinitionRelationship(userId,
definitionOneGUID,
definitionOneGUIDParameterName,
OpenMetadataType.GOVERNANCE_DEFINITION_TYPE_NAME,
OpenMetadataType.GOVERNANCE_DEFINITION.typeName,
definitionTwoGUID,
definitionTwoGUIDParameterName,
OpenMetadataType.GOVERNANCE_DEFINITION_TYPE_NAME,
OpenMetadataType.GOVERNANCE_DEFINITION.typeName,
requestBody.getRelationshipName(),
false,
false,
Expand Down Expand Up @@ -615,10 +615,10 @@ public VoidResponse setupSupportingDefinition(String serverName
handler.setupDelegationRelationship(userId,
definitionGUID,
definitionOneGUIDParameterName,
OpenMetadataType.GOVERNANCE_DEFINITION_TYPE_NAME,
OpenMetadataType.GOVERNANCE_DEFINITION.typeName,
supportingDefinitionGUID,
definitionTwoGUIDParameterName,
OpenMetadataType.GOVERNANCE_DEFINITION_TYPE_NAME,
OpenMetadataType.GOVERNANCE_DEFINITION.typeName,
requestBody.getRelationshipName(),
properties.getRationale(),
properties.getEffectiveFrom(),
Expand All @@ -633,10 +633,10 @@ else if (requestBody.getProperties() == null)
handler.setupDelegationRelationship(userId,
definitionGUID,
definitionOneGUIDParameterName,
OpenMetadataType.GOVERNANCE_DEFINITION_TYPE_NAME,
OpenMetadataType.GOVERNANCE_DEFINITION.typeName,
supportingDefinitionGUID,
definitionTwoGUIDParameterName,
OpenMetadataType.GOVERNANCE_DEFINITION_TYPE_NAME,
OpenMetadataType.GOVERNANCE_DEFINITION.typeName,
requestBody.getRelationshipName(),
null,
null,
Expand Down Expand Up @@ -707,10 +707,10 @@ public VoidResponse clearSupportingDefinition(String serverName
handler.clearDefinitionRelationship(userId,
definitionGUID,
definitionOneGUIDParameterName,
OpenMetadataType.GOVERNANCE_DEFINITION_TYPE_NAME,
OpenMetadataType.GOVERNANCE_DEFINITION.typeName,
supportingDefinitionGUID,
definitionTwoGUIDParameterName,
OpenMetadataType.GOVERNANCE_DEFINITION_TYPE_NAME,
OpenMetadataType.GOVERNANCE_DEFINITION.typeName,
requestBody.getRelationshipName(),
false,
false,
Expand Down
Loading

0 comments on commit 776b3d2

Please sign in to comment.