Merge pull request #8391 from mandy-chessell/oak2024

Tidy up synchronized methods in OCF framework
odpi · Sep 20, 2024 · 85da3dc · 85da3dc
2 parents b7d5f16 + 7350742
commit 85da3dc
Show file tree

Hide file tree

Showing 56 changed files with 230 additions and 185 deletions.
diff --git a/EgeriaContentPacksGUIDMap.json b/EgeriaContentPacksGUIDMap.json
diff --git a/content-packs/CocoBusinessSystemsArchive.omarchive b/content-packs/CocoBusinessSystemsArchive.omarchive
diff --git a/content-packs/CocoClinicalTrialsTemplatesArchive.omarchive b/content-packs/CocoClinicalTrialsTemplatesArchive.omarchive
diff --git a/content-packs/CocoComboArchive.omarchive b/content-packs/CocoComboArchive.omarchive
diff --git a/content-packs/CocoGovernanceEngineDefinitionsArchive.omarchive b/content-packs/CocoGovernanceEngineDefinitionsArchive.omarchive
diff --git a/content-packs/CocoGovernanceProgramArchive.omarchive b/content-packs/CocoGovernanceProgramArchive.omarchive
diff --git a/content-packs/CocoOrganizationArchive.omarchive b/content-packs/CocoOrganizationArchive.omarchive
diff --git a/content-packs/CocoSustainabilityArchive.omarchive b/content-packs/CocoSustainabilityArchive.omarchive
diff --git a/content-packs/CocoTypesArchive.omarchive b/content-packs/CocoTypesArchive.omarchive
diff --git a/content-packs/CoreContentPack.omarchive b/content-packs/CoreContentPack.omarchive
diff --git a/.../org/odpi/openmetadata/accessservices/assetconsumer/server/AssetConsumerRESTServices.java b/.../org/odpi/openmetadata/accessservices/assetconsumer/server/AssetConsumerRESTServices.java
@@ -3,6 +3,7 @@
 package org.odpi.openmetadata.accessservices.assetconsumer.server;
 
 import org.odpi.openmetadata.frameworks.connectors.ffdc.InvalidParameterException;
+import org.odpi.openmetadata.frameworks.connectors.ffdc.UserNotAuthorizedException;
 import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.*;
 import org.odpi.openmetadata.accessservices.assetconsumer.handlers.LoggingHandler;
 import org.odpi.openmetadata.frameworks.openmetadata.metadataelements.AssetGraph;
@@ -520,7 +521,7 @@ public AssetSearchMatchesListResponse findAssetsInDomain(String
                                                                        OpenMetadataType.ASSET.typeName,
                                                                        methodName);
                         }
-                        catch (InvalidParameterException notVisible)
+                        catch (InvalidParameterException | UserNotAuthorizedException notVisible)
                         {
                             asset = null;
                         }

diff --git a/...uration-store-connectors/configuration-encrypted-file-store-connector/README.md b/...uration-store-connectors/configuration-encrypted-file-store-connector/README.md
@@ -1,7 +1,7 @@
 <!-- SPDX-License-Identifier: CC-BY-4.0 -->
 <!-- Copyright Contributors to the ODPi Egeria project. -->
 
