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 2023/03/25 21:35:17 UTC
[commons-configuration] branch master updated (42dbd4be -> d5ffa439)
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 42dbd4be Javadoc: Remove extra "whitespace"
new 4f496190 Avoid NullPointerException in org.apache.commons.configuration2.web.AppletConfiguration.getKeysInternal().
new d6224a04 Inline single-use variable
new 57e1b945 Better internal method names
new fbb20a27 Better internal method names
new f37da720 Javadoc
new 8cdd1408 Ctor order
new c1d3b3ab Remove unused import
new 4585d750 Fix JDBC prepared statements leak in org.apache.commons.configuration2.DatabaseConfiguration.clearPropertyDirect(String). Fix JDBC prepared statements leak in org.apache.commons.configuration2.DatabaseConfiguration.clearPropertyDirect(String).
new fb8bb2c8 Better local name
new d7eae1f8 Remove unused import
new e1b99f4e Fix CI link
new d5ffa439 Organize imports
The 12 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 | 4 +-
src/changes/changes.xml | 6 ++
.../configuration2/DatabaseConfiguration.java | 7 +-
.../commons/configuration2/JNDIConfiguration.java | 13 +--
.../commons/configuration2/JSONConfiguration.java | 13 +--
.../commons/configuration2/XMLConfiguration.java | 19 ++--
.../commons/configuration2/XMLDocumentHelper.java | 7 +-
.../builder/BasicBuilderParameters.java | 2 +-
.../builder/BasicBuilderProperties.java | 2 +-
.../builder/XMLBuilderParametersImpl.java | 4 +-
.../io/ClasspathLocationStrategy.java | 2 +-
.../commons/configuration2/io/FileHandler.java | 16 +--
.../commons/configuration2/io/FileLocator.java | 2 +-
.../configuration2/io/FileLocatorUtils.java | 108 ++++++++++-----------
.../configuration2/resolver/CatalogResolver.java | 6 +-
.../configuration2/web/AppletConfiguration.java | 7 +-
.../web/ServletRequestConfiguration.java | 3 +-
.../org/apache/commons/configuration2/Logging.java | 6 +-
.../configuration2/TestJSONConfiguration.java | 3 +-
.../TestPropertiesConfiguration.java | 1 -
.../builder/TestXMLBuilderParametersImpl.java | 1 +
.../configuration2/io/TestFileLocatorUtils.java | 12 +--
22 files changed, 129 insertions(+), 115 deletions(-)
[commons-configuration] 09/12: Better local name
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 fb8bb2c8acae063cecb8b2e539f463901f6cc681
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Mar 25 17:10:41 2023 -0400
Better local name
---
src/main/java/org/apache/commons/configuration2/io/FileHandler.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/io/FileHandler.java b/src/main/java/org/apache/commons/configuration2/io/FileHandler.java
index 6bebf47c..8d76dfdf 100644
--- a/src/main/java/org/apache/commons/configuration2/io/FileHandler.java
+++ b/src/main/java/org/apache/commons/configuration2/io/FileHandler.java
@@ -687,9 +687,9 @@ public class FileHandler {
InputStream in = null;
try {
- final FileSystem obtainFileSystem = FileLocatorUtils.getFileSystem(locator);
+ final FileSystem fileSystem = FileLocatorUtils.getFileSystem(locator);
final URLConnectionOptions urlConnectionOptions = locator.getURLConnectionOptions();
- in = urlConnectionOptions == null ? obtainFileSystem.getInputStream(url) : obtainFileSystem.getInputStream(url, urlConnectionOptions);
+ in = urlConnectionOptions == null ? fileSystem.getInputStream(url) : fileSystem.getInputStream(url, urlConnectionOptions);
loadFromStream(in, locator.getEncoding(), url);
} catch (final ConfigurationException e) {
throw e;
[commons-configuration] 02/12: Inline single-use variable
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 d6224a041b00537f096ada4cc81fc52447c368bc
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Mar 25 16:47:51 2023 -0400
Inline single-use variable
---
.../org/apache/commons/configuration2/resolver/CatalogResolver.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java b/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java
index d5a424c0..00c8942c 100644
--- a/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java
+++ b/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java
@@ -233,8 +233,7 @@ public class CatalogResolver implements EntityResolver {
* @return the URL pointing to the file
*/
private static URL locate(final FileSystem fs, final String basePath, final String name) {
- final FileLocator locator = FileLocatorUtils.fileLocator().fileSystem(fs).basePath(basePath).fileName(name).create();
- return FileLocatorUtils.locate(locator);
+ return FileLocatorUtils.locate(FileLocatorUtils.fileLocator().fileSystem(fs).basePath(basePath).fileName(name).create());
}
/**
[commons-configuration] 08/12: Fix JDBC prepared statements leak in org.apache.commons.configuration2.DatabaseConfiguration.clearPropertyDirect(String). Fix JDBC prepared statements leak in org.apache.commons.configuration2.DatabaseConfiguration.clearPropertyDirect(String).
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 4585d750ac9487bc56a3ffeea4e5d1343bbfd4a4
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Mar 25 17:09:36 2023 -0400
Fix JDBC prepared statements leak in
org.apache.commons.configuration2.DatabaseConfiguration.clearPropertyDirect(String).
Fix JDBC prepared statements leak in
org.apache.commons.configuration2.DatabaseConfiguration.clearPropertyDirect(String).
---
src/changes/changes.xml | 3 +++
.../java/org/apache/commons/configuration2/DatabaseConfiguration.java | 4 +++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index f329fd05..c6a52139 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -47,6 +47,9 @@
<action type="fix" dev="ggregory" due-to="Gary Gregory">
Avoid NullPointerException in org.apache.commons.configuration2.web.AppletConfiguration.getKeysInternal().
</action>
+ <action type="fix" dev="ggregory" due-to="Gary Gregory">
+ Fix JDBC prepared statements leak in org.apache.commons.configuration2.DatabaseConfiguration.clearPropertyDirect(String).
+ </action>
<!-- UPDATE -->
<action type="update" dev="ggregory" due-to="Gary Gregory, Dependabot">
Bump actions/checkout from 3 to 3.1.0 #224.
diff --git a/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java b/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java
index 5d3bcc28..1df35c7d 100644
--- a/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java
@@ -448,7 +448,9 @@ public class DatabaseConfiguration extends AbstractConfiguration {
new JdbcOperation<Void>(ConfigurationErrorEvent.WRITE, ConfigurationEvent.CLEAR, null, null) {
@Override
protected Void performOperation() throws SQLException {
- initStatement(String.format(SQL_CLEAR, table), true).executeUpdate();
+ try (PreparedStatement statement = initStatement(String.format(SQL_CLEAR, table), true)) {
+ statement.executeUpdate();
+ }
return null;
}
}.execute();
[commons-configuration] 07/12: Remove unused import
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 c1d3b3ababe2d762623514e35fcfcc41b16e289f
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Mar 25 17:02:07 2023 -0400
Remove unused import
---
.../org/apache/commons/configuration2/resolver/CatalogResolver.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java b/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java
index 00c8942c..2cf89664 100644
--- a/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java
+++ b/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java
@@ -23,10 +23,9 @@ import java.net.URL;
import java.net.URLConnection;
import java.util.Vector;
-import org.apache.commons.configuration2.io.ConfigurationLogger;
import org.apache.commons.configuration2.ex.ConfigurationException;
import org.apache.commons.configuration2.interpol.ConfigurationInterpolator;
-import org.apache.commons.configuration2.io.FileLocator;
+import org.apache.commons.configuration2.io.ConfigurationLogger;
import org.apache.commons.configuration2.io.FileLocatorUtils;
import org.apache.commons.configuration2.io.FileSystem;
import org.apache.xml.resolver.CatalogException;
[commons-configuration] 11/12: Fix CI link
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 e1b99f4e57bf617b6a833607effbc2c227048084
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Mar 25 17:30:44 2023 -0400
Fix CI link
Fix XML
---
pom.xml | 4 ++--
src/changes/changes.xml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index fae93fb3..815e402f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,8 +41,8 @@
</issueManagement>
<ciManagement>
- <system>jenkins</system>
- <url>https://builds.apache.org/job/Commons-configuration/</url>
+ <system>github</system>
+ <url>https://github.com/apache/commons-configuration/actions</url>
</ciManagement>
<scm>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index c6a52139..f173c93d 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -36,7 +36,7 @@
</action>
<action type="fix" dev="ggregory" due-to="Arturo Bernal">
Use Java style array decelerations #244.
- </action>org.apache.commons.configuration2.web.AppletConfiguration.getKeysInternal()
+ </action>
<!-- ADD -->
<action issue="CONFIGURATION-799" type="add" dev="ggregory" due-to="Xinshiyou, Gary Gregory">
Add DefaultConversionHandler#setListDelimiterHandler(ListDelimiterHandler).
[commons-configuration] 10/12: Remove unused import
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 d7eae1f8ba124b3ff98c2cf69fce421e83bceebd
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Mar 25 17:13:48 2023 -0400
Remove unused import
---
.../org/apache/commons/configuration2/TestPropertiesConfiguration.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
index 2dd250e3..f9b78646 100644
--- a/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
@@ -45,7 +45,6 @@ import java.io.OutputStream;
import java.io.Reader;
import java.io.StringReader;
import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
import java.io.Writer;
import java.net.HttpURLConnection;
import java.net.URL;
[commons-configuration] 12/12: Organize imports
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 d5ffa439063c43c095058f37095b719304a03bf1
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Mar 25 17:35:11 2023 -0400
Organize imports
---
.../commons/configuration2/DatabaseConfiguration.java | 3 ++-
.../commons/configuration2/JNDIConfiguration.java | 13 +++++++------
.../commons/configuration2/JSONConfiguration.java | 13 +++++++------
.../commons/configuration2/XMLConfiguration.java | 19 ++++++++++---------
.../commons/configuration2/XMLDocumentHelper.java | 7 ++++---
.../builder/BasicBuilderParameters.java | 2 +-
.../builder/BasicBuilderProperties.java | 2 +-
.../builder/XMLBuilderParametersImpl.java | 4 ++--
.../web/ServletRequestConfiguration.java | 3 ++-
.../org/apache/commons/configuration2/Logging.java | 6 +++---
.../commons/configuration2/TestJSONConfiguration.java | 3 ++-
.../builder/TestXMLBuilderParametersImpl.java | 1 +
12 files changed, 42 insertions(+), 34 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java b/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java
index 1df35c7d..e2a34d67 100644
--- a/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java
@@ -17,7 +17,6 @@
package org.apache.commons.configuration2;
-import javax.sql.DataSource;
import java.sql.Clob;
import java.sql.Connection;
import java.sql.PreparedStatement;
@@ -29,6 +28,8 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.List;
+import javax.sql.DataSource;
+
import org.apache.commons.configuration2.convert.DisabledListDelimiterHandler;
import org.apache.commons.configuration2.convert.ListDelimiterHandler;
import org.apache.commons.configuration2.event.ConfigurationErrorEvent;
diff --git a/src/main/java/org/apache/commons/configuration2/JNDIConfiguration.java b/src/main/java/org/apache/commons/configuration2/JNDIConfiguration.java
index c193bc36..a5a1740c 100644
--- a/src/main/java/org/apache/commons/configuration2/JNDIConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/JNDIConfiguration.java
@@ -17,6 +17,13 @@
package org.apache.commons.configuration2;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NameClassPair;
@@ -24,12 +31,6 @@ import javax.naming.NameNotFoundException;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
import javax.naming.NotContextException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
import org.apache.commons.configuration2.event.ConfigurationErrorEvent;
import org.apache.commons.configuration2.io.ConfigurationLogger;
diff --git a/src/main/java/org/apache/commons/configuration2/JSONConfiguration.java b/src/main/java/org/apache/commons/configuration2/JSONConfiguration.java
index c1882195..d1806055 100644
--- a/src/main/java/org/apache/commons/configuration2/JSONConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/JSONConfiguration.java
@@ -17,18 +17,19 @@
package org.apache.commons.configuration2;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.type.MapType;
-import org.apache.commons.configuration2.ex.ConfigurationException;
-import org.apache.commons.configuration2.io.InputStreamSupport;
-import org.apache.commons.configuration2.tree.ImmutableNode;
-
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
import java.io.Writer;
import java.util.Map;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.io.InputStreamSupport;
+import org.apache.commons.configuration2.tree.ImmutableNode;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.type.MapType;
+
/**
* <p>
* A specialized hierarchical configuration class that is able to parse JSON documents.
diff --git a/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java b/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
index 87c69300..8b0c93bb 100644
--- a/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
@@ -17,15 +17,6 @@
package org.apache.commons.configuration2;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
@@ -40,6 +31,16 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
import org.apache.commons.configuration2.convert.ListDelimiterHandler;
import org.apache.commons.configuration2.ex.ConfigurationException;
import org.apache.commons.configuration2.io.ConfigurationLogger;
diff --git a/src/main/java/org/apache/commons/configuration2/XMLDocumentHelper.java b/src/main/java/org/apache/commons/configuration2/XMLDocumentHelper.java
index 74ccce01..69ef0be2 100644
--- a/src/main/java/org/apache/commons/configuration2/XMLDocumentHelper.java
+++ b/src/main/java/org/apache/commons/configuration2/XMLDocumentHelper.java
@@ -16,6 +16,10 @@
*/
package org.apache.commons.configuration2;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
@@ -27,9 +31,6 @@ import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMResult;
import javax.xml.transform.dom.DOMSource;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
import org.apache.commons.configuration2.ex.ConfigurationException;
import org.w3c.dom.Document;
diff --git a/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java b/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java
index 4d9cfac9..46d3e40e 100644
--- a/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java
+++ b/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java
@@ -22,13 +22,13 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.commons.configuration2.ConfigurationDecoder;
-import org.apache.commons.configuration2.io.ConfigurationLogger;
import org.apache.commons.configuration2.beanutils.BeanHelper;
import org.apache.commons.configuration2.convert.ConversionHandler;
import org.apache.commons.configuration2.convert.ListDelimiterHandler;
import org.apache.commons.configuration2.interpol.ConfigurationInterpolator;
import org.apache.commons.configuration2.interpol.InterpolatorSpecification;
import org.apache.commons.configuration2.interpol.Lookup;
+import org.apache.commons.configuration2.io.ConfigurationLogger;
import org.apache.commons.configuration2.sync.Synchronizer;
/**
diff --git a/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderProperties.java b/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderProperties.java
index abce17e7..8de3d731 100644
--- a/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderProperties.java
+++ b/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderProperties.java
@@ -20,12 +20,12 @@ import java.util.Collection;
import java.util.Map;
import org.apache.commons.configuration2.ConfigurationDecoder;
-import org.apache.commons.configuration2.io.ConfigurationLogger;
import org.apache.commons.configuration2.beanutils.BeanHelper;
import org.apache.commons.configuration2.convert.ConversionHandler;
import org.apache.commons.configuration2.convert.ListDelimiterHandler;
import org.apache.commons.configuration2.interpol.ConfigurationInterpolator;
import org.apache.commons.configuration2.interpol.Lookup;
+import org.apache.commons.configuration2.io.ConfigurationLogger;
import org.apache.commons.configuration2.sync.Synchronizer;
/**
diff --git a/src/main/java/org/apache/commons/configuration2/builder/XMLBuilderParametersImpl.java b/src/main/java/org/apache/commons/configuration2/builder/XMLBuilderParametersImpl.java
index 85f8cecc..1eea1285 100644
--- a/src/main/java/org/apache/commons/configuration2/builder/XMLBuilderParametersImpl.java
+++ b/src/main/java/org/apache/commons/configuration2/builder/XMLBuilderParametersImpl.java
@@ -16,10 +16,10 @@
*/
package org.apache.commons.configuration2.builder;
-import javax.xml.parsers.DocumentBuilder;
-
import java.util.Map;
+import javax.xml.parsers.DocumentBuilder;
+
import org.xml.sax.EntityResolver;
/**
diff --git a/src/main/java/org/apache/commons/configuration2/web/ServletRequestConfiguration.java b/src/main/java/org/apache/commons/configuration2/web/ServletRequestConfiguration.java
index 3e447c78..3c85eaa1 100644
--- a/src/main/java/org/apache/commons/configuration2/web/ServletRequestConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/web/ServletRequestConfiguration.java
@@ -17,13 +17,14 @@
package org.apache.commons.configuration2.web;
-import javax.servlet.ServletRequest;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import javax.servlet.ServletRequest;
+
/**
* A configuration wrapper to read the parameters of a servlet request. This configuration is read only, adding or
* removing a property will throw an UnsupportedOperationException.
diff --git a/src/test/java/org/apache/commons/configuration2/Logging.java b/src/test/java/org/apache/commons/configuration2/Logging.java
index 7a864af6..7dd600bd 100644
--- a/src/test/java/org/apache/commons/configuration2/Logging.java
+++ b/src/test/java/org/apache/commons/configuration2/Logging.java
@@ -17,11 +17,11 @@
package org.apache.commons.configuration2;
import org.apache.commons.logging.impl.Log4JLogger;
-import org.apache.log4j.Priority;
-import org.apache.log4j.Level;
import org.apache.log4j.Appender;
-import org.apache.log4j.PatternLayout;
import org.apache.log4j.ConsoleAppender;
+import org.apache.log4j.Level;
+import org.apache.log4j.PatternLayout;
+import org.apache.log4j.Priority;
/**
* Configures logging for tests.
diff --git a/src/test/java/org/apache/commons/configuration2/TestJSONConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestJSONConfiguration.java
index c303b349..7fd70b12 100644
--- a/src/test/java/org/apache/commons/configuration2/TestJSONConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestJSONConfiguration.java
@@ -18,8 +18,8 @@
package org.apache.commons.configuration2;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.FileReader;
import java.io.IOException;
@@ -32,6 +32,7 @@ import org.apache.commons.configuration2.ex.ConfigurationException;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.type.MapType;
diff --git a/src/test/java/org/apache/commons/configuration2/builder/TestXMLBuilderParametersImpl.java b/src/test/java/org/apache/commons/configuration2/builder/TestXMLBuilderParametersImpl.java
index 5d821fa2..5e3f7590 100644
--- a/src/test/java/org/apache/commons/configuration2/builder/TestXMLBuilderParametersImpl.java
+++ b/src/test/java/org/apache/commons/configuration2/builder/TestXMLBuilderParametersImpl.java
@@ -21,6 +21,7 @@ import static org.junit.jupiter.api.Assertions.assertSame;
import static org.mockito.Mockito.mock;
import java.util.Map;
+
import javax.xml.parsers.DocumentBuilder;
import org.apache.commons.configuration2.beanutils.BeanHelper;
[commons-configuration] 01/12: Avoid NullPointerException in org.apache.commons.configuration2.web.AppletConfiguration.getKeysInternal().
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 4f496190eaf6e629e70dcb0cdd38fd6a62758517
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Mar 25 16:47:05 2023 -0400
Avoid NullPointerException in
org.apache.commons.configuration2.web.AppletConfiguration.getKeysInternal().
---
src/changes/changes.xml | 5 ++++-
.../org/apache/commons/configuration2/web/AppletConfiguration.java | 7 ++++---
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 65040e1a..f329fd05 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -36,7 +36,7 @@
</action>
<action type="fix" dev="ggregory" due-to="Arturo Bernal">
Use Java style array decelerations #244.
- </action>
+ </action>org.apache.commons.configuration2.web.AppletConfiguration.getKeysInternal()
<!-- ADD -->
<action issue="CONFIGURATION-799" type="add" dev="ggregory" due-to="Xinshiyou, Gary Gregory">
Add DefaultConversionHandler#setListDelimiterHandler(ListDelimiterHandler).
@@ -44,6 +44,9 @@
<action type="fix" dev="ggregory" due-to="Gary Gregory">
Add ImmutableNode.stream().
</action>
+ <action type="fix" dev="ggregory" due-to="Gary Gregory">
+ Avoid NullPointerException in org.apache.commons.configuration2.web.AppletConfiguration.getKeysInternal().
+ </action>
<!-- UPDATE -->
<action type="update" dev="ggregory" due-to="Gary Gregory, Dependabot">
Bump actions/checkout from 3 to 3.1.0 #224.
diff --git a/src/main/java/org/apache/commons/configuration2/web/AppletConfiguration.java b/src/main/java/org/apache/commons/configuration2/web/AppletConfiguration.java
index 13d15a73..511bb646 100644
--- a/src/main/java/org/apache/commons/configuration2/web/AppletConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/web/AppletConfiguration.java
@@ -49,10 +49,11 @@ public class AppletConfiguration extends BaseWebConfiguration {
protected Iterator<String> getKeysInternal() {
final String[][] paramsInfo = applet.getParameterInfo();
final String[] keys = new String[paramsInfo != null ? paramsInfo.length : 0];
- for (int i = 0; i < keys.length; i++) {
- keys[i] = paramsInfo[i][0];
+ if (paramsInfo != null) {
+ for (int i = 0; i < keys.length; i++) {
+ keys[i] = paramsInfo[i][0];
+ }
}
-
return Arrays.asList(keys).iterator();
}
}
[commons-configuration] 03/12: Better internal method names
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 57e1b945584ea7055203e2d4702c8267f08590c5
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Mar 25 16:49:39 2023 -0400
Better internal method names
---
.../commons/configuration2/io/FileHandler.java | 14 ++---
.../configuration2/io/FileLocatorUtils.java | 62 +++++++++++-----------
.../configuration2/io/TestFileLocatorUtils.java | 12 ++---
3 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/io/FileHandler.java b/src/main/java/org/apache/commons/configuration2/io/FileHandler.java
index 71f3a9be..6bebf47c 100644
--- a/src/main/java/org/apache/commons/configuration2/io/FileHandler.java
+++ b/src/main/java/org/apache/commons/configuration2/io/FileHandler.java
@@ -485,7 +485,7 @@ public class FileHandler {
* @return the used {@code FileSystem}
*/
public FileSystem getFileSystem() {
- return FileLocatorUtils.obtainFileSystem(getFileLocator());
+ return FileLocatorUtils.getFileSystem(getFileLocator());
}
/**
@@ -496,7 +496,7 @@ public class FileHandler {
* @return the {@code FileLocationStrategy} to be used
*/
public FileLocationStrategy getLocationStrategy() {
- return FileLocatorUtils.obtainLocationStrategy(getFileLocator());
+ return FileLocatorUtils.getLocationStrategy(getFileLocator());
}
/**
@@ -509,7 +509,7 @@ public class FileHandler {
public String getPath() {
final FileLocator locator = getFileLocator();
final File file = createFile(locator);
- return FileLocatorUtils.obtainFileSystem(locator).getPath(file, locator.getSourceURL(), locator.getBasePath(), locator.getFileName());
+ return FileLocatorUtils.getFileSystem(locator).getPath(file, locator.getSourceURL(), locator.getBasePath(), locator.getFileName());
}
/**
@@ -687,7 +687,7 @@ public class FileHandler {
InputStream in = null;
try {
- final FileSystem obtainFileSystem = FileLocatorUtils.obtainFileSystem(locator);
+ final FileSystem obtainFileSystem = FileLocatorUtils.getFileSystem(locator);
final URLConnectionOptions urlConnectionOptions = locator.getURLConnectionOptions();
in = urlConnectionOptions == null ? obtainFileSystem.getInputStream(url) : obtainFileSystem.getInputStream(url, urlConnectionOptions);
loadFromStream(in, locator.getEncoding(), url);
@@ -872,7 +872,7 @@ public class FileHandler {
OutputStream out = null;
try {
- out = FileLocatorUtils.obtainFileSystem(locator).getOutputStream(file);
+ out = FileLocatorUtils.getFileSystem(locator).getOutputStream(file);
saveToStream(out, locator.getEncoding(), file.toURI().toURL());
} catch (final MalformedURLException muex) {
throw new ConfigurationException(muex);
@@ -953,7 +953,7 @@ public class FileHandler {
private void save(final String fileName, final FileLocator locator) throws ConfigurationException {
final URL url;
try {
- url = FileLocatorUtils.obtainFileSystem(locator).getURL(locator.getBasePath(), fileName);
+ url = FileLocatorUtils.getFileSystem(locator).getURL(locator.getBasePath(), fileName);
} catch (final MalformedURLException e) {
throw new ConfigurationException(e);
}
@@ -985,7 +985,7 @@ public class FileHandler {
private void save(final URL url, final FileLocator locator) throws ConfigurationException {
OutputStream out = null;
try {
- out = FileLocatorUtils.obtainFileSystem(locator).getOutputStream(url);
+ out = FileLocatorUtils.getFileSystem(locator).getOutputStream(url);
saveToStream(out, locator.getEncoding(), url);
if (out instanceof VerifiableOutputStream) {
try {
diff --git a/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java b/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java
index 018afee8..23183557 100644
--- a/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java
+++ b/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java
@@ -98,12 +98,6 @@ public final class FileLocatorUtils {
/** Property key for the source URL. */
private static final String PROP_SOURCE_URL = "sourceURL";
- /**
- * Private constructor so that no instances can be created.
- */
- private FileLocatorUtils() {
- }
-
/**
* Extends a path by another component. The given extension is added to the already existing path adding a separator if
* necessary.
@@ -379,6 +373,30 @@ public final class FileLocatorUtils {
return path.substring(path.lastIndexOf("/") + 1);
}
+ /**
+ * Obtains a non-<b>null</b> {@code FileSystem} object from the passed in {@code FileLocator}. If the passed in
+ * {@code FileLocator} has a {@code FileSystem} object, it is returned. Otherwise, result is the default
+ * {@code FileSystem}.
+ *
+ * @param locator the {@code FileLocator} (may be <b>null</b>)
+ * @return the {@code FileSystem} to be used for this {@code FileLocator}
+ */
+ static FileSystem getFileSystem(final FileLocator locator) {
+ return locator != null ? ObjectUtils.defaultIfNull(locator.getFileSystem(), DEFAULT_FILE_SYSTEM) : DEFAULT_FILE_SYSTEM;
+ }
+
+ /**
+ * Gets a non <b>null</b> {@code FileLocationStrategy} object from the passed in {@code FileLocator}. If the
+ * {@code FileLocator} is not <b>null</b> and has a {@code FileLocationStrategy} defined, this strategy is returned.
+ * Otherwise, result is the default {@code FileLocationStrategy}.
+ *
+ * @param locator the {@code FileLocator}
+ * @return the {@code FileLocationStrategy} for this {@code FileLocator}
+ */
+ static FileLocationStrategy getLocationStrategy(final FileLocator locator) {
+ return locator != null ? ObjectUtils.defaultIfNull(locator.getLocationStrategy(), DEFAULT_LOCATION_STRATEGY) : DEFAULT_LOCATION_STRATEGY;
+ }
+
/**
* Creates the default location strategy. This method creates a combined location strategy as described in the comment
* of the {@link #DEFAULT_LOCATION_STRATEGY} member field.
@@ -438,7 +456,7 @@ public final class FileLocatorUtils {
return null;
}
- return obtainLocationStrategy(locator).locate(obtainFileSystem(locator), locator);
+ return getLocationStrategy(locator).locate(getFileSystem(locator), locator);
}
/**
@@ -486,30 +504,6 @@ public final class FileLocatorUtils {
return url;
}
- /**
- * Obtains a non-<b>null</b> {@code FileSystem} object from the passed in {@code FileLocator}. If the passed in
- * {@code FileLocator} has a {@code FileSystem} object, it is returned. Otherwise, result is the default
- * {@code FileSystem}.
- *
- * @param locator the {@code FileLocator} (may be <b>null</b>)
- * @return the {@code FileSystem} to be used for this {@code FileLocator}
- */
- static FileSystem obtainFileSystem(final FileLocator locator) {
- return locator != null ? ObjectUtils.defaultIfNull(locator.getFileSystem(), DEFAULT_FILE_SYSTEM) : DEFAULT_FILE_SYSTEM;
- }
-
- /**
- * Obtains a non <b>null</b> {@code FileLocationStrategy} object from the passed in {@code FileLocator}. If the
- * {@code FileLocator} is not <b>null</b> and has a {@code FileLocationStrategy} defined, this strategy is returned.
- * Otherwise, result is the default {@code FileLocationStrategy}.
- *
- * @param locator the {@code FileLocator}
- * @return the {@code FileLocationStrategy} for this {@code FileLocator}
- */
- static FileLocationStrategy obtainLocationStrategy(final FileLocator locator) {
- return locator != null ? ObjectUtils.defaultIfNull(locator.getLocationStrategy(), DEFAULT_LOCATION_STRATEGY) : DEFAULT_LOCATION_STRATEGY;
- }
-
/**
* Stores the specified {@code FileLocator} in the given map. With the {@link #fromMap(Map)} method a new
* {@code FileLocator} with the same properties as the original one can be created.
@@ -548,4 +542,10 @@ public final class FileLocatorUtils {
return file.toURI().toURL();
}
+ /**
+ * Private constructor so that no instances can be created.
+ */
+ private FileLocatorUtils() {
+ }
+
}
diff --git a/src/test/java/org/apache/commons/configuration2/io/TestFileLocatorUtils.java b/src/test/java/org/apache/commons/configuration2/io/TestFileLocatorUtils.java
index b51cfd5f..6d512c01 100644
--- a/src/test/java/org/apache/commons/configuration2/io/TestFileLocatorUtils.java
+++ b/src/test/java/org/apache/commons/configuration2/io/TestFileLocatorUtils.java
@@ -404,7 +404,7 @@ public class TestFileLocatorUtils {
*/
@Test
public void testObtainFileSystemNotSetInLocator() {
- assertSame(FileLocatorUtils.DEFAULT_FILE_SYSTEM, FileLocatorUtils.obtainFileSystem(FileLocatorUtils.fileLocator().create()));
+ assertSame(FileLocatorUtils.DEFAULT_FILE_SYSTEM, FileLocatorUtils.getFileSystem(FileLocatorUtils.fileLocator().create()));
}
/**
@@ -412,7 +412,7 @@ public class TestFileLocatorUtils {
*/
@Test
public void testObtainFileSystemNullLocator() {
- assertSame(FileLocatorUtils.DEFAULT_FILE_SYSTEM, FileLocatorUtils.obtainFileSystem(null));
+ assertSame(FileLocatorUtils.DEFAULT_FILE_SYSTEM, FileLocatorUtils.getFileSystem(null));
}
/**
@@ -422,7 +422,7 @@ public class TestFileLocatorUtils {
public void testObtainFileSystemSetInLocator() {
final FileSystem fs = mock(FileSystem.class);
final FileLocator locator = FileLocatorUtils.fileLocator().fileSystem(fs).create();
- assertSame(fs, FileLocatorUtils.obtainFileSystem(locator));
+ assertSame(fs, FileLocatorUtils.getFileSystem(locator));
}
/**
@@ -431,7 +431,7 @@ public class TestFileLocatorUtils {
@Test
public void testObtainLocationStrategyNotSetInLocator() {
final FileLocator locator = FileLocatorUtils.fileLocator().create();
- assertSame(FileLocatorUtils.DEFAULT_LOCATION_STRATEGY, FileLocatorUtils.obtainLocationStrategy(locator));
+ assertSame(FileLocatorUtils.DEFAULT_LOCATION_STRATEGY, FileLocatorUtils.getLocationStrategy(locator));
}
/**
@@ -439,7 +439,7 @@ public class TestFileLocatorUtils {
*/
@Test
public void testObtainLocationStrategyNullLocator() {
- assertSame(FileLocatorUtils.DEFAULT_LOCATION_STRATEGY, FileLocatorUtils.obtainLocationStrategy(null));
+ assertSame(FileLocatorUtils.DEFAULT_LOCATION_STRATEGY, FileLocatorUtils.getLocationStrategy(null));
}
/**
@@ -449,7 +449,7 @@ public class TestFileLocatorUtils {
public void testObtainLocationStrategySetInLocator() {
final FileLocationStrategy strategy = mock(FileLocationStrategy.class);
final FileLocator locator = FileLocatorUtils.fileLocator().locationStrategy(strategy).create();
- assertSame(strategy, FileLocatorUtils.obtainLocationStrategy(locator));
+ assertSame(strategy, FileLocatorUtils.getLocationStrategy(locator));
}
/**
[commons-configuration] 04/12: Better internal method names
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 fbb20a27f508b8a98c93a9ea953949211bf218bb
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Mar 25 16:50:49 2023 -0400
Better internal method names
---
.../io/ClasspathLocationStrategy.java | 2 +-
.../configuration2/io/FileLocatorUtils.java | 58 +++++++++++-----------
2 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/io/ClasspathLocationStrategy.java b/src/main/java/org/apache/commons/configuration2/io/ClasspathLocationStrategy.java
index 76883c2f..a0e80716 100644
--- a/src/main/java/org/apache/commons/configuration2/io/ClasspathLocationStrategy.java
+++ b/src/main/java/org/apache/commons/configuration2/io/ClasspathLocationStrategy.java
@@ -37,6 +37,6 @@ public class ClasspathLocationStrategy implements FileLocationStrategy {
*/
@Override
public URL locate(final FileSystem fileSystem, final FileLocator locator) {
- return StringUtils.isEmpty(locator.getFileName()) ? null : FileLocatorUtils.locateFromClasspath(locator.getFileName());
+ return StringUtils.isEmpty(locator.getFileName()) ? null : FileLocatorUtils.getClasspathResource(locator.getFileName());
}
}
diff --git a/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java b/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java
index 23183557..68d25c64 100644
--- a/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java
+++ b/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java
@@ -307,6 +307,35 @@ public final class FileLocatorUtils {
return s.substring(0, s.lastIndexOf("/") + 1);
}
+ /**
+ * Tries to find a resource with the given name in the classpath.
+ *
+ * @param resourceName the name of the resource
+ * @return the URL to the found resource or <b>null</b> if the resource cannot be found
+ */
+ static URL getClasspathResource(final String resourceName) {
+ URL url = null;
+ // attempt to load from the context classpath
+ final ClassLoader loader = Thread.currentThread().getContextClassLoader();
+ if (loader != null) {
+ url = loader.getResource(resourceName);
+
+ if (url != null) {
+ LOG.debug("Loading configuration from the context classpath (" + resourceName + ")");
+ }
+ }
+
+ // attempt to load from the system classpath
+ if (url == null) {
+ url = ClassLoader.getSystemResource(resourceName);
+
+ if (url != null) {
+ LOG.debug("Loading configuration from the system classpath (" + resourceName + ")");
+ }
+ }
+ return url;
+ }
+
/**
* Tries to convert the specified base path and file name into a file object. This method is called e.g. by the save()
* methods of file based configurations. The parameter strings can be relative files, absolute files and URLs as well.
@@ -459,35 +488,6 @@ public final class FileLocatorUtils {
return getLocationStrategy(locator).locate(getFileSystem(locator), locator);
}
- /**
- * Tries to find a resource with the given name in the classpath.
- *
- * @param resourceName the name of the resource
- * @return the URL to the found resource or <b>null</b> if the resource cannot be found
- */
- static URL locateFromClasspath(final String resourceName) {
- URL url = null;
- // attempt to load from the context classpath
- final ClassLoader loader = Thread.currentThread().getContextClassLoader();
- if (loader != null) {
- url = loader.getResource(resourceName);
-
- if (url != null) {
- LOG.debug("Loading configuration from the context classpath (" + resourceName + ")");
- }
- }
-
- // attempt to load from the system classpath
- if (url == null) {
- url = ClassLoader.getSystemResource(resourceName);
-
- if (url != null) {
- LOG.debug("Loading configuration from the system classpath (" + resourceName + ")");
- }
- }
- return url;
- }
-
/**
* Tries to locate the file referenced by the passed in {@code FileLocator}. If this fails, an exception is thrown. This
* method works like {@link #locate(FileLocator)}; however, in case of a failed location attempt an exception is thrown.
[commons-configuration] 06/12: Ctor order
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 8cdd14089daac814372d242e7d71de9258049c51
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Mar 25 17:01:53 2023 -0400
Ctor order
---
.../apache/commons/configuration2/io/FileLocatorUtils.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java b/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java
index 68d25c64..4e01656f 100644
--- a/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java
+++ b/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java
@@ -98,6 +98,12 @@ public final class FileLocatorUtils {
/** Property key for the source URL. */
private static final String PROP_SOURCE_URL = "sourceURL";
+ /**
+ * Private constructor so that no instances can be created.
+ */
+ private FileLocatorUtils() {
+ }
+
/**
* Extends a path by another component. The given extension is added to the already existing path adding a separator if
* necessary.
@@ -542,10 +548,4 @@ public final class FileLocatorUtils {
return file.toURI().toURL();
}
- /**
- * Private constructor so that no instances can be created.
- */
- private FileLocatorUtils() {
- }
-
}
[commons-configuration] 05/12: Javadoc
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 f37da720b0e0d9f6c67d152e2da04ed5cddecb83
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Mar 25 16:51:36 2023 -0400
Javadoc
---
src/main/java/org/apache/commons/configuration2/io/FileLocator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/commons/configuration2/io/FileLocator.java b/src/main/java/org/apache/commons/configuration2/io/FileLocator.java
index c1eedcb0..e5868aaf 100644
--- a/src/main/java/org/apache/commons/configuration2/io/FileLocator.java
+++ b/src/main/java/org/apache/commons/configuration2/io/FileLocator.java
@@ -99,7 +99,7 @@ public final class FileLocator {
/**
* Creates a new immutable {@code FileLocatorImpl} object based on the properties set so far for this builder.
*
- * @return the newly created {@code FileLocator} object
+ * @return the newly created {@code FileLocator} object, never null.
*/
public FileLocator create() {
return new FileLocator(this);