Merge pull request #7312 from davidradl/git7229

#7229 do not create a 2nd unneeded default audit log destination, when adding an audit log destination
odpi · Jan 10, 2023 · 400f94e · 400f94e
2 parents 014cc56 + f84e6e3
commit 400f94e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/...ver/src/main/java/org/odpi/openmetadata/adminservices/server/OMAGServerAdminServices.java b/...ver/src/main/java/org/odpi/openmetadata/adminservices/server/OMAGServerAdminServices.java
@@ -2776,7 +2776,7 @@ public VoidResponse addAuditLogDestination(String                userId,
                 {
                     OMRSConfigurationFactory configurationFactory = new OMRSConfigurationFactory();
 
-                    repositoryServicesConfig = configurationFactory.getDefaultRepositoryServicesConfig();
+                    repositoryServicesConfig = configurationFactory.getDefaultRepositoryServicesConfig(false);
                 }
 
                 List<Connection>  auditLogDestinations = repositoryServicesConfig.getAuditLogConnections();

diff --git a/...rc/main/java/org/odpi/openmetadata/repositoryservices/admin/OMRSConfigurationFactory.java b/...rc/main/java/org/odpi/openmetadata/repositoryservices/admin/OMRSConfigurationFactory.java
@@ -353,18 +353,31 @@ public CohortConfig getDefaultCohortConfig(String               localServerName,
     /**
      * Returns a repository services config with the audit log set up.
      *
+     * @param addDefaultAuditLog when set add a default audit log.
      * @return minimally configured repository services config
      */
-    public RepositoryServicesConfig getDefaultRepositoryServicesConfig()
+    public RepositoryServicesConfig getDefaultRepositoryServicesConfig(boolean addDefaultAuditLog)
     {
         RepositoryServicesConfig repositoryServicesConfig = new RepositoryServicesConfig();
 
-        List<Connection>   auditLogStoreConnections = new ArrayList<>();
+        if (addDefaultAuditLog)
+        {
+            List<Connection>   auditLogStoreConnections = new ArrayList<>();
+            auditLogStoreConnections.add(connectorConfigurationFactory.getDefaultAuditLogConnection());
+            repositoryServicesConfig.setAuditLogConnections(auditLogStoreConnections);
+        }
 
-        auditLogStoreConnections.add(connectorConfigurationFactory.getDefaultAuditLogConnection());
+        return repositoryServicesConfig;
+    }
 
-        repositoryServicesConfig.setAuditLogConnections(auditLogStoreConnections);
 
-        return repositoryServicesConfig;
+    /**
+     * Returns a repository services config with the audit log set up.
+     *
+     * @return minimally configured repository services config
+     */
+    public RepositoryServicesConfig getDefaultRepositoryServicesConfig()
+    {
+       return getDefaultRepositoryServicesConfig(true);
     }
 }