Skip to content

Remove OperationalStatus enum #8926

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mandy-chessell merged 2 commits into from
Dec 14, 2025
Merged

Remove OperationalStatus enum #8926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f20dd15
Remove OperationalStatus enum
mandy-chessell Dec 14, 2025
12b1c75
Merge branch 'main' into oak2025
mandy-chessell Dec 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion EgeriaContentPacksGUIDMap.json
View file
Open in desktop

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/CocoBusinessSystemsArchive.omarchive
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/CocoClinicalTrialsTemplatesArchive.omarchive
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/CocoComboArchive.omarchive
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/CocoGovernanceEngineDefinitionsArchive.omarchive
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/CocoGovernanceProgramArchive.omarchive
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/CocoOrganizationArchive.omarchive
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/CocoSustainabilityArchive.omarchive
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/CocoTypesArchive.omarchive
View file
Open in desktop

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/EgeriaContentPack.omarchive
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/FilesContentPack.omarchive
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/JacquardHarvesterContentPack.omarchive
View file
Open in desktop

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/OpenLineageContentPack.omarchive
View file
Open in desktop

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/OrganizationInsightContentPack.omarchive
View file
Open in desktop

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/SimpleAPICatalog.omarchive
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/SimpleCatalog.omarchive
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/SimpleDataCatalog.omarchive
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-packs/SimpleGovernanceCatalog.omarchive
View file
Open in desktop

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

6 changes: 1 addition & 5 deletions ...enmetadata/adapters/connectors/postgres/catalog/PostgresServerCatalogTargetProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import org.odpi.openmetadata.frameworks.openmetadata.connectorcontext.OpenMetadataStore;
import org.odpi.openmetadata.frameworks.openmetadata.enums.CapabilityAssetUseType;
import org.odpi.openmetadata.frameworks.openmetadata.enums.ElementStatus;
import org.odpi.openmetadata.frameworks.openmetadata.enums.OperationalStatus;
import org.odpi.openmetadata.frameworks.openmetadata.ffdc.InvalidParameterException;
import org.odpi.openmetadata.frameworks.openmetadata.ffdc.PropertyServerException;
import org.odpi.openmetadata.frameworks.openmetadata.ffdc.UserNotAuthorizedException;
Expand Down Expand Up @@ -226,10 +225,7 @@ private String getDatabaseManagerGUID(String databaseServerGUID
new NewElementProperties(propertyHelper.addStringProperty(null,
OpenMetadataProperty.QUALIFIED_NAME.name,
databaseServerQualifiedName + ":DBMS")),
new NewElementProperties(propertyHelper.addEnumProperty(null,
OpenMetadataProperty.OPERATIONAL_STATUS.name,
OperationalStatus.getOpenTypeName(),
OperationalStatus.ENABLED.getName())));
null);
}
}
catch (Exception exception)
Expand Down
6 changes: 1 addition & 5 deletions ...ers/connectors/unitycatalog/provision/ProvisionUnityCatalogGovernanceActionConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import org.odpi.openmetadata.frameworks.openmetadata.properties.OpenMetadataElement;
import org.odpi.openmetadata.frameworks.openmetadata.search.MakeAnchorOptions;
import org.odpi.openmetadata.frameworks.openmetadata.specificationproperties.PlaceholderPropertyType;
import org.odpi.openmetadata.frameworks.openmetadata.enums.OperationalStatus;
import org.odpi.openmetadata.frameworks.openmetadata.search.MetadataSourceOptions;
import org.odpi.openmetadata.frameworks.openmetadata.search.NewElementProperties;
import org.odpi.openmetadata.frameworks.openmetadata.search.TemplateOptions;
Expand Down Expand Up @@ -253,10 +252,7 @@ private String createNewCatalog(String templateGUID) throws InvalidParameterExce
governanceContext.getRequestParameters(),
serverGUID,
OpenMetadataType.SUPPORTED_SOFTWARE_CAPABILITY_RELATIONSHIP.typeName,
propertyHelper.addEnumProperty(null,
OpenMetadataProperty.OPERATIONAL_STATUS.name,
OperationalStatus.getOpenTypeName(),
OperationalStatus.ENABLED.getName()),
null,
true);
}

Expand Down
1 change: 0 additions & 1 deletion ...rg/odpi/openmetadata/adapters/connectors/secretsstore/yaml/YAMLSecretsStoreConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import org.odpi.openmetadata.frameworks.connectors.properties.users.UserAccount;
import org.odpi.openmetadata.frameworks.openmetadata.ffdc.UserNotAuthorizedException;

