You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2024/05/22 13:24:44 UTC

(commons-configuration) branch master updated (affa444e -> 8ca98b4a)

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

ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-configuration.git


    from affa444e Let parent POM configure stock Javadoc links
     new b4dd0268 Fix PMD DynamicCombinedConfiguration in DynamicCombinedConfiguration
     new f5ca929d Fix PMD DynamicCombinedConfiguration in PropertiesConfiguration
     new d5e64268 Fix PMD DynamicCombinedConfiguration in AbstractListDelimiterHandler
     new 8662c3be Fix PMD DynamicCombinedConfiguration in DefaultPrefixLookupsHolder
     new 72e96717 Fix PMD DynamicCombinedConfiguration in DefaultPrefixLookupsHolder
     new aff03f1e Fix PMD DynamicCombinedConfiguration in AbstractImmutableNodeHandler
     new 0ed63c25 Sort PMD entries
     new 8ca98b4a Bump org.apache.commons:commons-parent from 69 to 70

The 8 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml                                                        |  2 +-
 src/changes/changes.xml                                        |  7 ++++++-
 .../commons/configuration2/DynamicCombinedConfiguration.java   |  2 +-
 .../apache/commons/configuration2/PropertiesConfiguration.java | 10 +++++-----
 .../configuration2/convert/AbstractListDelimiterHandler.java   |  4 ++--
 .../configuration2/interpol/ConfigurationInterpolator.java     |  5 ++---
 .../configuration2/tree/AbstractImmutableNodeHandler.java      |  2 +-
 7 files changed, 18 insertions(+), 14 deletions(-)


(commons-configuration) 04/08: Fix PMD DynamicCombinedConfiguration in DefaultPrefixLookupsHolder

Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-configuration.git

commit 8662c3beb0233e1fd448605b86cce31be9fa3535
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed May 22 09:20:08 2024 -0400

    Fix PMD DynamicCombinedConfiguration in DefaultPrefixLookupsHolder
---
 src/changes/changes.xml                                              | 2 ++
 .../commons/configuration2/interpol/ConfigurationInterpolator.java   | 5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 2df809aa..bced2fdc 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -43,6 +43,8 @@
       <action type="fix" dev="ggregory" due-to="Gary Gregory">Deprecate DatabaseConfiguration.getDatasource() in favor of getDataSource().</action>
       <action type="fix" dev="ggregory" due-to="Gary Gregory">Fix PMD DynamicCombinedConfiguration in DynamicCombinedConfiguration.</action>
       <action type="fix" dev="ggregory" due-to="Gary Gregory">Fix PMD DynamicCombinedConfiguration in PropertiesConfiguration.</action>
+      <action type="fix" dev="ggregory" due-to="Gary Gregory">Fix PMD DynamicCombinedConfiguration in AbstractListDelimiterHandler.</action>
+      <action type="fix" dev="ggregory" due-to="Gary Gregory">Fix PMD DynamicCombinedConfiguration in DefaultPrefixLookupsHolder.</action>
       <!-- UPDATE -->
       <action type="update" dev="ggregory" due-to="Dependabot">Bump commons-logging:commons-logging from 1.3.0 to 1.3.2 #390, #418.</action>
       <action type="update" dev="ggregory" due-to="Dependabot">Bump commons-io:commons-io from 2.15.1 to 2.16.1 #394, #400.</action>
