diff --git a/.gitignore b/.gitignore index 4c2490c19e4..b794952a8de 100644 --- a/.gitignore +++ b/.gitignore @@ -117,6 +117,7 @@ egeria-lineage-repositories/** component-id-report.md survey-report*.md valid-values-report*.md +surveys/* # Ignore any json files generated during junit open-metadata-resources/open-metadata-archives/design-model-archives/*.json diff --git a/build.gradle b/build.gradle index 5aed26aa38e..032105903da 100644 --- a/build.gradle +++ b/build.gradle @@ -95,6 +95,10 @@ subprojects { options.compilerArgs << "-Xlint:all" << "-Xmaxerrs" << "1000" << "-Xmaxwarns" << "1000" } + tasks.withType(Javadoc).configureEach { + options.addStringOption('Xdoclint:-missing', '-quiet') + } + // javadoc javadoc { options @@ -115,7 +119,7 @@ subprojects { // Code license { name = 'The Apache License, Version 2.0' - url = 'http://www.apache.org/licenses/LICENSE-2.0.txt' + url = 'https://www.apache.org/licenses/LICENSE-2.0.txt' } // Docs license { @@ -143,7 +147,7 @@ subprojects { scm { connection = 'scm:git:git://github.com/odpi/egeria.git' developerConnection = 'scm:git:ssh://github.com/odpi/egeria/egeria.git' - url = 'http://github.com/odpi/egeria' + url = 'https://github.com/odpi/egeria' } organization { name = 'LF AI & Data Foundation' diff --git a/open-metadata-implementation/access-services/asset-owner/asset-owner-server/src/main/java/org/odpi/openmetadata/accessservices/assetowner/server/AssetOwnerRESTServices.java b/open-metadata-implementation/access-services/asset-owner/asset-owner-server/src/main/java/org/odpi/openmetadata/accessservices/assetowner/server/AssetOwnerRESTServices.java index 80be2422b2c..9a45d1f8711 100644 --- a/open-metadata-implementation/access-services/asset-owner/asset-owner-server/src/main/java/org/odpi/openmetadata/accessservices/assetowner/server/AssetOwnerRESTServices.java +++ b/open-metadata-implementation/access-services/asset-owner/asset-owner-server/src/main/java/org/odpi/openmetadata/accessservices/assetowner/server/AssetOwnerRESTServices.java @@ -3627,6 +3627,7 @@ public VoidResponse addConnectionToAsset(String serverName, assetGUID, assetGUIDParameterName, OpenMetadataType.ASSET.typeName, + null, connection, assetSummary, false, diff --git a/open-metadata-implementation/access-services/data-engine/data-engine-api/src/main/java/org/odpi/openmetadata/accessservices/dataengine/ffdc/DataEngineAuditCode.java b/open-metadata-implementation/access-services/data-engine/data-engine-api/src/main/java/org/odpi/openmetadata/accessservices/dataengine/ffdc/DataEngineAuditCode.java index d9ac628c3b6..4dd9c542d13 100644 --- a/open-metadata-implementation/access-services/data-engine/data-engine-api/src/main/java/org/odpi/openmetadata/accessservices/dataengine/ffdc/DataEngineAuditCode.java +++ b/open-metadata-implementation/access-services/data-engine/data-engine-api/src/main/java/org/odpi/openmetadata/accessservices/dataengine/ffdc/DataEngineAuditCode.java @@ -104,7 +104,6 @@ public enum DataEngineAuditCode { * * @return message definition object */ - @Getter private final AuditLogMessageDefinition messageDefinition; /** 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 4e7636361b6..73090aa7531 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 @@ -7,15 +7,8 @@ import org.odpi.openmetadata.accessservices.governanceengine.properties.CatalogTargetProperties; import org.odpi.openmetadata.accessservices.governanceengine.properties.IntegrationGroupProperties; import org.odpi.openmetadata.accessservices.governanceengine.properties.RegisteredGovernanceServiceProperties; -import org.odpi.openmetadata.commonservices.generichandlers.AssetHandler; -import org.odpi.openmetadata.commonservices.generichandlers.ConnectionConverter; import org.odpi.openmetadata.commonservices.ffdc.InvalidParameterHandler; -import org.odpi.openmetadata.commonservices.generichandlers.ConnectionHandler; -import org.odpi.openmetadata.commonservices.generichandlers.ConnectorTypeHandler; -import org.odpi.openmetadata.commonservices.generichandlers.EndpointHandler; -import org.odpi.openmetadata.commonservices.generichandlers.OpenMetadataAPIDummyBeanConverter; -import org.odpi.openmetadata.commonservices.generichandlers.SoftwareCapabilityBuilder; -import org.odpi.openmetadata.commonservices.generichandlers.SoftwareCapabilityHandler; +import org.odpi.openmetadata.commonservices.generichandlers.*; import org.odpi.openmetadata.commonservices.repositoryhandler.RepositoryHandler; import org.odpi.openmetadata.commonservices.repositoryhandler.RepositoryRelationshipsIterator; import org.odpi.openmetadata.frameworks.auditlog.AuditLog; @@ -23,14 +16,10 @@ import org.odpi.openmetadata.frameworks.connectors.ffdc.PropertyServerException; import org.odpi.openmetadata.frameworks.connectors.ffdc.UserNotAuthorizedException; import org.odpi.openmetadata.frameworks.connectors.properties.beans.Connection; -import org.odpi.openmetadata.frameworks.connectors.properties.beans.ConnectorType; -import org.odpi.openmetadata.frameworks.connectors.properties.beans.EmbeddedConnection; -import org.odpi.openmetadata.frameworks.connectors.properties.beans.Endpoint; -import org.odpi.openmetadata.frameworks.connectors.properties.beans.VirtualConnection; import org.odpi.openmetadata.frameworks.governanceaction.mapper.OpenMetadataProperty; import org.odpi.openmetadata.frameworks.governanceaction.mapper.OpenMetadataType; -import org.odpi.openmetadata.frameworks.integration.properties.CatalogTarget; import org.odpi.openmetadata.frameworks.integration.contextmanager.PermittedSynchronization; +import org.odpi.openmetadata.frameworks.integration.properties.CatalogTarget; import org.odpi.openmetadata.metadatasecurity.server.OpenMetadataServerSecurityVerifier; import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.instances.EntityProxy; import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.properties.instances.InstanceProperties; @@ -39,11 +28,7 @@ import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.repositoryconnector.OMRSRepositoryHelper; import org.odpi.openmetadata.repositoryservices.ffdc.exception.TypeErrorException; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** @@ -61,8 +46,6 @@ public class GovernanceConfigurationHandler private final AssetHandler governanceServiceHandler; private final AssetHandler integrationConnectorHandler; private final ConnectionHandler connectionHandler; - private final ConnectorTypeHandler connectorTypeHandler; - private final EndpointHandler endpointHandler; private final InvalidParameterHandler invalidParameterHandler; private final RegisteredIntegrationConnectorConverter registeredIntegrationConnectorConverter; private final CatalogTargetConverter catalogTargetConverter; @@ -173,34 +156,6 @@ public GovernanceConfigurationHandler(String service defaultZones, publishZones, auditLog); - - this.connectorTypeHandler = new ConnectorTypeHandler<>(new OpenMetadataAPIDummyBeanConverter<>(repositoryHelper, serviceName, serverName), - ConnectorType.class, - serviceName, - serverName, - invalidParameterHandler, - repositoryHandler, - repositoryHelper, - localServerUserId, - securityVerifier, - supportedZones, - defaultZones, - publishZones, - auditLog); - - this.endpointHandler = new EndpointHandler<>(new OpenMetadataAPIDummyBeanConverter<>(repositoryHelper, serviceName, serverName), - Endpoint.class, - serviceName, - serverName, - invalidParameterHandler, - repositoryHandler, - repositoryHelper, - localServerUserId, - securityVerifier, - supportedZones, - defaultZones, - publishZones, - auditLog); } @@ -501,8 +456,6 @@ public String createGovernanceService(String userId, final String methodName = "createGovernanceService"; final String connectionParameterName = "createGovernanceService"; final String assetGUIDParameterName = "assetGUID"; - final String connectorTypeGUIDParameterName = "connectorTypeGUID"; - final String embeddedConnectionGUIDParameterName = "embeddedConnectionGUID "; final String typeNameParameterName = "typeName"; invalidParameterHandler.validateName(typeName, typeNameParameterName, methodName); @@ -528,177 +481,20 @@ public String createGovernanceService(String userId, if (assetGUID != null) { - Endpoint endpoint = connection.getEndpoint(); - String endpointGUID = null; - String endpointParameterName = "connection.getEndpoint()"; - - if (endpoint != null) - { - if (endpoint.getGUID() != null) - { - endpointGUID = endpoint.getGUID(); - } - else - { - String endpointTypeName = OpenMetadataType.ENDPOINT_TYPE_NAME; - - if ((endpoint.getType() != null) && (endpoint.getType().getTypeName() != null)) - { - endpointTypeName = endpoint.getType().getTypeName(); - } - - endpointGUID = endpointHandler.createEndpoint(userId, - null, - null, - assetGUID, - endpoint.getQualifiedName(), - endpoint.getDisplayName(), - endpoint.getDescription(), - endpoint.getAddress(), - endpoint.getProtocol(), - endpoint.getEncryptionMethod(), - endpoint.getAdditionalProperties(), - endpointTypeName, - endpoint.getExtendedProperties(), - null, - null, - null, - methodName); - } - } - - ConnectorType connectorType = connection.getConnectorType(); - - String connectorTypeGUID = connectorTypeHandler.getConnectorTypeForConnection(userId, - null, - null, - assetGUID, - connectorType.getQualifiedName(), - connectorType.getDisplayName(), - connectorType.getDescription(), - connectorType.getSupportedAssetTypeName(), - connectorType.getExpectedDataFormat(), - connectorType.getConnectorProviderClassName(), - connectorType.getConnectorFrameworkName(), - connectorType.getConnectorInterfaceLanguage(), - connectorType.getConnectorInterfaces(), - connectorType.getTargetTechnologySource(), - connectorType.getTargetTechnologyName(), - connectorType.getTargetTechnologyInterfaces(), - connectorType.getTargetTechnologyVersions(), - connectorType.getRecognizedAdditionalProperties(), - connectorType.getRecognizedSecuredProperties(), - connectorType.getRecognizedConfigurationProperties(), - connectorType.getAdditionalProperties(), - false, - false, - effectiveTime, - methodName); - - if (connectorTypeGUID != null) - { - if (connection instanceof VirtualConnection) - { - /* - * OpenGovernancePipelines are represented using a VirtualConnection that - * nests all the Connections for services to call. - */ - final String connectionGUIDParameterName = "connection.getGUID"; - - String connectionGUID = connectionHandler.createVirtualConnection(userId, - null, - null, - assetGUID, - assetGUIDParameterName, - connection.getAssetSummary(), - connection.getQualifiedName(), - connection.getDisplayName(), - connection.getDescription(), - connection.getAdditionalProperties(), - connection.getSecuredProperties(), - connection.getConfigurationProperties(), - connection.getUserId(), - connection.getClearPassword(), - connection.getEncryptedPassword(), - connectorTypeGUID, - connectorTypeGUIDParameterName, - null, - null, - false, - false, - effectiveTime, - methodName); - - List embeddedConnections = ((VirtualConnection) connection).getEmbeddedConnections(); - - if (embeddedConnections != null) - { - for (EmbeddedConnection embeddedConnection : embeddedConnections) - { - if (embeddedConnection != null) - { - String embeddedConnectionGUID = connectionHandler.saveConnection(userId, - null, - null, - assetGUID, - null, - assetGUIDParameterName, - OpenMetadataType.GOVERNANCE_SERVICE.typeName, - embeddedConnection.getEmbeddedConnection(), - null, - false, - false, - effectiveTime, - methodName); - connectionHandler.addEmbeddedConnection(userId, - null, - null, - connectionGUID, - connectionGUIDParameterName, - embeddedConnection.getPosition(), - embeddedConnection.getDisplayName(), - embeddedConnection.getArguments(), - embeddedConnectionGUID, - embeddedConnectionGUIDParameterName, - null, - null, - false, - false, - effectiveTime, - methodName); - } - } - } - } - else - { - connectionHandler.createConnection(userId, - null, - null, - assetGUID, - assetGUIDParameterName, - connection.getAssetSummary(), - connection.getQualifiedName(), - connection.getDisplayName(), - connection.getDescription(), - connection.getAdditionalProperties(), - connection.getSecuredProperties(), - connection.getConfigurationProperties(), - connection.getUserId(), - connection.getClearPassword(), - connection.getEncryptedPassword(), - connectorTypeGUID, - connectorTypeGUIDParameterName, - endpointGUID, - endpointParameterName, - null, - null, - false, - false, - effectiveTime, - methodName); - } - } + connectionHandler.saveConnection(userId, + null, + null, + assetGUID, + assetGUID, + assetGUIDParameterName, + typeName, + qualifiedName, + connection, + "Connection to create governance service", + false, + false, + effectiveTime, + methodName); } return assetGUID; @@ -1738,8 +1534,6 @@ public String createIntegrationConnector(String userId, final String methodName = "createIntegrationConnector"; final String connectionParameterName = "createIntegrationConnector"; final String assetGUIDParameterName = "assetGUID"; - final String connectorTypeGUIDParameterName = "connectorTypeGUID"; - final String embeddedConnectionGUIDParameterName = "embeddedConnectionGUID "; invalidParameterHandler.validateConnection(connection, connectionParameterName, methodName); @@ -1767,177 +1561,20 @@ public String createIntegrationConnector(String userId, if (assetGUID != null) { - Endpoint endpoint = connection.getEndpoint(); - String endpointGUID = null; - String endpointParameterName = "connection.getEndpoint()"; - - if (endpoint != null) - { - if (endpoint.getGUID() != null) - { - endpointGUID = endpoint.getGUID(); - } - else - { - String typeName = OpenMetadataType.ENDPOINT_TYPE_NAME; - - if ((endpoint.getType() != null) && (endpoint.getType().getTypeName() != null)) - { - typeName = endpoint.getType().getTypeName(); - } - - endpointGUID = endpointHandler.createEndpoint(userId, - null, - null, - assetGUID, - endpoint.getQualifiedName(), - endpoint.getDisplayName(), - endpoint.getDescription(), - endpoint.getAddress(), - endpoint.getProtocol(), - endpoint.getEncryptionMethod(), - endpoint.getAdditionalProperties(), - typeName, - endpoint.getExtendedProperties(), - null, - null, - null, - methodName); - } - } - - ConnectorType connectorType = connection.getConnectorType(); - - String connectorTypeGUID = connectorTypeHandler.getConnectorTypeForConnection(userId, - null, - null, - assetGUID, - connectorType.getQualifiedName(), - connectorType.getDisplayName(), - connectorType.getDescription(), - connectorType.getSupportedAssetTypeName(), - connectorType.getExpectedDataFormat(), - connectorType.getConnectorProviderClassName(), - connectorType.getConnectorFrameworkName(), - connectorType.getConnectorInterfaceLanguage(), - connectorType.getConnectorInterfaces(), - connectorType.getTargetTechnologySource(), - connectorType.getTargetTechnologyName(), - connectorType.getTargetTechnologyInterfaces(), - connectorType.getTargetTechnologyVersions(), - connectorType.getRecognizedAdditionalProperties(), - connectorType.getRecognizedSecuredProperties(), - connectorType.getRecognizedConfigurationProperties(), - connectorType.getAdditionalProperties(), - false, - false, - effectiveTime, - methodName); - - if (connectorTypeGUID != null) - { - if (connection instanceof VirtualConnection) - { - /* - * OpenGovernancePipelines are represented using a VirtualConnection that - * nests all the Connections for services to call. - */ - final String connectionGUIDParameterName = "connection.getGUID"; - - String connectionGUID = connectionHandler.createVirtualConnection(userId, - null, - null, - assetGUID, - assetGUIDParameterName, - connection.getAssetSummary(), - connection.getQualifiedName(), - connection.getDisplayName(), - connection.getDescription(), - connection.getAdditionalProperties(), - connection.getSecuredProperties(), - connection.getConfigurationProperties(), - connection.getUserId(), - connection.getClearPassword(), - connection.getEncryptedPassword(), - connectorTypeGUID, - connectorTypeGUIDParameterName, - null, - null, - false, - false, - effectiveTime, - methodName); - - List embeddedConnections = ((VirtualConnection) connection).getEmbeddedConnections(); - - if (embeddedConnections != null) - { - for (EmbeddedConnection embeddedConnection : embeddedConnections) - { - if (embeddedConnection != null) - { - String embeddedConnectionGUID = connectionHandler.saveConnection(userId, - null, - null, - assetGUID, - null, - assetGUIDParameterName, - OpenMetadataType.INTEGRATION_CONNECTOR_TYPE_NAME, - embeddedConnection.getEmbeddedConnection(), - null, - false, - false, - effectiveTime, - methodName); - connectionHandler.addEmbeddedConnection(userId, - null, - null, - connectionGUID, - connectionGUIDParameterName, - embeddedConnection.getPosition(), - embeddedConnection.getDisplayName(), - embeddedConnection.getArguments(), - embeddedConnectionGUID, - embeddedConnectionGUIDParameterName, - null, - null, - false, - false, - effectiveTime, - methodName); - } - } - } - } - else - { - connectionHandler.createConnection(userId, - null, - null, - assetGUID, - assetGUIDParameterName, - connection.getAssetSummary(), - connection.getQualifiedName(), - connection.getDisplayName(), - connection.getDescription(), - connection.getAdditionalProperties(), - connection.getSecuredProperties(), - connection.getConfigurationProperties(), - connection.getUserId(), - connection.getClearPassword(), - connection.getEncryptedPassword(), - connectorTypeGUID, - connectorTypeGUIDParameterName, - endpointGUID, - endpointParameterName, - null, - null, - false, - false, - effectiveTime, - methodName); - } - } + connectionHandler.saveConnection(userId, + null, + null, + assetGUID, + assetGUID, + assetGUIDParameterName, + OpenMetadataType.INTEGRATION_CONNECTOR_TYPE_NAME, + qualifiedName, + connection, + "Connection to create integration connector", + false, + false, + effectiveTime, + methodName); } return assetGUID; @@ -2382,8 +2019,7 @@ public RegisteredIntegrationConnectorElement getRegisteredIntegrationConnector(S if (relationships != null) { - - if (relationships.size() > 0) + if (!relationships.isEmpty()) { return registeredIntegrationConnectorConverter.getBean(this.getIntegrationConnectorByGUID(userId, integrationConnectorGUID), relationships.get(0)); } @@ -2595,8 +2231,7 @@ public CatalogTarget getCatalogTarget(String userId, if (relationships != null) { - - if (relationships.size() > 0) + if (!relationships.isEmpty()) { return catalogTargetConverter.getNewBean(CatalogTarget.class, relationships.get(0), methodName); } diff --git a/open-metadata-implementation/access-services/subject-area/subject-area-client/src/main/java/org/odpi/openmetadata/accessservices/subjectarea/client/SubjectAreaRestClient.java b/open-metadata-implementation/access-services/subject-area/subject-area-client/src/main/java/org/odpi/openmetadata/accessservices/subjectarea/client/SubjectAreaRestClient.java index ccb85edd72d..72dd6f15ea7 100644 --- a/open-metadata-implementation/access-services/subject-area/subject-area-client/src/main/java/org/odpi/openmetadata/accessservices/subjectarea/client/SubjectAreaRestClient.java +++ b/open-metadata-implementation/access-services/subject-area/subject-area-client/src/main/java/org/odpi/openmetadata/accessservices/subjectarea/client/SubjectAreaRestClient.java @@ -34,7 +34,7 @@ public class SubjectAreaRestClient extends FFDCRESTClient { private final String serverPlatformURLRoot; /** - * {@inheritDoc} + * Constructor */ public SubjectAreaRestClient(String serverName, String serverPlatformURLRoot) throws InvalidParameterException { super(serverName, serverPlatformURLRoot); @@ -43,7 +43,7 @@ public SubjectAreaRestClient(String serverName, String serverPlatformURLRoot) th } /** - * {@inheritDoc} + * Constructor */ public SubjectAreaRestClient(String serverName, String serverPlatformURLRoot, diff --git a/open-metadata-implementation/adapters/open-connectors/data-store-connectors/file-connectors/basic-file-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/datastore/basicfile/BasicFileStoreProvider.java b/open-metadata-implementation/adapters/open-connectors/data-store-connectors/file-connectors/basic-file-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/datastore/basicfile/BasicFileStoreProvider.java index 8c1c8a4c6c5..d570ae6df17 100644 --- a/open-metadata-implementation/adapters/open-connectors/data-store-connectors/file-connectors/basic-file-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/datastore/basicfile/BasicFileStoreProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/data-store-connectors/file-connectors/basic-file-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/datastore/basicfile/BasicFileStoreProvider.java @@ -3,6 +3,8 @@ package org.odpi.openmetadata.adapters.connectors.datastore.basicfile; +import org.odpi.openmetadata.frameworks.auditlog.AuditLogReportingComponent; +import org.odpi.openmetadata.frameworks.auditlog.ComponentDevelopmentStatus; import org.odpi.openmetadata.frameworks.connectors.ConnectorProviderBase; import org.odpi.openmetadata.frameworks.connectors.properties.beans.ConnectorType; import org.odpi.openmetadata.frameworks.governanceaction.mapper.OpenMetadataType; @@ -13,9 +15,22 @@ */ public class BasicFileStoreProvider extends ConnectorProviderBase { + /* + * Unique identifier of the connector for the audit log. + */ + private static final int connectorComponentId = 94; + + /* + * Unique identifier for the connector type. + */ private static final String connectorTypeGUID = "ba213761-f5f5-4cf5-a95f-6150aef09e0b"; + private static final String connectorQualifiedName = "Egeria:ResourceConnector:DataFile"; private static final String connectorTypeName = "Basic File Store Connector"; private static final String connectorTypeDescription = "Connector supports reading of Files."; + private static final String connectorWikiPage = "https://egeria-project.org/connectors/resource/basic-file-resource-connector/"; + + private static final String connectorClass = "org.odpi.openmetadata.adapters.connectors.datastore.basicfile.BasicFileStoreConnector"; + private static final String assetTypeName = OpenMetadataType.DATA_FILE.typeName; /** @@ -26,16 +41,14 @@ public BasicFileStoreProvider() { super(); - Class connectorClass = BasicFileStoreConnector.class; - - super.setConnectorClassName(connectorClass.getName()); + super.setConnectorClassName(connectorClass); connectorInterfaces.add(BasicFileStore.class.getName()); ConnectorType connectorType = new ConnectorType(); connectorType.setType(ConnectorType.getConnectorTypeType()); connectorType.setGUID(connectorTypeGUID); - connectorType.setQualifiedName(connectorTypeName); + connectorType.setQualifiedName(connectorQualifiedName); connectorType.setDisplayName(connectorTypeName); connectorType.setDescription(connectorTypeDescription); connectorType.setSupportedAssetTypeName(assetTypeName); @@ -43,5 +56,18 @@ public BasicFileStoreProvider() connectorType.setConnectorProviderClassName(this.getClass().getName()); super.connectorTypeBean = connectorType; + + /* + * Set up the component description used in the connector's audit log messages. + */ + AuditLogReportingComponent componentDescription = new AuditLogReportingComponent(); + + componentDescription.setComponentId(connectorComponentId); + componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.STABLE); + componentDescription.setComponentName(connectorTypeName); + componentDescription.setComponentDescription(connectorTypeDescription); + componentDescription.setComponentWikiURL(connectorWikiPage); + + super.setConnectorComponentDescription(componentDescription); } } diff --git a/open-metadata-implementation/adapters/open-connectors/data-store-connectors/file-connectors/basic-file-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/datastore/basicfile/BasicFolderProvider.java b/open-metadata-implementation/adapters/open-connectors/data-store-connectors/file-connectors/basic-file-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/datastore/basicfile/BasicFolderProvider.java index a688f0b44af..ac62d43e667 100644 --- a/open-metadata-implementation/adapters/open-connectors/data-store-connectors/file-connectors/basic-file-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/datastore/basicfile/BasicFolderProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/data-store-connectors/file-connectors/basic-file-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/datastore/basicfile/BasicFolderProvider.java @@ -3,6 +3,8 @@ package org.odpi.openmetadata.adapters.connectors.datastore.basicfile; +import org.odpi.openmetadata.frameworks.auditlog.AuditLogReportingComponent; +import org.odpi.openmetadata.frameworks.auditlog.ComponentDevelopmentStatus; import org.odpi.openmetadata.frameworks.connectors.ConnectorProviderBase; import org.odpi.openmetadata.frameworks.connectors.properties.beans.ConnectorType; import org.odpi.openmetadata.frameworks.governanceaction.mapper.OpenMetadataType; @@ -14,9 +16,22 @@ */ public class BasicFolderProvider extends ConnectorProviderBase { + /* + * Unique identifier of the connector for the audit log. + */ + private static final int connectorComponentId = 95; + + /* + * Unique identifier for the connector type. + */ private static final String connectorTypeGUID = "a9fc9231-f04a-40c4-99b1-4a1058063f5e"; + private static final String connectorQualifiedName = "Egeria:ResourceConnector:FileFolder"; private static final String connectorTypeName = "Basic Folder Connector"; private static final String connectorTypeDescription = "Connector supports reading of files in a directory (folder)."; + private static final String connectorWikiPage = "https://egeria-project.org/connectors/resource/basic-folder-resource-connector/"; + + private static final String connectorClass = "org.odpi.openmetadata.adapters.connectors.datastore.basicfile.BasicFolderConnector"; + private static final String assetTypeName = OpenMetadataType.FILE_FOLDER.typeName; /** @@ -27,16 +42,15 @@ public BasicFolderProvider() { super(); - Class connectorClass = BasicFolderConnector.class; - super.setConnectorClassName(connectorClass.getName()); + super.setConnectorClassName(connectorClass); connectorInterfaces.add(BasicFileStore.class.getName()); ConnectorType connectorType = new ConnectorType(); connectorType.setType(ConnectorType.getConnectorTypeType()); connectorType.setGUID(connectorTypeGUID); - connectorType.setQualifiedName(connectorTypeName); + connectorType.setQualifiedName(connectorQualifiedName); connectorType.setDisplayName(connectorTypeName); connectorType.setDescription(connectorTypeDescription); connectorType.setSupportedAssetTypeName(assetTypeName); @@ -44,5 +58,18 @@ public BasicFolderProvider() connectorType.setConnectorProviderClassName(this.getClass().getName()); super.connectorTypeBean = connectorType; + + /* + * Set up the component description used in the connector's audit log messages. + */ + AuditLogReportingComponent componentDescription = new AuditLogReportingComponent(); + + componentDescription.setComponentId(connectorComponentId); + componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.STABLE); + componentDescription.setComponentName(connectorTypeName); + componentDescription.setComponentDescription(connectorTypeDescription); + componentDescription.setComponentWikiURL(connectorWikiPage); + + super.setConnectorComponentDescription(componentDescription); } } diff --git a/open-metadata-implementation/adapters/open-connectors/data-store-connectors/file-connectors/csv-file-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/datastore/csvfile/CSVFileStoreProvider.java b/open-metadata-implementation/adapters/open-connectors/data-store-connectors/file-connectors/csv-file-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/datastore/csvfile/CSVFileStoreProvider.java index 0762b94f74e..c3e19c28cc8 100644 --- a/open-metadata-implementation/adapters/open-connectors/data-store-connectors/file-connectors/csv-file-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/datastore/csvfile/CSVFileStoreProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/data-store-connectors/file-connectors/csv-file-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/datastore/csvfile/CSVFileStoreProvider.java @@ -3,6 +3,8 @@ package org.odpi.openmetadata.adapters.connectors.datastore.csvfile; +import org.odpi.openmetadata.frameworks.auditlog.AuditLogReportingComponent; +import org.odpi.openmetadata.frameworks.auditlog.ComponentDevelopmentStatus; import org.odpi.openmetadata.frameworks.connectors.ConnectorProviderBase; import org.odpi.openmetadata.frameworks.connectors.properties.beans.ConnectorType; @@ -15,9 +17,23 @@ */ public class CSVFileStoreProvider extends ConnectorProviderBase { + /* + * Unique identifier of the connector for the audit log. + */ + private static final int connectorComponentId = 96; + + /* + * Unique identifier for the connector type. + */ private static final String connectorTypeGUID = "108b85fe-d7b8-45c3-9fb8-742ac4e4fb14"; + private static final String connectorQualifiedName = "Egeria:ResourceConnector:CSVFile"; private static final String connectorTypeName = "CSV File Connector"; private static final String connectorTypeDescription = "Connector supports reading of structured (CSV) files."; + private static final String connectorWikiPage = "https://egeria-project.org/connectors/resource/csv-file-resource-connector/"; + + + private static final String connectorClass = "org.odpi.openmetadata.adapters.connectors.datastore.csvfile.CSVFileStoreConnector"; + private static final String expectedDataFormat = "csv"; private static final String assetTypeName = "CSVFile"; @@ -46,16 +62,14 @@ public CSVFileStoreProvider() { super(); - Class connectorClass = CSVFileStoreConnector.class; - - super.setConnectorClassName(connectorClass.getName()); + super.setConnectorClassName(connectorClass); connectorInterfaces.add(CSVFileStore.class.getName()); ConnectorType connectorType = new ConnectorType(); connectorType.setType(ConnectorType.getConnectorTypeType()); connectorType.setGUID(connectorTypeGUID); - connectorType.setQualifiedName(connectorTypeName); + connectorType.setQualifiedName(connectorQualifiedName); connectorType.setDisplayName(connectorTypeName); connectorType.setDescription(connectorTypeDescription); connectorType.setConnectorProviderClassName(this.getClass().getName()); @@ -71,5 +85,18 @@ public CSVFileStoreProvider() connectorType.setRecognizedConfigurationProperties(recognizedConfigurationProperties); super.connectorTypeBean = connectorType; + + /* + * Set up the component description used in the connector's audit log messages. + */ + AuditLogReportingComponent componentDescription = new AuditLogReportingComponent(); + + componentDescription.setComponentId(connectorComponentId); + componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.STABLE); + componentDescription.setComponentName(connectorTypeName); + componentDescription.setComponentDescription(connectorTypeDescription); + componentDescription.setComponentWikiURL(connectorWikiPage); + + super.setConnectorComponentDescription(componentDescription); } } diff --git a/open-metadata-implementation/adapters/open-connectors/data-store-connectors/file-connectors/data-folder-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/datastore/datafolder/DataFolderProvider.java b/open-metadata-implementation/adapters/open-connectors/data-store-connectors/file-connectors/data-folder-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/datastore/datafolder/DataFolderProvider.java index afda9a0081d..9ec9dd3c823 100644 --- a/open-metadata-implementation/adapters/open-connectors/data-store-connectors/file-connectors/data-folder-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/datastore/datafolder/DataFolderProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/data-store-connectors/file-connectors/data-folder-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/datastore/datafolder/DataFolderProvider.java @@ -4,6 +4,8 @@ package org.odpi.openmetadata.adapters.connectors.datastore.datafolder; import org.odpi.openmetadata.adapters.connectors.datastore.basicfile.BasicFileStore; +import org.odpi.openmetadata.frameworks.auditlog.AuditLogReportingComponent; +import org.odpi.openmetadata.frameworks.auditlog.ComponentDevelopmentStatus; import org.odpi.openmetadata.frameworks.connectors.ConnectorProviderBase; import org.odpi.openmetadata.frameworks.connectors.properties.beans.ConnectorType; @@ -13,9 +15,23 @@ */ public class DataFolderProvider extends ConnectorProviderBase { - static final String connectorTypeGUID = "1ef9cbe2-9119-4ac0-b9ac-d838f0ed9caf"; - static final String connectorTypeName = "Data Folder Connector"; - static final String connectorTypeDescription = "Connector supports reading of data files grouped under a single folder."; + /* + * Unique identifier of the connector for the audit log. + */ + private static final int connectorComponentId = 97; + + /* + * Unique identifier for the connector type. + */ + private static final String connectorTypeGUID = "1ef9cbe2-9119-4ac0-b9ac-d838f0ed9caf"; + private static final String connectorQualifiedName = "Egeria:ResourceConnector:DataFolder"; + private static final String connectorTypeName = "Data Folder Connector"; + private static final String connectorTypeDescription = "Connector supports reading of data files grouped under a single folder."; + private static final String connectorWikiPage = "https://egeria-project.org/connectors/resource/data-folder-resource-connector/"; + + + private static final String connectorClass = "org.odpi.openmetadata.adapters.connectors.datastore.datafolder.DataFolderConnector"; + private static final String assetTypeName = "DataFolder"; @@ -26,16 +42,14 @@ public DataFolderProvider() { super(); - Class connectorClass = DataFolderConnector.class; - - super.setConnectorClassName(connectorClass.getName()); + super.setConnectorClassName(connectorClass); connectorInterfaces.add(BasicFileStore.class.getName()); ConnectorType connectorType = new ConnectorType(); connectorType.setType(ConnectorType.getConnectorTypeType()); connectorType.setGUID(connectorTypeGUID); - connectorType.setQualifiedName(connectorTypeName); + connectorType.setQualifiedName(connectorQualifiedName); connectorType.setDisplayName(connectorTypeName); connectorType.setDescription(connectorTypeDescription); connectorType.setSupportedAssetTypeName(assetTypeName); @@ -43,5 +57,18 @@ public DataFolderProvider() connectorType.setConnectorInterfaces(connectorInterfaces); super.connectorTypeBean = connectorType; + + /* + * Set up the component description used in the connector's audit log messages. + */ + AuditLogReportingComponent componentDescription = new AuditLogReportingComponent(); + + componentDescription.setComponentId(connectorComponentId); + componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.STABLE); + componentDescription.setComponentName(connectorTypeName); + componentDescription.setComponentDescription(connectorTypeDescription); + componentDescription.setComponentWikiURL(connectorWikiPage); + + super.setConnectorComponentDescription(componentDescription); } } diff --git a/open-metadata-implementation/adapters/open-connectors/data-store-connectors/jdbc-resource-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/jdbc/JDBCResourceConnectorProvider.java b/open-metadata-implementation/adapters/open-connectors/data-store-connectors/jdbc-resource-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/jdbc/JDBCResourceConnectorProvider.java index 222423497a6..1c7800c9832 100644 --- a/open-metadata-implementation/adapters/open-connectors/data-store-connectors/jdbc-resource-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/jdbc/JDBCResourceConnectorProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/data-store-connectors/jdbc-resource-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/jdbc/JDBCResourceConnectorProvider.java @@ -20,7 +20,7 @@ public class JDBCResourceConnectorProvider extends ConnectorProviderBase /* * Unique identifier of the connector for the audit log. */ - private static final int connectorComponentId = 662; + private static final int connectorComponentId = 93; /* * Unique identifier for the connector type. @@ -105,7 +105,7 @@ public JDBCResourceConnectorProvider() componentDescription.setComponentId(connectorComponentId); componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.STABLE); - componentDescription.setComponentName(connectorQualifiedName); + componentDescription.setComponentName(connectorDisplayName); componentDescription.setComponentDescription(connectorTypeDescription); componentDescription.setComponentWikiURL(connectorWikiPage); diff --git a/open-metadata-implementation/adapters/open-connectors/discovery-service-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/discoveryservices/discoveratlas/DiscoverApacheAtlasProvider.java b/open-metadata-implementation/adapters/open-connectors/discovery-service-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/discoveryservices/discoveratlas/DiscoverApacheAtlasProvider.java index 9eab9b9b672..7b6abf9172c 100644 --- a/open-metadata-implementation/adapters/open-connectors/discovery-service-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/discoveryservices/discoveratlas/DiscoverApacheAtlasProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/discovery-service-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/discoveryservices/discoveratlas/DiscoverApacheAtlasProvider.java @@ -32,7 +32,7 @@ public class DiscoverApacheAtlasProvider extends DiscoveryServiceProvider * Descriptive information about the connector for the connector type and audit log. */ private static final String connectorQualifiedName = "Egeria:OpenDiscoveryService:DiscoverApacheAtlas"; - private static final String connectorDisplayName = "DiscoverApacheAtlas Open Discovery Service"; + private static final String connectorDisplayName = "Discover Apache Atlas Open Discovery Service"; private static final String connectorDescription = "Connector publishes insights about a deployment of Apache Atlas."; private static final String connectorWikiPage = "https://egeria-project.org/connectors/discovery/apache-atlas-discovery-service/"; @@ -99,7 +99,7 @@ public DiscoverApacheAtlasProvider() componentDescription.setComponentId(connectorComponentId); componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.TECHNICAL_PREVIEW); - componentDescription.setComponentName(connectorQualifiedName); + componentDescription.setComponentName(connectorDisplayName); componentDescription.setComponentDescription(connectorDescription); componentDescription.setComponentWikiURL(connectorWikiPage); diff --git a/open-metadata-implementation/adapters/open-connectors/event-bus-connectors/open-metadata-topic-connectors/inmemory-open-metadata-topic-connector/src/main/java/org/odpi/openmetadata/adapters/eventbus/topic/inmemory/InMemoryOpenMetadataTopicProvider.java b/open-metadata-implementation/adapters/open-connectors/event-bus-connectors/open-metadata-topic-connectors/inmemory-open-metadata-topic-connector/src/main/java/org/odpi/openmetadata/adapters/eventbus/topic/inmemory/InMemoryOpenMetadataTopicProvider.java index f3de933df37..c42322f4cca 100644 --- a/open-metadata-implementation/adapters/open-connectors/event-bus-connectors/open-metadata-topic-connectors/inmemory-open-metadata-topic-connector/src/main/java/org/odpi/openmetadata/adapters/eventbus/topic/inmemory/InMemoryOpenMetadataTopicProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/event-bus-connectors/open-metadata-topic-connectors/inmemory-open-metadata-topic-connector/src/main/java/org/odpi/openmetadata/adapters/eventbus/topic/inmemory/InMemoryOpenMetadataTopicProvider.java @@ -72,7 +72,7 @@ public InMemoryOpenMetadataTopicProvider() componentDescription.setComponentId(connectorComponentId); componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.STABLE); - componentDescription.setComponentName(connectorQualifiedName); + componentDescription.setComponentName(connectorDisplayName); componentDescription.setComponentDescription(connectorDescription); componentDescription.setComponentWikiURL(connectorWikiPage); diff --git a/open-metadata-implementation/adapters/open-connectors/event-bus-connectors/open-metadata-topic-connectors/kafka-open-metadata-topic-connector/src/main/java/org/odpi/openmetadata/adapters/eventbus/topic/kafka/KafkaOpenMetadataTopicProvider.java b/open-metadata-implementation/adapters/open-connectors/event-bus-connectors/open-metadata-topic-connectors/kafka-open-metadata-topic-connector/src/main/java/org/odpi/openmetadata/adapters/eventbus/topic/kafka/KafkaOpenMetadataTopicProvider.java index d3ba1e4776c..0c4444941ac 100644 --- a/open-metadata-implementation/adapters/open-connectors/event-bus-connectors/open-metadata-topic-connectors/kafka-open-metadata-topic-connector/src/main/java/org/odpi/openmetadata/adapters/eventbus/topic/kafka/KafkaOpenMetadataTopicProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/event-bus-connectors/open-metadata-topic-connectors/kafka-open-metadata-topic-connector/src/main/java/org/odpi/openmetadata/adapters/eventbus/topic/kafka/KafkaOpenMetadataTopicProvider.java @@ -99,7 +99,7 @@ public KafkaOpenMetadataTopicProvider() componentDescription.setComponentId(connectorComponentId); componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.STABLE); - componentDescription.setComponentName(connectorQualifiedName); + componentDescription.setComponentName(connectorDisplayName); componentDescription.setComponentDescription(connectorDescription); componentDescription.setComponentWikiURL(connectorWikiPage); diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/ApacheAtlasIntegrationProvider.java b/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/ApacheAtlasIntegrationProvider.java index 5913798a4e6..6855c6d2d47 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/ApacheAtlasIntegrationProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/integration-connectors/atlas-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/apacheatlas/ApacheAtlasIntegrationProvider.java @@ -256,7 +256,7 @@ public ApacheAtlasIntegrationProvider() componentDescription.setComponentId(connectorComponentId); componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.TECHNICAL_PREVIEW); - componentDescription.setComponentName(connectorQualifiedName); + componentDescription.setComponentName(connectorDisplayName); componentDescription.setComponentDescription(connectorDescription); componentDescription.setComponentWikiURL(connectorWikiPage); diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/csv-lineage-import-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/csvlineageimporter/CSVLineageImporterProvider.java b/open-metadata-implementation/adapters/open-connectors/integration-connectors/csv-lineage-import-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/csvlineageimporter/CSVLineageImporterProvider.java index 6bfc5ac9cb7..3014622561e 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/csv-lineage-import-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/csvlineageimporter/CSVLineageImporterProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/integration-connectors/csv-lineage-import-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/csvlineageimporter/CSVLineageImporterProvider.java @@ -13,12 +13,12 @@ public class CSVLineageImporterProvider extends IntegrationConnectorProvider { private static final String connectorTypeGUID = "b6e5fda2-f5ef-4fc9-861f-2e724e74e6ac"; - private static final int connectorComponentId = 667; + private static final int connectorComponentId = 671; private static final String connectorQualifiedName = "Egeria:IntegrationConnector:Files:CSVLineageImporter"; private static final String connectorDisplayName = "CSV Lineage Importer Integration Connector"; private static final String connectorDescription = "Connector reads the content of a CSV file that contains lineage information and catalogues the content."; private static final String connectorWikiPage = "https://egeria-project.org/connectors/integration/csv-lineage-importer-integration-connector/"; - private static final String connectorClassName = CSVLineageImporterConnector.class.getName(); + private static final String connectorClassName = "org.odpi.openmetadata.adapters.connectors.integration.csvlineageimporter.CSVLineageImporterConnector"; /** * The name of the catalog target that contains the file to monitor. @@ -66,7 +66,7 @@ public CSVLineageImporterProvider() componentDescription.setComponentId(connectorComponentId); componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.STABLE); - componentDescription.setComponentName(connectorQualifiedName); + componentDescription.setComponentName(connectorDisplayName); componentDescription.setComponentDescription(connectorDescription); componentDescription.setComponentWikiURL(connectorWikiPage); diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/egeria-infrastructure-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/egeria/EgeriaCataloguerIntegrationProvider.java b/open-metadata-implementation/adapters/open-connectors/integration-connectors/egeria-infrastructure-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/egeria/EgeriaCataloguerIntegrationProvider.java index b05bfa17422..f739ce3086e 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/egeria-infrastructure-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/egeria/EgeriaCataloguerIntegrationProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/integration-connectors/egeria-infrastructure-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/egeria/EgeriaCataloguerIntegrationProvider.java @@ -89,7 +89,7 @@ public EgeriaCataloguerIntegrationProvider() componentDescription.setComponentId(connectorComponentId); componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.IN_DEVELOPMENT); - componentDescription.setComponentName(connectorQualifiedName); + componentDescription.setComponentName(connectorDisplayName); componentDescription.setComponentDescription(connectorDescription); componentDescription.setComponentWikiURL(connectorWikiPage); diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/files-integration-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/basicfiles/BasicFilesMonitorIntegrationProviderBase.java b/open-metadata-implementation/adapters/open-connectors/integration-connectors/files-integration-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/basicfiles/BasicFilesMonitorIntegrationProviderBase.java index 9758e85b476..7eda3089881 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/files-integration-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/basicfiles/BasicFilesMonitorIntegrationProviderBase.java +++ b/open-metadata-implementation/adapters/open-connectors/integration-connectors/files-integration-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/basicfiles/BasicFilesMonitorIntegrationProviderBase.java @@ -117,7 +117,7 @@ class BasicFilesMonitorIntegrationProviderBase extends IntegrationConnectorProvi componentDescription.setComponentId(connectorComponentId); componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.STABLE); - componentDescription.setComponentName(connectorQualifiedName); + componentDescription.setComponentName(connectorDisplayName); componentDescription.setComponentDescription(connectorDescription); componentDescription.setComponentWikiURL(connectorWikiPage); diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/files-integration-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/basicfiles/DataFilesMonitorIntegrationConnector.java b/open-metadata-implementation/adapters/open-connectors/integration-connectors/files-integration-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/basicfiles/DataFilesMonitorIntegrationConnector.java index 27aae71980d..8c3d053b1d7 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/files-integration-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/basicfiles/DataFilesMonitorIntegrationConnector.java +++ b/open-metadata-implementation/adapters/open-connectors/integration-connectors/files-integration-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/basicfiles/DataFilesMonitorIntegrationConnector.java @@ -8,7 +8,7 @@ import org.odpi.openmetadata.accessservices.datamanager.properties.ArchiveProperties; import org.odpi.openmetadata.accessservices.datamanager.properties.DataFileProperties; import org.odpi.openmetadata.accessservices.datamanager.properties.TemplateProperties; -import org.odpi.openmetadata.adapters.connectors.datastore.basicfile.BasicFileStoreProvider; +import org.odpi.openmetadata.adapters.connectors.datastore.basicfile.BasicFolderProvider; import org.odpi.openmetadata.adapters.connectors.integration.basicfiles.ffdc.BasicFilesIntegrationConnectorsAuditCode; import org.odpi.openmetadata.adapters.connectors.integration.basicfiles.ffdc.BasicFilesIntegrationConnectorsErrorCode; import org.odpi.openmetadata.adapters.connectors.integration.basicfiles.ffdc.exception.FileException; @@ -46,7 +46,7 @@ FileFolderElement getFolderElement(File dataFolderFile) throws ConnectorCheckedE return super.getFolderElement(dataFolderFile, DeployedImplementationType.FILE_FOLDER.getAssociatedTypeName(), DeployedImplementationType.FILE_FOLDER.getDeployedImplementationType(), - BasicFileStoreProvider.class.getName()); + BasicFolderProvider.class.getName()); } diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/jdbc-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/jdbc/JDBCIntegrationConnectorProvider.java b/open-metadata-implementation/adapters/open-connectors/integration-connectors/jdbc-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/jdbc/JDBCIntegrationConnectorProvider.java index 07f811a56ce..a24f704db42 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/jdbc-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/jdbc/JDBCIntegrationConnectorProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/integration-connectors/jdbc-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/jdbc/JDBCIntegrationConnectorProvider.java @@ -97,7 +97,7 @@ public JDBCIntegrationConnectorProvider() componentDescription.setComponentId(connectorComponentId); componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.TECHNICAL_PREVIEW); - componentDescription.setComponentName(connectorQualifiedName); + componentDescription.setComponentName(connectorDisplayName); componentDescription.setComponentDescription(connectorDescription); componentDescription.setComponentWikiURL(connectorWikiPage); diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/kafka-audit-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/kafkaaudit/DistributeAuditEventsFromKafkaProvider.java b/open-metadata-implementation/adapters/open-connectors/integration-connectors/kafka-audit-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/kafkaaudit/DistributeAuditEventsFromKafkaProvider.java index 95e5385b439..4b06e6b2a0b 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/kafka-audit-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/kafkaaudit/DistributeAuditEventsFromKafkaProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/integration-connectors/kafka-audit-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/kafkaaudit/DistributeAuditEventsFromKafkaProvider.java @@ -78,7 +78,7 @@ public DistributeAuditEventsFromKafkaProvider() componentDescription.setComponentId(connectorComponentId); componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.TECHNICAL_PREVIEW); - componentDescription.setComponentName(connectorQualifiedName); + componentDescription.setComponentName(connectorDisplayName); componentDescription.setComponentDescription(connectorDescription); componentDescription.setComponentWikiURL(connectorWikiPage); diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/kafka-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/kafka/KafkaMonitorIntegrationProvider.java b/open-metadata-implementation/adapters/open-connectors/integration-connectors/kafka-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/kafka/KafkaMonitorIntegrationProvider.java index deda0916619..15fa4097c8c 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/kafka-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/kafka/KafkaMonitorIntegrationProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/integration-connectors/kafka-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/kafka/KafkaMonitorIntegrationProvider.java @@ -88,7 +88,7 @@ public KafkaMonitorIntegrationProvider() componentDescription.setComponentId(connectorComponentId); componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.STABLE); - componentDescription.setComponentName(connectorQualifiedName); + componentDescription.setComponentName(connectorDisplayName); componentDescription.setComponentDescription(connectorDescription); componentDescription.setComponentWikiURL(connectorWikiPage); diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/openapi-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/openapis/OpenAPIMonitorIntegrationProvider.java b/open-metadata-implementation/adapters/open-connectors/integration-connectors/openapi-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/openapis/OpenAPIMonitorIntegrationProvider.java index 1aca0792311..9bee0824ac2 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/openapi-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/openapis/OpenAPIMonitorIntegrationProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/integration-connectors/openapi-integration-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/openapis/OpenAPIMonitorIntegrationProvider.java @@ -80,7 +80,7 @@ public OpenAPIMonitorIntegrationProvider() componentDescription.setComponentId(connectorComponentId); componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.TECHNICAL_PREVIEW); - componentDescription.setComponentName(connectorQualifiedName); + componentDescription.setComponentName(connectorDisplayName); componentDescription.setComponentDescription(connectorDescription); componentDescription.setComponentWikiURL(connectorWikiPage); diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/openlineage-integration-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/openlineage/APIBasedOpenLineageLogStoreProvider.java b/open-metadata-implementation/adapters/open-connectors/integration-connectors/openlineage-integration-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/openlineage/APIBasedOpenLineageLogStoreProvider.java index 10d71fe9529..8982a72e583 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/openlineage-integration-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/openlineage/APIBasedOpenLineageLogStoreProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/integration-connectors/openlineage-integration-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/openlineage/APIBasedOpenLineageLogStoreProvider.java @@ -70,7 +70,7 @@ public APIBasedOpenLineageLogStoreProvider() componentDescription.setComponentId(connectorComponentId); componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.TECHNICAL_PREVIEW); - componentDescription.setComponentName(connectorQualifiedName); + componentDescription.setComponentName(connectorDisplayName); componentDescription.setComponentDescription(connectorDescription); componentDescription.setComponentWikiURL(connectorWikiPage); diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/openlineage-integration-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/openlineage/FileBasedOpenLineageLogStoreProvider.java b/open-metadata-implementation/adapters/open-connectors/integration-connectors/openlineage-integration-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/openlineage/FileBasedOpenLineageLogStoreProvider.java index 191a2835930..ce83afb0f56 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/openlineage-integration-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/openlineage/FileBasedOpenLineageLogStoreProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/integration-connectors/openlineage-integration-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/openlineage/FileBasedOpenLineageLogStoreProvider.java @@ -71,7 +71,7 @@ public FileBasedOpenLineageLogStoreProvider() componentDescription.setComponentId(connectorComponentId); componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.TECHNICAL_PREVIEW); - componentDescription.setComponentName(connectorQualifiedName); + componentDescription.setComponentName(connectorDisplayName); componentDescription.setComponentDescription(connectorDescription); componentDescription.setComponentWikiURL(connectorWikiPage); diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/openlineage-integration-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/openlineage/GovernanceActionOpenLineageIntegrationProvider.java b/open-metadata-implementation/adapters/open-connectors/integration-connectors/openlineage-integration-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/openlineage/GovernanceActionOpenLineageIntegrationProvider.java index 4c2cde277be..8b43b77db8b 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/openlineage-integration-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/openlineage/GovernanceActionOpenLineageIntegrationProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/integration-connectors/openlineage-integration-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/openlineage/GovernanceActionOpenLineageIntegrationProvider.java @@ -72,7 +72,7 @@ public GovernanceActionOpenLineageIntegrationProvider() componentDescription.setComponentId(connectorComponentId); componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.TECHNICAL_PREVIEW); - componentDescription.setComponentName(connectorQualifiedName); + componentDescription.setComponentName(connectorDisplayName); componentDescription.setComponentDescription(connectorDescription); componentDescription.setComponentWikiURL(connectorWikiPage); diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/openlineage-integration-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/openlineage/OpenLineageCataloguerIntegrationProvider.java b/open-metadata-implementation/adapters/open-connectors/integration-connectors/openlineage-integration-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/openlineage/OpenLineageCataloguerIntegrationProvider.java index 91851f76977..8ce604949ac 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/openlineage-integration-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/openlineage/OpenLineageCataloguerIntegrationProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/integration-connectors/openlineage-integration-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/openlineage/OpenLineageCataloguerIntegrationProvider.java @@ -70,7 +70,7 @@ public OpenLineageCataloguerIntegrationProvider() componentDescription.setComponentId(connectorComponentId); componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.TECHNICAL_PREVIEW); - componentDescription.setComponentName(connectorQualifiedName); + componentDescription.setComponentName(connectorDisplayName); componentDescription.setComponentDescription(connectorDescription); componentDescription.setComponentWikiURL(connectorWikiPage); diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/openlineage-integration-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/openlineage/OpenLineageEventReceiverIntegrationProvider.java b/open-metadata-implementation/adapters/open-connectors/integration-connectors/openlineage-integration-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/openlineage/OpenLineageEventReceiverIntegrationProvider.java index 27a74b84486..2873b92e379 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/openlineage-integration-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/openlineage/OpenLineageEventReceiverIntegrationProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/integration-connectors/openlineage-integration-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/openlineage/OpenLineageEventReceiverIntegrationProvider.java @@ -73,7 +73,7 @@ public OpenLineageEventReceiverIntegrationProvider() componentDescription.setComponentId(connectorComponentId); componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.TECHNICAL_PREVIEW); - componentDescription.setComponentName(connectorQualifiedName); + componentDescription.setComponentName(connectorDisplayName); componentDescription.setComponentDescription(connectorDescription); componentDescription.setComponentWikiURL(connectorWikiPage); diff --git a/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/cohort-registry-store-connectors/cohort-registry-file-store-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/cohortregistrystore/file/FileBasedRegistryStoreProvider.java b/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/cohort-registry-store-connectors/cohort-registry-file-store-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/cohortregistrystore/file/FileBasedRegistryStoreProvider.java index 66dca32ff3f..ea90fe0382a 100644 --- a/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/cohort-registry-store-connectors/cohort-registry-file-store-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/cohortregistrystore/file/FileBasedRegistryStoreProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/cohort-registry-store-connectors/cohort-registry-file-store-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/cohortregistrystore/file/FileBasedRegistryStoreProvider.java @@ -69,7 +69,7 @@ public FileBasedRegistryStoreProvider() componentDescription.setComponentId(connectorComponentId); componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.STABLE); - componentDescription.setComponentName(connectorQualifiedName); + componentDescription.setComponentName(connectorDisplayName); componentDescription.setComponentDescription(connectorDescription); componentDescription.setComponentWikiURL(connectorWikiPage); diff --git a/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-archive-connectors/open-metadata-archive-directory-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/archiveconnector/directory/DirectoryBasedOpenMetadataArchiveStoreProvider.java b/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-archive-connectors/open-metadata-archive-directory-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/archiveconnector/directory/DirectoryBasedOpenMetadataArchiveStoreProvider.java index eaed1081247..1a4d4e8e4b0 100644 --- a/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-archive-connectors/open-metadata-archive-directory-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/archiveconnector/directory/DirectoryBasedOpenMetadataArchiveStoreProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-archive-connectors/open-metadata-archive-directory-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/archiveconnector/directory/DirectoryBasedOpenMetadataArchiveStoreProvider.java @@ -81,7 +81,7 @@ public DirectoryBasedOpenMetadataArchiveStoreProvider() componentDescription.setComponentId(connectorComponentId); componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.IN_DEVELOPMENT); - componentDescription.setComponentName(connectorQualifiedName); + componentDescription.setComponentName(connectorDisplayName); componentDescription.setComponentDescription(connectorDescription); componentDescription.setComponentWikiURL(connectorWikiPage); diff --git a/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-archive-connectors/open-metadata-archive-file-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/archiveconnector/file/FileBasedOpenMetadataArchiveStoreProvider.java b/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-archive-connectors/open-metadata-archive-file-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/archiveconnector/file/FileBasedOpenMetadataArchiveStoreProvider.java index ba6ed34ab8d..13a07f5a8e4 100644 --- a/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-archive-connectors/open-metadata-archive-file-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/archiveconnector/file/FileBasedOpenMetadataArchiveStoreProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-archive-connectors/open-metadata-archive-file-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/archiveconnector/file/FileBasedOpenMetadataArchiveStoreProvider.java @@ -69,7 +69,7 @@ public FileBasedOpenMetadataArchiveStoreProvider() componentDescription.setComponentId(connectorComponentId); componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.STABLE); - componentDescription.setComponentName(connectorQualifiedName); + componentDescription.setComponentName(connectorDisplayName); componentDescription.setComponentDescription(connectorDescription); componentDescription.setComponentWikiURL(connectorWikiPage); diff --git a/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-collection-store-connectors/graph-repository-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/graphrepository/repositoryconnector/GraphOMRSRepositoryConnectorProvider.java b/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-collection-store-connectors/graph-repository-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/graphrepository/repositoryconnector/GraphOMRSRepositoryConnectorProvider.java index ae9e992b771..55e470cc7d2 100644 --- a/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-collection-store-connectors/graph-repository-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/graphrepository/repositoryconnector/GraphOMRSRepositoryConnectorProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-collection-store-connectors/graph-repository-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/graphrepository/repositoryconnector/GraphOMRSRepositoryConnectorProvider.java @@ -78,7 +78,7 @@ public GraphOMRSRepositoryConnectorProvider() componentDescription.setComponentId(connectorComponentId); componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.STABLE); - componentDescription.setComponentName(connectorQualifiedName); + componentDescription.setComponentName(connectorDisplayName); componentDescription.setComponentDescription(connectorDescription); componentDescription.setComponentWikiURL(connectorWikiPage); diff --git a/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-collection-store-connectors/inmemory-repository-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/inmemory/repositoryconnector/InMemoryOMRSRepositoryConnectorProvider.java b/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-collection-store-connectors/inmemory-repository-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/inmemory/repositoryconnector/InMemoryOMRSRepositoryConnectorProvider.java index a1f396d3ece..1949aea0707 100644 --- a/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-collection-store-connectors/inmemory-repository-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/inmemory/repositoryconnector/InMemoryOMRSRepositoryConnectorProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-collection-store-connectors/inmemory-repository-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/inmemory/repositoryconnector/InMemoryOMRSRepositoryConnectorProvider.java @@ -78,7 +78,7 @@ public InMemoryOMRSRepositoryConnectorProvider() componentDescription.setComponentId(connectorComponentId); componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.STABLE); - componentDescription.setComponentName(connectorQualifiedName); + componentDescription.setComponentName(connectorDisplayName); componentDescription.setComponentDescription(connectorDescription); componentDescription.setComponentWikiURL(connectorWikiPage); diff --git a/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-collection-store-connectors/inmemory-repository-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/readonly/repositoryconnector/ReadOnlyOMRSRepositoryConnectorProvider.java b/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-collection-store-connectors/inmemory-repository-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/readonly/repositoryconnector/ReadOnlyOMRSRepositoryConnectorProvider.java index a4641b896f5..5983dedf33e 100644 --- a/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-collection-store-connectors/inmemory-repository-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/readonly/repositoryconnector/ReadOnlyOMRSRepositoryConnectorProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-collection-store-connectors/inmemory-repository-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/readonly/repositoryconnector/ReadOnlyOMRSRepositoryConnectorProvider.java @@ -78,7 +78,7 @@ public ReadOnlyOMRSRepositoryConnectorProvider() componentDescription.setComponentId(connectorComponentId); componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.STABLE); - componentDescription.setComponentName(connectorQualifiedName); + componentDescription.setComponentName(connectorDisplayName); componentDescription.setComponentDescription(connectorDescription); componentDescription.setComponentWikiURL(connectorWikiPage); diff --git a/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-collection-store-connectors/omrs-rest-repository-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/rest/repositoryconnector/OMRSRESTRepositoryConnectorProvider.java b/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-collection-store-connectors/omrs-rest-repository-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/rest/repositoryconnector/OMRSRESTRepositoryConnectorProvider.java index 9be69bbae00..819a1262ec9 100644 --- a/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-collection-store-connectors/omrs-rest-repository-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/rest/repositoryconnector/OMRSRESTRepositoryConnectorProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-collection-store-connectors/omrs-rest-repository-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/rest/repositoryconnector/OMRSRESTRepositoryConnectorProvider.java @@ -77,7 +77,7 @@ public OMRSRESTRepositoryConnectorProvider() componentDescription.setComponentId(connectorComponentId); componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.STABLE); - componentDescription.setComponentName(connectorQualifiedName); + componentDescription.setComponentName(connectorDisplayName); componentDescription.setComponentDescription(connectorDescription); componentDescription.setComponentWikiURL(connectorWikiPage); diff --git a/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-collection-store-connectors/xtdb-repository-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/xtdb/repositoryconnector/XTDBOMRSRepositoryConnectorProvider.java b/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-collection-store-connectors/xtdb-repository-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/xtdb/repositoryconnector/XTDBOMRSRepositoryConnectorProvider.java index baaec6a0d3a..4780acc0f2c 100644 --- a/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-collection-store-connectors/xtdb-repository-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/xtdb/repositoryconnector/XTDBOMRSRepositoryConnectorProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/open-metadata-collection-store-connectors/xtdb-repository-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/xtdb/repositoryconnector/XTDBOMRSRepositoryConnectorProvider.java @@ -73,12 +73,12 @@ * } * */ -public class XTDBOMRSRepositoryConnectorProvider extends OMRSRepositoryConnectorProviderBase { - +public class XTDBOMRSRepositoryConnectorProvider extends OMRSRepositoryConnectorProviderBase +{ /* * Unique identifier of the connector for the audit log. */ - private static final int connectorComponentId = 100; + private static final int connectorComponentId = 87; /* * Unique identifier for the connector type. @@ -96,7 +96,7 @@ public class XTDBOMRSRepositoryConnectorProvider extends OMRSRepositoryConnector /* * Class of the connector. */ - private static final Class connectorClass = XTDBOMRSRepositoryConnector.class; + private static final String connectorClass = "org.odpi.openmetadata.adapters.repositoryservices.xtdb.repositoryconnector.XTDBOMRSRepositoryConnector"; public static final String XTDB_CONFIG = "xtdbConfig"; public static final String XTDB_CONFIG_EDN = "xtdbConfigEDN"; @@ -114,7 +114,7 @@ public XTDBOMRSRepositoryConnectorProvider() { /* * Set up the class name of the connector that this provider creates. */ - super.setConnectorClassName(connectorClass.getName()); + super.setConnectorClassName(connectorClass); /* * Set up the connector type that should be included in a connection used to configure this connector. @@ -142,7 +142,7 @@ public XTDBOMRSRepositoryConnectorProvider() { AuditLogReportingComponent componentDescription = new AuditLogReportingComponent(); componentDescription.setComponentId(connectorComponentId); - componentDescription.setComponentName(connectorQualifiedName); + componentDescription.setComponentName(connectorDisplayName); componentDescription.setComponentDescription(connectorDescription); componentDescription.setComponentWikiURL(connectorWikiPage); diff --git a/open-metadata-implementation/adapters/open-connectors/secrets-store-connectors/env-variable-secrets-store-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/secretsstore/envar/EnvVarSecretsStoreProvider.java b/open-metadata-implementation/adapters/open-connectors/secrets-store-connectors/env-variable-secrets-store-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/secretsstore/envar/EnvVarSecretsStoreProvider.java index 126ee46a0e3..a168a59bae9 100644 --- a/open-metadata-implementation/adapters/open-connectors/secrets-store-connectors/env-variable-secrets-store-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/secretsstore/envar/EnvVarSecretsStoreProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/secrets-store-connectors/env-variable-secrets-store-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/secretsstore/envar/EnvVarSecretsStoreProvider.java @@ -70,7 +70,7 @@ public EnvVarSecretsStoreProvider() componentDescription.setComponentId(connectorComponentId); componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.TECHNICAL_PREVIEW); - componentDescription.setComponentName(connectorQualifiedName); + componentDescription.setComponentName(connectorDisplayName); componentDescription.setComponentDescription(connectorDescription); componentDescription.setComponentWikiURL(connectorWikiPage); diff --git a/open-metadata-implementation/adapters/open-connectors/survey-action-connectors/build.gradle b/open-metadata-implementation/adapters/open-connectors/survey-action-connectors/build.gradle index 180b3125e6c..bedc4cce190 100644 --- a/open-metadata-implementation/adapters/open-connectors/survey-action-connectors/build.gradle +++ b/open-metadata-implementation/adapters/open-connectors/survey-action-connectors/build.gradle @@ -14,6 +14,7 @@ dependencies { compileOnly project(':open-metadata-implementation:adapters:open-connectors:data-store-connectors:file-connectors:basic-file-connector') compileOnly project(':open-metadata-implementation:adapters:open-connectors:system-connectors:apache-atlas-rest-connector') compileOnly 'org.slf4j:slf4j-api' + implementation 'commons-io:commons-io' testImplementation 'org.testng:testng' compileOnly 'com.fasterxml.jackson.core:jackson-annotations' diff --git a/open-metadata-implementation/adapters/open-connectors/survey-action-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/surveyaction/SequentialSurveyPipelineProvider.java b/open-metadata-implementation/adapters/open-connectors/survey-action-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/surveyaction/SequentialSurveyPipelineProvider.java index 6d01f3fb791..6bd87177467 100644 --- a/open-metadata-implementation/adapters/open-connectors/survey-action-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/surveyaction/SequentialSurveyPipelineProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/survey-action-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/surveyaction/SequentialSurveyPipelineProvider.java @@ -3,6 +3,8 @@ package org.odpi.openmetadata.adapters.connectors.surveyaction; +import org.odpi.openmetadata.frameworks.auditlog.AuditLogReportingComponent; +import org.odpi.openmetadata.frameworks.auditlog.ComponentDevelopmentStatus; import org.odpi.openmetadata.frameworks.connectors.properties.beans.ConnectorType; import org.odpi.openmetadata.frameworks.surveyaction.SurveyActionServiceProvider; @@ -11,29 +13,56 @@ */ public class SequentialSurveyPipelineProvider extends SurveyActionServiceProvider { - static final String connectorTypeGUID = "30f2c202-7f2d-4d5d-9b17-6064f32f3c74"; - static final String connectorTypeName = "Sequential Survey Pipeline Connector"; - static final String connectorTypeDescription = "Connector supports the sequential execution of survey action services."; + /* + * Unique identifier of the connector for the audit log. + */ + private static final int connectorComponentId = 667; + + /* + * Descriptive information about the connector for the connector type and audit log. + */ + private static final String connectorTypeGUID = "30f2c202-7f2d-4d5d-9b17-6064f32f3c74"; + private static final String connectorTypeQualifiedName = "Egeria:SurveyActionService:SequentialSurveyPipelineService"; + private static final String connectorTypeName = "Sequential Survey Pipeline Connector"; + private static final String connectorTypeDescription = "Connector supports the sequential execution of survey action services."; + private static final String connectorWikiPage = "https://egeria-project.org/connectors/survey-action/sequential-survey-pipeline-service/"; + + + /* + * Class of the connector. + */ + private static final String connectorClass = "org.odpi.openmetadata.adapters.connectors.surveyaction.SequentialSurveyPipeline"; /** * Constructor used to initialize the ConnectorProviderBase with the Java class name of the specific - * discovery service implementation. + * survey action service implementation. */ public SequentialSurveyPipelineProvider() { - Class connectorClass = SequentialSurveyPipeline.class; - - super.setConnectorClassName(connectorClass.getName()); + super.setConnectorClassName(connectorClass); ConnectorType connectorType = new ConnectorType(); connectorType.setType(ConnectorType.getConnectorTypeType()); connectorType.setGUID(connectorTypeGUID); - connectorType.setQualifiedName(connectorTypeName); + connectorType.setQualifiedName(connectorTypeQualifiedName); connectorType.setDisplayName(connectorTypeName); connectorType.setDescription(connectorTypeDescription); connectorType.setConnectorProviderClassName(this.getClass().getName()); connectorType.setSupportedAssetTypeName(supportedAssetTypeName); super.connectorTypeBean = connectorType; + + /* + * Set up the component description used in the connector's audit log messages. + */ + AuditLogReportingComponent componentDescription = new AuditLogReportingComponent(); + + componentDescription.setComponentId(connectorComponentId); + componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.TECHNICAL_PREVIEW); + componentDescription.setComponentName(connectorTypeName); + componentDescription.setComponentDescription(connectorTypeDescription); + componentDescription.setComponentWikiURL(connectorWikiPage); + + super.setConnectorComponentDescription(componentDescription); } } diff --git a/open-metadata-implementation/adapters/open-connectors/survey-action-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/surveyaction/ffdc/SurveyServiceAuditCode.java b/open-metadata-implementation/adapters/open-connectors/survey-action-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/surveyaction/ffdc/SurveyServiceAuditCode.java new file mode 100644 index 00000000000..3248af92796 --- /dev/null +++ b/open-metadata-implementation/adapters/open-connectors/survey-action-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/surveyaction/ffdc/SurveyServiceAuditCode.java @@ -0,0 +1,139 @@ +/* SPDX-License-Identifier: Apache-2.0 */ +/* Copyright Contributors to the ODPi Egeria project. */ +package org.odpi.openmetadata.adapters.connectors.surveyaction.ffdc; + +import org.odpi.openmetadata.frameworks.auditlog.AuditLogRecordSeverityLevel; +import org.odpi.openmetadata.frameworks.auditlog.messagesets.AuditLogMessageDefinition; +import org.odpi.openmetadata.frameworks.auditlog.messagesets.AuditLogMessageSet; + + +/** + * The SurveyServiceAuditCode is used to define the message content for the OMRS Audit Log. + * The 5 fields in the enum are: + *
    + *
  • Log Message Identifier - to uniquely identify the message
    • + *
  • Severity - is this an event, decision, action, error or exception
    • + *
  • Log Message Text - includes placeholder to allow additional values to be captured
    • + *
  • Additional Information - further parameters and data relating to the audit message (optional)
    • + *
  • SystemAction - describes the result of the situation
    • + *
  • UserAction - describes how a user should correct the situation
    • + *
+ */ +public enum SurveyServiceAuditCode implements AuditLogMessageSet +{ + /** + * SURVEY-ACTION-SERVICE-0001 - The survey action service received an unexpected exception {0} during method {1}; the error message was: {2} + */ + UNEXPECTED_EXCEPTION("SURVEY-ACTION-SERVICE-0001", + AuditLogRecordSeverityLevel.EXCEPTION, + "The survey action service {0} received an unexpected exception {1} during method {2}; the error message was: {3}", + "The connector is unable to process the current request.", + "Use the details from the error message to determine the cause of the error and retry the request once it is resolved."), + + /** + * SURVEY-ACTION-SERVICE-0002 - The survey action service {0} is creating log file {1} + */ + CREATING_LOG_FILE("SURVEY-ACTION-SERVICE-0002", + AuditLogRecordSeverityLevel.INFO, + "The survey action service {0} is creating log file {1} which is catalogued as CSVFile asset {2}", + "This message tells the survey team that a particular survey log file is being created.", + "No specific action is required. The results are added to the log file and the asset for this log file is catalogued as a CSV file."), + + + /** + * SURVEY-ACTION-SERVICE-0003 - The survey action service {0} is overriding log file {1} + */ + REUSING_LOG_FILE("SURVEY-ACTION-SERVICE-0003", + AuditLogRecordSeverityLevel.INFO, + "The survey action service {0} is overriding log file {1}", + "This message warns the survey team that a particular survey log file is being reused.", + "No specific action is required. The new results are appended to the existing results."), + ; + + private final String logMessageId; + private final AuditLogRecordSeverityLevel severity; + private final String logMessage; + private final String systemAction; + private final String userAction; + + + /** + * The constructor for SurveyServiceAuditCode expects to be passed one of the enumeration rows defined in + * SurveyServiceAuditCode above. For example: + *
+ * SurveyServiceAuditCode auditCode = SurveyServiceAuditCode.SERVER_NOT_AVAILABLE; + *
+ * This will expand out to the 5 parameters shown below. + * + * @param messageId - unique id for the message + * @param severity - severity of the message + * @param message - text for the message + * @param systemAction - description of the action taken by the system when the condition happened + * @param userAction - instructions for resolving the situation, if any + */ + SurveyServiceAuditCode(String messageId, + AuditLogRecordSeverityLevel severity, + String message, + String systemAction, + String userAction) + { + this.logMessageId = messageId; + this.severity = severity; + this.logMessage = message; + this.systemAction = systemAction; + this.userAction = userAction; + } + + + /** + * Retrieve a message definition object for logging. This method is used when there are no message inserts. + * + * @return message definition object. + */ + @Override + public AuditLogMessageDefinition getMessageDefinition() + { + return new AuditLogMessageDefinition(logMessageId, + severity, + logMessage, + systemAction, + userAction); + } + + + /** + * Retrieve a message definition object for logging. This method is used when there are values to be inserted into the message. + * + * @param params array of parameters (all strings). They are inserted into the message according to the numbering in the message text. + * @return message definition object. + */ + @Override + public AuditLogMessageDefinition getMessageDefinition(String ...params) + { + AuditLogMessageDefinition messageDefinition = new AuditLogMessageDefinition(logMessageId, + severity, + logMessage, + systemAction, + userAction); + messageDefinition.setMessageParameters(params); + return messageDefinition; + } + + + /** + * JSON-style toString + * + * @return string of property names and values for this enum + */ + @Override + public String toString() + { + return "SurveyServiceAuditCode{" + + "logMessageId='" + logMessageId + '\'' + + ", severity=" + severity + + ", logMessage='" + logMessage + '\'' + + ", systemAction='" + systemAction + '\'' + + ", userAction='" + userAction + '\'' + + '}'; + } +} diff --git a/open-metadata-implementation/adapters/open-connectors/survey-action-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/surveyaction/surveycsv/CSVSurveyServiceProvider.java b/open-metadata-implementation/adapters/open-connectors/survey-action-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/surveyaction/surveycsv/CSVSurveyServiceProvider.java index a4327957c5e..321f64e75bd 100644 --- a/open-metadata-implementation/adapters/open-connectors/survey-action-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/surveyaction/surveycsv/CSVSurveyServiceProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/survey-action-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/surveyaction/surveycsv/CSVSurveyServiceProvider.java @@ -2,6 +2,8 @@ /* Copyright Contributors to the ODPi Egeria project. */ package org.odpi.openmetadata.adapters.connectors.surveyaction.surveycsv; +import org.odpi.openmetadata.frameworks.auditlog.AuditLogReportingComponent; +import org.odpi.openmetadata.frameworks.auditlog.ComponentDevelopmentStatus; import org.odpi.openmetadata.frameworks.connectors.properties.beans.ConnectorType; import org.odpi.openmetadata.frameworks.governanceaction.actiontargettype.ActionTargetType; import org.odpi.openmetadata.frameworks.governanceaction.refdata.DeployedImplementationType; @@ -15,9 +17,26 @@ */ public class CSVSurveyServiceProvider extends SurveyActionServiceProvider { - static final String connectorTypeGUID = "2a844ac9-bb86-4765-9f3c-04df148c05a5"; - static final String connectorTypeName = "CSV Survey Action Service Connector"; - static final String connectorTypeDescription = "Connector supports the schema extraction and profiling of data in a CSV file."; + /* + * Unique identifier of the connector for the audit log. + */ + private static final int connectorComponentId = 668; + + /* + * Descriptive information about the connector for the connector type and audit log. + */ + private static final String connectorTypeGUID = "2a844ac9-bb86-4765-9f3c-04df148c05a5"; + private static final String connectorTypeQualifiedName = "Egeria:SurveyActionService:CSVFileSurveyService"; + private static final String connectorTypeName = "CSV File Survey Action Service Connector"; + private static final String connectorTypeDescription = "Connector supports the schema extraction and profiling of data in a CSV file."; + private static final String connectorWikiPage = "https://egeria-project.org/connectors/survey-action/csv-survey-action-service/"; + + /* + * Class of the connector. + */ + private static final String connectorClass = "org.odpi.openmetadata.adapters.connectors.surveyaction.surveycsv.CSVSurveyService"; + + static final String FILE_TARGET_PROPERTY = "fileToSurvey"; /** @@ -28,14 +47,12 @@ public CSVSurveyServiceProvider() { super(); - String connectorClass = "org.odpi.openmetadata.adapters.connectors.surveyaction.surveycsv.CSVSurveyService"; - super.setConnectorClassName(connectorClass); ConnectorType connectorType = new ConnectorType(); connectorType.setType(ConnectorType.getConnectorTypeType()); connectorType.setGUID(connectorTypeGUID); - connectorType.setQualifiedName(connectorTypeName); + connectorType.setQualifiedName(connectorTypeQualifiedName); connectorType.setDisplayName(connectorTypeName); connectorType.setDescription(connectorTypeDescription); connectorType.setConnectorProviderClassName(this.getClass().getName()); @@ -53,5 +70,18 @@ public CSVSurveyServiceProvider() actionTargetType.setDeployedImplementationType(DeployedImplementationType.FILE_FOLDER.getDeployedImplementationType()); super.actionTargetTypes.put(FILE_TARGET_PROPERTY, actionTargetType); + + /* + * Set up the component description used in the connector's audit log messages. + */ + AuditLogReportingComponent componentDescription = new AuditLogReportingComponent(); + + componentDescription.setComponentId(connectorComponentId); + componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.TECHNICAL_PREVIEW); + componentDescription.setComponentName(connectorTypeName); + componentDescription.setComponentDescription(connectorTypeDescription); + componentDescription.setComponentWikiURL(connectorWikiPage); + + super.setConnectorComponentDescription(componentDescription); } } diff --git a/open-metadata-implementation/adapters/open-connectors/survey-action-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/surveyaction/surveyfile/FileSurveyServiceProvider.java b/open-metadata-implementation/adapters/open-connectors/survey-action-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/surveyaction/surveyfile/FileSurveyServiceProvider.java index a4c0e4ae00f..48e86af8a5f 100644 --- a/open-metadata-implementation/adapters/open-connectors/survey-action-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/surveyaction/surveyfile/FileSurveyServiceProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/survey-action-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/surveyaction/surveyfile/FileSurveyServiceProvider.java @@ -2,6 +2,8 @@ /* Copyright Contributors to the ODPi Egeria project. */ package org.odpi.openmetadata.adapters.connectors.surveyaction.surveyfile; +import org.odpi.openmetadata.frameworks.auditlog.AuditLogReportingComponent; +import org.odpi.openmetadata.frameworks.auditlog.ComponentDevelopmentStatus; import org.odpi.openmetadata.frameworks.connectors.properties.beans.ConnectorType; import org.odpi.openmetadata.frameworks.governanceaction.actiontargettype.ActionTargetType; import org.odpi.openmetadata.frameworks.governanceaction.refdata.DeployedImplementationType; @@ -15,9 +17,25 @@ */ public class FileSurveyServiceProvider extends SurveyActionServiceProvider { - static final String connectorTypeGUID = "0c06ebb3-0a8f-476f-b8f8-602c01643523"; - static final String connectorTypeName = "File Survey Action Service Connector"; - static final String connectorTypeDescription = "Connector supports the extractions of basic file properties."; + /* + * Unique identifier of the connector for the audit log. + */ + private static final int connectorComponentId = 669; + + /* + * Descriptive information about the connector for the connector type and audit log. + */ + private static final String connectorTypeGUID = "0c06ebb3-0a8f-476f-b8f8-602c01643523"; + private static final String connectorTypeQualifiedName = "Egeria:SurveyActionService:FileSurveyService"; + private static final String connectorTypeName = "File Survey Action Service Connector"; + private static final String connectorTypeDescription = "Connector supports the extractions of basic file properties."; + private static final String connectorWikiPage = "https://egeria-project.org/connectors/survey-action/file-survey-action-service/"; + + /* + * Class of the connector. + */ + private static final String connectorClass = "org.odpi.openmetadata.adapters.connectors.surveyaction.surveyfile.FileSurveyService"; + static final String FILE_TARGET_PROPERTY = "fileToSurvey"; @@ -29,14 +47,12 @@ public FileSurveyServiceProvider() { super(); - String connectorClass = "org.odpi.openmetadata.adapters.connectors.surveyaction.surveyfile.FileSurveyService"; - super.setConnectorClassName(connectorClass); ConnectorType connectorType = new ConnectorType(); connectorType.setType(ConnectorType.getConnectorTypeType()); connectorType.setGUID(connectorTypeGUID); - connectorType.setQualifiedName(connectorTypeName); + connectorType.setQualifiedName(connectorTypeQualifiedName); connectorType.setDisplayName(connectorTypeName); connectorType.setDescription(connectorTypeDescription); connectorType.setConnectorProviderClassName(this.getClass().getName()); @@ -54,5 +70,18 @@ public FileSurveyServiceProvider() actionTargetType.setDeployedImplementationType(DeployedImplementationType.FILE_FOLDER.getDeployedImplementationType()); super.actionTargetTypes.put(FILE_TARGET_PROPERTY, actionTargetType); + + /* + * Set up the component description used in the connector's audit log messages. + */ + AuditLogReportingComponent componentDescription = new AuditLogReportingComponent(); + + componentDescription.setComponentId(connectorComponentId); + componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.TECHNICAL_PREVIEW); + componentDescription.setComponentName(connectorTypeName); + componentDescription.setComponentDescription(connectorTypeDescription); + componentDescription.setComponentWikiURL(connectorWikiPage); + + super.setConnectorComponentDescription(componentDescription); } } diff --git a/open-metadata-implementation/adapters/open-connectors/survey-action-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/surveyaction/surveyfolder/FolderSurveyService.java b/open-metadata-implementation/adapters/open-connectors/survey-action-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/surveyaction/surveyfolder/FolderSurveyService.java index 75d84a59619..efb5548411e 100644 --- a/open-metadata-implementation/adapters/open-connectors/survey-action-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/surveyaction/surveyfolder/FolderSurveyService.java +++ b/open-metadata-implementation/adapters/open-connectors/survey-action-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/surveyaction/surveyfolder/FolderSurveyService.java @@ -2,15 +2,17 @@ /* Copyright Contributors to the ODPi Egeria project. */ package org.odpi.openmetadata.adapters.connectors.surveyaction.surveyfolder; -import org.odpi.openmetadata.adapters.connectors.datastore.basicfile.BasicFileStore; +import org.apache.commons.io.FileUtils; +import org.odpi.openmetadata.adapters.connectors.datastore.basicfile.BasicFolderConnector; import org.odpi.openmetadata.adapters.connectors.surveyaction.AuditableSurveyService; -import org.odpi.openmetadata.frameworks.governanceaction.fileclassifier.FileClassifier; +import org.odpi.openmetadata.adapters.connectors.surveyaction.ffdc.SurveyServiceAuditCode; import org.odpi.openmetadata.frameworks.connectors.Connector; import org.odpi.openmetadata.frameworks.connectors.ffdc.ConnectorCheckedException; import org.odpi.openmetadata.frameworks.connectors.ffdc.InvalidParameterException; import org.odpi.openmetadata.frameworks.connectors.ffdc.PropertyServerException; import org.odpi.openmetadata.frameworks.connectors.ffdc.UserNotAuthorizedException; import org.odpi.openmetadata.frameworks.connectors.properties.AssetUniverse; +import org.odpi.openmetadata.frameworks.governanceaction.fileclassifier.FileClassifier; import org.odpi.openmetadata.frameworks.governanceaction.mapper.OpenMetadataType; import org.odpi.openmetadata.frameworks.governanceaction.search.PropertyHelper; import org.odpi.openmetadata.frameworks.surveyaction.AnnotationStore; @@ -21,7 +23,8 @@ import org.odpi.openmetadata.frameworks.surveyaction.properties.DataProfileLogAnnotation; import org.odpi.openmetadata.frameworks.surveyaction.properties.DataSourceMeasurementAnnotation; -import java.io.*; +import java.io.File; +import java.io.IOException; import java.util.*; @@ -113,7 +116,7 @@ else if (! propertyHelper.isTypeOf(assetUniverse, OpenMetadataType.FILE_FOLDER.t * the cast will fail. */ connector = assetStore.getConnectorToAsset(); - BasicFileStore assetConnector = (BasicFileStore)connector; + BasicFolderConnector assetConnector = (BasicFolderConnector)connector; File rootFolder = assetConnector.getFile(); @@ -234,29 +237,45 @@ private String setUpExternalLogFile(String surveyReportGUID, PropertyServerException, UserNotAuthorizedException { - String logFileName = "surveys/report" + surveyReportGUID + "-fileNameCounts.csv"; - File logFile = new File(logFileName); + final String methodName = "setUpExternalLogFile"; - FileWriter fileWriter = new FileWriter(logFile); - PrintWriter printWriter = new PrintWriter(fileWriter); + String logFileName = "surveys/report-" + surveyReportGUID + "-fileNameCounts.csv"; + SurveyAssetStore assetStore = surveyContext.getAssetStore(); - printWriter.print("FileName, Number of Occurrences"); + String assetGUID = assetStore.addCSVFileToCatalog("File name counts for survey report " + surveyReportGUID, + "Shows how many occurrences of each file name was found in the nested directory structure.", + logFileName, + null, + ',', + '"'); - for (String fileName : fileNameCounts.keySet()) + File logFile = new File(logFileName); + + if (logFile.exists()) + { + auditLog.logMessage(methodName, + SurveyServiceAuditCode.REUSING_LOG_FILE.getMessageDefinition(surveyActionServiceName, + logFileName)); + } + else { - printWriter.printf("%s, %d", fileName, fileNameCounts.get(fileName)); + auditLog.logMessage(methodName, + SurveyServiceAuditCode.CREATING_LOG_FILE.getMessageDefinition(surveyActionServiceName, + logFileName, + assetGUID)); + + FileUtils.writeStringToFile(logFile, "FileName, Number of Occurrences\n", (String)null, false); } - printWriter.close(); - SurveyAssetStore assetStore = surveyContext.getAssetStore(); + for (String fileName : fileNameCounts.keySet()) + { + String row = fileName + "," + fileNameCounts.get(fileName) + "\n"; + + FileUtils.writeStringToFile(logFile, row, (String)null, true); + } - return assetStore.addCSVFileToCatalog("File name counts for survey report " + surveyReportGUID, - "Shows how many occurrences of each file name was found in the nested directory structure.", - logFileName, - null, - ',', - '"'); + return assetGUID; } diff --git a/open-metadata-implementation/adapters/open-connectors/survey-action-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/surveyaction/surveyfolder/FolderSurveyServiceProvider.java b/open-metadata-implementation/adapters/open-connectors/survey-action-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/surveyaction/surveyfolder/FolderSurveyServiceProvider.java index a400c4f27ed..0efda9e9e3a 100644 --- a/open-metadata-implementation/adapters/open-connectors/survey-action-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/surveyaction/surveyfolder/FolderSurveyServiceProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/survey-action-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/surveyaction/surveyfolder/FolderSurveyServiceProvider.java @@ -2,6 +2,8 @@ /* Copyright Contributors to the ODPi Egeria project. */ package org.odpi.openmetadata.adapters.connectors.surveyaction.surveyfolder; +import org.odpi.openmetadata.frameworks.auditlog.AuditLogReportingComponent; +import org.odpi.openmetadata.frameworks.auditlog.ComponentDevelopmentStatus; import org.odpi.openmetadata.frameworks.connectors.properties.beans.ConnectorType; import org.odpi.openmetadata.frameworks.governanceaction.actiontargettype.ActionTargetType; import org.odpi.openmetadata.frameworks.governanceaction.refdata.DeployedImplementationType; @@ -15,28 +17,41 @@ */ public class FolderSurveyServiceProvider extends SurveyActionServiceProvider { - static final String connectorTypeGUID = "297ede10-a004-4aa6-9af3-55e400551531"; - static final String connectorTypeName = "Folder Survey Action Service Connector"; - static final String connectorTypeDescription = "Connector supports the surveying of file in a directory (folder) and the directories beneath it."; + /* + * Unique identifier of the connector for the audit log. + */ + private static final int connectorComponentId = 670; + + /* + * Descriptive information about the connector for the connector type and audit log. + */ + private static final String connectorTypeGUID = "297ede10-a004-4aa6-9af3-55e400551531"; + private static final String connectorTypeQualifiedName = "Egeria:SurveyActionService:FolderSurveyService"; + private static final String connectorTypeName = "Folder Survey Action Service Connector"; + private static final String connectorTypeDescription = "Connector supports the surveying of file in a directory (folder) and the directories beneath it."; + private static final String connectorWikiPage = "https://egeria-project.org/connectors/survey-action/folder-survey-action-service/"; + + /* + * Class of the connector. + */ + private static final String connectorClass = "org.odpi.openmetadata.adapters.connectors.surveyaction.surveyfolder.FolderSurveyService"; static final String FILE_TARGET_PROPERTY = "fileToSurvey"; /** * Constructor used to initialize the ConnectorProviderBase with the Java class name of the specific - * OCF Connector implementation. + * survey action implementation. */ public FolderSurveyServiceProvider() { super(); - String connectorClass = "org.odpi.openmetadata.adapters.connectors.surveyaction.surveyfolder.FolderSurveyService"; - super.setConnectorClassName(connectorClass); ConnectorType connectorType = new ConnectorType(); connectorType.setType(ConnectorType.getConnectorTypeType()); connectorType.setGUID(connectorTypeGUID); - connectorType.setQualifiedName(connectorTypeName); + connectorType.setQualifiedName(connectorTypeQualifiedName); connectorType.setDisplayName(connectorTypeName); connectorType.setDescription(connectorTypeDescription); connectorType.setConnectorProviderClassName(this.getClass().getName()); @@ -54,5 +69,18 @@ public FolderSurveyServiceProvider() actionTargetType.setDeployedImplementationType(DeployedImplementationType.FILE_FOLDER.getDeployedImplementationType()); super.actionTargetTypes.put(FILE_TARGET_PROPERTY, actionTargetType); + + /* + * Set up the component description used in the connector's audit log messages. + */ + AuditLogReportingComponent componentDescription = new AuditLogReportingComponent(); + + componentDescription.setComponentId(connectorComponentId); + componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.TECHNICAL_PREVIEW); + componentDescription.setComponentName(connectorTypeName); + componentDescription.setComponentDescription(connectorTypeDescription); + componentDescription.setComponentWikiURL(connectorWikiPage); + + super.setConnectorComponentDescription(componentDescription); } } diff --git a/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/ApacheAtlasRESTProvider.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/ApacheAtlasRESTProvider.java index 443ec21ac99..5f79ffbb887 100644 --- a/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/ApacheAtlasRESTProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/ApacheAtlasRESTProvider.java @@ -84,7 +84,7 @@ public ApacheAtlasRESTProvider() componentDescription.setComponentId(connectorComponentId); componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.TECHNICAL_PREVIEW); - componentDescription.setComponentName(connectorQualifiedName); + componentDescription.setComponentName(connectorDisplayName); componentDescription.setComponentDescription(connectorDescription); componentDescription.setComponentWikiURL(connectorWikiPage); 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 3084c153fa1..fcf0d732ee7 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 @@ -1398,6 +1398,7 @@ public void updateAssetWithConnection(String userId, assetGUID, assetGUIDParameterName, typeName, + qualifiedName, connection, assetSummary, forLineage, 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 61c280f9f49..32b2258321e 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 @@ -242,6 +242,7 @@ private String findConnection(String userId, * @param assetGUID unique identifier of linked asset (or null) * @param assetGUIDParameterName parameter name supplying assetGUID * @param assetTypeName type of asset + * @param parentQualifiedName qualified name of associated asset/connection * @param connection object to add * @param assetSummary description of the asset for the connection * @param forLineage return elements marked with the Memento classification? @@ -261,6 +262,7 @@ public String saveConnection(String userId, String assetGUID, String assetGUIDParameterName, String assetTypeName, + String parentQualifiedName, Connection connection, String assetSummary, boolean forLineage, @@ -296,6 +298,7 @@ public String saveConnection(String userId, assetGUID, assetGUIDParameterName, assetTypeName, + parentQualifiedName, connection, assetSummary, forLineage, @@ -326,8 +329,8 @@ public String saveConnection(String userId, * @param externalSourceGUID guid of the software capability entity that represented the external source - null for local * @param externalSourceName name of the software capability entity that represented the external source * @param anchorGUID unique identifier of the anchor entity if applicable - * @param anchorTypeName type name of anchor * @param connectionGUID unique identifier of connected connection + * @param connectionQualifiedName connection qualified name * @param endpoint endpoint object or null * @param connectorType connector type object or null * @param embeddedConnections list of embedded connections or null - only for Virtual Connections @@ -344,8 +347,8 @@ private void saveAssociatedConnectionEntities(String userId, String externalSourceGUID, String externalSourceName, String anchorGUID, - String anchorTypeName, String connectionGUID, + String connectionQualifiedName, Endpoint endpoint, ConnectorType connectorType, List embeddedConnections, @@ -370,6 +373,7 @@ private void saveAssociatedConnectionEntities(String userId, String endpointGUID = endpointHandler.saveEndpoint(userId, externalSourceGUID, externalSourceName, + connectionQualifiedName, endpoint, forLineage, forDuplicateProcessing, @@ -422,6 +426,7 @@ private void saveAssociatedConnectionEntities(String userId, String connectorTypeGUID = connectorTypeHandler.saveConnectorType(userId, externalSourceGUID, externalSourceName, + connectionQualifiedName, connectorType, methodName); @@ -497,6 +502,7 @@ private void saveAssociatedConnectionEntities(String userId, null, null, null, + connectionQualifiedName, realConnection, null, forLineage, @@ -514,10 +520,8 @@ private void saveAssociatedConnectionEntities(String userId, serviceName, serverName); - embeddedConnectionBuilder.setAnchors(userId, anchorGUID, anchorTypeName, methodName); - repositoryHandler.createRelationship(userId, - OpenMetadataType.CONNECTION_CONNECTOR_TYPE_TYPE_GUID, + OpenMetadataType.EMBEDDED_CONNECTION_TYPE_GUID, externalSourceGUID, externalSourceName, connectionGUID, @@ -543,6 +547,7 @@ private void saveAssociatedConnectionEntities(String userId, * @param assetGUID unique identifier of linked asset (or null) * @param assetGUIDParameterName parameter name supplying assetGUID * @param assetTypeName type of asset + * @param parentQualifiedName qualified name of parent asset/connection * @param connection object to add * @param assetSummary description of the asset for the connection * @param forLineage return elements marked with the Memento classification? @@ -562,6 +567,7 @@ private String addConnection(String userId, String assetGUID, String assetGUIDParameterName, String assetTypeName, + String parentQualifiedName, Connection connection, String assetSummary, boolean forLineage, @@ -609,7 +615,14 @@ private String addConnection(String userId, } } - ConnectionBuilder connectionBuilder = new ConnectionBuilder(connection.getQualifiedName(), + String connectionQualifiedName = connection.getQualifiedName(); + + if ((connectionQualifiedName == null) && (parentQualifiedName != null)) + { + connectionQualifiedName = parentQualifiedName + "-" +connectionTypeName; + } + + ConnectionBuilder connectionBuilder = new ConnectionBuilder(connectionQualifiedName, connection.getDisplayName(), connection.getDescription(), connection.getAdditionalProperties(), @@ -645,8 +658,8 @@ private String addConnection(String userId, externalSourceGUID, externalSourceName, anchorGUID, - anchorTypeName, connectionGUID, + connectionQualifiedName, connection.getEndpoint(), connection.getConnectorType(), embeddedConnections, @@ -770,8 +783,8 @@ private String updateConnection(String userId, externalSourceGUID, externalSourceName, anchorGUID, - null, existingConnectionGUID, + connection.getQualifiedName(), connection.getEndpoint(), connection.getConnectorType(), embeddedConnections, 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 11096822146..20740eafe29 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 @@ -178,6 +178,7 @@ private String findConnectorType(String userId, * @param userId calling userId * @param externalSourceGUID guid of the software capability entity that represented the external source - null for local * @param externalSourceName name of the software capability entity that represented the external source + * @param parentQualifiedName qualified name of parent object (typically connection) * @param connectorType object to add * @param methodName calling method * @@ -189,6 +190,7 @@ private String findConnectorType(String userId, String saveConnectorType(String userId, String externalSourceGUID, String externalSourceName, + String parentQualifiedName, ConnectorType connectorType, String methodName) throws InvalidParameterException, PropertyServerException, @@ -200,11 +202,18 @@ String saveConnectorType(String userId, if (existingConnectorType == null) { + String connectorTypeQualifiedName = connectorType.getQualifiedName(); + + if (connectorTypeQualifiedName == null) + { + connectorTypeQualifiedName = parentQualifiedName + "-ConnectorType"; + } + return this.createConnectorType(userId, externalSourceGUID, externalSourceName, null, - connectorType.getQualifiedName(), + connectorTypeQualifiedName, connectorType.getDisplayName(), connectorType.getDescription(), connectorType.getSupportedAssetTypeName(), @@ -258,7 +267,7 @@ String saveConnectorType(String userId, null, null, null, - false, + true, false, false, new Date(), @@ -340,7 +349,7 @@ public String createConnectorType(String userId, PropertyServerException, UserNotAuthorizedException { - final String nameParameter = "qualifiedName"; + final String nameParameter = "connectorType.qualifiedName"; final String anchorGUIDParameter = "anchorGUID"; invalidParameterHandler.validateName(qualifiedName, nameParameter, methodName); @@ -748,7 +757,10 @@ public void updateConnectorType(String userId, { final String nameParameter = "qualifiedName"; - invalidParameterHandler.validateName(qualifiedName, nameParameter, methodName); + if (! isMergeUpdate) + { + invalidParameterHandler.validateName(qualifiedName, nameParameter, methodName); + } String typeName = OpenMetadataType.CONNECTOR_TYPE_TYPE_NAME; 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 3100f790f70..bf2a67963fc 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 @@ -180,6 +180,7 @@ private String findEndpoint(String userId, * @param userId calling userId * @param externalSourceGUID guid of the software capability entity that represented the external source - null for local * @param externalSourceName name of the software capability entity that represented the external source + * @param parentQualifiedName qualified name of parent - typically the connection * @param endpoint object to add * @param forLineage return elements marked with the Memento classification? * @param forDuplicateProcessing do not merge elements marked as duplicates? @@ -193,6 +194,7 @@ private String findEndpoint(String userId, String saveEndpoint(String userId, String externalSourceGUID, String externalSourceName, + String parentQualifiedName, Endpoint endpoint, boolean forLineage, boolean forDuplicateProcessing, @@ -205,11 +207,17 @@ String saveEndpoint(String userId, if (existingEndpointGUID == null) { + String endpointQualifiedName = endpoint.getQualifiedName(); + + if (endpointQualifiedName == null) + { + endpointQualifiedName = parentQualifiedName + "-Endpoint"; + } return createEndpoint(userId, externalSourceGUID, externalSourceName, null, - endpoint.getQualifiedName(), + endpointQualifiedName, endpoint.getDisplayName(), endpoint.getDescription(), endpoint.getAddress(), @@ -239,7 +247,7 @@ String saveEndpoint(String userId, endpoint.getAdditionalProperties(), null, null, - false, + true, null, null, forLineage, @@ -300,7 +308,7 @@ public String createEndpoint(String userId, PropertyServerException, UserNotAuthorizedException { - final String nameParameter = "qualifiedName"; + final String nameParameter = "endpoint.qualifiedName"; final String anchorGUIDParameter = "anchorGUID"; invalidParameterHandler.validateName(qualifiedName, nameParameter, methodName); @@ -575,7 +583,10 @@ public void updateEndpoint(String userId, { final String nameParameter = "qualifiedName"; - invalidParameterHandler.validateName(qualifiedName, nameParameter, methodName); + if (! isMergeUpdate) + { + invalidParameterHandler.validateName(qualifiedName, nameParameter, methodName); + } String typeName = OpenMetadataType.ENDPOINT_TYPE_NAME; diff --git a/open-metadata-implementation/frameworks/open-connector-framework/src/main/java/org/odpi/openmetadata/frameworks/connectors/properties/beans/Connection.java b/open-metadata-implementation/frameworks/open-connector-framework/src/main/java/org/odpi/openmetadata/frameworks/connectors/properties/beans/Connection.java index 2aba68db7f2..2362e96c4af 100644 --- a/open-metadata-implementation/frameworks/open-connector-framework/src/main/java/org/odpi/openmetadata/frameworks/connectors/properties/beans/Connection.java +++ b/open-metadata-implementation/frameworks/open-connector-framework/src/main/java/org/odpi/openmetadata/frameworks/connectors/properties/beans/Connection.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.*; +import java.io.Serial; import java.util.HashMap; import java.util.Map; import java.util.Objects; @@ -14,7 +15,6 @@ /** * The connection is an object that contains the properties needed to create and initialise a connector to access a * specific data assets. - * * The properties for a connection are defined in model 0201. They include the following options for connector name: *
    *
  • @@ -37,7 +37,6 @@ *
* * Either the guid, qualifiedName or displayName can be used to specify the name for a connection. - * * Other properties for the connection include: *
    *
  • @@ -92,7 +91,8 @@ }) public class Connection extends Referenceable { - private static final long serialVersionUID = 1L; + @Serial + private static final long serialVersionUID = 1L; /* * Attributes of a connector diff --git a/open-metadata-implementation/frameworks/open-connector-framework/src/main/java/org/odpi/openmetadata/frameworks/connectors/properties/beans/EmbeddedConnection.java b/open-metadata-implementation/frameworks/open-connector-framework/src/main/java/org/odpi/openmetadata/frameworks/connectors/properties/beans/EmbeddedConnection.java index 26c734d9913..7e7d60469b4 100644 --- a/open-metadata-implementation/frameworks/open-connector-framework/src/main/java/org/odpi/openmetadata/frameworks/connectors/properties/beans/EmbeddedConnection.java +++ b/open-metadata-implementation/frameworks/open-connector-framework/src/main/java/org/odpi/openmetadata/frameworks/connectors/properties/beans/EmbeddedConnection.java @@ -7,6 +7,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; +import java.io.Serial; import java.util.HashMap; import java.util.Map; import java.util.Objects; @@ -23,7 +24,8 @@ @JsonIgnoreProperties(ignoreUnknown=true) public class EmbeddedConnection extends PropertyBase { - private static final long serialVersionUID = 1L; + @Serial + private static final long serialVersionUID = 1L; /* * Attributes of an embedded connection diff --git a/open-metadata-implementation/frameworks/open-connector-framework/src/main/java/org/odpi/openmetadata/frameworks/connectors/properties/beans/Endpoint.java b/open-metadata-implementation/frameworks/open-connector-framework/src/main/java/org/odpi/openmetadata/frameworks/connectors/properties/beans/Endpoint.java index 008ee20bd2d..b9e83153469 100644 --- a/open-metadata-implementation/frameworks/open-connector-framework/src/main/java/org/odpi/openmetadata/frameworks/connectors/properties/beans/Endpoint.java +++ b/open-metadata-implementation/frameworks/open-connector-framework/src/main/java/org/odpi/openmetadata/frameworks/connectors/properties/beans/Endpoint.java @@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; +import java.io.Serial; import java.util.Objects; import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.NONE; @@ -65,7 +66,8 @@ @JsonIgnoreProperties(ignoreUnknown=true) public class Endpoint extends Referenceable { - private static final long serialVersionUID = 1L; + @Serial + private static final long serialVersionUID = 1L; /* * Properties of an Endpoint diff --git a/open-metadata-implementation/frameworks/open-connector-framework/src/main/java/org/odpi/openmetadata/frameworks/connectors/properties/beans/VirtualConnection.java b/open-metadata-implementation/frameworks/open-connector-framework/src/main/java/org/odpi/openmetadata/frameworks/connectors/properties/beans/VirtualConnection.java index 04e87586abf..535067be928 100644 --- a/open-metadata-implementation/frameworks/open-connector-framework/src/main/java/org/odpi/openmetadata/frameworks/connectors/properties/beans/VirtualConnection.java +++ b/open-metadata-implementation/frameworks/open-connector-framework/src/main/java/org/odpi/openmetadata/frameworks/connectors/properties/beans/VirtualConnection.java @@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; +import java.io.Serial; import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -22,7 +23,8 @@ @JsonIgnoreProperties(ignoreUnknown=true) public class VirtualConnection extends Connection { - private static final long serialVersionUID = 1L; + @Serial + private static final long serialVersionUID = 1L; /* * Attributes of a virtual connection diff --git a/open-metadata-resources/open-metadata-reports/component-id-report/build.gradle b/open-metadata-resources/open-metadata-reports/component-id-report/build.gradle index 26def53f5d9..72dd96fab21 100644 --- a/open-metadata-resources/open-metadata-reports/component-id-report/build.gradle +++ b/open-metadata-resources/open-metadata-reports/component-id-report/build.gradle @@ -13,6 +13,7 @@ dependencies { implementation project(':open-metadata-implementation:frameworks:open-connector-framework') runtimeOnly project(':open-metadata-implementation:frameworks:open-discovery-framework') runtimeOnly project(':open-metadata-implementation:frameworks:governance-action-framework') + runtimeOnly project(':open-metadata-implementation:frameworks:survey-action-framework') implementation project(':open-metadata-implementation:repository-services:repository-services-apis') compileOnly project(':open-metadata-implementation:platform-services:platform-services-client') implementation project(':open-metadata-implementation:admin-services:admin-services-api') @@ -21,11 +22,17 @@ dependencies { runtimeOnly project(':open-metadata-implementation:adapters:open-connectors:repository-services-connectors:open-metadata-archive-connectors:open-metadata-archive-file-connector') runtimeOnly project(':open-metadata-implementation:adapters:open-connectors:repository-services-connectors:open-metadata-archive-connectors:open-metadata-archive-directory-connector') runtimeOnly project(':open-metadata-implementation:adapters:open-connectors:repository-services-connectors:open-metadata-collection-store-connectors:inmemory-repository-connector') + runtimeOnly project(':open-metadata-implementation:adapters:open-connectors:repository-services-connectors:open-metadata-collection-store-connectors:xtdb-repository-connector') runtimeOnly project(':open-metadata-implementation:adapters:open-connectors:repository-services-connectors:open-metadata-collection-store-connectors:omrs-rest-repository-connector') runtimeOnly project(':open-metadata-resources:open-metadata-samples:open-metadata-security-samples') runtimeOnly project(':open-metadata-implementation:adapters:open-connectors:data-store-connectors:jdbc-resource-connector') + runtimeOnly project(':open-metadata-implementation:adapters:open-connectors:data-store-connectors:file-connectors:basic-file-connector') + runtimeOnly project(':open-metadata-implementation:adapters:open-connectors:data-store-connectors:file-connectors:csv-file-connector') + runtimeOnly project(':open-metadata-implementation:adapters:open-connectors:data-store-connectors:file-connectors:data-folder-connector') + runtimeOnly project(':open-metadata-implementation:adapters:open-connectors:event-bus-connectors:open-metadata-topic-connectors:inmemory-open-metadata-topic-connector') runtimeOnly project(':open-metadata-implementation:adapters:open-connectors:event-bus-connectors:open-metadata-topic-connectors:kafka-open-metadata-topic-connector') runtimeOnly project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:atlas-integration-connector') + runtimeOnly project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:csv-lineage-import-integration-connector') runtimeOnly project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:egeria-infrastructure-integration-connector') runtimeOnly project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:files-integration-connectors') runtimeOnly project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:jdbc-integration-connector') @@ -35,6 +42,8 @@ dependencies { runtimeOnly project(':open-metadata-implementation:adapters:open-connectors:secrets-store-connectors:env-variable-secrets-store-connector') runtimeOnly project(':open-metadata-implementation:adapters:open-connectors:system-connectors:apache-atlas-rest-connector') runtimeOnly project(':open-metadata-implementation:adapters:open-connectors:discovery-service-connectors') + runtimeOnly project(':open-metadata-implementation:adapters:open-connectors:governance-action-connectors') + runtimeOnly project(':open-metadata-implementation:adapters:open-connectors:survey-action-connectors') runtimeOnly 'ch.qos.logback:logback-classic' } diff --git a/open-metadata-resources/open-metadata-reports/component-id-report/src/main/java/org/odpi/openmetadata/reports/componentid/ComponentIdReport.java b/open-metadata-resources/open-metadata-reports/component-id-report/src/main/java/org/odpi/openmetadata/reports/componentid/ComponentIdReport.java index 7374b23f07d..db43221c9ab 100644 --- a/open-metadata-resources/open-metadata-reports/component-id-report/src/main/java/org/odpi/openmetadata/reports/componentid/ComponentIdReport.java +++ b/open-metadata-resources/open-metadata-reports/component-id-report/src/main/java/org/odpi/openmetadata/reports/componentid/ComponentIdReport.java @@ -33,16 +33,23 @@ public class ComponentIdReport private static final String fileMetadataArchiveConnector = "org.odpi.openmetadata.adapters.repositoryservices.archiveconnector.file.FileBasedOpenMetadataArchiveStoreProvider"; private static final String inMemRepositoryConnector = "org.odpi.openmetadata.adapters.repositoryservices.inmemory.repositoryconnector.InMemoryOMRSRepositoryConnectorProvider"; private static final String readOnlyRepositoryConnector = "org.odpi.openmetadata.adapters.repositoryservices.readonly.repositoryconnector.ReadOnlyOMRSRepositoryConnectorProvider"; + private static final String xtdbRepositoryConnector = "org.odpi.openmetadata.adapters.repositoryservices.xtdb.repositoryconnector.XTDBOMRSRepositoryConnectorProvider"; + private static final String janusRepositoryConnector = "org.odpi.openmetadata.adapters.repositoryservices.graphrepository.repositoryconnector.GraphOMRSRepositoryConnectorProvider"; private static final String restRepositoryConnector = "org.odpi.openmetadata.adapters.repositoryservices.rest.repositoryconnector.OMRSRESTRepositoryConnectorProvider"; private static final String platformSecurityConnectorProviderClassName = "org.odpi.openmetadata.metadatasecurity.samples.CocoPharmaPlatformSecurityProvider"; private static final String serverSecurityConnectorProviderClassName = "org.odpi.openmetadata.metadatasecurity.samples.CocoPharmaServerSecurityProvider"; private static final String jdbcResourceConnectorProviderClassName = "org.odpi.openmetadata.adapters.connectors.resource.jdbc.JDBCResourceConnectorProvider"; + private static final String dataFolderResourceConnectorProviderClassName = "org.odpi.openmetadata.adapters.connectors.datastore.datafolder.DataFolderProvider"; + private static final String fileFolderResourceConnectorProviderClassName = "org.odpi.openmetadata.adapters.connectors.datastore.basicfile.BasicFolderProvider"; + private static final String fileResourceConnectorProviderClassName = "org.odpi.openmetadata.adapters.connectors.datastore.basicfile.BasicFileStoreProvider"; + private static final String csvFileResourceConnectorProviderClassName = "org.odpi.openmetadata.adapters.connectors.datastore.csvfile.CSVFileStoreProvider"; + private static final String inmemTopicConnectorProviderClassName = "org.odpi.openmetadata.adapters.eventbus.topic.inmemory.InMemoryOpenMetadataTopicProvider"; private static final String kafkaTopicConnectorProviderClassName = "org.odpi.openmetadata.adapters.eventbus.topic.kafka.KafkaOpenMetadataTopicProvider"; private static final String atlasIntegrationConnectorProviderClassName = "org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.ApacheAtlasIntegrationProvider"; private static final String egeriaIntegrationConnectorProviderClassName = "org.odpi.openmetadata.adapters.connectors.integration.egeria.EgeriaCataloguerIntegrationProvider"; private static final String filesIntegrationConnectorProviderClassName = "org.odpi.openmetadata.adapters.connectors.integration.basicfiles.DataFilesMonitorIntegrationProvider"; private static final String foldersIntegrationConnectorProviderClassName = "org.odpi.openmetadata.adapters.connectors.integration.basicfiles.DataFolderMonitorIntegrationProvider"; - private static final String csvLineageImporterIntegrationConnectorProviderClassName = "org.odpi.openmetadata.adapters.connectors.integration.basicfiles.CSVLineageImporterProvider"; + private static final String csvLineageImporterIntegrationConnectorProviderClassName = "org.odpi.openmetadata.adapters.connectors.integration.csvlineageimporter.CSVLineageImporterProvider"; private static final String jdbcIntegrationConnectorProviderClassName = "org.odpi.openmetadata.adapters.connectors.integration.jdbc.JDBCIntegrationConnectorProvider"; private static final String kafkaIntegrationConnectorProviderClassName = "org.odpi.openmetadata.adapters.connectors.integration.kafka.KafkaMonitorIntegrationProvider"; private static final String openAPIIntegrationConnectorProviderClassName = "org.odpi.openmetadata.adapters.connectors.integration.openapis.OpenAPIMonitorIntegrationProvider"; @@ -54,6 +61,10 @@ public class ComponentIdReport private static final String envVarSecretsStoreProviderClassName = "org.odpi.openmetadata.adapters.connectors.secretsstore.envar.EnvVarSecretsStoreProvider"; private static final String apacheAtlasRESTConnectorProviderClassName = "org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.ApacheAtlasRESTProvider"; private static final String apacheAtlasDiscoveryServiceProviderClassName = "org.odpi.openmetadata.adapters.connectors.discoveryservices.discoveratlas.DiscoverApacheAtlasProvider"; + private static final String sequentialSurveyPipelineProviderClassName = "org.odpi.openmetadata.adapters.connectors.surveyaction.SequentialSurveyPipelineProvider"; + private static final String folderSurveyActionProviderClassName = "org.odpi.openmetadata.adapters.connectors.surveyaction.surveyfolder.FolderSurveyServiceProvider"; + private static final String fileSurveyActionProviderClassName = "org.odpi.openmetadata.adapters.connectors.surveyaction.surveyfile.FileSurveyServiceProvider"; + private static final String csvFileSurveyActionProviderClassName = "org.odpi.openmetadata.adapters.connectors.surveyaction.surveycsv.CSVSurveyServiceProvider"; /** @@ -199,11 +210,18 @@ public void run() throws IOException this.addConnectorDescription(directoryMetadataArchiveConnector, report); this.addConnectorDescription(fileMetadataArchiveConnector, report); this.addConnectorDescription(inMemRepositoryConnector, report); + // Problem with gradle file this.addConnectorDescription(janusRepositoryConnector, report); + this.addConnectorDescription(xtdbRepositoryConnector, report); this.addConnectorDescription(readOnlyRepositoryConnector, report); this.addConnectorDescription(restRepositoryConnector, report); this.addConnectorDescription(platformSecurityConnectorProviderClassName, report); this.addConnectorDescription(serverSecurityConnectorProviderClassName, report); this.addConnectorDescription(jdbcResourceConnectorProviderClassName, report); + this.addConnectorDescription(csvFileResourceConnectorProviderClassName, report); + this.addConnectorDescription(fileResourceConnectorProviderClassName, report); + this.addConnectorDescription(fileFolderResourceConnectorProviderClassName, report); + this.addConnectorDescription(dataFolderResourceConnectorProviderClassName, report); + this.addConnectorDescription(inmemTopicConnectorProviderClassName, report); this.addConnectorDescription(kafkaTopicConnectorProviderClassName, report); this.addConnectorDescription(atlasIntegrationConnectorProviderClassName, report); this.addConnectorDescription(egeriaIntegrationConnectorProviderClassName, report); @@ -221,6 +239,10 @@ public void run() throws IOException this.addConnectorDescription(envVarSecretsStoreProviderClassName, report); this.addConnectorDescription(apacheAtlasRESTConnectorProviderClassName, report); this.addConnectorDescription(apacheAtlasDiscoveryServiceProviderClassName, report); + this.addConnectorDescription(folderSurveyActionProviderClassName, report); + this.addConnectorDescription(fileSurveyActionProviderClassName, report); + this.addConnectorDescription(csvFileSurveyActionProviderClassName, report); + this.addConnectorDescription(sequentialSurveyPipelineProviderClassName, report); File reportFile = new File(reportFileName); diff --git a/open-metadata-resources/open-metadata-samples/open-metadata-security-samples/src/main/java/org/odpi/openmetadata/metadatasecurity/samples/CocoPharmaPlatformSecurityProvider.java b/open-metadata-resources/open-metadata-samples/open-metadata-security-samples/src/main/java/org/odpi/openmetadata/metadatasecurity/samples/CocoPharmaPlatformSecurityProvider.java index 8217f43c9d9..d84b382b394 100644 --- a/open-metadata-resources/open-metadata-samples/open-metadata-security-samples/src/main/java/org/odpi/openmetadata/metadatasecurity/samples/CocoPharmaPlatformSecurityProvider.java +++ b/open-metadata-resources/open-metadata-samples/open-metadata-security-samples/src/main/java/org/odpi/openmetadata/metadatasecurity/samples/CocoPharmaPlatformSecurityProvider.java @@ -70,7 +70,7 @@ public CocoPharmaPlatformSecurityProvider() componentDescription.setComponentId(connectorComponentId); componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.STABLE); - componentDescription.setComponentName(connectorQualifiedName); + componentDescription.setComponentName(connectorDisplayName); componentDescription.setComponentDescription(connectorDescription); componentDescription.setComponentWikiURL(connectorWikiPage); diff --git a/open-metadata-resources/open-metadata-samples/open-metadata-security-samples/src/main/java/org/odpi/openmetadata/metadatasecurity/samples/CocoPharmaServerSecurityProvider.java b/open-metadata-resources/open-metadata-samples/open-metadata-security-samples/src/main/java/org/odpi/openmetadata/metadatasecurity/samples/CocoPharmaServerSecurityProvider.java index a8c4935157a..fc3c7740b76 100644 --- a/open-metadata-resources/open-metadata-samples/open-metadata-security-samples/src/main/java/org/odpi/openmetadata/metadatasecurity/samples/CocoPharmaServerSecurityProvider.java +++ b/open-metadata-resources/open-metadata-samples/open-metadata-security-samples/src/main/java/org/odpi/openmetadata/metadatasecurity/samples/CocoPharmaServerSecurityProvider.java @@ -70,7 +70,7 @@ public CocoPharmaServerSecurityProvider() componentDescription.setComponentId(connectorComponentId); componentDescription.setComponentDevelopmentStatus(ComponentDevelopmentStatus.STABLE); - componentDescription.setComponentName(connectorQualifiedName); + componentDescription.setComponentName(connectorDisplayName); componentDescription.setComponentDescription(connectorDescription); componentDescription.setComponentWikiURL(connectorWikiPage);