-![Released](../../../../../images/egeria-content-status-released.png#pagewidth)
+![Deprecated](../../../../../images/egeria-content-status-deprecated.png#pagewidth)
 
 [![javadoc](https://javadoc.io/badge2/org.odpi.egeria/configuration-encrypted-file-store-connector/javadoc.svg)](https://javadoc.io/doc/org.odpi.egeria/configuration-encrypted-file-store-connector)
 

diff --git a/...java/org/odpi/openmetadata/adapters/repositoryservices/ConnectorConfigurationFactory.java b/...java/org/odpi/openmetadata/adapters/repositoryservices/ConnectorConfigurationFactory.java
@@ -49,7 +49,7 @@ public class ConnectorConfigurationFactory
     private static final String defaultCohortTopicConnectorRootName     = defaultTopicRootName + "cohort.";
 
 
-    private static final String ENCRYPTED_FILE_BASED_SERVER_CONFIG_STORE_PROVIDER          = "org.odpi.openmetadata.adapters.adminservices.configurationstore.encryptedfile.EncryptedFileBasedServerConfigStoreProvider";
+    private static final String FILE_BASED_SERVER_CONFIG_STORE_PROVIDER                    = "org.odpi.openmetadata.adapters.adminservices.configurationstore.file.FileBasedServerConfigStoreProvider";
     private static final String IN_MEMORY_OPEN_METADATA_TOPIC_PROVIDER                     = "org.odpi.openmetadata.adapters.eventbus.topic.inmemory.InMemoryOpenMetadataTopicProvider";
     private static final String KAFKA_OPEN_METADATA_TOPIC_PROVIDER                         = "org.odpi.openmetadata.adapters.eventbus.topic.kafka.KafkaOpenMetadataTopicProvider";
     private static final String FILE_BASED_OPEN_METADATA_ARCHIVE_STORE_PROVIDER            = "org.odpi.openmetadata.adapters.repositoryservices.archiveconnector.file.FileBasedOpenMetadataArchiveStoreProvider";
@@ -89,9 +89,9 @@ public Connection getServerConfigConnection(String    serverName)
         endpoint.setAddress("data/servers/" + serverName + "/config/" + serverName + ".config");
 
         Connection connection = new Connection();
-        connection.setDisplayName("Encrypted File Config Store Connection");
+        connection.setDisplayName("File Config Store Connection");
         connection.setEndpoint(endpoint);
-        connection.setConnectorType(getConnectorType(ENCRYPTED_FILE_BASED_SERVER_CONFIG_STORE_PROVIDER));
+        connection.setConnectorType(getConnectorType(FILE_BASED_SERVER_CONFIG_STORE_PROVIDER));
         connection.setQualifiedName(endpoint.getAddress());
 
         return connection;
@@ -105,8 +105,8 @@ public Connection getServerConfigConnection(String    serverName)
    public Connection getServerConfigConnectionForRetrieveAll()
     {
         Connection connection = new Connection();
-        connection.setDisplayName("Encrypted File Config Store Connection");
-        connection.setConnectorType(getConnectorType(ENCRYPTED_FILE_BASED_SERVER_CONFIG_STORE_PROVIDER));
+        connection.setDisplayName("File Config Store Connection");
+        connection.setConnectorType(getConnectorType(FILE_BASED_SERVER_CONFIG_STORE_PROVIDER));
         return connection;
     }
 

diff --git a/...openmetadata/adapters/connectors/postgres/catalog/PostgresServerIntegrationConnector.java b/...openmetadata/adapters/connectors/postgres/catalog/PostgresServerIntegrationConnector.java
@@ -54,7 +54,7 @@ public class PostgresServerIntegrationConnector extends InfrastructureIntegrator
      * @throws ConnectorCheckedException there is a problem within the connector.
      */
     @Override
-    public synchronized void start() throws ConnectorCheckedException
+    public void start() throws ConnectorCheckedException
     {
         super.start();
 
@@ -514,7 +514,7 @@ private   void catalogDatabase(String              databaseName,
      * @throws ConnectorCheckedException there is a problem within the connector.
      */
     @Override
-    public  synchronized void disconnect() throws ConnectorCheckedException
+    public  void disconnect() throws ConnectorCheckedException
     {
         /*
          * This disconnects any embedded connections such as secrets connectors.

diff --git a/...en-connectors/data-manager-connectors/unity-catalog-connectors/UnityCatalog-catalogs.http b/...en-connectors/data-manager-connectors/unity-catalog-connectors/UnityCatalog-catalogs.http
@@ -1,6 +1,6 @@
 
-#@ucURL=http://localhost:8080
-@ucURL=http://egeria.pdr-associates.com:8070
+@ucURL=http://localhost:8080
+#@ucURL=http://egeria.pdr-associates.com:8070
 
 ###
 # @name list catalogs

diff --git a/...pen-connectors/data-manager-connectors/unity-catalog-connectors/UnityCatalog-schemas.http b/...pen-connectors/data-manager-connectors/unity-catalog-connectors/UnityCatalog-schemas.http
@@ -1,10 +1,10 @@
 
-#@ucURL=http://localhost:8080
-@ucURL=http://egeria.pdr-associates.com:8070
+@ucURL=http://localhost:8080
+#@ucURL=http://egeria.pdr-associates.com:8070
 
 ###
 # @name list schemas
-GET {{ucURL}}/api/2.1/unity-catalog/schemas?catalog_name=unity&max_results=10
+GET {{ucURL}}/api/2.1/unity-catalog/schemas?catalog_name=clinical_trials&max_results=10
 
 ###
 # @name create schema

diff --git a/...ger-connectors/unity-catalog-connectors/UnityCatalog-setup-onboarding-clinical-trial.http b/...ger-connectors/unity-catalog-connectors/UnityCatalog-setup-onboarding-clinical-trial.http
@@ -24,6 +24,15 @@ Content-Type: application/json
 # =====================================================================================================================
 # Set up Unity Catalog ...
 
+###
+# @name create catalog
+POST {{ucURL}}/api/2.1/unity-catalog/catalogs
+Content-Type: application/json
+
+{
+  "name": "clinical_trials",
+  "comment": "Clinical trials data for personalized medicine research."
+}
 
 
 ###

diff --git a/...open-connectors/data-manager-connectors/unity-catalog-connectors/UnityCatalog-tables.http b/...open-connectors/data-manager-connectors/unity-catalog-connectors/UnityCatalog-tables.http
@@ -1,6 +1,6 @@
 
-#@ucURL=http://localhost:8080
-@ucURL=http://egeria.pdr-associates.com:8070
+@ucURL=http://localhost:8080
+#@ucURL=http://egeria.pdr-associates.com:8070
 
 ###
 # @name list tables

diff --git a/...pen-connectors/data-manager-connectors/unity-catalog-connectors/UnityCatalog-volumes.http b/...pen-connectors/data-manager-connectors/unity-catalog-connectors/UnityCatalog-volumes.http
@@ -1,10 +1,10 @@
 
-#@ucURL=http://localhost:8080
-@ucURL=http://egeria.pdr-associates.com:8070
+@ucURL=http://localhost:8080
+#ucURL=http://egeria.pdr-associates.com:8070
 
 ###
 # @name list volumes
-GET {{ucURL}}/api/2.1/unity-catalog/volumes?catalog_name=unity&schema_name=default&max_results=10
+GET {{ucURL}}/api/2.1/unity-catalog/volumes?catalog_name=clinical_trials&schema_name=teddy_bear_drop_foot&max_results=10
 
 ###
 # @name create volume

diff --git a/...data/adapters/connectors/unitycatalog/sync/OSSUnityCatalogInsideCatalogSyncConnector.java b/...data/adapters/connectors/unitycatalog/sync/OSSUnityCatalogInsideCatalogSyncConnector.java
@@ -51,7 +51,7 @@ public class OSSUnityCatalogInsideCatalogSyncConnector extends CatalogIntegrator
      * @throws ConnectorCheckedException there is a problem within the connector.
      */
     @Override
-    public synchronized void start() throws ConnectorCheckedException
+    public void start() throws ConnectorCheckedException
     {
         final String methodName = "start";
 

diff --git a/...penmetadata/adapters/connectors/unitycatalog/sync/OSSUnityCatalogServerSyncConnector.java b/...penmetadata/adapters/connectors/unitycatalog/sync/OSSUnityCatalogServerSyncConnector.java
@@ -35,7 +35,7 @@ public class    OSSUnityCatalogServerSyncConnector extends CatalogIntegratorConn
      * @throws ConnectorCheckedException there is a problem within the connector.
      */
     @Override
-    public synchronized void start() throws ConnectorCheckedException
+    public void start() throws ConnectorCheckedException
     {
         final String methodName = "start";
 

diff --git a/...n/java/org/odpi/openmetadata/adapters/connectors/resource/jdbc/JDBCResourceConnector.java b/...n/java/org/odpi/openmetadata/adapters/connectors/resource/jdbc/JDBCResourceConnector.java
@@ -98,7 +98,7 @@ public void initializeEmbeddedConnectors(List<Connector> embeddedConnectors)
      * @throws ConnectorCheckedException there is a problem within the connector.
      */
     @Override
-    public synchronized void start() throws ConnectorCheckedException
+    public void start() throws ConnectorCheckedException
     {
         super.start();
 
@@ -404,7 +404,7 @@ private String getPlaceholders(int numberOfColumns)
      * @throws ConnectorCheckedException there is a problem within the connector.
      */
     @Override
-    public  synchronized void disconnect() throws ConnectorCheckedException
+    public  void disconnect() throws ConnectorCheckedException
     {
         /*
          * This disconnects any embedded connections such as secrets connectors.

diff --git a/...ava/org/odpi/openmetadata/adapters/connectors/dynamicarchivers/DynamicArchiveService.java b/...ava/org/odpi/openmetadata/adapters/connectors/dynamicarchivers/DynamicArchiveService.java
@@ -100,7 +100,7 @@ private List<ArchiveDestination> getEmbeddedArchiveStoresConnectors()
      * @throws ConnectorCheckedException there is a problem within the archive service.
      */
     @Override
-    public synchronized void start() throws ConnectorCheckedException
+    public void start() throws ConnectorCheckedException
     {
         super.start();
 

diff --git a/...va/org/odpi/openmetadata/adapters/connectors/surveyaction/surveycsv/CSVSurveyService.java b/...va/org/odpi/openmetadata/adapters/connectors/surveyaction/surveycsv/CSVSurveyService.java
@@ -668,7 +668,7 @@ public ResourceProfileAnnotation getDataProfileAnnotation()
      * @throws ConnectorCheckedException there is a problem within the connector.
      */
     @Override
-    public  synchronized void disconnect() throws ConnectorCheckedException
+    public  void disconnect() throws ConnectorCheckedException
     {
         if (connector != null)
         {

diff --git a/.../org/odpi/openmetadata/adapters/connectors/surveyaction/surveyfile/FileSurveyService.java b/.../org/odpi/openmetadata/adapters/connectors/surveyaction/surveyfile/FileSurveyService.java
@@ -74,7 +74,7 @@ public void start() throws ConnectorCheckedException
      * @throws ConnectorCheckedException there is a problem within the connector.
      */
     @Override
-    public  synchronized void disconnect() throws ConnectorCheckedException
+    public void disconnect() throws ConnectorCheckedException
     {
         if (connector != null)
         {

diff --git a/.../odpi/openmetadata/adapters/connectors/surveyaction/surveyfolder/FolderSurveyService.java b/.../odpi/openmetadata/adapters/connectors/surveyaction/surveyfolder/FolderSurveyService.java
@@ -836,7 +836,7 @@ static class InaccessibleFile
      * @throws ConnectorCheckedException there is a problem within the connector.
      */
     @Override
-    public  synchronized void disconnect() throws ConnectorCheckedException
+    public void disconnect() throws ConnectorCheckedException
     {
         if (connector != null)
         {

diff --git a/...ters/connectors/governanceactions/stewardship/CatalogServerGovernanceActionConnector.java b/...ters/connectors/governanceactions/stewardship/CatalogServerGovernanceActionConnector.java
@@ -44,7 +44,7 @@ public CatalogServerGovernanceActionConnector()
      * @throws ConnectorCheckedException there is a problem within the governance action service.
      */
     @Override
-    public synchronized void start() throws ConnectorCheckedException
+    public void start() throws ConnectorCheckedException
     {
         final String methodName = "start";
 

diff --git a/...pters/connectors/governanceactions/stewardship/CreateServerGovernanceActionConnector.java b/...pters/connectors/governanceactions/stewardship/CreateServerGovernanceActionConnector.java
@@ -44,7 +44,7 @@ public CreateServerGovernanceActionConnector()
      * @throws ConnectorCheckedException there is a problem within the governance action service.
      */
     @Override
-    public synchronized void start() throws ConnectorCheckedException
+    public void start() throws ConnectorCheckedException
     {
         final String methodName = "start";
 

diff --git a/...metadata/adapters/connectors/integration/egeria/EgeriaCataloguerIntegrationConnector.java b/...metadata/adapters/connectors/integration/egeria/EgeriaCataloguerIntegrationConnector.java
@@ -979,15 +979,12 @@ private void assessElementForMonitoring(String       elementGUID,
      * @throws ConnectorCheckedException something failed in the super class
      */
     @Override
-    public synchronized void disconnect() throws ConnectorCheckedException
+    public void disconnect() throws ConnectorCheckedException
     {
         final String methodName = "disconnect";
 
-        if (auditLog != null)
-        {
-            auditLog.logMessage(methodName,
-                                EgeriaInfrastructureConnectorAuditCode.CONNECTOR_STOPPING.getMessageDefinition(connectorName));
-        }
+        auditLog.logMessage(methodName,
+                            EgeriaInfrastructureConnectorAuditCode.CONNECTOR_STOPPING.getMessageDefinition(connectorName));
 
         super.disconnect();
     }

diff --git a/...ctors/integration-connectors/openlineage-integration-connectors/openLineage requests.http b/...ctors/integration-connectors/openlineage-integration-connectors/openLineage requests.http
@@ -1,8 +1,9 @@
 # openLineage requests
 
 #@openLineageBackend=http://localhost:5000
-@openLineageBackend=http://egeria.pdr-associates.com:5050
-#@openLineageBackend=https://localhost:9443/servers/integration-daemon/open-metadata/integration-services/lineage-integrator/users/airflownpa
+#@openLineageBackend=http://localhost:6000
+#@openLineageBackend=http://egeria.pdr-associates.com:5050
+@openLineageBackend=https://localhost:9443/servers/integration-daemon/open-metadata/integration-services/lineage-integrator/users/airflownpa
 @openLineageNamespace=restTestNameSpace
 @openLineageRunId=001
 

diff --git a/...s/connectors/integration/openlineage/GovernanceActionOpenLineageIntegrationConnector.java b/...s/connectors/integration/openlineage/GovernanceActionOpenLineageIntegrationConnector.java
@@ -49,7 +49,7 @@ public GovernanceActionOpenLineageIntegrationConnector()
      * @throws ConnectorCheckedException there is a problem within the connector.
      */
     @Override
-    public synchronized void start() throws ConnectorCheckedException
+    public void start() throws ConnectorCheckedException
     {
         super.start();
 
@@ -68,15 +68,12 @@ public synchronized void start() throws ConnectorCheckedException
         }
         catch (Exception error)
         {
-            if (auditLog != null)
-            {
-                auditLog.logException(methodName,
-                                      OpenLineageIntegrationConnectorAuditCode.UNEXPECTED_EXCEPTION.getMessageDefinition(connectorName,
-                                                                                                                         error.getClass().getName(),
-                                                                                                                         methodName,
-                                                                                                                         error.getMessage()),
-                                      error);
-            }
+            auditLog.logException(methodName,
+                                  OpenLineageIntegrationConnectorAuditCode.UNEXPECTED_EXCEPTION.getMessageDefinition(connectorName,
+                                                                                                                     error.getClass().getName(),
+                                                                                                                     methodName,
+                                                                                                                     error.getMessage()),
+                                  error);
         }
     }
 

diff --git a/...etadata/adapters/connectors/integration/openlineage/OpenLineageLogStoreConnectorBase.java b/...etadata/adapters/connectors/integration/openlineage/OpenLineageLogStoreConnectorBase.java
@@ -154,7 +154,7 @@ else if (connectionProperties.getConnectorType() != null)
      * @throws ConnectorCheckedException there is a problem within the connector.
      */
     @Override
-    public synchronized void start() throws ConnectorCheckedException
+    public void start() throws ConnectorCheckedException
     {
         super.start();
 
@@ -181,7 +181,7 @@ public synchronized void start() throws ConnectorCheckedException
      * @throws ConnectorCheckedException there is a problem with the connector.  It is not able to refresh the catalog targets.
      */
     @Override
-    public synchronized void refresh() throws ConnectorCheckedException
+    public void refresh() throws ConnectorCheckedException
     {
         final String methodName = "refresh";
 
@@ -281,8 +281,8 @@ else if (propertyHelper.isTypeOf(catalogTarget.getCatalogTargetElement(), OpenMe
      * @param rawEvent json payload received for the event
      */
     @Override
-    public synchronized void processOpenLineageRunEvent(OpenLineageRunEvent event,
-                                                        String              rawEvent)
+    public void processOpenLineageRunEvent(OpenLineageRunEvent event,
+                                           String              rawEvent)
     {
         final String methodName = "processOpenLineageRunEvent";
 

diff --git a/...openmetadata/adapters/repositoryservices/xtdb/repositoryconnector/ffdc/XTDBAuditCode.java b/...openmetadata/adapters/repositoryservices/xtdb/repositoryconnector/ffdc/XTDBAuditCode.java
@@ -189,7 +189,7 @@ public enum XTDBAuditCode implements AuditLogMessageSet
      * OMRS-XTDB-REPOSITORY-0016 - A search was requested for property {0} which does not match any of the type restrictions: {1}
      */
     INVALID_PROPERTY("OMRS-XTDB-REPOSITORY-0016",
-                     AuditLogRecordSeverityLevel.INFO,
+                     AuditLogRecordSeverityLevel.TRACE,
                      "A search was requested for property {0} which does not match any of the type restrictions: {1}",
                      "The requested search is for a property which does not exist on any of the types for which the search is restricted, and therefore no results will be returned.",
                      "This message is provided for informational purposes, should a user expect some results to their search " +

diff --git a/...odpi/openmetadata/adapters/connectors/apachekafka/resource/ApacheKafkaAdminConnector.java b/...odpi/openmetadata/adapters/connectors/apachekafka/resource/ApacheKafkaAdminConnector.java
@@ -186,7 +186,7 @@ public DescribeTopicsResult describeTopics() throws ConnectorCheckedException
      * @throws ConnectorCheckedException there is a problem within the connector.
      */
     @Override
-    public synchronized void disconnect() throws ConnectorCheckedException
+    public void disconnect() throws ConnectorCheckedException
     {
         if (kafkaAdminClient != null)
         {

diff --git a/.../connectors/egeriainfrastructure/platform/catalog/OMAGServerPlatformCatalogConnector.java b/.../connectors/egeriainfrastructure/platform/catalog/OMAGServerPlatformCatalogConnector.java
@@ -71,7 +71,7 @@ public String toString()
      * @throws ConnectorCheckedException there is a problem within the connector.
      */
     @Override
-    public synchronized void start() throws ConnectorCheckedException
+    public void start() throws ConnectorCheckedException
     {
         super.start();
 

diff --git a/...ain/java/org/odpi/openmetadata/adminservices/spring/ConfigRepositoryServicesResource.java b/...ain/java/org/odpi/openmetadata/adminservices/spring/ConfigRepositoryServicesResource.java
@@ -466,7 +466,7 @@ public VoidResponse setXTDBLocalKVRepository(@PathVariable String          userI
                externalDocs=@ExternalDocumentation(description="Further Information",
                                                    url="https://egeria-project.org/connectors/repository/xtdb/"))
 
-    public VoidResponse setXTDBLocalRepository(@PathVariable String             userId,
+    public VoidResponse setXTDBLocalRepository(@PathVariable String              userId,
                                                @PathVariable String              serverName,
                                                @RequestBody  Map<String, Object> storageProperties)
     {