Repository: logging-log4j-audit Updated Branches: refs/heads/master 65ccad83e -> 7660899fc
[LOG4J2-2442] Extract common code to a single method 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/04ab4e64 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/tree/04ab4e64 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/diff/04ab4e64 Branch: refs/heads/master Commit: 04ab4e64bf77408149a9eb835741b689cc558b44 Parents: c2bfa53 Author: Andrei Ivanov <[email protected]> Authored: Sun Sep 16 17:13:18 2018 +0300 Committer: Andrei Ivanov <[email protected]> Committed: Sun Sep 16 17:13:18 2018 +0300 ---------------------------------------------------------------------- .../logging/log4j/audit/AbstractEventLogger.java | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/04ab4e64/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 da2254a..ac0bb54 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 @@ -79,24 +79,19 @@ public abstract class AbstractEventLogger { } public void logEvent(String eventName, Map<String, String> attributes) { - Event event = catalogManager.getEvent(eventName); - if (event == null) { - throw new AuditException("Unable to locate definition of audit event " + eventName); - } - logEvent(eventName, attributes, event, defaultAuditExceptionHandler); + logEvent(eventName, null, attributes, defaultAuditExceptionHandler); } public void logEvent(String eventName, String catalogId, Map<String, String> attributes) { - Event event = catalogManager.getEvent(eventName, catalogId); - if (event == null) { - throw new AuditException("Unable to locate definition of audit event " + eventName); - } - logEvent(eventName, attributes, event, defaultAuditExceptionHandler); + logEvent(eventName, catalogId, attributes, defaultAuditExceptionHandler); } public void logEvent(String eventName, Map<String, String> attributes, AuditExceptionHandler exceptionHandler) { - Event event = catalogManager.getEvent(eventName); + logEvent(eventName, null, attributes, exceptionHandler); + } + private void logEvent(String eventName, String catalogId, Map<String, String> attributes, AuditExceptionHandler exceptionHandler) { + Event event = catalogId == null ? catalogManager.getEvent(eventName) : catalogManager.getEvent(eventName, catalogId); if (event == null) { throw new AuditException("Unable to locate definition of audit event " + eventName); }
