You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by vy...@apache.org on 2020/11/19 16:00:19 UTC
[logging-log4j2] branch master updated (581d543 -> cf01a51)
This is an automated email from the ASF dual-hosted git repository.
vy pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git.
from 581d543 Align JTL module with the one in release-2.x.
new cd4aa20 Escape XML characters in JTL POM.
new cf01a51 Replace enum singletons with final classes, as requested by Gary Gregory.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
log4j-layout-template-json/pom.xml | 2 ++
.../log4j/layout/template/json/JsonTemplateLayoutDefaults.java | 4 +++-
.../layout/template/json/resolver/EventResolverFactories.java | 4 +++-
.../json/resolver/StackTraceElementObjectResolverFactories.java | 4 +++-
.../log4j/layout/template/json/resolver/TemplateResolvers.java | 4 +++-
.../log4j/layout/template/json/util/RecyclerFactories.java | 4 +++-
.../log4j/layout/template/json/util/StringParameterParser.java | 8 ++++++--
.../org/apache/logging/log4j/layout/template/json/util/Uris.java | 4 +++-
.../apache/logging/log4j/layout/template/json/JacksonFixture.java | 4 +++-
.../log4j/layout/template/json/LayoutComparisonHelpers.java | 4 +++-
.../logging/log4j/layout/template/json/LogEventFixture.java | 4 +++-
.../org/apache/logging/log4j/layout/template/json/LogstashIT.java | 4 +++-
12 files changed, 38 insertions(+), 12 deletions(-)
[logging-log4j2] 01/02: Escape XML characters in JTL POM.
Posted by vy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit cd4aa208fbcf9fdfea9e82890212cd17d3bc0662
Author: Volkan Yazıcı <vo...@gmail.com>
AuthorDate: Thu Nov 19 16:47:10 2020 +0100
Escape XML characters in JTL POM.
---
log4j-layout-template-json/pom.xml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/log4j-layout-template-json/pom.xml b/log4j-layout-template-json/pom.xml
index 11decbd..972b4e9 100644
--- a/log4j-layout-template-json/pom.xml
+++ b/log4j-layout-template-json/pom.xml
@@ -392,6 +392,7 @@
<arg>1</arg>
<arg>-e</arg>
<arg>
+ <![CDATA[
input {
gelf {
host => "logstash"
@@ -436,6 +437,7 @@
index => "log4j"
}
}
+ ]]>
</arg>
</exec>
</entrypoint>
[logging-log4j2] 02/02: Replace enum singletons with final classes,
as requested by Gary Gregory.
Posted by vy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit cf01a51a2dc85a6d434596174f61ac690324522d
Author: Volkan Yazıcı <vo...@gmail.com>
AuthorDate: Thu Nov 19 16:59:38 2020 +0100
Replace enum singletons with final classes, as requested by Gary Gregory.
---
.../log4j/layout/template/json/JsonTemplateLayoutDefaults.java | 4 +++-
.../layout/template/json/resolver/EventResolverFactories.java | 4 +++-
.../json/resolver/StackTraceElementObjectResolverFactories.java | 4 +++-
.../log4j/layout/template/json/resolver/TemplateResolvers.java | 4 +++-
.../log4j/layout/template/json/util/RecyclerFactories.java | 4 +++-
.../log4j/layout/template/json/util/StringParameterParser.java | 8 ++++++--
.../org/apache/logging/log4j/layout/template/json/util/Uris.java | 4 +++-
.../apache/logging/log4j/layout/template/json/JacksonFixture.java | 4 +++-
.../log4j/layout/template/json/LayoutComparisonHelpers.java | 4 +++-
.../logging/log4j/layout/template/json/LogEventFixture.java | 4 +++-
.../org/apache/logging/log4j/layout/template/json/LogstashIT.java | 4 +++-
11 files changed, 36 insertions(+), 12 deletions(-)
diff --git a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutDefaults.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutDefaults.java
index 4f417ee..5cf1e97 100644
--- a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutDefaults.java
+++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutDefaults.java
@@ -25,7 +25,9 @@ import java.nio.charset.StandardCharsets;
import java.util.Locale;
import java.util.TimeZone;
-public enum JsonTemplateLayoutDefaults {;
+public final class JsonTemplateLayoutDefaults {
+
+ private JsonTemplateLayoutDefaults() {}
private static final PropertiesUtil PROPERTIES = PropertiesUtil.getProperties();
diff --git a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/EventResolverFactories.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/EventResolverFactories.java
index b4b4f49..0bfcd76 100644
--- a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/EventResolverFactories.java
+++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/EventResolverFactories.java
@@ -24,7 +24,9 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-enum EventResolverFactories {;
+final class EventResolverFactories {
+
+ private EventResolverFactories() {}
private static final Map<String, TemplateResolverFactory<LogEvent, EventResolverContext, ? extends TemplateResolver<LogEvent>>> RESOLVER_FACTORY_BY_NAME =
createResolverFactoryByName();
diff --git a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceElementObjectResolverFactories.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceElementObjectResolverFactories.java
index ff1170c..cf76012 100644
--- a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceElementObjectResolverFactories.java
+++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceElementObjectResolverFactories.java
@@ -20,7 +20,9 @@ import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.Map;
-enum StackTraceElementObjectResolverFactories {;
+final class StackTraceElementObjectResolverFactories {
+
+ private StackTraceElementObjectResolverFactories() {}
private static final Map<String, TemplateResolverFactory<StackTraceElement, StackTraceElementObjectResolverContext, ? extends TemplateResolver<StackTraceElement>>> RESOLVER_FACTORY_BY_NAME =
createResolverFactoryByName();
diff --git a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolvers.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolvers.java
index 3ffa87a..ab4dfa4 100644
--- a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolvers.java
+++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolvers.java
@@ -26,7 +26,9 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-public enum TemplateResolvers {;
+public final class TemplateResolvers {
+
+ private TemplateResolvers() {}
private static final String RESOLVER_FIELD_NAME = "$resolver";
diff --git a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/RecyclerFactories.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/RecyclerFactories.java
index 21c9644..531259b 100644
--- a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/RecyclerFactories.java
+++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/RecyclerFactories.java
@@ -32,7 +32,9 @@ import java.util.Queue;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.function.Supplier;
-public enum RecyclerFactories {;
+public final class RecyclerFactories {
+
+ private RecyclerFactories() {}
private static final String JCTOOLS_QUEUE_CLASS_SUPPLIER_PATH =
"org.jctools.queues.MpmcArrayQueue.new";
diff --git a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/StringParameterParser.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/StringParameterParser.java
index 2952d06..041f2e3 100644
--- a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/StringParameterParser.java
+++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/StringParameterParser.java
@@ -25,9 +25,13 @@ import java.util.Objects;
import java.util.Set;
import java.util.concurrent.Callable;
-public enum StringParameterParser {;
+public final class StringParameterParser {
- public enum Values {;
+ private StringParameterParser() {}
+
+ public static final class Values {
+
+ private Values() {}
static NullValue nullValue() {
return NullValue.INSTANCE;
diff --git a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/Uris.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/Uris.java
index 5df1791..c783350 100644
--- a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/Uris.java
+++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/Uris.java
@@ -34,7 +34,9 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
-public enum Uris {;
+public final class Uris {
+
+ private Uris() {}
private static final Logger LOGGER = StatusLogger.getLogger();
diff --git a/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JacksonFixture.java b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JacksonFixture.java
index bd9e76f..aaf5c4f 100644
--- a/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JacksonFixture.java
+++ b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/JacksonFixture.java
@@ -18,7 +18,9 @@ package org.apache.logging.log4j.layout.template.json;
import com.fasterxml.jackson.databind.ObjectMapper;
-public enum JacksonFixture {;
+public final class JacksonFixture {
+
+ private JacksonFixture() {}
private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
diff --git a/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/LayoutComparisonHelpers.java b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/LayoutComparisonHelpers.java
index e0be875..1c343c5 100644
--- a/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/LayoutComparisonHelpers.java
+++ b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/LayoutComparisonHelpers.java
@@ -22,7 +22,9 @@ import org.apache.logging.log4j.layout.template.json.util.JsonReader;
import java.util.Map;
-enum LayoutComparisonHelpers {;
+final class LayoutComparisonHelpers {
+
+ private LayoutComparisonHelpers() {}
@SuppressWarnings("unchecked")
static Map<String, Object> renderUsing(
diff --git a/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/LogEventFixture.java b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/LogEventFixture.java
index 408a34d..c2fd5c5 100644
--- a/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/LogEventFixture.java
+++ b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/LogEventFixture.java
@@ -30,7 +30,9 @@ import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
-enum LogEventFixture {;
+final class LogEventFixture {
+
+ private LogEventFixture() {}
private static final int TIME_OVERLAPPING_CONSECUTIVE_EVENT_COUNT = 10;
diff --git a/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/LogstashIT.java b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/LogstashIT.java
index 62c2222..7dc201e 100644
--- a/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/LogstashIT.java
+++ b/log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/LogstashIT.java
@@ -142,7 +142,9 @@ public class LogstashIT {
/**
* Constants hardcoded in docker-maven-plugin configuration, do not change!
*/
- private enum MavenHardcodedConstants {;
+ private static final class MavenHardcodedConstants {
+
+ private MavenHardcodedConstants() {}
private static final int LS_GELF_INPUT_PORT = 12222;