Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#7229 do not create a 2nd unneeded default audit log destination, when adding an audit log destination #7312

Merged
merged 2 commits into from
Jan 10, 2023
Merged

#7229 do not create a 2nd unneeded default audit log destination, when adding an audit log destination #7312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79cd329
git7229
davidradl Jan 10, 2023
f84e6e3
Merge branch 'main' of https://github.com/odpi/egeria into git7229
davidradl Jan 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ver/src/main/java/org/odpi/openmetadata/adminservices/server/OMAGServerAdminServices.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
23 changes: 18 additions & 5 deletions ...rc/main/java/org/odpi/openmetadata/repositoryservices/admin/OMRSConfigurationFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}