[logging-log4j2] branch release-2.x updated: Change config element name

[rgoers]

This is an automated email from the ASF dual-hosted git repository.

rgoers pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


The following commit(s) were added to refs/heads/release-2.x by this push:
     new 455dca15dd Change config element name
455dca15dd is described below

commit 455dca15dde489e88a5a57b27f137baa567130f4
Author: Ralph Goers <rgo...@apache.org>
AuthorDate: Thu May 5 23:12:58 2022 +0200

    Change config element name
---
 .../log4j/core/filter/MutableThreadContextMapFilter.java    | 13 ++++++++-----
 .../log4j/core/filter/mutable/KeyValuePairConfig.java       | 12 ++++++------
 log4j-core/src/test/resources/emptyConfig.json              |  2 +-
 log4j-core/src/test/resources/filterConfig.json             |  2 +-
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MutableThreadContextMapFilter.java
 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MutableThreadContextMapFilter.java
index c1525788a5..3fab3e4fa0 100644
--- 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MutableThreadContextMapFilter.java
+++ 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MutableThreadContextMapFilter.java
@@ -51,6 +51,7 @@ import org.apache.logging.log4j.message.Message;
 import org.apache.logging.log4j.util.PerformanceSensitive;
 import org.apache.logging.log4j.util.PropertiesUtil;
 
+import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 /**
@@ -61,7 +62,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 @PerformanceSensitive("allocation")
 public class MutableThreadContextMapFilter extends AbstractFilter {
 
-    private static final ObjectMapper MAPPER = new ObjectMapper();
+    private static final ObjectMapper MAPPER = new ObjectMapper()
+            .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, 
false);
     private static final KeyValuePair[] EMPTY_ARRAY = {};
 
     private volatile Filter filter;
@@ -346,10 +348,10 @@ public class MutableThreadContextMapFilter extends 
AbstractFilter {
             try {
                 final KeyValuePairConfig keyValuePairConfig = 
MAPPER.readValue(inputStream, KeyValuePairConfig.class);
                 if (keyValuePairConfig != null) {
-                    final Map<String, String[]> config = 
keyValuePairConfig.getConfig();
-                    if (config != null && config.size() > 0) {
+                    final Map<String, String[]> configs = 
keyValuePairConfig.getConfigs();
+                    if (configs != null && configs.size() > 0) {
                         final List<KeyValuePair> pairs = new ArrayList<>();
-                        for (Map.Entry<String, String[]> entry : 
config.entrySet()) {
+                        for (Map.Entry<String, String[]> entry : 
configs.entrySet()) {
                             final String key = entry.getKey();
                             for (final String value : entry.getValue()) {
                                 if (value != null) {
@@ -366,10 +368,11 @@ public class MutableThreadContextMapFilter extends 
AbstractFilter {
                             configResult.status = Status.EMPTY;
                         }
                     } else {
+                        LOGGER.debug("No configuration data in {}", 
source.toString());
                         configResult.status = Status.EMPTY;
                     }
                 } else {
-                    LOGGER.warn("No config element in 
MutableThreadContextMapFilter configuration");
+                    LOGGER.warn("No configs element in 
MutableThreadContextMapFilter configuration");
                     configResult.status = Status.ERROR;
                 }
             } catch (Exception ex) {
diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/mutable/KeyValuePairConfig.java
 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/mutable/KeyValuePairConfig.java
index 60c0788afb..455f3de90b 100644
--- 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/mutable/KeyValuePairConfig.java
+++ 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/mutable/KeyValuePairConfig.java
@@ -27,20 +27,20 @@ public class KeyValuePairConfig {
      * Map of keys and values for the MutableThreadContextMapFilter. Example 
file:
      * <pre>
      *   {
-     *     "config": {
+     *     "configs": {
      *       "loginId": ["rgoers", "adam"],
      *       "accountNumber": ["30510263"]
      *   }
      * }
      * </pre>
      */
-    private Map<String, String[]> config;
+    private Map<String, String[]> configs;
 
-    public Map<String, String[]> getConfig() {
-        return config;
+    public Map<String, String[]> getConfigs() {
+        return configs;
     }
 
-    public void setConfig(Map<String, String[]> config) {
-        this.config = config;
+    public void setConfig(Map<String, String[]> configs) {
+        this.configs = configs;
     }
 }
diff --git a/log4j-core/src/test/resources/emptyConfig.json 
b/log4j-core/src/test/resources/emptyConfig.json
index c3a465a6ab..37086f2b1f 100644
--- a/log4j-core/src/test/resources/emptyConfig.json
+++ b/log4j-core/src/test/resources/emptyConfig.json
@@ -1,4 +1,4 @@
 {
-  "keyValuePairs": {
+  "configs": {
   }
 }
\ No newline at end of file
diff --git a/log4j-core/src/test/resources/filterConfig.json 
b/log4j-core/src/test/resources/filterConfig.json
index 9477ad5b30..91c8143ec2 100644
--- a/log4j-core/src/test/resources/filterConfig.json
+++ b/log4j-core/src/test/resources/filterConfig.json
@@ -1,5 +1,5 @@
 {
-  "config": {
+  "configs": {
     "loginId": ["rgoers", "adam"],
     "corpAcctNumber": ["30510263"]
   }