Corrections per PR code-review (apache#3369).

* switched tests to use Builders instead of createLogger
* changed new LoggerConig.RootLogger.Builder#withFilter to LoggerConfig.RootLogger.Builder#setFilter
* deprecated LoggerConfig.Builder.withFilter and added LoggerConig.Builder.setFilter
* moved changelog to correct .2.x.x directory

Author: jethomas-tsi

log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigTest.java

@@ -100,7 +100,7 @@ void testSingleFilterInvocation() {
                 .withLoggerName(FQCN)
                 .withConfig(configuration)
                 .withLevel(Level.INFO)
-                .withFilter(filter)
+                .setFilter(filter)
                 .build();
         final Appender appender = mock(Appender.class);
         when(appender.isStarted()).thenReturn(true);

log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/CustomConfigurationTest.java

@@ -63,20 +63,26 @@ void testConfig(final LoggerContext ctx) {
                 .withConfiguration(config)
                 .build();
         final FileAppender appender = FileAppender.newBuilder()
-                .withFileName(logFile.toString())
-                .withAppend(false)
-                .setName("File")
+                .setBufferedIo(false)
                 .setIgnoreExceptions(false)
-                .withBufferedIo(false)
+                .setName("File")
                 .setLayout(layout)
+                .withAppend(false)
+                .withFileName(logFile.toString())
                 .build();
         appender.start();
         config.addAppender(appender);
         final AppenderRef ref = AppenderRef.createAppenderRef("File", null, null);
         final AppenderRef[] refs = new AppenderRef[] {ref};
 
-        final LoggerConfig loggerConfig = LoggerConfig.createLogger(
-                false, Level.INFO, "org.apache.logging.log4j", "true", refs, null, config, null);
+        final LoggerConfig loggerConfig = LoggerConfig.newBuilder()
+                .withConfig(config)
+                .withAdditivity(false)
+                .withIncludeLocation("true")
+                .withLevel(Level.INFO)
+                .withLoggerName("org.apache.logging.log4j")
+                .withRefs(refs)
+                .build();
         loggerConfig.addAppender(appender, null, null);
         config.addLogger("org.apache.logging.log4j", loggerConfig);
         ctx.updateLoggers();

log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/LoggerConfigTest.java

@@ -44,11 +44,16 @@ class LoggerConfigTest {
     private static final String FQCN = LoggerConfigTest.class.getName();
 
     private static LoggerConfig createForProperties(final Property[] properties) {
-        return LoggerConfig.createLogger(
-                true, Level.INFO, "name", "false", new AppenderRef[0], properties, new NullConfiguration(), null);
+        return LoggerConfig.newBuilder()
+                .withConfig(new NullConfiguration())
+                .withAdditivity(true)
+                .withLevel(Level.INFO)
+                .withLoggerName("name")
+                .withIncludeLocation("false")
+                .withProperties(properties)
+                .build();
     }
 
-    @SuppressWarnings({"deprecation"})
     @Test
     void testPropertiesWithoutSubstitution() {
         assertNull(createForProperties(null).getPropertyList(), "null propertiesList");
@@ -126,7 +131,7 @@ void testSingleFilterInvocation() {
                 .withLoggerName(FQCN)
                 .withConfig(configuration)
                 .withLevel(Level.INFO)
-                .withFilter(filter)
+                .setFilter(filter)
                 .build();
         final Appender appender = mock(Appender.class);
         when(appender.isStarted()).thenReturn(true);

log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java

@@ -214,14 +214,20 @@ public Filter getFilter() {
         }
 
         /**
-         * @deprecated Use {@link #withFilter(Filter)} instead
+         * @deprecated Use {@link #setFilter(Filter)} instead
          */
         @Deprecated
         public B withtFilter(final Filter filter) {
-            return withFilter(filter);
+            return setFilter(filter);
         }
 
+        /** @deprecated Use {@link #setFilter(Filter)} instead. */
+        @Deprecated
         public B withFilter(final Filter filter) {
+            return setFilter(filter);
+        }
+
+        public B setFilter(final Filter filter) {
             this.filter = filter;
             return asBuilder();
         }
@@ -945,15 +951,14 @@ public Filter getFilter() {
             }
 
             /**
-             * @deprecated Use {@link #withFilter(Filter)} instead
+             * @deprecated Use {@link #setFilter(Filter)} instead
              */
             @Deprecated
             public B withtFilter(final Filter filter) {
-                this.filter = filter;
-                return asBuilder();
+                return setFilter(filter);
             }
 
-            public B withFilter(final Filter filter) {
+            public B setFilter(final Filter filter) {
                 this.filter = filter;
                 return asBuilder();
             }