From 4f3979fe0fbdc57b6484eff6f482f484f2f29c81 Mon Sep 17 00:00:00 2001 From: Mandy Chessell Date: Tue, 5 Sep 2023 13:12:17 +0100 Subject: [PATCH 1/4] Rename report packages to match gradle Signed-off-by: Mandy Chessell --- .../component-id-report/build.gradle | 11 ++++ .../componentid/ComponentIdReport.java | 66 ++++++++++++++----- .../databasereport/DatabaseReport.java | 6 +- .../platform/EgeriaPlatformReport.java | 28 ++++++-- .../reports/EgeriaReport.java | 2 +- 5 files changed, 85 insertions(+), 28 deletions(-) rename open-metadata-resources/open-metadata-reports/component-id-report/src/main/java/org/odpi/openmetadata/{devprojects => }/reports/componentid/ComponentIdReport.java (64%) rename open-metadata-resources/open-metadata-reports/database-report/src/main/java/org/odpi/openmetadata/{devprojects => }/reports/databasereport/DatabaseReport.java (99%) rename open-metadata-resources/open-metadata-reports/report-utilities/src/main/java/org/odpi/openmetadata/{devprojects => }/reports/EgeriaReport.java (99%) 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 3db8da88cfe..bd5d27eceb2 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 @@ -22,6 +22,17 @@ dependencies { 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: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: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: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') + runtimeOnly project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:kafka-integration-connector') + runtimeOnly project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:openapi-integration-connector') + runtimeOnly project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:openlineage-integration-connectors') + 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 'ch.qos.logback:logback-classic' } diff --git a/open-metadata-resources/open-metadata-reports/component-id-report/src/main/java/org/odpi/openmetadata/devprojects/reports/componentid/ComponentIdReport.java b/open-metadata-resources/open-metadata-reports/component-id-report/src/main/java/org/odpi/openmetadata/reports/componentid/ComponentIdReport.java similarity index 64% rename from open-metadata-resources/open-metadata-reports/component-id-report/src/main/java/org/odpi/openmetadata/devprojects/reports/componentid/ComponentIdReport.java rename to open-metadata-resources/open-metadata-reports/component-id-report/src/main/java/org/odpi/openmetadata/reports/componentid/ComponentIdReport.java index 093f74a3ae4..4cf19ea3285 100644 --- a/open-metadata-resources/open-metadata-reports/component-id-report/src/main/java/org/odpi/openmetadata/devprojects/reports/componentid/ComponentIdReport.java +++ b/open-metadata-resources/open-metadata-reports/component-id-report/src/main/java/org/odpi/openmetadata/reports/componentid/ComponentIdReport.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.devprojects.reports.componentid; +package org.odpi.openmetadata.reports.componentid; import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceDescription; import org.odpi.openmetadata.adminservices.configuration.registration.EngineServiceDescription; @@ -22,20 +22,36 @@ */ public class ComponentIdReport { - private static String reportFileName = "component-id-report.md"; - private static String licenseString = "\n"; - private static String copyrightString = "\n\n"; - private static String reportHeader = "| ComponentId | ComponentName | ComponentDescription | Component Home Page | \n| :--- | :--- | :--- | :--- |\n"; - private static String snippetString = "\n--8<-- \"snippets/abbr.md\""; - - private static String fileCohortRegistryConnector = "org.odpi.openmetadata.adapters.repositoryservices.cohortregistrystore.file.FileBasedRegistryStoreProvider"; - private static String directoryMetadataArchiveConnector = "org.odpi.openmetadata.adapters.repositoryservices.archiveconnector.directory.DirectoryBasedOpenMetadataArchiveStoreProvider"; - private static String fileMetadataArchiveConnector = "org.odpi.openmetadata.adapters.repositoryservices.archiveconnector.file.FileBasedOpenMetadataArchiveStoreProvider"; - private static String inMemRepositoryConnector = "org.odpi.openmetadata.adapters.repositoryservices.inmemory.repositoryconnector.InMemoryOMRSRepositoryConnectorProvider"; - private static String readOnlyRepositoryConnector = "org.odpi.openmetadata.adapters.repositoryservices.readonly.repositoryconnector.ReadOnlyOMRSRepositoryConnectorProvider"; - private static String restRepositoryConnector = "org.odpi.openmetadata.adapters.repositoryservices.rest.repositoryconnector.OMRSRESTRepositoryConnectorProvider"; - private static String platformSecurityConnectorProviderClassName = "org.odpi.openmetadata.metadatasecurity.samples.CocoPharmaPlatformSecurityProvider"; - private static String serverSecurityConnectorProviderClassName = "org.odpi.openmetadata.metadatasecurity.samples.CocoPharmaServerSecurityProvider"; + private static final String reportFileName = "component-id-report.md"; + private static final String licenseString = "\n"; + private static final String copyrightString = "\n\n"; + private static final String reportHeader = "| ComponentId | ComponentName | ComponentDescription | Component Home Page | \n| :--- | :--- | :--- | :--- |\n"; + private static final String snippetString = "\n--8<-- \"snippets/abbr.md\""; + + private static final String fileCohortRegistryConnector = "org.odpi.openmetadata.adapters.repositoryservices.cohortregistrystore.file.FileBasedRegistryStoreProvider"; + private static final String directoryMetadataArchiveConnector = "org.odpi.openmetadata.adapters.repositoryservices.archiveconnector.directory.DirectoryBasedOpenMetadataArchiveStoreProvider"; + 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 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 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 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"; + private static final String apiBasedOpenLineageLogStoreIntegrationConnectorProviderClassName = "org.odpi.openmetadata.adapters.connectors.integration.openlineage.APIBasedOpenLineageLogStoreProvider"; + private static final String fileBasedOpenLineageLogStoreIntegrationConnectorProviderClassName = "org.odpi.openmetadata.adapters.connectors.integration.openlineage.FileBasedOpenLineageLogStoreProvider"; + private static final String gaOpenLineageIntegrationConnectorProviderClassName = "org.odpi.openmetadata.adapters.connectors.integration.openlineage.GovernanceActionOpenLineageIntegrationProvider"; + private static final String openLineageCataloguerIntegrationConnectorProviderClassName = "org.odpi.openmetadata.adapters.connectors.integration.openlineage.OpenLineageCataloguerIntegrationProvider"; + private static final String openLineageEventReceiverIntegrationConnectorProviderClassName = "org.odpi.openmetadata.adapters.connectors.integration.openlineage.OpenLineageEventReceiverIntegrationProvider"; + 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"; /** @@ -52,10 +68,8 @@ private ComponentDescription getConnectorDescription(String connectorProviderCla Object potentialConnectorProvider = connectorProviderClass.getConstructor().newInstance(); - if (potentialConnectorProvider instanceof ConnectorProviderBase) + if (potentialConnectorProvider instanceof ConnectorProviderBase connectorProvider) { - ConnectorProviderBase connectorProvider = (ConnectorProviderBase) potentialConnectorProvider; - return connectorProvider.getConnectorComponentDescription(); } } @@ -187,6 +201,22 @@ public void run() throws IOException this.addConnectorDescription(restRepositoryConnector, report); this.addConnectorDescription(platformSecurityConnectorProviderClassName, report); this.addConnectorDescription(serverSecurityConnectorProviderClassName, report); + this.addConnectorDescription(jdbcResourceConnectorProviderClassName, report); + this.addConnectorDescription(kafkaTopicConnectorProviderClassName, report); + this.addConnectorDescription(atlasIntegrationConnectorProviderClassName, report); + this.addConnectorDescription(egeriaIntegrationConnectorProviderClassName, report); + this.addConnectorDescription(filesIntegrationConnectorProviderClassName, report); + this.addConnectorDescription(foldersIntegrationConnectorProviderClassName, report); + this.addConnectorDescription(jdbcIntegrationConnectorProviderClassName, report); + this.addConnectorDescription(kafkaIntegrationConnectorProviderClassName, report); + this.addConnectorDescription(openAPIIntegrationConnectorProviderClassName, report); + this.addConnectorDescription(apiBasedOpenLineageLogStoreIntegrationConnectorProviderClassName, report); + this.addConnectorDescription(fileBasedOpenLineageLogStoreIntegrationConnectorProviderClassName, report); + this.addConnectorDescription(gaOpenLineageIntegrationConnectorProviderClassName, report); + this.addConnectorDescription(openLineageCataloguerIntegrationConnectorProviderClassName, report); + this.addConnectorDescription(openLineageEventReceiverIntegrationConnectorProviderClassName, report); + this.addConnectorDescription(envVarSecretsStoreProviderClassName, report); + this.addConnectorDescription(apacheAtlasRESTConnectorProviderClassName, report); File reportFile = new File(reportFileName); diff --git a/open-metadata-resources/open-metadata-reports/database-report/src/main/java/org/odpi/openmetadata/devprojects/reports/databasereport/DatabaseReport.java b/open-metadata-resources/open-metadata-reports/database-report/src/main/java/org/odpi/openmetadata/reports/databasereport/DatabaseReport.java similarity index 99% rename from open-metadata-resources/open-metadata-reports/database-report/src/main/java/org/odpi/openmetadata/devprojects/reports/databasereport/DatabaseReport.java rename to open-metadata-resources/open-metadata-reports/database-report/src/main/java/org/odpi/openmetadata/reports/databasereport/DatabaseReport.java index e7da885b988..e2f3e006f97 100644 --- a/open-metadata-resources/open-metadata-reports/database-report/src/main/java/org/odpi/openmetadata/devprojects/reports/databasereport/DatabaseReport.java +++ b/open-metadata-resources/open-metadata-reports/database-report/src/main/java/org/odpi/openmetadata/reports/databasereport/DatabaseReport.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.devprojects.reports.databasereport; +package org.odpi.openmetadata.reports.databasereport; import org.odpi.openmetadata.accessservices.datamanager.client.DatabaseManagerClient; @@ -14,7 +14,7 @@ import org.odpi.openmetadata.accessservices.datamanager.properties.DatabaseProperties; import org.odpi.openmetadata.accessservices.datamanager.properties.DatabaseSchemaProperties; import org.odpi.openmetadata.accessservices.datamanager.properties.DatabaseTableProperties; -import org.odpi.openmetadata.devprojects.reports.EgeriaReport; +import org.odpi.openmetadata.reports.EgeriaReport; import org.odpi.openmetadata.http.HttpHelper; import org.odpi.openmetadata.platformservices.client.PlatformServicesClient; @@ -680,7 +680,7 @@ public static void main(String[] args) DatabaseReport utility = new DatabaseReport(serverName, platformURLRoot, clientUserId); - HttpHelper.noStrictSSLIfConfigured(); + HttpHelper.noStrictSSL(); String platformOrigin = utility.getPlatformOrigin(); diff --git a/open-metadata-resources/open-metadata-reports/egeria-platform-report/src/main/java/org/odpi/openmetadata/devprojects/reports/platform/EgeriaPlatformReport.java b/open-metadata-resources/open-metadata-reports/egeria-platform-report/src/main/java/org/odpi/openmetadata/devprojects/reports/platform/EgeriaPlatformReport.java index d4a6ff84912..0a1c70cdfb1 100644 --- a/open-metadata-resources/open-metadata-reports/egeria-platform-report/src/main/java/org/odpi/openmetadata/devprojects/reports/platform/EgeriaPlatformReport.java +++ b/open-metadata-resources/open-metadata-reports/egeria-platform-report/src/main/java/org/odpi/openmetadata/devprojects/reports/platform/EgeriaPlatformReport.java @@ -16,7 +16,7 @@ import org.odpi.openmetadata.adminservices.configuration.properties.ViewServiceConfig; import org.odpi.openmetadata.adminservices.configuration.registration.AccessServiceDescription; import org.odpi.openmetadata.adminservices.configuration.registration.GovernanceServicesDescription; -import org.odpi.openmetadata.devprojects.reports.EgeriaReport; +import org.odpi.openmetadata.reports.EgeriaReport; import org.odpi.openmetadata.frameworks.connectors.ffdc.InvalidParameterException; import org.odpi.openmetadata.frameworks.connectors.properties.beans.Connection; import org.odpi.openmetadata.http.HttpHelper; @@ -152,7 +152,16 @@ private void run() /* * Output requested for all servers */ - Set configuredServers = configurationManagementClient.getAllServerConfigurations(); + Set configuredServers = null; + + try + { + configuredServers = configurationManagementClient.getAllServerConfigurations(); + } + catch (Exception exception) + { + // assume no configurations + } if (configuredServers != null) { @@ -325,11 +334,18 @@ private void run() /* * Now all the details about the servers is assembled, it can be printed out. */ - for (OMAGServerDetails serverDetails : serverDetailsMap.values()) + if (serverDetailsMap.isEmpty()) { - if (serverDetails != null) + report.printReportLine(detailIndentLevel + 1, "None"); + } + else + { + for (OMAGServerDetails serverDetails : serverDetailsMap.values()) { - serverDetails.printServer(detailIndentLevel + 1); + if (serverDetails != null) + { + serverDetails.printServer(detailIndentLevel + 1); + } } } @@ -1240,7 +1256,7 @@ public static void main(String[] args) System.out.println("Using userId: " + clientUserId); System.out.println(); - HttpHelper.noStrictSSLIfConfigured(); + HttpHelper.noStrictSSL(); try { diff --git a/open-metadata-resources/open-metadata-reports/report-utilities/src/main/java/org/odpi/openmetadata/devprojects/reports/EgeriaReport.java b/open-metadata-resources/open-metadata-reports/report-utilities/src/main/java/org/odpi/openmetadata/reports/EgeriaReport.java similarity index 99% rename from open-metadata-resources/open-metadata-reports/report-utilities/src/main/java/org/odpi/openmetadata/devprojects/reports/EgeriaReport.java rename to open-metadata-resources/open-metadata-reports/report-utilities/src/main/java/org/odpi/openmetadata/reports/EgeriaReport.java index 39142ab9f0a..64dc2e5a1ee 100644 --- a/open-metadata-resources/open-metadata-reports/report-utilities/src/main/java/org/odpi/openmetadata/devprojects/reports/EgeriaReport.java +++ b/open-metadata-resources/open-metadata-reports/report-utilities/src/main/java/org/odpi/openmetadata/reports/EgeriaReport.java @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: Apache-2.0 */ /* Copyright Contributors to the ODPi Egeria project. */ -package org.odpi.openmetadata.devprojects.reports; +package org.odpi.openmetadata.reports; From bb3eb92b7e319fb56ecdef4e785e3f4fdf0108de Mon Sep 17 00:00:00 2001 From: Mandy Chessell Date: Tue, 5 Sep 2023 13:14:06 +0100 Subject: [PATCH 2/4] Fix spelling mistake Signed-off-by: Mandy Chessell --- .github/ISSUE_TEMPLATE/newrepo.yml | 2 +- .../EncryptedFileBasedServerConfigStoreConnector.java | 6 +++++- .../resource/jdbc/JDBCResourceConnectorProvider.java | 4 ++-- .../topic/inmemory/InMemoryOpenMetadataTopicProvider.java | 6 ++---- .../topic/kafka/KafkaOpenMetadataTopicProvider.java | 4 ++-- .../apacheatlas/ApacheAtlasIntegrationProvider.java | 4 ++-- .../egeria/EgeriaCataloguerIntegrationProvider.java | 4 ++-- .../BasicFilesMonitorIntegrationProviderBase.java | 6 +++--- .../basicfiles/DataFilesMonitorIntegrationProvider.java | 2 +- .../basicfiles/DataFolderMonitorIntegrationProvider.java | 2 +- .../integration/jdbc/JDBCIntegrationConnectorProvider.java | 4 ++-- .../integration/kafka/KafkaMonitorIntegrationProvider.java | 4 ++-- .../openapis/OpenAPIMonitorIntegrationProvider.java | 4 ++-- .../openlineage/APIBasedOpenLineageLogStoreProvider.java | 4 ++-- .../openlineage/FileBasedOpenLineageLogStoreProvider.java | 4 ++-- .../GovernanceActionOpenLineageIntegrationProvider.java | 4 ++-- .../OpenLineageCataloguerIntegrationProvider.java | 4 ++-- .../OpenLineageEventReceiverIntegrationProvider.java | 4 ++-- .../console/ConsoleAuditLogStoreProvider.java | 4 ++-- .../eventdisplay/EventDisplayAuditLogStoreProvider.java | 4 ++-- .../eventtopic/EventTopicAuditLogStoreProvider.java | 4 ++-- .../auditlogstore/file/FileBasedAuditLogStoreProvider.java | 4 ++-- .../auditlogstore/slf4j/SLF4JAuditLogStoreProvider.java | 4 ++-- .../file/FileBasedRegistryStoreProvider.java | 5 ++--- .../DirectoryBasedOpenMetadataArchiveStoreIterator.java | 1 - .../DirectoryBasedOpenMetadataArchiveStoreProvider.java | 5 ++--- .../file/FileBasedOpenMetadataArchiveStoreProvider.java | 4 ++-- .../GraphOMRSRepositoryConnectorProvider.java | 6 +++--- .../InMemoryOMRSRepositoryConnectorProvider.java | 7 +++---- .../ReadOnlyOMRSRepositoryConnectorProvider.java | 7 +++---- .../OMRSRESTRepositoryConnectorProvider.java | 7 +++---- .../secretsstore/envar/EnvVarSecretsStoreProvider.java | 4 ++-- .../resource/apacheatlas/ApacheAtlasRESTConnector.java | 4 +--- .../resource/apacheatlas/ApacheAtlasRESTProvider.java | 4 ++-- 34 files changed, 70 insertions(+), 76 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/newrepo.yml b/.github/ISSUE_TEMPLATE/newrepo.yml index 3c049ea9ba8..2e173439944 100644 --- a/.github/ISSUE_TEMPLATE/newrepo.yml +++ b/.github/ISSUE_TEMPLATE/newrepo.yml @@ -105,7 +105,7 @@ body: - If using containers, they will be published to quay.io & docker.io & built for arm64 + amd64 with same release versions as other artifacts - If using maven, versioning should follow 1.1 / 1.1-SNAPSHOT convention. For javascript etc use semver, ie 1.1.1 / 1.1.1-rc.0 - Follows egeria branching-strategy ie branch just before release - - Security policy aligned with egeria - common mailing list for reporting vulnarabilities + - Security policy aligned with egeria - common mailing list for reporting vulnerabilities placeholder: | Yes - all true validations: diff --git a/open-metadata-implementation/adapters/open-connectors/configuration-store-connectors/configuration-encrypted-file-store-connector/src/main/java/org/odpi/openmetadata/adapters/adminservices/configurationstore/encryptedfile/EncryptedFileBasedServerConfigStoreConnector.java b/open-metadata-implementation/adapters/open-connectors/configuration-store-connectors/configuration-encrypted-file-store-connector/src/main/java/org/odpi/openmetadata/adapters/adminservices/configurationstore/encryptedfile/EncryptedFileBasedServerConfigStoreConnector.java index 7647a107570..c24c8773eeb 100644 --- a/open-metadata-implementation/adapters/open-connectors/configuration-store-connectors/configuration-encrypted-file-store-connector/src/main/java/org/odpi/openmetadata/adapters/adminservices/configurationstore/encryptedfile/EncryptedFileBasedServerConfigStoreConnector.java +++ b/open-metadata-implementation/adapters/open-connectors/configuration-store-connectors/configuration-encrypted-file-store-connector/src/main/java/org/odpi/openmetadata/adapters/adminservices/configurationstore/encryptedfile/EncryptedFileBasedServerConfigStoreConnector.java @@ -247,8 +247,12 @@ public void removeServerConfig() { } } + /** + * {@inheritDoc} + */ @Override - public Set retrieveAllServerConfigs() { + public Set retrieveAllServerConfigs() + { final String methodName = "retrieveAllServerConfigs"; Set omagServerConfigSet = new HashSet<>(); String templateString = getStoreTemplateName(); 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 d031fe57706..222423497a6 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 @@ -58,7 +58,7 @@ public class JDBCResourceConnectorProvider extends ConnectorProviderBase /* * Class of the connector. */ - private static final Class connectorClass = JDBCResourceConnector.class; + private static final String connectorClassName = "org.odpi.openmetadata.adapters.connectors.resource.jdbc.JDBCResourceConnector"; /** * Constructor used to initialize the ConnectorProviderBase with the Java class name of the specific connector implementation. @@ -71,7 +71,7 @@ public JDBCResourceConnectorProvider() /* * Set up the class name of the connector that this provider creates. */ - super.setConnectorClassName(connectorClass.getName()); + super.setConnectorClassName(connectorClassName); /* * Set up the connector type that should be included in a connection used to configure this connector. 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 f0bab649b38..f3de933df37 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 @@ -8,8 +8,6 @@ import org.odpi.openmetadata.frameworks.connectors.properties.beans.ConnectorType; import org.odpi.openmetadata.repositoryservices.connectors.openmetadatatopic.OpenMetadataTopicProvider; -import java.util.ArrayList; -import java.util.List; /** * InMemoryOpenMetadataTopicProvider provides implementation of the connector provider for the InMemoryOpenMetadataTopicConnector. @@ -38,7 +36,7 @@ public class InMemoryOpenMetadataTopicProvider extends OpenMetadataTopicProvider /* * Class of the connector. */ - private static final Class connectorClass = InMemoryOpenMetadataTopicConnector.class; + private static final String connectorClassName = "org.odpi.openmetadata.adapters.eventbus.topic.inmemory.InMemoryOpenMetadataTopicConnector"; /** @@ -52,7 +50,7 @@ public InMemoryOpenMetadataTopicProvider() /* * Set up the class name of the connector that this provider creates. */ - super.setConnectorClassName(connectorClass.getName()); + super.setConnectorClassName(connectorClassName); /* * Set up the connector type that should be included in a connection used to configure this connector. 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 00653307e5d..d3ba1e4776c 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 @@ -39,7 +39,7 @@ public class KafkaOpenMetadataTopicProvider extends OpenMetadataTopicProvider /* * Class of the connector. */ - private static final Class connectorClass = KafkaOpenMetadataTopicConnector.class; + private static final String connectorClassName = "org.odpi.openmetadata.adapters.eventbus.topic.kafka.KafkaOpenMetadataTopicConnector"; private static final String expectedDataFormat = "PLAINTEXT"; private static final String supportedAssetTypeName = "KafkaTopic"; @@ -61,7 +61,7 @@ public KafkaOpenMetadataTopicProvider() /* * Set up the class name of the connector that this provider creates. */ - super.setConnectorClassName(connectorClass.getName()); + super.setConnectorClassName(connectorClassName); /* * Set up the connector type that should be included in a connection used to configure this connector. 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 6f20182d1c1..b2c2e7d820d 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 @@ -38,7 +38,7 @@ public class ApacheAtlasIntegrationProvider extends IntegrationConnectorProvider /* * Class of the connector. */ - private static final Class connectorClass = ApacheAtlasIntegrationConnector.class; + private static final String connectorClassName = "org.odpi.openmetadata.adapters.connectors.integration.apacheatlas.ApacheAtlasIntegrationConnector"; /** @@ -64,7 +64,7 @@ public ApacheAtlasIntegrationProvider() /* * Set up the class name of the connector that this provider creates. */ - super.setConnectorClassName(connectorClass.getName()); + super.setConnectorClassName(connectorClassName); /* * Set up the connector type that should be included in a connection used to configure this connector. 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 0d6b959de40..80d3416dc43 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 @@ -36,7 +36,7 @@ public class EgeriaCataloguerIntegrationProvider extends IntegrationConnectorPro /* * Class of the connector. */ - private static final Class connectorClass = EgeriaCataloguerIntegrationConnector.class; + private static final String connectorClassName = "org.odpi.openmetadata.adapters.connectors.integration.egeria.EgeriaCataloguerIntegrationConnector"; /** @@ -49,7 +49,7 @@ public EgeriaCataloguerIntegrationProvider() /* * Set up the class name of the connector that this provider creates. */ - super.setConnectorClassName(connectorClass.getName()); + super.setConnectorClassName(connectorClassName); /* * Set up the connector type that should be included in a connection used to configure this connector. 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 cba0c61fcf9..2a759cd5718 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 @@ -30,7 +30,7 @@ class BasicFilesMonitorIntegrationProviderBase extends IntegrationConnectorProvi * @param connectorDisplayName the printable name for this connector * @param connectorDescription the description of this connector * @param connectorWikiPage the URL of the connector page in the connector catalog - * @param connectorClass the name of the connector class that the connector provider creates + * @param connectorClassName the name of the connector class that the connector provider creates */ BasicFilesMonitorIntegrationProviderBase(String connectorTypeGUID, int connectorComponentId, @@ -38,14 +38,14 @@ class BasicFilesMonitorIntegrationProviderBase extends IntegrationConnectorProvi String connectorDisplayName, String connectorDescription, String connectorWikiPage, - Class connectorClass) + String connectorClassName) { super(); /* * Set up the class name of the connector that this provider creates. */ - super.setConnectorClassName(connectorClass.getName()); + super.setConnectorClassName(connectorClassName); /* * Set up the connector type that should be included in a connection used to configure this connector. diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/files-integration-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/basicfiles/DataFilesMonitorIntegrationProvider.java b/open-metadata-implementation/adapters/open-connectors/integration-connectors/files-integration-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/basicfiles/DataFilesMonitorIntegrationProvider.java index 06e7ab5d973..4d9719fc2fa 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/files-integration-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/basicfiles/DataFilesMonitorIntegrationProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/integration-connectors/files-integration-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/basicfiles/DataFilesMonitorIntegrationProvider.java @@ -29,6 +29,6 @@ public DataFilesMonitorIntegrationProvider() connectorDisplayName, connectorDescription, connectorWikiPage, - DataFilesMonitorIntegrationConnector.class); + "org.odpi.openmetadata.adapters.connectors.integration.basicfiles.DataFilesMonitorIntegrationConnector"); } } diff --git a/open-metadata-implementation/adapters/open-connectors/integration-connectors/files-integration-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/basicfiles/DataFolderMonitorIntegrationProvider.java b/open-metadata-implementation/adapters/open-connectors/integration-connectors/files-integration-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/basicfiles/DataFolderMonitorIntegrationProvider.java index 71be8b4f602..4e6dac659b7 100644 --- a/open-metadata-implementation/adapters/open-connectors/integration-connectors/files-integration-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/basicfiles/DataFolderMonitorIntegrationProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/integration-connectors/files-integration-connectors/src/main/java/org/odpi/openmetadata/adapters/connectors/integration/basicfiles/DataFolderMonitorIntegrationProvider.java @@ -28,6 +28,6 @@ public DataFolderMonitorIntegrationProvider() connectorDisplayName, connectorDescription, connectorWikiPage, - DataFolderMonitorIntegrationConnector.class); + "org.odpi.openmetadata.adapters.connectors.integration.basicfiles.DataFolderMonitorIntegrationConnector"); } } 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 6ff79d2e63a..bcfe8cea583 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 @@ -34,7 +34,7 @@ public class JDBCIntegrationConnectorProvider extends IntegrationConnectorProvid /* * Class of the connector. */ - private static final Class connectorClass = JDBCIntegrationConnector.class; + private static final String connectorClassName = "org.odpi.openmetadata.adapters.connectors.integration.jdbc.JDBCIntegrationConnector"; /** * Constructor used to initialize the ConnectorProviderBase with the Java class name of the specific @@ -47,7 +47,7 @@ public JDBCIntegrationConnectorProvider() /* * Set up the class name of the connector that this provider creates. */ - super.setConnectorClassName(connectorClass.getName()); + super.setConnectorClassName(connectorClassName); /* * Set up the connector type that should be included in a connection used to configure this connector. 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 a2bd38925f2..f3682903ed9 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 @@ -38,7 +38,7 @@ public class KafkaMonitorIntegrationProvider extends IntegrationConnectorProvide /* * Class of the connector. */ - private static final Class connectorClass = KafkaMonitorIntegrationConnector.class; + private static final String connectorClassName = "org.odpi.openmetadata.adapters.connectors.integration.kafka.KafkaMonitorIntegrationConnector"; static final String TEMPLATE_QUALIFIED_NAME_CONFIGURATION_PROPERTY = "templateQualifiedName"; @@ -54,7 +54,7 @@ public KafkaMonitorIntegrationProvider() /* * Set up the class name of the connector that this provider creates. */ - super.setConnectorClassName(connectorClass.getName()); + super.setConnectorClassName(connectorClassName); /* * Set up the connector type that should be included in a connection used to configure this connector. 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 2f3fece4df6..1aca0792311 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 @@ -38,7 +38,7 @@ public class OpenAPIMonitorIntegrationProvider extends IntegrationConnectorProvi /* * Class of the connector. */ - private static final Class connectorClass = OpenAPIMonitorIntegrationConnector.class; + private static final String connectorClassName = "org.odpi.openmetadata.adapters.connectors.integration.openapis.OpenAPIMonitorIntegrationConnector"; static final String TEMPLATE_QUALIFIED_NAME_CONFIGURATION_PROPERTY = "templateQualifiedName"; @@ -54,7 +54,7 @@ public OpenAPIMonitorIntegrationProvider() /* * Set up the class name of the connector that this provider creates. */ - super.setConnectorClassName(connectorClass.getName()); + super.setConnectorClassName(connectorClassName); /* * Set up the connector type that should be included in a connection used to configure this connector. 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 90f365bc6df..10d71fe9529 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 @@ -33,7 +33,7 @@ public class APIBasedOpenLineageLogStoreProvider extends IntegrationConnectorPro /* * Class of the connector. */ - private static final Class connectorClass = APIBasedOpenLineageLogStoreConnector.class; + private static final String connectorClassName = "org.odpi.openmetadata.adapters.connectors.integration.openlineage.APIBasedOpenLineageLogStoreConnector"; /** @@ -47,7 +47,7 @@ public APIBasedOpenLineageLogStoreProvider() /* * Set up the class name of the connector that this provider creates. */ - super.setConnectorClassName(connectorClass.getName()); + super.setConnectorClassName(connectorClassName); /* * Set up the connector type that should be included in a connection used to configure this connector. 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 b19e3392ccf..191a2835930 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 @@ -34,7 +34,7 @@ public class FileBasedOpenLineageLogStoreProvider extends IntegrationConnectorPr /* * Class of the connector. */ - private static final Class connectorClass = FileBasedOpenLineageLogStoreConnector.class; + private static final String connectorClassName = "org.odpi.openmetadata.adapters.connectors.integration.openlineage.FileBasedOpenLineageLogStoreConnector"; /** @@ -48,7 +48,7 @@ public FileBasedOpenLineageLogStoreProvider() /* * Set up the class name of the connector that this provider creates. */ - super.setConnectorClassName(connectorClass.getName()); + super.setConnectorClassName(connectorClassName); /* * Set up the connector type that should be included in a connection used to configure this connector. 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 e27bf64826c..4c2cde277be 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 @@ -36,7 +36,7 @@ public class GovernanceActionOpenLineageIntegrationProvider extends IntegrationC /* * Class of the connector. */ - private static final Class connectorClass = GovernanceActionOpenLineageIntegrationConnector.class; + private static final String connectorClassName = "org.odpi.openmetadata.adapters.connectors.integration.openlineage.GovernanceActionOpenLineageIntegrationConnector"; /** @@ -49,7 +49,7 @@ public GovernanceActionOpenLineageIntegrationProvider() /* * Set up the class name of the connector that this provider creates. */ - super.setConnectorClassName(connectorClass.getName()); + super.setConnectorClassName(connectorClassName); /* * Set up the connector type that should be included in a connection used to configure this connector. 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 858c5cc5eb4..91851f76977 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 @@ -34,7 +34,7 @@ public class OpenLineageCataloguerIntegrationProvider extends IntegrationConnect /* * Class of the connector. */ - private static final Class connectorClass = OpenLineageCataloguerIntegrationConnector.class; + private static final String connectorClassName = "org.odpi.openmetadata.adapters.connectors.integration.openlineage.OpenLineageCataloguerIntegrationConnector"; /** @@ -47,7 +47,7 @@ public OpenLineageCataloguerIntegrationProvider() /* * Set up the class name of the connector that this provider creates. */ - super.setConnectorClassName(connectorClass.getName()); + super.setConnectorClassName(connectorClassName); /* * Set up the connector type that should be included in a connection used to configure this connector. 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 817b788460a..27a74b84486 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 @@ -37,7 +37,7 @@ public class OpenLineageEventReceiverIntegrationProvider extends IntegrationConn /* * Class of the connector. */ - private static final Class connectorClass = OpenLineageEventReceiverIntegrationConnector.class; + private static final String connectorClassName = "org.odpi.openmetadata.adapters.connectors.integration.openlineage.OpenLineageEventReceiverIntegrationConnector"; /** @@ -50,7 +50,7 @@ public OpenLineageEventReceiverIntegrationProvider() /* * Set up the class name of the connector that this provider creates. */ - super.setConnectorClassName(connectorClass.getName()); + super.setConnectorClassName(connectorClassName); /* * Set up the connector type that should be included in a connection used to configure this connector. diff --git a/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/audit-log-connectors/audit-log-console-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/auditlogstore/console/ConsoleAuditLogStoreProvider.java b/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/audit-log-connectors/audit-log-console-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/auditlogstore/console/ConsoleAuditLogStoreProvider.java index 8da6a7fd310..865d7a975cd 100644 --- a/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/audit-log-connectors/audit-log-console-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/auditlogstore/console/ConsoleAuditLogStoreProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/audit-log-connectors/audit-log-console-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/auditlogstore/console/ConsoleAuditLogStoreProvider.java @@ -26,7 +26,7 @@ public class ConsoleAuditLogStoreProvider extends OMRSAuditLogStoreProviderBase /* * Class of the connector. */ - private static final Class connectorClass = ConsoleAuditLogStoreConnector.class; + private static final String connectorClassName = "org.odpi.openmetadata.adapters.repositoryservices.auditlogstore.console.ConsoleAuditLogStoreConnector"; /** @@ -40,7 +40,7 @@ public ConsoleAuditLogStoreProvider() /* * Set up the class name of the connector that this provider creates. */ - super.setConnectorClassName(connectorClass.getName()); + super.setConnectorClassName(connectorClassName); /* * Set up the connector type that should be included in a connection used to configure this connector. diff --git a/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/audit-log-connectors/audit-log-console-event-display-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/auditlogstore/console/eventdisplay/EventDisplayAuditLogStoreProvider.java b/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/audit-log-connectors/audit-log-console-event-display-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/auditlogstore/console/eventdisplay/EventDisplayAuditLogStoreProvider.java index 6125ad7605d..1cef86ec9ff 100644 --- a/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/audit-log-connectors/audit-log-console-event-display-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/auditlogstore/console/eventdisplay/EventDisplayAuditLogStoreProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/audit-log-connectors/audit-log-console-event-display-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/auditlogstore/console/eventdisplay/EventDisplayAuditLogStoreProvider.java @@ -26,7 +26,7 @@ public class EventDisplayAuditLogStoreProvider extends OMRSAuditLogStoreProvider /* * Class of the connector. */ - private static final Class connectorClass = EventDisplayAuditLogStoreConnector.class; + private static final String connectorClassName = "org.odpi.openmetadata.adapters.repositoryservices.auditlogstore.console.eventdisplay.EventDisplayAuditLogStoreConnector"; /** @@ -40,7 +40,7 @@ public EventDisplayAuditLogStoreProvider() /* * Set up the class name of the connector that this provider creates. */ - super.setConnectorClassName(connectorClass.getName()); + super.setConnectorClassName(connectorClassName); /* * Set up the connector type that should be included in a connection used to configure this connector. diff --git a/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/audit-log-connectors/audit-log-event-topic-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/auditlogstore/eventtopic/EventTopicAuditLogStoreProvider.java b/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/audit-log-connectors/audit-log-event-topic-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/auditlogstore/eventtopic/EventTopicAuditLogStoreProvider.java index 1be9f3ef3b4..756f394258c 100644 --- a/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/audit-log-connectors/audit-log-event-topic-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/auditlogstore/eventtopic/EventTopicAuditLogStoreProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/audit-log-connectors/audit-log-event-topic-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/auditlogstore/eventtopic/EventTopicAuditLogStoreProvider.java @@ -26,7 +26,7 @@ public class EventTopicAuditLogStoreProvider extends OMRSAuditLogStoreProviderBa /* * Class of the connector. */ - private static final Class connectorClass = EventTopicAuditLogStoreConnector.class; + private static final String connectorClassName = "org.odpi.openmetadata.adapters.repositoryservices.auditlogstore.eventtopic.EventTopicAuditLogStoreConnector"; /** @@ -40,7 +40,7 @@ public EventTopicAuditLogStoreProvider() /* * Set up the class name of the connector that this provider creates. */ - super.setConnectorClassName(connectorClass.getName()); + super.setConnectorClassName(connectorClassName); /* * Set up the connector type that should be included in a connection used to configure this connector. diff --git a/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/audit-log-connectors/audit-log-file-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/auditlogstore/file/FileBasedAuditLogStoreProvider.java b/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/audit-log-connectors/audit-log-file-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/auditlogstore/file/FileBasedAuditLogStoreProvider.java index 3e5542b292b..4ecd9ede7cf 100644 --- a/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/audit-log-connectors/audit-log-file-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/auditlogstore/file/FileBasedAuditLogStoreProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/audit-log-connectors/audit-log-file-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/auditlogstore/file/FileBasedAuditLogStoreProvider.java @@ -25,7 +25,7 @@ public class FileBasedAuditLogStoreProvider extends OMRSAuditLogStoreProviderBas /* * Class of the connector. */ - private static final Class connectorClass = FileBasedAuditLogStoreConnector.class; + private static final String connectorClassName = "org.odpi.openmetadata.adapters.repositoryservices.auditlogstore.file.FileBasedAuditLogStoreConnector"; /** @@ -39,7 +39,7 @@ public FileBasedAuditLogStoreProvider() /* * Set up the class name of the connector that this provider creates. */ - super.setConnectorClassName(connectorClass.getName()); + super.setConnectorClassName(connectorClassName); /* * Set up the connector type that should be included in a connection used to configure this connector. diff --git a/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/audit-log-connectors/audit-log-slf4j-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/auditlogstore/slf4j/SLF4JAuditLogStoreProvider.java b/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/audit-log-connectors/audit-log-slf4j-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/auditlogstore/slf4j/SLF4JAuditLogStoreProvider.java index a29435d1f5b..75533afde95 100644 --- a/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/audit-log-connectors/audit-log-slf4j-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/auditlogstore/slf4j/SLF4JAuditLogStoreProvider.java +++ b/open-metadata-implementation/adapters/open-connectors/repository-services-connectors/audit-log-connectors/audit-log-slf4j-connector/src/main/java/org/odpi/openmetadata/adapters/repositoryservices/auditlogstore/slf4j/SLF4JAuditLogStoreProvider.java @@ -25,7 +25,7 @@ public class SLF4JAuditLogStoreProvider extends OMRSAuditLogStoreProviderBase /* * Class of the connector. */ - private static final Class connectorClass = SLF4JAuditLogStoreConnector.class; + private static final String connectorClassName = "org.odpi.openmetadata.adapters.repositoryservices.auditlogstore.slf4j.SLF4JAuditLogStoreConnector"; /** * Constructor used to initialize the ConnectorProviderBase with the Java class name of the specific @@ -38,7 +38,7 @@ public SLF4JAuditLogStoreProvider() /* * Set up the class name of the connector that this provider creates. */ - super.setConnectorClassName(connectorClass.getName()); + super.setConnectorClassName(connectorClassName); /* * Set up the connector type that should be included in a connection used to configure this connector. 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 4073291ab28..66dca32ff3f 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 @@ -5,7 +5,6 @@ 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.repositoryservices.auditlog.OMRSAuditingComponent; import org.odpi.openmetadata.repositoryservices.connectors.stores.cohortregistrystore.OMRSCohortRegistryStoreProviderBase; /** @@ -34,7 +33,7 @@ public class FileBasedRegistryStoreProvider extends OMRSCohortRegistryStoreProvi /* * Class of the connector. */ - private static final Class connectorClass = FileBasedRegistryStoreConnector.class; + private static final String connectorClassName = "org.odpi.openmetadata.adapters.repositoryservices.cohortregistrystore.file.FileBasedRegistryStoreConnector"; /** @@ -48,7 +47,7 @@ public FileBasedRegistryStoreProvider() /* * Set up the class name of the connector that this provider creates. */ - super.setConnectorClassName(connectorClass.getName()); + super.setConnectorClassName(connectorClassName); /* * Set up the connector type that should be included in a connection used to configure this connector. 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/DirectoryBasedOpenMetadataArchiveStoreIterator.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/DirectoryBasedOpenMetadataArchiveStoreIterator.java index b6809400b99..3ea14ef4cd2 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/DirectoryBasedOpenMetadataArchiveStoreIterator.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/DirectoryBasedOpenMetadataArchiveStoreIterator.java @@ -49,7 +49,6 @@ public boolean hasNext() return (pointer < length); } - @Override public T next() { 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 53135d30dc9..eaed1081247 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 @@ -6,7 +6,6 @@ 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.repositoryservices.auditlog.OMRSAuditingComponent; import org.odpi.openmetadata.repositoryservices.connectors.stores.archivestore.OpenMetadataArchiveStoreProviderBase; import java.util.ArrayList; @@ -38,7 +37,7 @@ public class DirectoryBasedOpenMetadataArchiveStoreProvider extends OpenMetadata /* * Class of the connector. */ - private static final Class connectorClass = DirectoryBasedOpenMetadataArchiveStoreConnector.class; + private static final String connectorClassName = "org.odpi.openmetadata.adapters.repositoryservices.archiveconnector.directory.DirectoryBasedOpenMetadataArchiveStoreConnector"; /* * Names of configuration properties @@ -56,7 +55,7 @@ public DirectoryBasedOpenMetadataArchiveStoreProvider() /* * Set up the class name of the connector that this provider creates. */ - super.setConnectorClassName(connectorClass.getName()); + super.setConnectorClassName(connectorClassName); /* * Set up the connector type that should be included in a connection used to configure this connector. 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 1fd08a15857..ba6ed34ab8d 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 @@ -35,7 +35,7 @@ public class FileBasedOpenMetadataArchiveStoreProvider extends OpenMetadataArchi /* * Class of the connector. */ - private static final Class connectorClass = FileBasedOpenMetadataArchiveStoreConnector.class; + private static final String connectorClassName = "org.odpi.openmetadata.adapters.repositoryservices.archiveconnector.file.FileBasedOpenMetadataArchiveStoreConnector"; /** * Constructor to initialize the ConnectorProviderBase class. @@ -47,7 +47,7 @@ public FileBasedOpenMetadataArchiveStoreProvider() /* * Set up the class name of the connector that this provider creates. */ - super.setConnectorClassName(connectorClass.getName()); + super.setConnectorClassName(connectorClassName); /* * Set up the connector type that should be included in a connection used to configure this connector. 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 ae019dc939f..ae9e992b771 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 @@ -13,7 +13,7 @@ * The GraphOMRSRepositoryConnectorProvider is the connector provider for the GraphOMRSRepositoryConnector. * It extends OMRSRepositoryConnectorProviderBase which in turn extends the OCF ConnectorProviderBase. * ConnectorProviderBase supports the creation of connector instances. - * + *

* The GraphOMRSRepositoryConnectorProvider must initialize ConnectorProviderBase with the Java class * name of the OMRS Connector implementation (by calling super.setConnectorClassName(className)). * Then the connector provider will work. @@ -42,7 +42,7 @@ public class GraphOMRSRepositoryConnectorProvider extends OMRSRepositoryConnecto /* * Class of the connector. */ - private static final Class connectorClass = GraphOMRSRepositoryConnector.class; + private static final String connectorClassName = "org.odpi.openmetadata.adapters.repositoryservices.graphrepository.repositoryconnector.GraphOMRSRepositoryConnector"; /** @@ -56,7 +56,7 @@ public GraphOMRSRepositoryConnectorProvider() /* * Set up the class name of the connector that this provider creates. */ - super.setConnectorClassName(connectorClass.getName()); + super.setConnectorClassName(connectorClassName); /* * Set up the connector type that should be included in a connection used to configure this connector. 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 9dec11cdeec..a1f396d3ece 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 @@ -6,7 +6,6 @@ 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.repositoryservices.auditlog.OMRSAuditingComponent; import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.repositoryconnector.OMRSRepositoryConnectorProviderBase; /** @@ -14,7 +13,7 @@ * The InMemoryOMRSRepositoryConnectorProvider is the connector provider for the InMemoryOMRSRepositoryConnector. * It extends OMRSRepositoryConnectorProviderBase which in turn extends the OCF ConnectorProviderBase. * ConnectorProviderBase supports the creation of connector instances. - * + *

* The InMemoryOMRSRepositoryConnectorProvider must initialize ConnectorProviderBase with the Java class * name of the OMRS Connector implementation (by calling super.setConnectorClassName(className)). * Then the connector provider will work. @@ -43,7 +42,7 @@ public class InMemoryOMRSRepositoryConnectorProvider extends OMRSRepositoryConne /* * Class of the connector. */ - private static final Class connectorClass = InMemoryOMRSRepositoryConnector.class; + private static final String connectorClassName = "org.odpi.openmetadata.adapters.repositoryservices.inmemory.repositoryconnector.InMemoryOMRSRepositoryConnector"; /** @@ -57,7 +56,7 @@ public InMemoryOMRSRepositoryConnectorProvider() /* * Set up the class name of the connector that this provider creates. */ - super.setConnectorClassName(connectorClass.getName()); + super.setConnectorClassName(connectorClassName); /* * Set up the connector type that should be included in a connection used to configure this connector. 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 9ee2a8e4ef4..a4641b896f5 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 @@ -6,7 +6,6 @@ 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.repositoryservices.auditlog.OMRSAuditingComponent; import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.repositoryconnector.OMRSRepositoryConnectorProviderBase; /** @@ -14,7 +13,7 @@ * The ReadOnlyOMRSRepositoryConnectorProvider is the connector provider for the ReadOnlyOMRSRepositoryConnector. * It extends OMRSRepositoryConnectorProviderBase which in turn extends the OCF ConnectorProviderBase. * ConnectorProviderBase supports the creation of connector instances. - * + *

* The ReadOnlyOMRSRepositoryConnectorProvider must initialize ConnectorProviderBase with the Java class * name of the OMRS Connector implementation (by calling super.setConnectorClassName(className)). * Then the connector provider will work. @@ -43,7 +42,7 @@ public class ReadOnlyOMRSRepositoryConnectorProvider extends OMRSRepositoryConne /* * Class of the connector. */ - private static final Class connectorClass = ReadOnlyOMRSRepositoryConnector.class; + private static final String connectorClassName = "org.odpi.openmetadata.adapters.repositoryservices.readonly.repositoryconnector.ReadOnlyOMRSRepositoryConnector"; /** @@ -57,7 +56,7 @@ public ReadOnlyOMRSRepositoryConnectorProvider() /* * Set up the class name of the connector that this provider creates. */ - super.setConnectorClassName(connectorClass.getName()); + super.setConnectorClassName(connectorClassName); /* * Set up the connector type that should be included in a connection used to configure this connector. 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 bbdb80f2a5d..9be69bbae00 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 @@ -6,7 +6,6 @@ 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.repositoryservices.auditlog.OMRSAuditingComponent; import org.odpi.openmetadata.repositoryservices.connectors.stores.metadatacollectionstore.repositoryconnector.OMRSRepositoryConnectorProviderBase; /** @@ -14,7 +13,7 @@ * The OMRSRESTRepositoryConnectorProvider is the connector provider for the OMRSRESTRepositoryConnector. * It extends OMRSRepositoryConnectorProviderBase which in turn extends the OCF ConnectorProviderBase. * ConnectorProviderBase supports the creation of connector instances. - * + *

* The OMRSRESTRepositoryConnectorProvider must initialize ConnectorProviderBase with the Java class * name of the OMRS Connector implementation (by calling super.setConnectorClassName(className)). * Then the connector provider will work. @@ -43,7 +42,7 @@ public class OMRSRESTRepositoryConnectorProvider extends OMRSRepositoryConnector /* * Class of the connector. */ - private static final Class connectorClass = OMRSRESTRepositoryConnector.class; + private static final String connectorClassName = "org.odpi.openmetadata.adapters.repositoryservices.rest.repositoryconnector.OMRSRESTRepositoryConnector"; /** * Constructor used to initialize the ConnectorProviderBase with the Java class name of the specific @@ -56,7 +55,7 @@ public OMRSRESTRepositoryConnectorProvider() /* * Set up the class name of the connector that this provider creates. */ - super.setConnectorClassName(connectorClass.getName()); + super.setConnectorClassName(connectorClassName); /* * Set up the connector type that should be included in a connection used to configure this connector. 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 6832027d5de..126ee46a0e3 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 @@ -35,7 +35,7 @@ public class EnvVarSecretsStoreProvider extends ConnectorProviderBase /* * Class of the connector. */ - private static final Class connectorClass = EnvVarSecretsStoreConnector.class; + private static final String connectorClassName = "org.odpi.openmetadata.adapters.connectors.secretsstore.envar.EnvVarSecretsStoreConnector"; /** * Constructor used to initialize the ConnectorProvider with the Java class name of the specific @@ -48,7 +48,7 @@ public EnvVarSecretsStoreProvider() /* * Set up the class name of the connector that this provider creates. */ - super.setConnectorClassName(connectorClass.getName()); + super.setConnectorClassName(connectorClassName); /* * Set up the connector type that should be included in a connection used to configure this connector. 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/ApacheAtlasRESTConnector.java b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/ApacheAtlasRESTConnector.java index 615de32b08b..223bc947026 100644 --- a/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/ApacheAtlasRESTConnector.java +++ b/open-metadata-implementation/adapters/open-connectors/system-connectors/apache-atlas-rest-connector/src/main/java/org/odpi/openmetadata/adapters/connectors/resource/apacheatlas/ApacheAtlasRESTConnector.java @@ -2,9 +2,7 @@ /* Copyright Contributors to the ODPi Egeria project. */ package org.odpi.openmetadata.adapters.connectors.resource.apacheatlas; - -import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.ffdc.ApacheAtlasAuditCode; -import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.ffdc.ApacheAtlasErrorCode; +import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.ffdc.*; import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.ffdc.NameConflictException; import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasBusinessMetadataDef; import org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.properties.AtlasClassificationDef; 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 2f06bf2a622..4f7f065703c 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 @@ -44,7 +44,7 @@ public class ApacheAtlasRESTProvider extends ConnectorProviderBase /* * Class of the connector. */ - private static final Class connectorClass = ApacheAtlasRESTConnector.class; + private static final String connectorClassName = "org.odpi.openmetadata.adapters.connectors.resource.apacheatlas.ApacheAtlasRESTConnector"; /** @@ -58,7 +58,7 @@ public ApacheAtlasRESTProvider() /* * Set up the class name of the connector that this provider creates. */ - super.setConnectorClassName(connectorClass.getName()); + super.setConnectorClassName(connectorClassName); /* * Set up the connector type that should be included in a connection used to configure this connector. From 68f9e53a97aaa8ba700fd7985bb3ebc5dde18a14 Mon Sep 17 00:00:00 2001 From: Mandy Chessell Date: Tue, 5 Sep 2023 13:15:36 +0100 Subject: [PATCH 3/4] Do not check certificate Signed-off-by: Mandy Chessell --- .../conformance/client/OpenMetadataConformanceTestReport.java | 2 +- .../odpi/openmetadata/utilities/serverconfig/ServerConfig.java | 2 +- .../org/odpi/openmetadata/utilities/serverops/ServerOps.java | 2 +- .../samples/createavrofile/CreateAvroFileAssetSample.java | 2 +- .../samples/createcsvfile/CreateCSVFileAssetSample.java | 2 +- .../itinfrastructure/samples/assetdeploy/AssetDeploy.java | 2 +- .../assetconsumer/samples/assetlookup/AssetLookUp.java | 2 +- .../samples/readavrofile/AvroFileReaderSample.java | 2 +- .../assetconsumer/samples/readcsvfile/CSVFileReaderSample.java | 2 +- .../accessservices/samples/assetsetup/AssetSetUp.java | 2 +- .../samples/leadership/GovernanceLeadershipSample.java | 2 +- .../samples/zonecreate/CreateGovernanceZoneSample.java | 2 +- .../samples/definition/SubjectAreaDefinitionSample.java | 2 +- .../samples/configure/ConfigMetadataServerSample.java | 2 +- .../samples/CocoPharmaServerSecurityProvider.java | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/open-metadata-conformance-suite/open-metadata-conformance-suite-client/src/main/java/org/odpi/openmetadata/conformance/client/OpenMetadataConformanceTestReport.java b/open-metadata-conformance-suite/open-metadata-conformance-suite-client/src/main/java/org/odpi/openmetadata/conformance/client/OpenMetadataConformanceTestReport.java index b1cc1b5c68c..9f8bdd7b7b9 100644 --- a/open-metadata-conformance-suite/open-metadata-conformance-suite-client/src/main/java/org/odpi/openmetadata/conformance/client/OpenMetadataConformanceTestReport.java +++ b/open-metadata-conformance-suite/open-metadata-conformance-suite-client/src/main/java/org/odpi/openmetadata/conformance/client/OpenMetadataConformanceTestReport.java @@ -347,7 +347,7 @@ public static void main(String[] args) password = args[3]; } - HttpHelper.noStrictSSLIfConfigured(); + HttpHelper.noStrictSSL(); System.out.println("======================================="); System.out.println(" Open Metadata Conformance Test Report "); diff --git a/open-metadata-resources/open-metadata-dev-utilities/egeria-config-utility/src/main/java/org/odpi/openmetadata/utilities/serverconfig/ServerConfig.java b/open-metadata-resources/open-metadata-dev-utilities/egeria-config-utility/src/main/java/org/odpi/openmetadata/utilities/serverconfig/ServerConfig.java index 13877805177..1414589f597 100644 --- a/open-metadata-resources/open-metadata-dev-utilities/egeria-config-utility/src/main/java/org/odpi/openmetadata/utilities/serverconfig/ServerConfig.java +++ b/open-metadata-resources/open-metadata-dev-utilities/egeria-config-utility/src/main/java/org/odpi/openmetadata/utilities/serverconfig/ServerConfig.java @@ -832,7 +832,7 @@ public static void main(String[] args) ServerConfig utility = new ServerConfig(platformURLRoot, clientUserId); - HttpHelper.noStrictSSLIfConfigured(); + HttpHelper.noStrictSSL(); String platformOrigin = utility.getPlatformOrigin(); diff --git a/open-metadata-resources/open-metadata-dev-utilities/egeria-ops-utility/src/main/java/org/odpi/openmetadata/utilities/serverops/ServerOps.java b/open-metadata-resources/open-metadata-dev-utilities/egeria-ops-utility/src/main/java/org/odpi/openmetadata/utilities/serverops/ServerOps.java index 10a34517e87..83201b748cd 100644 --- a/open-metadata-resources/open-metadata-dev-utilities/egeria-ops-utility/src/main/java/org/odpi/openmetadata/utilities/serverops/ServerOps.java +++ b/open-metadata-resources/open-metadata-dev-utilities/egeria-ops-utility/src/main/java/org/odpi/openmetadata/utilities/serverops/ServerOps.java @@ -347,7 +347,7 @@ public static void main(String[] args) ServerOps utility = new ServerOps(platformURLRoot, clientUserId); - HttpHelper.noStrictSSLIfConfigured(); + HttpHelper.noStrictSSL(); String platformOrigin = utility.getPlatformOrigin(); diff --git a/open-metadata-resources/open-metadata-samples/access-services-samples/asset-management-samples/asset-create-avro-sample/src/main/java/org/odpi/openmetadata/accessservices/assetowner/samples/createavrofile/CreateAvroFileAssetSample.java b/open-metadata-resources/open-metadata-samples/access-services-samples/asset-management-samples/asset-create-avro-sample/src/main/java/org/odpi/openmetadata/accessservices/assetowner/samples/createavrofile/CreateAvroFileAssetSample.java index abed521afa2..a4a06144d87 100644 --- a/open-metadata-resources/open-metadata-samples/access-services-samples/asset-management-samples/asset-create-avro-sample/src/main/java/org/odpi/openmetadata/accessservices/assetowner/samples/createavrofile/CreateAvroFileAssetSample.java +++ b/open-metadata-resources/open-metadata-samples/access-services-samples/asset-management-samples/asset-create-avro-sample/src/main/java/org/odpi/openmetadata/accessservices/assetowner/samples/createavrofile/CreateAvroFileAssetSample.java @@ -75,7 +75,7 @@ public static void main(String[] args) System.exit(-1); } - HttpHelper.noStrictSSLIfConfigured(); + HttpHelper.noStrictSSL(); String fileName = args[0]; diff --git a/open-metadata-resources/open-metadata-samples/access-services-samples/asset-management-samples/asset-create-csv-sample/src/main/java/org/odpi/openmetadata/accessservices/assetowner/samples/createcsvfile/CreateCSVFileAssetSample.java b/open-metadata-resources/open-metadata-samples/access-services-samples/asset-management-samples/asset-create-csv-sample/src/main/java/org/odpi/openmetadata/accessservices/assetowner/samples/createcsvfile/CreateCSVFileAssetSample.java index 0ba29ee7132..c66b7715159 100644 --- a/open-metadata-resources/open-metadata-samples/access-services-samples/asset-management-samples/asset-create-csv-sample/src/main/java/org/odpi/openmetadata/accessservices/assetowner/samples/createcsvfile/CreateCSVFileAssetSample.java +++ b/open-metadata-resources/open-metadata-samples/access-services-samples/asset-management-samples/asset-create-csv-sample/src/main/java/org/odpi/openmetadata/accessservices/assetowner/samples/createcsvfile/CreateCSVFileAssetSample.java @@ -101,7 +101,7 @@ public static void main(String[] args) System.out.println("Creating file: " + fileName); System.out.println(); - HttpHelper.noStrictSSLIfConfigured(); + HttpHelper.noStrictSSL(); try { diff --git a/open-metadata-resources/open-metadata-samples/access-services-samples/asset-management-samples/asset-deploy-sample/src/main/java/org/odpi/openmetadata/accessservices/itinfrastructure/samples/assetdeploy/AssetDeploy.java b/open-metadata-resources/open-metadata-samples/access-services-samples/asset-management-samples/asset-deploy-sample/src/main/java/org/odpi/openmetadata/accessservices/itinfrastructure/samples/assetdeploy/AssetDeploy.java index 5e6e80d2348..d8478d31d5f 100644 --- a/open-metadata-resources/open-metadata-samples/access-services-samples/asset-management-samples/asset-deploy-sample/src/main/java/org/odpi/openmetadata/accessservices/itinfrastructure/samples/assetdeploy/AssetDeploy.java +++ b/open-metadata-resources/open-metadata-samples/access-services-samples/asset-management-samples/asset-deploy-sample/src/main/java/org/odpi/openmetadata/accessservices/itinfrastructure/samples/assetdeploy/AssetDeploy.java @@ -301,7 +301,7 @@ public static void main(String[] args) AssetDeploy utility = new AssetDeploy(platformURLRoot, clientUserId, serverName); - HttpHelper.noStrictSSLIfConfigured(); + HttpHelper.noStrictSSL(); String platformOrigin = utility.getPlatformOrigin(); diff --git a/open-metadata-resources/open-metadata-samples/access-services-samples/asset-management-samples/asset-look-up-sample/src/main/java/org/odpi/openmetadata/accessservices/assetconsumer/samples/assetlookup/AssetLookUp.java b/open-metadata-resources/open-metadata-samples/access-services-samples/asset-management-samples/asset-look-up-sample/src/main/java/org/odpi/openmetadata/accessservices/assetconsumer/samples/assetlookup/AssetLookUp.java index 34b807fb287..cdfc4d8b333 100644 --- a/open-metadata-resources/open-metadata-samples/access-services-samples/asset-management-samples/asset-look-up-sample/src/main/java/org/odpi/openmetadata/accessservices/assetconsumer/samples/assetlookup/AssetLookUp.java +++ b/open-metadata-resources/open-metadata-samples/access-services-samples/asset-management-samples/asset-look-up-sample/src/main/java/org/odpi/openmetadata/accessservices/assetconsumer/samples/assetlookup/AssetLookUp.java @@ -728,7 +728,7 @@ public static void main(String[] args) AssetLookUp utility = new AssetLookUp(serverName, platformURLRoot, clientUserId); - HttpHelper.noStrictSSLIfConfigured(); + HttpHelper.noStrictSSL(); String platformOrigin = utility.getPlatformOrigin(); diff --git a/open-metadata-resources/open-metadata-samples/access-services-samples/asset-management-samples/asset-reader-avro-sample/src/main/java/org/odpi/openmetadata/accessservices/assetconsumer/samples/readavrofile/AvroFileReaderSample.java b/open-metadata-resources/open-metadata-samples/access-services-samples/asset-management-samples/asset-reader-avro-sample/src/main/java/org/odpi/openmetadata/accessservices/assetconsumer/samples/readavrofile/AvroFileReaderSample.java index e796038c357..57f248c981d 100644 --- a/open-metadata-resources/open-metadata-samples/access-services-samples/asset-management-samples/asset-reader-avro-sample/src/main/java/org/odpi/openmetadata/accessservices/assetconsumer/samples/readavrofile/AvroFileReaderSample.java +++ b/open-metadata-resources/open-metadata-samples/access-services-samples/asset-management-samples/asset-reader-avro-sample/src/main/java/org/odpi/openmetadata/accessservices/assetconsumer/samples/readavrofile/AvroFileReaderSample.java @@ -330,7 +330,7 @@ public static void main(String[] args) System.out.println("Using userId: " + clientUserId); System.out.println(); - HttpHelper.noStrictSSLIfConfigured(); + HttpHelper.noStrictSSL(); try { diff --git a/open-metadata-resources/open-metadata-samples/access-services-samples/asset-management-samples/asset-reader-csv-sample/src/main/java/org/odpi/openmetadata/accessservices/assetconsumer/samples/readcsvfile/CSVFileReaderSample.java b/open-metadata-resources/open-metadata-samples/access-services-samples/asset-management-samples/asset-reader-csv-sample/src/main/java/org/odpi/openmetadata/accessservices/assetconsumer/samples/readcsvfile/CSVFileReaderSample.java index d134488a013..1c60a3716fb 100644 --- a/open-metadata-resources/open-metadata-samples/access-services-samples/asset-management-samples/asset-reader-csv-sample/src/main/java/org/odpi/openmetadata/accessservices/assetconsumer/samples/readcsvfile/CSVFileReaderSample.java +++ b/open-metadata-resources/open-metadata-samples/access-services-samples/asset-management-samples/asset-reader-csv-sample/src/main/java/org/odpi/openmetadata/accessservices/assetconsumer/samples/readcsvfile/CSVFileReaderSample.java @@ -365,7 +365,7 @@ public static void main(String[] args) System.out.println("Reading file: " + fileName); System.out.println(); - HttpHelper.noStrictSSLIfConfigured(); + HttpHelper.noStrictSSL(); try { diff --git a/open-metadata-resources/open-metadata-samples/access-services-samples/asset-management-samples/asset-set-up-sample/src/main/java/org/odpi/openmetadata/accessservices/samples/assetsetup/AssetSetUp.java b/open-metadata-resources/open-metadata-samples/access-services-samples/asset-management-samples/asset-set-up-sample/src/main/java/org/odpi/openmetadata/accessservices/samples/assetsetup/AssetSetUp.java index 54cc934fa6e..6a3cd82b539 100644 --- a/open-metadata-resources/open-metadata-samples/access-services-samples/asset-management-samples/asset-set-up-sample/src/main/java/org/odpi/openmetadata/accessservices/samples/assetsetup/AssetSetUp.java +++ b/open-metadata-resources/open-metadata-samples/access-services-samples/asset-management-samples/asset-set-up-sample/src/main/java/org/odpi/openmetadata/accessservices/samples/assetsetup/AssetSetUp.java @@ -412,7 +412,7 @@ public static void main(String[] args) System.out.println("Using userId: " + clientUserId); System.out.println(); - HttpHelper.noStrictSSLIfConfigured(); + HttpHelper.noStrictSSL(); try { diff --git a/open-metadata-resources/open-metadata-samples/access-services-samples/governance-program-client-samples/governance-leadership-sample/src/main/java/org/odpi/openmetadata/accessservices/governanceprogram/samples/leadership/GovernanceLeadershipSample.java b/open-metadata-resources/open-metadata-samples/access-services-samples/governance-program-client-samples/governance-leadership-sample/src/main/java/org/odpi/openmetadata/accessservices/governanceprogram/samples/leadership/GovernanceLeadershipSample.java index 418b6b4c542..7c121552500 100644 --- a/open-metadata-resources/open-metadata-samples/access-services-samples/governance-program-client-samples/governance-leadership-sample/src/main/java/org/odpi/openmetadata/accessservices/governanceprogram/samples/leadership/GovernanceLeadershipSample.java +++ b/open-metadata-resources/open-metadata-samples/access-services-samples/governance-program-client-samples/governance-leadership-sample/src/main/java/org/odpi/openmetadata/accessservices/governanceprogram/samples/leadership/GovernanceLeadershipSample.java @@ -951,7 +951,7 @@ public static void main(String[] args) serverURLRoot = args[1]; clientUserId = args[2]; - HttpHelper.noStrictSSLIfConfigured(); + HttpHelper.noStrictSSL(); System.out.println("==============================="); diff --git a/open-metadata-resources/open-metadata-samples/access-services-samples/governance-program-client-samples/governance-zone-create-sample/src/main/java/org/odpi/openmetadata/accessservices/governanceprogram/samples/zonecreate/CreateGovernanceZoneSample.java b/open-metadata-resources/open-metadata-samples/access-services-samples/governance-program-client-samples/governance-zone-create-sample/src/main/java/org/odpi/openmetadata/accessservices/governanceprogram/samples/zonecreate/CreateGovernanceZoneSample.java index 7ab7b38543d..8b01c5d0517 100644 --- a/open-metadata-resources/open-metadata-samples/access-services-samples/governance-program-client-samples/governance-zone-create-sample/src/main/java/org/odpi/openmetadata/accessservices/governanceprogram/samples/zonecreate/CreateGovernanceZoneSample.java +++ b/open-metadata-resources/open-metadata-samples/access-services-samples/governance-program-client-samples/governance-zone-create-sample/src/main/java/org/odpi/openmetadata/accessservices/governanceprogram/samples/zonecreate/CreateGovernanceZoneSample.java @@ -173,7 +173,7 @@ public static void main(String[] args) System.out.println("Using userId: " + clientUserId); System.out.println(); - HttpHelper.noStrictSSLIfConfigured(); + HttpHelper.noStrictSSL(); try diff --git a/open-metadata-resources/open-metadata-samples/access-services-samples/subject-area-client-samples/subject-area-categories-sample/src/main/java/org/odpi/openmetadata/accessservices/subjectarea/samples/definition/SubjectAreaDefinitionSample.java b/open-metadata-resources/open-metadata-samples/access-services-samples/subject-area-client-samples/subject-area-categories-sample/src/main/java/org/odpi/openmetadata/accessservices/subjectarea/samples/definition/SubjectAreaDefinitionSample.java index 6f20c634127..0c94ea9515a 100644 --- a/open-metadata-resources/open-metadata-samples/access-services-samples/subject-area-client-samples/subject-area-categories-sample/src/main/java/org/odpi/openmetadata/accessservices/subjectarea/samples/definition/SubjectAreaDefinitionSample.java +++ b/open-metadata-resources/open-metadata-samples/access-services-samples/subject-area-client-samples/subject-area-categories-sample/src/main/java/org/odpi/openmetadata/accessservices/subjectarea/samples/definition/SubjectAreaDefinitionSample.java @@ -228,7 +228,7 @@ public static void main(String[] args) throws IOException System.out.println("OMAG server platform: " + serverName); System.out.println("Using userId: " + clientUserId); - HttpHelper.noStrictSSLIfConfigured(); + HttpHelper.noStrictSSL(); try { diff --git a/open-metadata-resources/open-metadata-samples/admin-services-samples/config-metadata-server-sample/src/main/java/org/odpi/openmetadata/adminservices/samples/configure/ConfigMetadataServerSample.java b/open-metadata-resources/open-metadata-samples/admin-services-samples/config-metadata-server-sample/src/main/java/org/odpi/openmetadata/adminservices/samples/configure/ConfigMetadataServerSample.java index 0a1af50b358..33db605fb86 100644 --- a/open-metadata-resources/open-metadata-samples/admin-services-samples/config-metadata-server-sample/src/main/java/org/odpi/openmetadata/adminservices/samples/configure/ConfigMetadataServerSample.java +++ b/open-metadata-resources/open-metadata-samples/admin-services-samples/config-metadata-server-sample/src/main/java/org/odpi/openmetadata/adminservices/samples/configure/ConfigMetadataServerSample.java @@ -190,7 +190,7 @@ public static void main(String[] args) adminUserId = args[1]; } - HttpHelper.noStrictSSLIfConfigured(); + HttpHelper.noStrictSSL(); if (args.length > 3) { 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 a92a5a4b830..a8c4935157a 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 @@ -16,7 +16,7 @@ public class CocoPharmaServerSecurityProvider extends OpenMetadataServerSecurity /* * Unique identifier of the connector for the audit log. */ - private static final int connectorComponentId = 90; + private static final int connectorComponentId = 92; /* * Unique identifier for the connector type. From bd409bf3a54363dd09e3afdfb56f07208504773d Mon Sep 17 00:00:00 2001 From: Mandy Chessell Date: Tue, 5 Sep 2023 13:16:20 +0100 Subject: [PATCH 4/4] Improve Javadoc Signed-off-by: Mandy Chessell --- .../http-helper/README.md | 12 +++++- .../odpi/openmetadata/http/HttpHelper.java | 40 +++++++++++-------- 2 files changed, 34 insertions(+), 18 deletions(-) diff --git a/open-metadata-implementation/adapters/authentication-plugins/http-helper/README.md b/open-metadata-implementation/adapters/authentication-plugins/http-helper/README.md index 55c9240656c..c0d2d6088cf 100644 --- a/open-metadata-implementation/adapters/authentication-plugins/http-helper/README.md +++ b/open-metadata-implementation/adapters/authentication-plugins/http-helper/README.md @@ -1,11 +1,19 @@ -![Released](../../../../images/egeria-content-status-released.png#pagewidth) +![Stable](../../../../images/egeria-content-status-released.png#pagewidth) # HTTP Helper -A plug-in for managing Transport Level Security (TLS) in the server. +A plug-in for managing Transport Level Security (TLS) in a client. + +## Client-side certificate checking + +Egeria is set up to validate certificates in the caller to a REST API. +The certificate received from the server is typically validated against +the certificates in the client's trust store. + +The HTTP helpers make it possible to turn off this certificate checking. ---- Return to [authentication-plugins](..) module. diff --git a/open-metadata-implementation/adapters/authentication-plugins/http-helper/src/main/java/org/odpi/openmetadata/http/HttpHelper.java b/open-metadata-implementation/adapters/authentication-plugins/http-helper/src/main/java/org/odpi/openmetadata/http/HttpHelper.java index 35f0f5ce0ad..ef9396ac57f 100644 --- a/open-metadata-implementation/adapters/authentication-plugins/http-helper/src/main/java/org/odpi/openmetadata/http/HttpHelper.java +++ b/open-metadata-implementation/adapters/authentication-plugins/http-helper/src/main/java/org/odpi/openmetadata/http/HttpHelper.java @@ -12,13 +12,18 @@ import java.security.GeneralSecurityException; import java.security.cert.X509Certificate; -public class HttpHelper { +/** + * Turn off client-side checking of certificates. There are two options, one to turn it off all the time and the other is + * controlled through the -Dstrict.ssl=false property. + */ +public class HttpHelper +{ private static final Logger LOGGER = LoggerFactory.getLogger(HttpHelper.class); /** - * Allows using self signed certificates https connections - * makes all the clients and servers trusted no matter the certificate + * Allows the use of self-signed certificates on https connections. + * The client will trust the server no matter which certificate is sent. */ public static void noStrictSSL(){ @@ -26,41 +31,44 @@ public static void noStrictSSL(){ // Create a trust manager that does not validate certificate chains TrustManager[] trustAllCerts = new TrustManager[] { - new X509TrustManager() { + new X509TrustManager() + { public java.security.cert.X509Certificate[] getAcceptedIssuers() { return new X509Certificate[0]; } - public void checkClientTrusted( - java.security.cert.X509Certificate[] certs, String authType) { + public void checkClientTrusted(java.security.cert.X509Certificate[] certs, String authType) + { } - public void checkServerTrusted( - java.security.cert.X509Certificate[] certs, String authType) { + public void checkServerTrusted(java.security.cert.X509Certificate[] certs, String authType) + { } } }; // Install the all-trusting trust manager - try { + try + { SSLContext sc = SSLContext.getInstance("SSL"); sc.init(null, trustAllCerts, new java.security.SecureRandom()); HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory()); HttpsURLConnection.setDefaultHostnameVerifier ((hostname, session) -> true); - } catch (GeneralSecurityException e) { + } + catch (GeneralSecurityException e) + { LOGGER.error("The configuration for no strict SSL went wrong"); } } + /** - * Allows using self signed certificates https connections - * makes all the clients and servers trusted no matter the certificate - * Only if the override property strict.ssl is set + * Allows using self-signed certificates https connections. + * If -Dstrict.ssl=false is set, the client will trust the server no matter the certificate passed. */ - public static void noStrictSSLIfConfigured() { + public static void noStrictSSLIfConfigured() + { if ("false".equalsIgnoreCase(System.getProperty("strict.ssl"))) { noStrictSSL(); } - } - }