Merge pull request #7568 from planetf1/egeria-release-4.0

odpi · Mar 24, 2023 · b4c056d · b4c056d
2 parents 662c1d9 + 662ad65
commit b4c056d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/...etadata/governanceservers/integrationdaemonservices/handlers/IntegrationGroupHandler.java b/...etadata/governanceservers/integrationdaemonservices/handlers/IntegrationGroupHandler.java
@@ -325,10 +325,17 @@ private void refreshRegisteredIntegrationConnector(RegisteredIntegrationConnecto
                     {
                         IntegrationServiceHandler integrationServiceHandler = integrationServiceHandlerMap.get(serviceURLMarker);
 
+                        String userId = serverUserId;
+
+                        if (registeredIntegrationConnectorElement.getRegistrationProperties().getConnectorUserId() != null)
+                        {
+                            userId = registeredIntegrationConnectorElement.getRegistrationProperties().getConnectorUserId();
+                        }
+
                         connectorHandler = new IntegrationConnectorHandler(registeredIntegrationConnectorElement.getConnectorId(),
                                                                            registeredIntegrationConnectorElement.getElementHeader().getGUID(),
                                                                            registeredIntegrationConnectorElement.getRegistrationProperties().getConnectorName(),
-                                                                           registeredIntegrationConnectorElement.getRegistrationProperties().getConnectorUserId(),
+                                                                           userId,
                                                                            registeredIntegrationConnectorElement.getRegistrationProperties().getStartDate(),
                                                                            registeredIntegrationConnectorElement.getRegistrationProperties().getStopDate(),
                                                                            registeredIntegrationConnectorElement.getRegistrationProperties().getRefreshTimeInterval(),

diff --git a/...adata/governanceservers/integrationdaemonservices/handlers/IntegrationServiceHandler.java b/...adata/governanceservers/integrationdaemonservices/handlers/IntegrationServiceHandler.java
@@ -28,6 +28,7 @@
 public class IntegrationServiceHandler
 {
     private final String                    localServerName;               /* Initialized in constructor */
+    private final String                    localServerUserId;             /* Initialized in constructor */
     private final IntegrationServiceConfig  serviceConfig;                 /* Initialized in constructor */
     private final IntegrationContextManager contextManager;                /* Initialized in constructor */
     private final AuditLog                  auditLog;                      /* Initialized in constructor */
@@ -45,11 +46,13 @@ public class IntegrationServiceHandler
      * @param auditLog logging destination
      */
     public IntegrationServiceHandler(String                    localServerName,
+                                     String                    localServerUserId,
                                      IntegrationServiceConfig  serviceConfig,
                                      IntegrationContextManager contextManager,
                                      AuditLog                  auditLog)
     {
         this.localServerName       = localServerName;
+        this.localServerUserId     = localServerUserId;
         this.serviceConfig         = serviceConfig;
         this.contextManager        = contextManager;
         this.auditLog              = auditLog;
@@ -101,10 +104,16 @@ public List<IntegrationConnectorHandler> initialize()
                         connectorConfig.setPermittedSynchronization(serviceConfig.getDefaultPermittedSynchronization());
                     }
 
+                    String userId = localServerUserId;
+
+                    if (connectorConfig.getConnectorUserId() != null)
+                    {
+                        userId = connectorConfig.getConnectorUserId();
+                    }
                     IntegrationConnectorHandler connectorHandler = new IntegrationConnectorHandler(connectorConfig.getConnectorId(),
                                                                                                    null,
                                                                                                    connectorConfig.getConnectorName(),
-                                                                                                   connectorConfig.getConnectorUserId(),
+                                                                                                   userId,
                                                                                                    null,
                                                                                                    null,
                                                                                                    connectorConfig.getRefreshTimeInterval(),

diff --git a/...ernanceservers/integrationdaemonservices/server/IntegrationDaemonOperationalServices.java b/...ernanceservers/integrationdaemonservices/server/IntegrationDaemonOperationalServices.java
@@ -31,7 +31,7 @@
 
 /**
  * IntegrationDaemonOperationalServices is responsible for controlling the startup and shutdown of
- * of the integration daemon services.
+ * the integration daemon services.
  */
 public class IntegrationDaemonOperationalServices
 {
@@ -155,6 +155,7 @@ else if (staticConfiguration.isEmpty())
                     contextManager.createClients();
 
                     IntegrationServiceHandler integrationServiceHandler = new IntegrationServiceHandler(localServerName,
+                                                                                                        localServerUserId,
                                                                                                         integrationServiceConfig,
                                                                                                         contextManager,
                                                                                                         auditLog);