Merge branch 'master' of https://github.com/apache/logging-log4j-audit into LOG4J2-2443
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/commit/ff477a08 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/tree/ff477a08 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/diff/ff477a08 Branch: refs/heads/master Commit: ff477a08524592d64b4f7e84e2ff880bd7d55dbb Parents: 063c258 f4dee64 Author: Andrei Ivanov <andrei.iva...@arnia.ro> Authored: Mon Sep 24 11:00:09 2018 +0300 Committer: Andrei Ivanov <andrei.iva...@arnia.ro> Committed: Mon Sep 24 11:00:09 2018 +0300 ---------------------------------------------------------------------- .../log4j/audit/AbstractEventLogger.java | 69 ++++++++++++-------- .../logging/log4j/audit/LogEventFactory.java | 37 ++++++++--- .../log4j/audit/catalog/CatalogManagerImpl.java | 33 ++++++---- .../log4j/audit/generator/ClassGenerator.java | 13 +++- .../audit/generator/InterfacesGenerator.java | 8 +++ .../log4j/audit/rest/RequestContextFilter.java | 21 +++--- .../rest/RequestContextHandlerInterceptor.java | 22 ++++--- .../logging/log4j/audit/AuditLoggerTest.java | 56 ++++++++++++---- .../logging/log4j/audit/BaseEventTest.java | 39 +++++++++++ .../apache/logging/log4j/audit/LoginTest.java | 55 ++++++++++++++++ .../logging/log4j/audit/TransferTest.java | 58 +++++++++------- .../apache/logging/log4j/audit/event/Login.java | 6 ++ .../src/test/resources/basicCatalog.json | 5 ++ .../logging/log4j/audit/plugin/AuditMojo.java | 7 ++ .../src/site/markdown/index.md | 2 + src/changes/changes.xml | 26 ++++++++ 16 files changed, 353 insertions(+), 104 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/ff477a08/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/AbstractEventLogger.java ---------------------------------------------------------------------- diff --cc log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/AbstractEventLogger.java index 2b74236,5de2844..dc16b16 --- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/AbstractEventLogger.java +++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/AbstractEventLogger.java @@@ -192,8 -205,9 +206,9 @@@ public abstract class AbstractEventLogg } } if (errors.length() > 0) { - throw new AuditException("Event " + eventName + " has incorrect data in the Thread Context: " + errors.toString()); + throw new ConstraintValidationException("Event " + eventName + " has incorrect data in the Thread Context: " + errors.toString()); } + msg.putAll(attributes); try { logEvent(msg); http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/ff477a08/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/LogEventFactory.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/ff477a08/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/AuditLoggerTest.java ---------------------------------------------------------------------- diff --cc log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/AuditLoggerTest.java index 9e8b18d,5b075d5..c038c98 --- a/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/AuditLoggerTest.java +++ b/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/AuditLoggerTest.java @@@ -22,7 -22,9 +22,9 @@@ import org.apache.logging.log4j.audit.c import org.apache.logging.log4j.audit.catalog.CatalogManagerImpl; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.audit.catalog.StringCatalogReader; -import org.apache.logging.log4j.audit.exception.AuditException; +import org.apache.logging.log4j.audit.exception.ConstraintValidationException; + import org.apache.logging.log4j.catalog.api.CatalogReader; + import org.apache.logging.log4j.catalog.api.dao.ClassPathCatalogReader; import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.Configuration; @@@ -99,8 -111,21 +111,21 @@@ public class AuditLoggerTest assertTrue("No toAccount", msg.contains("toAccount=\"123456\"")); } - @Test(expected = AuditException.class) + @Test(expected = ConstraintValidationException.class) - public void testBadAttribute() { + public void testMissingRequestContextAttribute() { + auditLogger = buildAuditLogger(catalogReader); + + Map<String, String> properties = new HashMap<String, String>(); + properties.put("toAccount", "123456"); + properties.put("fromAccount", "111111"); + properties.put("amount", "111.55"); + auditLogger.logEvent("transfer", properties); + } + - @Test(expected = AuditException.class) ++ @Test(expected = ConstraintValidationException.class) + public void testMissingEventAttribute() { + auditLogger = buildAuditLogger(catalogReader); + ThreadContext.put("companyId", "12345"); ThreadContext.put("ipAddress", "127.0.0.1"); ThreadContext.put("environment", "dev"); http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/ff477a08/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/TransferTest.java ----------------------------------------------------------------------
