[LOG4J2-2442] normalize the event name
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/eefa81ff Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/tree/eefa81ff Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/diff/eefa81ff Branch: refs/heads/master Commit: eefa81ffbb178ff4153a05946cc42759f85e1a21 Parents: 04ab4e6 Author: Andrei Ivanov <andrei.iva...@arnia.ro> Authored: Sun Sep 16 17:15:30 2018 +0300 Committer: Andrei Ivanov <andrei.iva...@arnia.ro> Committed: Sun Sep 16 17:15:30 2018 +0300 ---------------------------------------------------------------------- .../org/apache/logging/log4j/audit/AbstractEventLogger.java | 8 +++++--- .../java/org/apache/logging/log4j/audit/AuditLoggerTest.java | 5 +++-- 2 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/eefa81ff/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/AbstractEventLogger.java ---------------------------------------------------------------------- diff --git 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 index ac0bb54..22ec90f 100644 --- 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 @@ -21,6 +21,7 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.ThreadContext; import org.apache.logging.log4j.audit.catalog.CatalogManager; import org.apache.logging.log4j.audit.exception.AuditException; +import org.apache.logging.log4j.audit.util.NamingUtils; import org.apache.logging.log4j.catalog.api.Attribute; import org.apache.logging.log4j.catalog.api.Constraint; import org.apache.logging.log4j.catalog.api.Event; @@ -91,11 +92,12 @@ public abstract class AbstractEventLogger { } private void logEvent(String eventName, String catalogId, Map<String, String> attributes, AuditExceptionHandler exceptionHandler) { - Event event = catalogId == null ? catalogManager.getEvent(eventName) : catalogManager.getEvent(eventName, catalogId); + String eventId = NamingUtils.lowerFirst(eventName); + Event event = catalogId == null ? catalogManager.getEvent(eventId) : catalogManager.getEvent(eventId, catalogId); if (event == null) { - throw new AuditException("Unable to locate definition of audit event " + eventName); + throw new AuditException("Unable to locate definition of audit event " + eventId); } - logEvent(eventName, attributes, event, exceptionHandler); + logEvent(eventId, attributes, event, exceptionHandler); } protected abstract void logEvent(StructuredDataMessage message); http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/eefa81ff/log4j-audit/log4j-audit-api/src/test/java/org/apache/logging/log4j/audit/AuditLoggerTest.java ---------------------------------------------------------------------- diff --git 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 index abe6eb8..77ee464 100644 --- 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 @@ -85,7 +85,7 @@ public class AuditLoggerTest { properties.put("fromAccount", "111111"); properties.put("amount", "111.55"); try { - auditLogger.logEvent("transfer", properties); + auditLogger.logEvent("Transfer", properties); } catch (Exception ex) { ex.printStackTrace(); fail(); @@ -94,6 +94,7 @@ public class AuditLoggerTest { assertNotNull("No messages", msgs); assertTrue("No messages", msgs.size() == 1); String msg = msgs.get(0); + assertTrue("Normalized event name", msg.contains("transfer@")); assertTrue("No companyId", msg.contains("companyId=\"12345\"")); assertTrue("No ipAddress", msg.contains("ipAddress=\"127.0.0.1\"")); assertTrue("No toAccount", msg.contains("toAccount=\"123456\"")); @@ -110,6 +111,6 @@ public class AuditLoggerTest { Map<String, String> properties = new HashMap<String, String>(); properties.put("toAccount", "123456"); properties.put("amount", "111.55"); - auditLogger.logEvent("transfer", properties); + auditLogger.logEvent("Transfer", properties); } }