import javax.net.ssl.SSLContext;
import java.io.File;
import java.net.URI;
import java.net.URLEncoder;
Expand Down
6 changes: 6 additions & 0 deletions ...pters/connectors/egeriainfrastructure/control/EgeriaSoftwareServerTemplateDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,12 @@ public String getServerName()
}


public String getNamespace()
{
return PlaceholderProperty.ORGANIZATION_NAME.getPlaceholder();
}


/**
* Return the server description.
*
Expand Down
5 changes: 5 additions & 0 deletions ...apters/connectors/egeriainfrastructure/control/OMAGServerPlatformPlaceholderProperty.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,9 @@ public static List<PlaceholderPropertyType> getPlatformPlaceholderPropertyTypes(
placeholderPropertyTypes.add(OMAGServerPlatformPlaceholderProperty.PLATFORM_DESCRIPTION.getPlaceholderType());
placeholderPropertyTypes.add(PlaceholderProperty.VERSION_IDENTIFIER.getPlaceholderType());
placeholderPropertyTypes.add(PlaceholderProperty.CONNECTION_USER_ID.getPlaceholderType());
placeholderPropertyTypes.add(PlaceholderProperty.ORGANIZATION_NAME.getPlaceholderType());
placeholderPropertyTypes.add(PlaceholderProperty.SECRETS_STORE.getPlaceholderType());
placeholderPropertyTypes.add(PlaceholderProperty.SECRETS_COLLECTION_NAME.getPlaceholderType());

return placeholderPropertyTypes;
}
Expand All @@ -179,6 +182,8 @@ public static List<PlaceholderPropertyType> getOMAGServerPlaceholderPropertyType
placeholderPropertyTypes.add(PlaceholderProperty.DESCRIPTION.getPlaceholderType());
placeholderPropertyTypes.add(PlaceholderProperty.VERSION_IDENTIFIER.getPlaceholderType());
placeholderPropertyTypes.add(PlaceholderProperty.CONNECTION_USER_ID.getPlaceholderType());
placeholderPropertyTypes.add(PlaceholderProperty.SECRETS_STORE.getPlaceholderType());
placeholderPropertyTypes.add(PlaceholderProperty.SECRETS_COLLECTION_NAME.getPlaceholderType());

return placeholderPropertyTypes;
}
Expand Down
84 changes: 65 additions & 19 deletions .../connectors/egeriainfrastructure/platform/catalog/OMAGServerPlatformCatalogConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@

import org.odpi.openmetadata.adapters.connectors.egeriainfrastructure.control.OMAGServerPlatformPlaceholderProperty;
import org.odpi.openmetadata.adapters.connectors.egeriainfrastructure.properties.*;
import org.odpi.openmetadata.adapters.connectors.egeriainfrastructure.servers.EngineHostConnector;
import org.odpi.openmetadata.adapters.connectors.egeriainfrastructure.servers.IntegrationDaemonConnector;
import org.odpi.openmetadata.adapters.connectors.egeriainfrastructure.servers.MetadataAccessServerConnector;
import org.odpi.openmetadata.adapters.connectors.egeriainfrastructure.servers.ViewServerConnector;
import org.odpi.openmetadata.adminservices.configuration.properties.OMAGServerConfig;
import org.odpi.openmetadata.frameworks.connectors.controls.SecretsStorePurpose;
Expand All @@ -23,7 +26,6 @@
import org.odpi.openmetadata.frameworks.openmetadata.definitions.EgeriaSolutionComponent;
import org.odpi.openmetadata.frameworks.openmetadata.enums.CapabilityAssetUseType;
import org.odpi.openmetadata.frameworks.openmetadata.enums.ElementOriginCategory;
import org.odpi.openmetadata.frameworks.openmetadata.enums.OperationalStatus;
import org.odpi.openmetadata.frameworks.openmetadata.events.OpenMetadataEventListener;
import org.odpi.openmetadata.frameworks.openmetadata.events.OpenMetadataOutTopicEvent;
import org.odpi.openmetadata.frameworks.openmetadata.ffdc.InvalidParameterException;
Expand Down Expand Up @@ -557,6 +559,8 @@ private synchronized void processPlatforms()
*/
private void checkServerLineage() throws InvalidParameterException, PropertyServerException, UserNotAuthorizedException
{
final String methodName = "checkServerLineage";

AssetClient assetClient = integrationContext.getAssetClient(OpenMetadataType.SOFTWARE_SERVER.typeName);

int startFrom = 0;
Expand Down Expand Up @@ -591,13 +595,60 @@ private void checkServerLineage() throws InvalidParameterException, PropertyServ

OMAGServerConfig serverConfig = viewServerConnector.getResolvedOMAGServerConfig();

viewServerConnector.disconnect();
}
}
else if (EgeriaDeployedImplementationType.INTEGRATION_DAEMON.getDeployedImplementationType().equals(softwareServerProperties.getDeployedImplementationType()))
{
Connector connector = integrationContext.getConnectedAssetContext().getConnectorForAsset(softwareServer.getElementHeader().getGUID(), auditLog);

if (connector instanceof IntegrationDaemonConnector integrationDaemonConnector)
{
integrationDaemonConnector.setDelegatingUserId(integrationContext.getMyUserId());
integrationDaemonConnector.start();

OMAGServerConfig serverConfig = integrationDaemonConnector.getResolvedOMAGServerConfig();

integrationDaemonConnector.disconnect();
}
}
else if (EgeriaDeployedImplementationType.ENGINE_HOST.getDeployedImplementationType().equals(softwareServerProperties.getDeployedImplementationType()))
{
Connector connector = integrationContext.getConnectedAssetContext().getConnectorForAsset(softwareServer.getElementHeader().getGUID(), auditLog);

if (connector instanceof EngineHostConnector engineHostConnector)
{
engineHostConnector.setDelegatingUserId(integrationContext.getMyUserId());
engineHostConnector.start();

OMAGServerConfig serverConfig = engineHostConnector.getResolvedOMAGServerConfig();

engineHostConnector.disconnect();
}
}
else if (EgeriaDeployedImplementationType.METADATA_ACCESS_SERVER.getDeployedImplementationType().equals(softwareServerProperties.getDeployedImplementationType()))
{
Connector connector = integrationContext.getConnectedAssetContext().getConnectorForAsset(softwareServer.getElementHeader().getGUID(), auditLog);

if (connector instanceof MetadataAccessServerConnector metadataAccessServerConnector)
{
metadataAccessServerConnector.setDelegatingUserId(integrationContext.getMyUserId());
metadataAccessServerConnector.start();

OMAGServerConfig serverConfig = metadataAccessServerConnector.getResolvedOMAGServerConfig();

metadataAccessServerConnector.disconnect();
}
}
}
catch (Exception error)
{

super.logExceptionRecord(methodName,
OMAGConnectorAuditCode.UNEXPECTED_EXCEPTION.getMessageDefinition(connectorName,
error.getClass().getName(),
methodName,
error.getMessage()),
error);
}
}
}
Expand All @@ -622,7 +673,7 @@ private String getServerQualifiedName(String platformURLRoot,
String serverName,
String organizationName)
{
if (organizationName == null)
if ((organizationName == null) || (organizationName.isBlank()) || ("null".equals(organizationName)))
{
return serverType + "::" + platformURLRoot + "::" + serverName;
}
Expand All @@ -645,7 +696,7 @@ private String getServerDisplayName(String platformURLRoot,
String serverName,
String organizationName)
{
if (organizationName == null)
if ((organizationName == null) || (organizationName.isBlank()) || ("null".equals(organizationName)))
{
return serverName + " on " + platformURLRoot;
}
Expand All @@ -657,16 +708,16 @@ private String getServerDisplayName(String platformURLRoot,


/**
* Construct the qualified name for a server.
* Construct the resource name for a server.
*
* @param organizationName owning organization
* @param serverName unique name for the server.
* @return composite qualified name
*/
private String getServerResourceName(String serverName,
String organizationName)
String organizationName)
{
if (organizationName == null)
if ((organizationName == null) || (organizationName.isBlank()) || ("null".equals(organizationName)))
{
return serverName;
}
Expand Down Expand Up @@ -807,6 +858,7 @@ private void catalogPlatform(String platformURLRoot) throws InvalidParameterExce
placeholderProperties.put(PlaceholderProperty.SECRETS_STORE.getName(), super.getSecretsLocation(SecretsStorePurpose.REST_BEARER_TOKEN.getName()));
placeholderProperties.put(PlaceholderProperty.SECRETS_COLLECTION_NAME.getName(), super.getSecretsCollectionName(SecretsStorePurpose.REST_BEARER_TOKEN.getName()));
placeholderProperties.put(PlaceholderProperty.VERSION_IDENTIFIER.getName(), null);
placeholderProperties.put(PlaceholderProperty.ORGANIZATION_NAME.getName(), null);

String platformQualifiedName = EgeriaDeployedImplementationType.OMAG_SERVER_PLATFORM.getDeployedImplementationType() + "::" + platformURLRoot;

Expand Down Expand Up @@ -888,6 +940,7 @@ private void updatePlatform(OMAGServerPlatformProperties platformProperties,
softwareServerPlatformProperties.setDisplayName(platformProperties.getPlatformPublicProperties().getDisplayName());
softwareServerPlatformProperties.setDescription(platformProperties.getPlatformPublicProperties().getDescription());
softwareServerPlatformProperties.setURL(this.getURL(null));
softwareServerPlatformProperties.setNamespace(platformProperties.getPlatformOrganization());
softwareServerPlatformProperties.setVersionIdentifier(platformProperties.getPlatformBuildProperties().getVersion());
softwareServerPlatformProperties.setCategory(EGERIA_DEPLOYMENT_CATEGORY);

Expand Down Expand Up @@ -940,6 +993,7 @@ private String catalogServer(OMAGServerProperties omagServerProperties,
placeholderProperties.put(PlaceholderProperty.VERSION_IDENTIFIER.getName(), platformProperties.getPlatformOrigin());
placeholderProperties.put(PlaceholderProperty.DESCRIPTION.getName(), omagServerProperties.getDescription());
placeholderProperties.put(PlaceholderProperty.CONNECTION_USER_ID.getName(), null);
placeholderProperties.put(PlaceholderProperty.ORGANIZATION_NAME.getName(), omagServerProperties.getOrganizationName());

String serverQualifiedName = this.getServerQualifiedName(platformProperties.getPlatformURLRoot(),
omagServerProperties.getServerType(),
Expand Down Expand Up @@ -1106,8 +1160,8 @@ private void updateServer(OMAGServerProperties omagServerProperties,
omagServerProperties.getServerName(),
omagServerProperties.getOrganizationName()));
softwareServerProperties.setVersionIdentifier(platformProperties.getPlatformBuildProperties().getVersion());
softwareServerProperties.setResourceName(this.getServerResourceName(omagServerProperties.getServerName(),
omagServerProperties.getOrganizationName()));

softwareServerProperties.setNamespace(omagServerProperties.getOrganizationName());
softwareServerProperties.setDeployedImplementationType(omagServerProperties.getServerType());
softwareServerProperties.setCategory(EGERIA_DEPLOYMENT_CATEGORY);
softwareServerProperties.setURL(this.getURL(omagServerProperties.getServerType()));
Expand Down Expand Up @@ -1218,11 +1272,7 @@ private void checkAndLinkGovernanceServerCapabilities(OMAGServerProperties omagS
(governanceEngineSummary.getGovernanceEngineGUID() != null) &&
(!processedEngines.contains(governanceEngineSummary.getGovernanceEngineGUID())))
{
SupportedSoftwareCapabilityProperties supportedSoftwareCapabilityProperties = new SupportedSoftwareCapabilityProperties();

supportedSoftwareCapabilityProperties.setOperationalStatus(OperationalStatus.ENABLED);

assetClient.linkSoftwareCapability(serverGUID, governanceEngineSummary.getGovernanceEngineGUID(), new MakeAnchorOptions(assetClient.getMetadataSourceOptions()), supportedSoftwareCapabilityProperties);
assetClient.linkSoftwareCapability(serverGUID, governanceEngineSummary.getGovernanceEngineGUID(), new MakeAnchorOptions(assetClient.getMetadataSourceOptions()), null);

processedEngines.add(governanceEngineSummary.getGovernanceEngineGUID());
}
Expand Down Expand Up @@ -1299,11 +1349,7 @@ else if (omagServerProperties instanceof OMAGIntegrationDaemonProperties omagInt
(integrationGroupProperties.getIntegrationGroupGUID() != null) &&
(!processedGroups.contains(integrationGroupProperties.getIntegrationGroupGUID())))
{
SupportedSoftwareCapabilityProperties supportedSoftwareCapabilityProperties = new SupportedSoftwareCapabilityProperties();

supportedSoftwareCapabilityProperties.setOperationalStatus(OperationalStatus.ENABLED);

assetClient.linkSoftwareCapability(serverGUID, integrationGroupProperties.getIntegrationGroupGUID(), new MakeAnchorOptions(assetClient.getMetadataSourceOptions()), supportedSoftwareCapabilityProperties);
assetClient.linkSoftwareCapability(serverGUID, integrationGroupProperties.getIntegrationGroupGUID(), new MakeAnchorOptions(assetClient.getMetadataSourceOptions()), null);

processedGroups.add(integrationGroupProperties.getIntegrationGroupGUID());
}
Expand Down
Loading
Loading