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 2022/05/15 18:32:26 UTC
[commons-configuration] branch master updated (94711d6c -> f296a1d6)
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 94711d6c Fix compiler generics warnings
new 4bafe3cf Maker some test classes static.
new 16fa8099 Make private class static.
new f296a1d6 Simplify.
The 3 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:
.../commons/configuration2/PropertiesConfiguration.java | 14 ++++++--------
.../commons/configuration2/tree/ModelTransaction.java | 2 +-
.../configuration2/TestDefaultImmutableConfiguration.java | 2 +-
.../configuration2/TestDynamicCombinedConfiguration.java | 2 +-
.../commons/configuration2/TestXMLConfiguration.java | 2 +-
.../configuration2/web/TestServletFilterConfiguration.java | 2 +-
6 files changed, 11 insertions(+), 13 deletions(-)
[commons-configuration] 02/03: Make private class static.
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 16fa8099a886ea733f9fbc3560cef99205751917
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun May 15 14:31:56 2022 -0400
Make private class static.
---
.../java/org/apache/commons/configuration2/tree/ModelTransaction.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java b/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java
index b5328aea..e2e7f9f2 100644
--- a/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java
+++ b/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java
@@ -562,7 +562,7 @@ class ModelTransaction {
* An abstract base class representing an operation to be performed on a node. Concrete subclasses implement specific
* update operations.
*/
- private abstract class Operation {
+ private abstract static class Operation {
/**
* Executes this operation on the provided target node returning the result.
*
[commons-configuration] 03/03: Simplify.
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 f296a1d662636db181fa3fcc5f522ecb002e9a07
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun May 15 14:32:20 2022 -0400
Simplify.
---
.../commons/configuration2/PropertiesConfiguration.java | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java b/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java
index d1a698bf..91cafe65 100644
--- a/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java
@@ -789,10 +789,8 @@ public class PropertiesConfiguration extends BaseConfiguration implements FileBa
if (ArrayUtils.contains(SEPARATORS, c) || ArrayUtils.contains(WHITE_SPACE, c) || c == '\\') {
// escape the separator
newkey.append('\\');
- newkey.append(c);
- } else {
- newkey.append(c);
}
+ newkey.append(c);
}
return newkey.toString();
@@ -1229,12 +1227,12 @@ public class PropertiesConfiguration extends BaseConfiguration implements FileBa
} else if (ch == 'u') {
// uh-oh, we're in unicode country....
inUnicode = true;
- } else if (needsUnescape(ch)) {
- out.append(ch);
} else {
- // JUP simply throws away the \ of unknown escape sequences
- if (!jupCompatible) {
- out.append('\\');
+ if (!needsUnescape(ch)) {
+ // JUP simply throws away the \ of unknown escape sequences
+ if (!jupCompatible) {
+ out.append('\\');
+ }
}
out.append(ch);
}
[commons-configuration] 01/03: Maker some test classes static.
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 4bafe3cfbf3ad675b25226a5a412b569e21273c9
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun May 15 13:32:57 2022 -0400
Maker some test classes static.
---
.../commons/configuration2/TestDefaultImmutableConfiguration.java | 2 +-
.../apache/commons/configuration2/TestDynamicCombinedConfiguration.java | 2 +-
.../java/org/apache/commons/configuration2/TestXMLConfiguration.java | 2 +-
.../commons/configuration2/web/TestServletFilterConfiguration.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/test/java/org/apache/commons/configuration2/TestDefaultImmutableConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestDefaultImmutableConfiguration.java
index d0b97f38..23a6824c 100644
--- a/src/test/java/org/apache/commons/configuration2/TestDefaultImmutableConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestDefaultImmutableConfiguration.java
@@ -42,7 +42,7 @@ import org.junit.Test;
public class TestDefaultImmutableConfiguration {
/** Tests default methods. This class MUST NOT override the default methods! */
- private class MapImmutableConfiguration implements ImmutableConfiguration {
+ private static class MapImmutableConfiguration implements ImmutableConfiguration {
Map<String, Object> map = new HashMap<>();
diff --git a/src/test/java/org/apache/commons/configuration2/TestDynamicCombinedConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestDynamicCombinedConfiguration.java
index 8f0515c7..918ab169 100644
--- a/src/test/java/org/apache/commons/configuration2/TestDynamicCombinedConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestDynamicCombinedConfiguration.java
@@ -99,7 +99,7 @@ public class TestDynamicCombinedConfiguration {
}
}
- private class ReloadThread extends Thread {
+ private static class ReloadThread extends Thread {
private final CombinedConfigurationBuilder builder;
private final int[] failures;
private final int index;
diff --git a/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java
index 8f9ff4fc..9985dfe9 100644
--- a/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java
@@ -74,7 +74,7 @@ public class TestXMLConfiguration {
/**
* A thread used for testing concurrent access to a builder.
*/
- private class ReloadThread extends Thread {
+ private static class ReloadThread extends Thread {
private final FileBasedConfigurationBuilder<?> builder;
ReloadThread(final FileBasedConfigurationBuilder<?> confBulder) {
diff --git a/src/test/java/org/apache/commons/configuration2/web/TestServletFilterConfiguration.java b/src/test/java/org/apache/commons/configuration2/web/TestServletFilterConfiguration.java
index ff7bfd99..5da734c4 100644
--- a/src/test/java/org/apache/commons/configuration2/web/TestServletFilterConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/web/TestServletFilterConfiguration.java
@@ -33,7 +33,7 @@ import org.junit.Test;
*
*/
public class TestServletFilterConfiguration extends TestAbstractConfiguration {
- private class MockFilterConfig implements FilterConfig {
+ private static class MockFilterConfig implements FilterConfig {
private final Properties parameters = new Properties();
@Override