Sync JTL with `main`
diff --git a/log4j-layout-template-json/pom.xml b/log4j-layout-template-json/pom.xml
index cbdc5e3..369d38d 100644
--- a/log4j-layout-template-json/pom.xml
+++ b/log4j-layout-template-json/pom.xml
@@ -81,6 +81,24 @@
</configuration>
</plugin>
+ <!-- Disable Failsafe, tests are in the `-test` module. -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+
+ <!-- Disable Surefire, tests are in the `-test` module. -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+
</plugins>
</build>
diff --git a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayout.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayout.java
index 4f0ba67..0a42028 100644
--- a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayout.java
+++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayout.java
@@ -507,7 +507,7 @@
}
private void validate() {
- Objects.requireNonNull(configuration, "config");
+ Objects.requireNonNull(configuration, "configuration");
if (Strings.isBlank(eventTemplate) && Strings.isBlank(eventTemplateUri)) {
throw new IllegalArgumentException("both eventTemplate and eventTemplateUri are blank");
}
diff --git a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/CaseConverterResolver.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/CaseConverterResolver.java
index 0f4c322..73724b1 100644
--- a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/CaseConverterResolver.java
+++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/CaseConverterResolver.java
@@ -201,7 +201,7 @@
if (strategyName == null) {
return ErrorHandlingStrategy.REPLACE;
}
- for (ErrorHandlingStrategy strategy : ErrorHandlingStrategy.values()) {
+ for (final ErrorHandlingStrategy strategy : ErrorHandlingStrategy.values()) {
if (strategy.name.equals(strategyName)) {
return strategy;
}
diff --git a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolver.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolver.java
index 5da503e..6818419 100644
--- a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolver.java
+++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolver.java
@@ -48,7 +48,7 @@
* For instance, the stack trace resolver can be short-circuited using this
* check if the stack traces are disabled in the layout configuration.
*/
- default boolean isResolvable(V value) {
+ default boolean isResolvable(final V value) {
return true;
}
@@ -62,7 +62,7 @@
*
* @param succeedingEntry false, if this is the first element in a collection; true, otherwise
*/
- default void resolve(V value, JsonWriter jsonWriter, boolean succeedingEntry) {
+ default void resolve(final V value, final JsonWriter jsonWriter, final boolean succeedingEntry) {
resolve(value, jsonWriter);
}
}
diff --git a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolverContext.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolverContext.java
index 4d4ebd2..74ca965 100644
--- a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolverContext.java
+++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolverContext.java
@@ -52,7 +52,7 @@
* @param node the root object of the read template
* @return the root object of the template to be compiled
*/
- default Object processTemplateBeforeResolverInjection(Object node) {
+ default Object processTemplateBeforeResolverInjection(final Object node) {
return node;
}
}
diff --git a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolverInterceptor.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolverInterceptor.java
index c2909a2..d48d3a1 100644
--- a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolverInterceptor.java
+++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/resolver/TemplateResolverInterceptor.java
@@ -49,7 +49,7 @@
* @param node the root object of the read template
* @return the root object of the template to be compiled
*/
- default Object processTemplateBeforeResolverInjection(C context, Object node) {
+ default Object processTemplateBeforeResolverInjection(final C context, final Object node) {
return node;
}
}
diff --git a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/JsonWriter.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/JsonWriter.java
index 9b9aa4e..4316d73 100644
--- a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/JsonWriter.java
+++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/JsonWriter.java
@@ -700,7 +700,7 @@
} else {
final long longNumber = number.longValue();
final double doubleValue = number.doubleValue();
- if (Double.compare(longNumber, doubleValue) == 0) {
+ if (Double.compare((double) longNumber, doubleValue) == 0) {
writeNumber(longNumber);
} else {
writeNumber(doubleValue);
