Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #3743 - Making new ConfigurationProcessor interface default 

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
This commit is contained in:
Joakim Erdfelt 2019-06-10 08:19:59 -05:00
parent bb0c87a42a
commit a8d008b851
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
jetty-xml/src/main/java/org/eclipse/jetty/xml/ConfigurationProcessor.java
View File

@ -18,6 +18,7 @@
package org.eclipse.jetty.xml; package org.eclipse.jetty.xml;
import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.util.resource.Resource;
@ -37,14 +38,29 @@ public interface ConfigurationProcessor
* @deprecated use {@link #init(Resource, XmlParser.Node, XmlConfiguration)} instead * @deprecated use {@link #init(Resource, XmlParser.Node, XmlConfiguration)} instead
*/ */
@Deprecated @Deprecated
default void init(URL url, XmlParser.Node root, XmlConfiguration configuration) void init(URL url, XmlParser.Node root, XmlConfiguration configuration);
/**
* Initialize a ConfigurationProcessor from provided Resource and XML
*
* @param resource the resource being read
* @param root the parsed XML root node for the resource
* @param configuration the configuration being used (typically for ref IDs)
*/
default void init(Resource resource, XmlParser.Node root, XmlConfiguration configuration)
{ {
// Moving back and forth between URL and File/FileSystem/Path/Resource is known to cause escaping issues. // Moving back and forth between URL and File/FileSystem/Path/Resource is known to cause escaping issues.
init(Resource.newResource(url), root, configuration); try
{
init(resource.getURI().toURL(), root, configuration);
}
catch (MalformedURLException e)
{
throw new IllegalStateException("Unable to convert Resource to URL", e);
}
} }
void init(Resource resource, XmlParser.Node root, XmlConfiguration configuration); Object configure(Object obj) throws Exception;
Object configure( Object obj) throws Exception;
Object configure() throws Exception; Object configure() throws Exception;
} }