diff --git a/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java b/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java
index f0705dce..19a84e32 100644
--- a/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java
+++ b/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java
@@ -165,9 +165,8 @@ public class ConfigurationInterpolator {
          * @param props initialization properties
          */
         DefaultPrefixLookupsHolder(final Properties props) {
-            final Map<String, Lookup> lookups =
-                    props.containsKey(ConfigurationInterpolator.DEFAULT_PREFIX_LOOKUPS_PROPERTY)
-                        ? parseLookups(props.getProperty(ConfigurationInterpolator.DEFAULT_PREFIX_LOOKUPS_PROPERTY))
+            final Map<String, Lookup> lookups = props.containsKey(DEFAULT_PREFIX_LOOKUPS_PROPERTY)
+                        ? parseLookups(props.getProperty(DEFAULT_PREFIX_LOOKUPS_PROPERTY))
                         : createDefaultLookups();
 
             defaultLookups = Collections.unmodifiableMap(lookups);


(commons-configuration) 06/08: Fix PMD DynamicCombinedConfiguration in AbstractImmutableNodeHandler

Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-configuration.git

commit aff03f1ec26723521b22faa0ae1d82908532a49d
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed May 22 09:20:55 2024 -0400

    Fix PMD DynamicCombinedConfiguration in AbstractImmutableNodeHandler
---
 src/changes/changes.xml                                                 | 1 +
 .../commons/configuration2/tree/AbstractImmutableNodeHandler.java       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index bced2fdc..f5e80a02 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -45,6 +45,7 @@
       <action type="fix" dev="ggregory" due-to="Gary Gregory">Fix PMD DynamicCombinedConfiguration in PropertiesConfiguration.</action>
       <action type="fix" dev="ggregory" due-to="Gary Gregory">Fix PMD DynamicCombinedConfiguration in AbstractListDelimiterHandler.</action>
       <action type="fix" dev="ggregory" due-to="Gary Gregory">Fix PMD DynamicCombinedConfiguration in DefaultPrefixLookupsHolder.</action>
+      <action type="fix" dev="ggregory" due-to="Gary Gregory">Fix PMD DynamicCombinedConfiguration in AbstractImmutableNodeHandler.</action>
       <!-- UPDATE -->
       <action type="update" dev="ggregory" due-to="Dependabot">Bump commons-logging:commons-logging from 1.3.0 to 1.3.2 #390, #418.</action>
       <action type="update" dev="ggregory" due-to="Dependabot">Bump commons-io:commons-io from 2.15.1 to 2.16.1 #394, #400.</action>
diff --git a/src/main/java/org/apache/commons/configuration2/tree/AbstractImmutableNodeHandler.java b/src/main/java/org/apache/commons/configuration2/tree/AbstractImmutableNodeHandler.java
index b0a44f0a..bdd7b3a8 100644
--- a/src/main/java/org/apache/commons/configuration2/tree/AbstractImmutableNodeHandler.java
+++ b/src/main/java/org/apache/commons/configuration2/tree/AbstractImmutableNodeHandler.java
@@ -113,7 +113,7 @@ abstract class AbstractImmutableNodeHandler implements NodeHandler<ImmutableNode
      */
     @Override
     public boolean isDefined(final ImmutableNode node) {
-        return AbstractImmutableNodeHandler.checkIfNodeDefined(node);
+        return checkIfNodeDefined(node);
     }
 
     @Override


(commons-configuration) 02/08: Fix PMD DynamicCombinedConfiguration in PropertiesConfiguration

Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-configuration.git

commit f5ca929dc7b1bf3bd71943feaabedd9915da3a5f
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed May 22 09:17:37 2024 -0400

    Fix PMD DynamicCombinedConfiguration in PropertiesConfiguration
---
 src/changes/changes.xml                                        |  1 +
 .../apache/commons/configuration2/PropertiesConfiguration.java | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 3980f805..2df809aa 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -42,6 +42,7 @@
       <action type="fix" dev="ggregory" due-to="Gary Gregory">Fail-fast with a NullPointerException if ServletRequestConfiguration(ServletRequest) is called with null.</action>
       <action type="fix" dev="ggregory" due-to="Gary Gregory">Deprecate DatabaseConfiguration.getDatasource() in favor of getDataSource().</action>
       <action type="fix" dev="ggregory" due-to="Gary Gregory">Fix PMD DynamicCombinedConfiguration in DynamicCombinedConfiguration.</action>
+      <action type="fix" dev="ggregory" due-to="Gary Gregory">Fix PMD DynamicCombinedConfiguration in PropertiesConfiguration.</action>
       <!-- UPDATE -->
       <action type="update" dev="ggregory" due-to="Dependabot">Bump commons-logging:commons-logging from 1.3.0 to 1.3.2 #390, #418.</action>
       <action type="update" dev="ggregory" due-to="Dependabot">Bump commons-io:commons-io from 2.15.1 to 2.16.1 #394, #400.</action>
diff --git a/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java b/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java
index 71d04e21..5ee9d653 100644
--- a/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java
@@ -1059,7 +1059,7 @@ public class PropertiesConfiguration extends BaseConfiguration implements FileBa
      * @return A String.
      */
     public static String getInclude() {
-        return PropertiesConfiguration.include;
+        return include;
     }
 
     /**
@@ -1072,7 +1072,7 @@ public class PropertiesConfiguration extends BaseConfiguration implements FileBa
      * @since 2.5
      */
     public static String getIncludeOptional() {
-        return PropertiesConfiguration.includeOptional;
+        return includeOptional;
     }
 
     /**
@@ -1106,7 +1106,7 @@ public class PropertiesConfiguration extends BaseConfiguration implements FileBa
      * @param inc A String.
      */
     public static void setInclude(final String inc) {
-        PropertiesConfiguration.include = inc;
+        include = inc;
     }
 
     /**
@@ -1119,7 +1119,7 @@ public class PropertiesConfiguration extends BaseConfiguration implements FileBa
      * @since 2.5
      */
     public static void setIncludeOptional(final String inc) {
-        PropertiesConfiguration.includeOptional = inc;
+        includeOptional = inc;
     }
 
     /**
@@ -1316,7 +1316,7 @@ public class PropertiesConfiguration extends BaseConfiguration implements FileBa
      * @since 2.6
      */
     public ConfigurationConsumer<ConfigurationException> getIncludeListener() {
-        return includeListener != null ? includeListener : PropertiesConfiguration.DEFAULT_INCLUDE_LISTENER;
+        return includeListener != null ? includeListener : DEFAULT_INCLUDE_LISTENER;
     }
 
     /**


(commons-configuration) 07/08: Sort PMD entries

Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-configuration.git

commit 0ed63c252183c0331ccbbbe7303e25133d172f58
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed May 22 09:21:34 2024 -0400

    Sort PMD entries
---
 src/changes/changes.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index f5e80a02..2ae2f9ba 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -41,11 +41,11 @@
       <action type="fix" dev="ggregory" due-to="Gary Gregory">Fail-fast with a NullPointerException if ServletFilterConfiguration(FilterConfig) is called with null.</action>
       <action type="fix" dev="ggregory" due-to="Gary Gregory">Fail-fast with a NullPointerException if ServletRequestConfiguration(ServletRequest) is called with null.</action>
       <action type="fix" dev="ggregory" due-to="Gary Gregory">Deprecate DatabaseConfiguration.getDatasource() in favor of getDataSource().</action>
-      <action type="fix" dev="ggregory" due-to="Gary Gregory">Fix PMD DynamicCombinedConfiguration in DynamicCombinedConfiguration.</action>
-      <action type="fix" dev="ggregory" due-to="Gary Gregory">Fix PMD DynamicCombinedConfiguration in PropertiesConfiguration.</action>
+      <action type="fix" dev="ggregory" due-to="Gary Gregory">Fix PMD DynamicCombinedConfiguration in AbstractImmutableNodeHandler.</action>
       <action type="fix" dev="ggregory" due-to="Gary Gregory">Fix PMD DynamicCombinedConfiguration in AbstractListDelimiterHandler.</action>
       <action type="fix" dev="ggregory" due-to="Gary Gregory">Fix PMD DynamicCombinedConfiguration in DefaultPrefixLookupsHolder.</action>
-      <action type="fix" dev="ggregory" due-to="Gary Gregory">Fix PMD DynamicCombinedConfiguration in AbstractImmutableNodeHandler.</action>
+      <action type="fix" dev="ggregory" due-to="Gary Gregory">Fix PMD DynamicCombinedConfiguration in DynamicCombinedConfiguration.</action>
+      <action type="fix" dev="ggregory" due-to="Gary Gregory">Fix PMD DynamicCombinedConfiguration in PropertiesConfiguration.</action>
       <!-- UPDATE -->
       <action type="update" dev="ggregory" due-to="Dependabot">Bump commons-logging:commons-logging from 1.3.0 to 1.3.2 #390, #418.</action>
       <action type="update" dev="ggregory" due-to="Dependabot">Bump commons-io:commons-io from 2.15.1 to 2.16.1 #394, #400.</action>


(commons-configuration) 01/08: Fix PMD DynamicCombinedConfiguration in DynamicCombinedConfiguration

Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-configuration.git

commit b4dd0268db01b77acf80e40cc3e18dbc9861624f
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed May 22 09:16:54 2024 -0400

    Fix PMD DynamicCombinedConfiguration in DynamicCombinedConfiguration
---
 src/changes/changes.xml                                                 | 1 +
 .../org/apache/commons/configuration2/DynamicCombinedConfiguration.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 48f899ed..3980f805 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -41,6 +41,7 @@
       <action type="fix" dev="ggregory" due-to="Gary Gregory">Fail-fast with a NullPointerException if ServletFilterConfiguration(FilterConfig) is called with null.</action>
       <action type="fix" dev="ggregory" due-to="Gary Gregory">Fail-fast with a NullPointerException if ServletRequestConfiguration(ServletRequest) is called with null.</action>
       <action type="fix" dev="ggregory" due-to="Gary Gregory">Deprecate DatabaseConfiguration.getDatasource() in favor of getDataSource().</action>
+      <action type="fix" dev="ggregory" due-to="Gary Gregory">Fix PMD DynamicCombinedConfiguration in DynamicCombinedConfiguration.</action>
       <!-- UPDATE -->
       <action type="update" dev="ggregory" due-to="Dependabot">Bump commons-logging:commons-logging from 1.3.0 to 1.3.2 #390, #418.</action>
       <action type="update" dev="ggregory" due-to="Dependabot">Bump commons-io:commons-io from 2.15.1 to 2.16.1 #394, #400.</action>
diff --git a/src/main/java/org/apache/commons/configuration2/DynamicCombinedConfiguration.java b/src/main/java/org/apache/commons/configuration2/DynamicCombinedConfiguration.java
index 15fdde3b..780af401 100644
--- a/src/main/java/org/apache/commons/configuration2/DynamicCombinedConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/DynamicCombinedConfiguration.java
@@ -746,7 +746,7 @@ public class DynamicCombinedConfiguration extends CombinedConfiguration {
         return new ConfigurationInterpolator() {
             @Override
             protected Lookup fetchLookupForPrefix(final String prefix) {
-                return ConfigurationInterpolator.nullSafeLookup(getInterpolator().getLookups().get(prefix));
+                return nullSafeLookup(getInterpolator().getLookups().get(prefix));
             }
         };
     }


(commons-configuration) 03/08: Fix PMD DynamicCombinedConfiguration in AbstractListDelimiterHandler

Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-configuration.git

commit d5e64268f80e7e3233b75e176bba5e3594c4252c
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed May 22 09:18:22 2024 -0400

    Fix PMD DynamicCombinedConfiguration in AbstractListDelimiterHandler
---
 pom.xml                                                               | 2 +-
 .../commons/configuration2/convert/AbstractListDelimiterHandler.java  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 014ffee0..beed062d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-parent</artifactId>
-    <version>69</version>
+    <version>70</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>commons-configuration2</artifactId>
diff --git a/src/main/java/org/apache/commons/configuration2/convert/AbstractListDelimiterHandler.java b/src/main/java/org/apache/commons/configuration2/convert/AbstractListDelimiterHandler.java
index 5d0489cb..3f4de63f 100644
--- a/src/main/java/org/apache/commons/configuration2/convert/AbstractListDelimiterHandler.java
+++ b/src/main/java/org/apache/commons/configuration2/convert/AbstractListDelimiterHandler.java
@@ -49,9 +49,9 @@ public abstract class AbstractListDelimiterHandler implements ListDelimiterHandl
             // Don't handle as an Iterable.
             result.add(value);
         } else if (value instanceof Iterable) {
-            AbstractListDelimiterHandler.flattenIterator(handler, result, ((Iterable<?>) value).iterator(), limit, dejaVu);
+            flattenIterator(handler, result, ((Iterable<?>) value).iterator(), limit, dejaVu);
         } else if (value instanceof Iterator) {
-            AbstractListDelimiterHandler.flattenIterator(handler, result, (Iterator<?>) value, limit, dejaVu);
+            flattenIterator(handler, result, (Iterator<?>) value, limit, dejaVu);
         } else if (value != null) {
             if (value.getClass().isArray()) {
                 for (int len = Array.getLength(value), idx = 0, size = 0; idx < len && size < limit; idx++, size = result.size()) {


(commons-configuration) 08/08: Bump org.apache.commons:commons-parent from 69 to 70

Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-configuration.git

commit 8ca98b4abffdd731b114373512e94e28e4b8b8d3
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed May 22 09:24:38 2024 -0400

    Bump org.apache.commons:commons-parent from 69 to 70
---
 src/changes/changes.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 2ae2f9ba..0d150ac5 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -49,7 +49,7 @@
       <!-- UPDATE -->
       <action type="update" dev="ggregory" due-to="Dependabot">Bump commons-logging:commons-logging from 1.3.0 to 1.3.2 #390, #418.</action>
       <action type="update" dev="ggregory" due-to="Dependabot">Bump commons-io:commons-io from 2.15.1 to 2.16.1 #394, #400.</action>
-      <action type="update" dev="ggregory" due-to="Dependabot">Bump org.apache.commons:commons-parent from 67 to 69 #396.</action>
+      <action type="update" dev="ggregory" due-to="Dependabot">Bump org.apache.commons:commons-parent from 67 to 70 #396.</action>
       <action type="update" dev="ggregory" due-to="Dependabot">Bump slf4j.version from 2.0.12 to 2.0.13 #403.</action>
       <action type="update" dev="ggregory" due-to="Dependabot">Bump org.apache.commons:commons-text from 1.11.0 to 1.12.0 #404.</action>
       <action type="update" dev="ggregory" due-to="Gary Gregory">Bump spring.version from 5.3.33 to 5.3.35 #424.</action>


(commons-configuration) 05/08: Fix PMD DynamicCombinedConfiguration in DefaultPrefixLookupsHolder

Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-configuration.git

commit 72e96717b0874d2e79a93cb8d596545da664958e
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed May 22 09:20:08 2024 -0400

    Fix PMD DynamicCombinedConfiguration in DefaultPrefixLookupsHolder