You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2016/09/01 16:33:34 UTC
[49/50] logging-log4j2 git commit: Ensure consistent attribute
ordering when building XML configuration
Ensure consistent attribute ordering when building XML configuration
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/1dc04f83
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1dc04f83
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1dc04f83
Branch: refs/heads/feature/LOG4J2-1430
Commit: 1dc04f83f5128598425d2cfdda7317f873f5c0ff
Parents: 878e8bc
Author: Mikael St�ldal <mi...@magine.com>
Authored: Thu Sep 1 18:03:00 2016 +0200
Committer: Mikael St�ldal <mi...@magine.com>
Committed: Thu Sep 1 18:03:00 2016 +0200
----------------------------------------------------------------------
.../logging/log4j/core/config/builder/api/Component.java | 4 ++--
.../core/config/builder/impl/DefaultComponentBuilder.java | 4 ++--
.../log4j/core/config/builder/ConfigurationBuilderTest.java | 9 ++++-----
3 files changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1dc04f83/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/Component.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/Component.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/Component.java
index 8ad901f..2832d58 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/Component.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/Component.java
@@ -17,7 +17,7 @@
package org.apache.logging.log4j.core.config.builder.api;
import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -28,7 +28,7 @@ import java.util.Map;
*/
public class Component {
- private final Map<String, String> attributes = new HashMap<>();
+ private final Map<String, String> attributes = new LinkedHashMap<>();
private final List<Component> components = new ArrayList<>();
private final String pluginType;
private final String value;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1dc04f83/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
index d1c066c..b73039d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
@@ -17,7 +17,7 @@
package org.apache.logging.log4j.core.config.builder.impl;
import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -38,7 +38,7 @@ class DefaultComponentBuilder<T extends ComponentBuilder<T>, CB extends Configur
private final CB builder;
private final String type;
- private final Map<String, String> attributes = new HashMap<>();
+ private final Map<String, String> attributes = new LinkedHashMap<>();
private final List<Component> components = new ArrayList<>();
private final String name;
private final String value;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1dc04f83/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java
index 25772a7..eb11d5d 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java
@@ -24,7 +24,6 @@ import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilder;
import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilderFactory;
import org.apache.logging.log4j.core.config.builder.impl.BuiltConfiguration;
import org.junit.Test;
-import org.xmlunit.matchers.CompareMatcher;
import static org.junit.Assert.*;
@@ -60,12 +59,12 @@ public class ConfigurationBuilderTest {
"\t\t<Property name=\"MyKey\">MyValue</Property>" + EOL +
"\t</Properties>" + EOL +
"\t<Scripts>" + EOL +
- "\t\t<ScriptFile path=\"target/test-classes/scripts/filter.groovy\" name=\"target/test-classes/scripts/filter.groovy\" isWatched=\"true\"/>" + EOL +
+ "\t\t<ScriptFile name=\"target/test-classes/scripts/filter.groovy\" path=\"target/test-classes/scripts/filter.groovy\" isWatched=\"true\"/>" + EOL +
"\t</Scripts>" + EOL +
"\t<CustomLevels>" + EOL +
"\t\t<CustomLevel name=\"Panic\" intLevel=\"17\"/>" + EOL +
"\t</CustomLevels>" + EOL +
- "\t<ThresholdFilter onMatch=\"ACCEPT\" level=\"DEBUG\" onMisMatch=\"NEUTRAL\"/>" + EOL +
+ "\t<ThresholdFilter onMatch=\"ACCEPT\" onMisMatch=\"NEUTRAL\" level=\"DEBUG\"/>" + EOL +
"\t<Appenders>" + EOL +
"\t\t<CONSOLE name=\"Stdout\" target=\"SYSTEM_OUT\">" + EOL +
"\t\t\t<PatternLayout pattern=\"%d [%t] %-5level: %msg%n%throwable\"/>" + EOL +
@@ -73,7 +72,7 @@ public class ConfigurationBuilderTest {
"\t\t</CONSOLE>" + EOL +
"\t</Appenders>" + EOL +
"\t<Loggers>" + EOL +
- "\t\t<Logger additivity=\"false\" level=\"DEBUG\" includeLocation=\"true\" name=\"org.apache.logging.log4j\">" + EOL +
+ "\t\t<Logger name=\"org.apache.logging.log4j\" level=\"DEBUG\" includeLocation=\"true\" additivity=\"false\">" + EOL +
"\t\t\t<AppenderRef ref=\"Stdout\"/>" + EOL +
"\t\t</Logger>" + EOL +
"\t\t<Root level=\"ERROR\">" + EOL +
@@ -87,7 +86,7 @@ public class ConfigurationBuilderTest {
final ConfigurationBuilder<BuiltConfiguration> builder = ConfigurationBuilderFactory.newConfigurationBuilder();
addTestFixtures("config name", builder);
final String xmlConfiguration = builder.toXmlConfiguration();
- assertThat(xmlConfiguration, CompareMatcher.isIdenticalTo(expectedXml));
+ assertEquals(expectedXml, xmlConfiguration);
}
}