(logging-log4j2) branch main updated: Remove redundant override

[mattsicker]

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

mattsicker pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


The following commit(s) were added to refs/heads/main by this push:
     new 3ff25531b0 Remove redundant override
3ff25531b0 is described below

commit 3ff25531b04a7676080853ec55671ce226db4dcf
Author: Matt Sicker <mattsic...@apache.org>
AuthorDate: Mon Jan 1 19:55:47 2024 -0600

    Remove redundant override
    
    Signed-off-by: Matt Sicker <mattsic...@apache.org>
---
 .../logging/log4j/test/junit/TestPropertyResolver.java       | 11 +++++------
 .../log4j/plugins/internal/util/HierarchicalCollections.java | 12 ++++++------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git 
a/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/TestPropertyResolver.java
 
b/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/TestPropertyResolver.java
index b86a6d711c..4af5001566 100644
--- 
a/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/TestPropertyResolver.java
+++ 
b/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/TestPropertyResolver.java
@@ -23,6 +23,7 @@ import org.junit.jupiter.api.extension.BeforeEachCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ParameterContext;
 import org.junit.jupiter.api.extension.ParameterResolutionException;
+import org.junit.jupiter.api.extension.support.TypeBasedParameterResolver;
 import org.junit.platform.commons.support.AnnotationSupport;
 import org.junit.platform.commons.support.HierarchyTraversalMode;
 import org.junit.platform.commons.support.ModifierSupport;
@@ -31,10 +32,6 @@ import org.junit.platform.commons.support.ReflectionSupport;
 public class TestPropertyResolver extends 
TypeBasedParameterResolver<TestProperties>
         implements BeforeAllCallback, BeforeEachCallback {
 
-    public TestPropertyResolver() {
-        super(TestProperties.class);
-    }
-
     @Override
     public void beforeEach(final ExtensionContext context) throws Exception {
         final TestProperties props = 
TestPropertySource.createProperties(context);
@@ -42,10 +39,11 @@ public class TestPropertyResolver extends 
TypeBasedParameterResolver<TestPropert
                 .forEach(setProperty -> props.setProperty(setProperty.key(), 
setProperty.value()));
         final Class<?> testClass = context.getRequiredTestClass();
         final Object testInstance = context.getRequiredTestInstance();
+        final Class<? extends TestProperties> testPropertiesType = 
props.getClass();
         ReflectionSupport.findFields(
                         testClass,
                         field -> ModifierSupport.isNotStatic(field)
-                                && 
field.getType().equals(TestProperties.class),
+                                && 
field.getType().isAssignableFrom(testPropertiesType),
                         HierarchyTraversalMode.BOTTOM_UP)
                 .forEach(field -> ReflectionUtil.setFieldValue(field, 
testInstance, props));
     }
@@ -56,10 +54,11 @@ public class TestPropertyResolver extends 
TypeBasedParameterResolver<TestPropert
         
AnnotationSupport.findRepeatableAnnotations(context.getRequiredTestClass(), 
SetTestProperty.class)
                 .forEach(setProperty -> props.setProperty(setProperty.key(), 
setProperty.value()));
         final Class<?> testClass = context.getRequiredTestClass();
+        final Class<? extends TestProperties> testPropertiesType = 
props.getClass();
         ReflectionSupport.findFields(
                         testClass,
                         field -> ModifierSupport.isStatic(field)
-                                && 
field.getType().equals(TestProperties.class),
+                                && 
field.getType().isAssignableFrom(testPropertiesType),
                         HierarchyTraversalMode.BOTTOM_UP)
                 .forEach(field -> ReflectionUtil.setStaticFieldValue(field, 
props));
     }
diff --git 
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/internal/util/HierarchicalCollections.java
 
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/internal/util/HierarchicalCollections.java
index 0b0169ef33..6119e139ad 100644
--- 
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/internal/util/HierarchicalCollections.java
+++ 
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/internal/util/HierarchicalCollections.java
@@ -16,7 +16,12 @@
  */
 package org.apache.logging.log4j.plugins.internal.util;
 
-import java.util.*;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
 class HierarchicalCollections {
@@ -79,11 +84,6 @@ class HierarchicalCollections {
         public Set<K> keySet() {
             return new HierarchicalSet<>(super.keySet(), parent.keySet());
         }
-
-        @Override
-        public HierarchicalMap<K, V> newChildMap() {
-            return new ChildMap<>(this);
-        }
     }
 
     private static final class HierarchicalSet<E> extends AbstractSet<E> {