[logging-log4j2] branch release-2.x updated: Change the variable 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 73b0513e4e Change the variable name
73b0513e4e is described below

commit 73b0513e4ec282c1e4d8eee32721eeb363201b9c
Author: Ralph Goers <rgo...@apache.org>
AuthorDate: Wed May 4 19:04:48 2022 +0200

    Change the variable name
---
 .../log4j/core/filter/MutableThreadContextMapFilter.java     | 12 ++++++------
 .../log4j/core/filter/mutable/KeyValuePairConfig.java        | 12 ++++++------
 log4j-core/src/test/resources/filterConfig.json              |  2 +-
 3 files changed, 13 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 ff0b5c2d34..7a96d81950 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
@@ -84,7 +84,6 @@ public class MutableThreadContextMapFilter extends 
AbstractFilter {
 
     @Override
     public void start() {
-
         if (pollInterval > 0) {
             future = scheduler.scheduleWithFixedDelay(new FileMonitor(), 0, 
pollInterval, TimeUnit.SECONDS);
             LOGGER.debug("Watching {} with poll interval {}", 
source.toString(), pollInterval);
@@ -344,11 +343,12 @@ public class MutableThreadContextMapFilter extends 
AbstractFilter {
         if (result.getStatus() == Status.SUCCESS) {
             LOGGER.debug("Processing Debug key/value pairs from: {}", 
source.toString());
             try {
-                final KeyValuePairConfig config = 
MAPPER.readValue(inputStream, KeyValuePairConfig.class);
-                if (config != null && config.getdebugIds() != null) {
-                    if (config.getdebugIds().size() > 0) {
+                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 List<KeyValuePair> pairs = new ArrayList<>();
-                        for (Map.Entry<String, String[]> entry : 
config.getdebugIds().entrySet()) {
+                        for (Map.Entry<String, String[]> entry : 
config.entrySet()) {
                             final String key = entry.getKey();
                             for (final String value : entry.getValue()) {
                                 if (value != null) {
@@ -368,7 +368,7 @@ public class MutableThreadContextMapFilter extends 
AbstractFilter {
                         configResult.status = Status.EMPTY;
                     }
                 } else {
-                    LOGGER.warn("No debugIds element in ThreadContextMapFilter 
configuration");
+                    LOGGER.warn("No config 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 e0372e6146..60c0788afb 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>
      *   {
-     *     "debugIds": {
+     *     "config": {
      *       "loginId": ["rgoers", "adam"],
      *       "accountNumber": ["30510263"]
      *   }
      * }
      * </pre>
      */
-    private Map<String, String[]> debugIds;
+    private Map<String, String[]> config;
 
-    public Map<String, String[]> getdebugIds() {
-        return debugIds;
+    public Map<String, String[]> getConfig() {
+        return config;
     }
 
-    public void setKeyValuePairs(Map<String, String[]> debugIds) {
-        this.debugIds = debugIds;
+    public void setConfig(Map<String, String[]> config) {
+        this.config = config;
     }
 }
diff --git a/log4j-core/src/test/resources/filterConfig.json 
b/log4j-core/src/test/resources/filterConfig.json
index 8857185068..9477ad5b30 100644
--- a/log4j-core/src/test/resources/filterConfig.json
+++ b/log4j-core/src/test/resources/filterConfig.json
@@ -1,5 +1,5 @@
 {
-  "debugIds": {
+  "config": {
     "loginId": ["rgoers", "adam"],
     "corpAcctNumber": ["30510263"]
   }