You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2018/09/23 17:19:51 UTC
[3/6] logging-log4j-audit git commit: [LOG4J2-2421] remove pointless
creation of array
[LOG4J2-2421] remove pointless creation of array
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/0c3a58a3
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/tree/0c3a58a3
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/diff/0c3a58a3
Branch: refs/heads/master
Commit: 0c3a58a33923a4eabac20669a89b8cc7dbc21575
Parents: baa2d74
Author: Andrei Ivanov <an...@arnia.ro>
Authored: Mon Sep 17 17:17:39 2018 +0300
Committer: Andrei Ivanov <an...@arnia.ro>
Committed: Mon Sep 17 17:17:39 2018 +0300
----------------------------------------------------------------------
.../logging/log4j/audit/AbstractEventLogger.java | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/0c3a58a3/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 b3ad586..e9af187 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
@@ -28,9 +28,7 @@ import org.apache.logging.log4j.catalog.api.EventAttribute;
import org.apache.logging.log4j.catalog.api.plugins.ConstraintPlugins;
import org.apache.logging.log4j.message.StructuredDataMessage;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import static org.apache.logging.log4j.catalog.api.constant.Constants.*;
@@ -124,8 +122,7 @@ public abstract class AbstractEventLogger {
missingAttributes.append(name);
} else {
if (attr.getConstraints() != null && attr.getConstraints().size() > 0) {
- Constraint[] constraints = attr.getConstraints().toArray(new Constraint[attr.getConstraints().size()]);
- validateConstraints(false, constraints, name, attributes.get(name), errors);
+ validateConstraints(false, attr.getConstraints(), name, attributes.get(name), errors);
}
}
}
@@ -202,9 +199,7 @@ public abstract class AbstractEventLogger {
}
Set<Constraint> constraintList = attribute.getConstraints();
if (constraintList != null && constraintList.size() > 0) {
- Constraint[] constraints =
- attribute.getConstraints().toArray(new Constraint[attribute.getConstraints().size()]);
- validateConstraints(true, constraints, entry.getKey(), ThreadContext.get(entry.getKey()), errors);
+ validateConstraints(true, constraintList, entry.getKey(), ThreadContext.get(entry.getKey()), errors);
}
}
if (errors.length() > 0) {
@@ -223,7 +218,7 @@ public abstract class AbstractEventLogger {
}
}
- private static void validateConstraints(boolean isRequestContext, Constraint[] constraints, String name,
+ private static void validateConstraints(boolean isRequestContext, Collection<Constraint> constraints, String name,
String value, StringBuilder errors) {
for (Constraint constraint : constraints) {
constraintPlugins.validateConstraint(isRequestContext, constraint.getConstraintType().getName(), name, value,