You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2019/11/29 07:50:34 UTC
[syncope] 01/03: [SYNCOPE-1511] Use AuditDAO.TABLE_NAME
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 599b090ad5714a21d443cfe1409c9d14881a3431
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Thu Nov 28 10:50:11 2019 +0100
[SYNCOPE-1511] Use AuditDAO.TABLE_NAME
---
.../java/org/apache/syncope/core/logic/init/LoggerLoader.java | 9 +++++----
.../core/provisioning/java/job/report/AuditReportlet.java | 5 +++--
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/core/idrepo/logic/src/main/java/org/apache/syncope/core/logic/init/LoggerLoader.java b/core/idrepo/logic/src/main/java/org/apache/syncope/core/logic/init/LoggerLoader.java
index f3eddbc..17e357c 100644
--- a/core/idrepo/logic/src/main/java/org/apache/syncope/core/logic/init/LoggerLoader.java
+++ b/core/idrepo/logic/src/main/java/org/apache/syncope/core/logic/init/LoggerLoader.java
@@ -41,6 +41,7 @@ import org.apache.syncope.core.logic.MemoryAppender;
import org.apache.syncope.core.spring.security.AuthContextUtils;
import org.apache.syncope.core.persistence.api.ImplementationLookup;
import org.apache.syncope.core.persistence.api.SyncopeCoreLoader;
+import org.apache.syncope.core.persistence.api.dao.AuditDAO;
import org.apache.syncope.core.spring.ApplicationContextProvider;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.annotation.Autowired;
@@ -97,7 +98,7 @@ public class LoggerLoader implements SyncopeCoreLoader {
setIgnoreExceptions(false).
setConnectionSource(new DataSourceConnectionSource(domain, datasource)).
setBufferSize(0).
- setTableName("SYNCOPEAUDIT").
+ setTableName(AuditDAO.TABLE_NAME).
setColumnConfigs(buildColumnConfigs(ctx)).
setColumnMappings(new ColumnMapping[0]).
build();
@@ -155,9 +156,9 @@ public class LoggerLoader implements SyncopeCoreLoader {
}
public static void addAppenderToContext(
- final LoggerContext ctx,
- final AuditAppender auditAppender,
- final LoggerConfig eventLogConf) {
+ final LoggerContext ctx,
+ final AuditAppender auditAppender,
+ final LoggerConfig eventLogConf) {
Appender targetAppender = ctx.getConfiguration().getAppender(auditAppender.getTargetAppenderName());
if (targetAppender == null) {
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/report/AuditReportlet.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/report/AuditReportlet.java
index 4529a0a..7b9c555 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/report/AuditReportlet.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/report/AuditReportlet.java
@@ -26,6 +26,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.common.lib.report.AuditReportletConf;
import org.apache.syncope.common.lib.report.ReportletConf;
import org.apache.syncope.core.persistence.api.DomainHolder;
+import org.apache.syncope.core.persistence.api.dao.AuditDAO;
import org.apache.syncope.core.persistence.api.entity.AuditEntry;
import org.apache.syncope.core.provisioning.api.AuditEntryImpl;
import org.apache.syncope.core.spring.security.AuthContextUtils;
@@ -48,12 +49,12 @@ public class AuditReportlet extends AbstractReportlet {
private DataSource datasource;
private void doExtractConf(final ContentHandler handler, final AtomicReference<String> status) throws SAXException {
- status.set("Fetching " + conf.getSize() + " rows from the SYNCOPEAUDIT table");
+ status.set("Fetching " + conf.getSize() + " rows from the " + AuditDAO.TABLE_NAME + " table");
JdbcTemplate jdbcTemplate = new JdbcTemplate(datasource);
jdbcTemplate.setMaxRows(conf.getSize());
List<Map<String, Object>> rows = jdbcTemplate.
- queryForList("SELECT * FROM SYNCOPEAUDIT ORDER BY EVENT_DATE DESC");
+ queryForList("SELECT * FROM " + AuditDAO.TABLE_NAME + " ORDER BY EVENT_DATE DESC");
handler.startElement("", "", "events", null);
AttributesImpl atts = new AttributesImpl();