Corrections due to #2307 review

Co-authored-by: Volkan Yazıcı <volkan@yazi.ci>

Author: ppkarwasz

log4j-kit/src/main/java/org/apache/logging/log4j/kit/env/ConfigurablePropertyEnvironment.java

@@ -35,9 +35,6 @@
 
     /**
      * Provides a name for the configuration property.
-     * <p>
-     *
-     * </p>
      */
     String name() default "";
 

log4j-kit/src/main/java/org/apache/logging/log4j/kit/env/Log4jProperty.java

@@ -29,8 +29,7 @@ public interface PropertySource {
     /**
      * Provides the priority of the property source.
      * <p>
-     *     Property sources are ordered according to the natural ordering of their priority. Sources with lower
-     *     numerical value take precedence over those with higher numerical value.
+     *     Sources with higher priority override values from sources with lower priority.
      * </p>
      *
      * @return priority value

log4j-kit/src/main/java/org/apache/logging/log4j/kit/env/PropertySource.java

@@ -27,16 +27,20 @@
  *     Should haves a slightly lower priority than global environment variables.
  * </p>
  */
-public class ContextEnvironmentPropertySource implements PropertySource {
+public class ContextualEnvironmentPropertySource implements PropertySource {
 
-    private static final int DEFAULT_PRIORITY = 100;
+    private static final int DEFAULT_PRIORITY = 0;
 
     private final String prefix;
     private final int priority;
 
-    public ContextEnvironmentPropertySource(final String contextName, final int priorityOffset) {
+    public ContextualEnvironmentPropertySource(final String contextName) {
+        this(contextName, DEFAULT_PRIORITY);
+    }
+
+    public ContextualEnvironmentPropertySource(final String contextName, final int priority) {
         this.prefix = "log4j2." + contextName + ".";
-        this.priority = DEFAULT_PRIORITY + priorityOffset;
+        this.priority = priority;
     }
 
     @Override

log4j-kit/src/main/java/org/apache/logging/log4j/kit/env/internal/ContextEnvironmentPropertySource.java renamed to log4j-kit/src/main/java/org/apache/logging/log4j/kit/env/internal/ContextualEnvironmentPropertySource.java

@@ -26,16 +26,20 @@
  *     Should have a slightly lower priority than global system properties.
  * </p>
  */
-public class ContextPropertiesPropertySource implements PropertySource {
+public class ContextualJavaPropsPropertySource implements PropertySource {
 
-    private static final int DEFAULT_PRIORITY = 0;
+    private static final int DEFAULT_PRIORITY = 100;
 
     private final String prefix;
     private final int priority;
 
-    public ContextPropertiesPropertySource(final String contextName, final int priorityOffset) {
-        this.prefix = "log4j2." + contextName + ".";
-        this.priority = DEFAULT_PRIORITY + priorityOffset;
+    public ContextualJavaPropsPropertySource(final String contextName) {
+        this(contextName, DEFAULT_PRIORITY);
+    }
+
+    public ContextualJavaPropsPropertySource(final String contextName, final int priority) {
+        this.prefix = "log4j.contexts." + contextName + ".";
+        this.priority = priority;
     }
 
     @Override

log4j-kit/src/main/java/org/apache/logging/log4j/kit/env/internal/ContextPropertiesPropertySource.java renamed to log4j-kit/src/main/java/org/apache/logging/log4j/kit/env/internal/ContextualJavaPropsPropertySource.java

@@ -21,11 +21,11 @@
 /**
  * An environment implementation that uses a specific classloader to load classes.
  */
-public abstract class ClassloaderPropertyEnvironment extends BasicPropertyEnvironment {
+public abstract class ClassLoaderPropertyEnvironment extends BasicPropertyEnvironment {
 
     private final ClassLoader loader;
 
-    public ClassloaderPropertyEnvironment(final ClassLoader loader, final Logger statusLogger) {
+    public ClassLoaderPropertyEnvironment(final ClassLoader loader, final Logger statusLogger) {
         super(statusLogger);
         this.loader = loader;
     }