This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/master by this push:
new 22a711267c Change config element name
22a711267c is described below
commit 22a711267c88aa1b650c790e34076e2d16aabac5
Author: Ralph Goers <[email protected]>
AuthorDate: Thu May 5 23:12:30 2022 +0200
Change config element name
---
log4j-core-test/src/test/resources/emptyConfig.json | 2 +-
log4j-core-test/src/test/resources/filterConfig.json | 2 +-
.../log4j/core/filter/MutableThreadContextMapFilter.java | 14 +++++++++-----
.../log4j/core/filter/mutable/KeyValuePairConfig.java | 10 +++++-----
4 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/log4j-core-test/src/test/resources/emptyConfig.json
b/log4j-core-test/src/test/resources/emptyConfig.json
index c3a465a6ab..37086f2b1f 100644
--- a/log4j-core-test/src/test/resources/emptyConfig.json
+++ b/log4j-core-test/src/test/resources/emptyConfig.json
@@ -1,4 +1,4 @@
{
- "keyValuePairs": {
+ "configs": {
}
}
\ No newline at end of file
diff --git a/log4j-core-test/src/test/resources/filterConfig.json
b/log4j-core-test/src/test/resources/filterConfig.json
index 9477ad5b30..91c8143ec2 100644
--- a/log4j-core-test/src/test/resources/filterConfig.json
+++ b/log4j-core-test/src/test/resources/filterConfig.json
@@ -1,5 +1,5 @@
{
- "config": {
+ "configs": {
"loginId": ["rgoers", "adam"],
"corpAcctNumber": ["30510263"]
}
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 1480508cad..7eb949a192 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
@@ -52,6 +52,7 @@ import org.apache.logging.log4j.plugins.PluginFactory;
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;
/**
@@ -62,8 +63,9 @@ import com.fasterxml.jackson.databind.ObjectMapper;
@PerformanceSensitive("allocation")
public class MutableThreadContextMapFilter extends AbstractFilter {
- private static final ObjectMapper MAPPER = new ObjectMapper();
- private static final KeyValuePair[] EMPTY_ARRAY = new KeyValuePair[0];
+ private static final ObjectMapper MAPPER = new ObjectMapper()
+ .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES,
false);
+ private static final KeyValuePair[] EMPTY_ARRAY = {};
private volatile Filter filter;
private final long pollInterval;
@@ -359,10 +361,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) {
@@ -376,6 +378,7 @@ public class MutableThreadContextMapFilter extends
AbstractFilter {
configResult.pairs = pairs.toArray(EMPTY_ARRAY);
configResult.status = Status.SUCCESS;
} else {
+ LOGGER.debug("No configuration data in {}",
source.toString());
configResult.status = Status.EMPTY;
}
} else {
@@ -390,6 +393,7 @@ public class MutableThreadContextMapFilter extends
AbstractFilter {
configResult.status = Status.ERROR;
}
} else {
+ LOGGER.warn("No configs element in MutableThreadContextMapFilter
configuration");
configResult.status = result.getStatus();
}
return configResult;
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..564bbaaa01 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
@@ -34,13 +34,13 @@ public class KeyValuePairConfig {
* }
* </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 setConfigs(Map<String, String[]> configs) {
+ this.configs = configs;
}
}
