Skip to content

Switch to use commons-digester3 #318

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
harrisric wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Switch to use commons-digester3 #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c10e77
Switch to use commons-digester3
harrisric Feb 14, 2025
a8d97e4
Update the schema for the digester-rules.
harrisric Feb 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 3 additions & 14 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,20 +169,9 @@
<version>1.10.1</version>
</dependency>
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
<version>2.1</version>
<!-- exclude older version and use declared-only -->
<exclusions>
<exclusion>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
<groupId>org.apache.commons</groupId>
<artifactId>commons-digester3</artifactId>
<version>3.2</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/apache/commons/validator/FormSetFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
package org.apache.commons.validator;

import org.apache.commons.digester.AbstractObjectCreationFactory;
import org.apache.commons.digester3.AbstractObjectCreationFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.xml.sax.Attributes;
Expand All @@ -26,7 +26,7 @@
*
* @since 1.2
*/
public class FormSetFactory extends AbstractObjectCreationFactory {
public class FormSetFactory extends AbstractObjectCreationFactory<FormSet> {

/** Logging */
private transient Log log = LogFactory.getLog(FormSetFactory.class);
Expand Down Expand Up @@ -89,9 +89,9 @@ private FormSet createFormSet(final ValidatorResources resources,
* @throws Exception If an error occurs creating the FormSet.
*/
@Override
public Object createObject(final Attributes attributes) throws Exception {
public FormSet createObject(final Attributes attributes) throws Exception {

final ValidatorResources resources = (ValidatorResources) digester.peek(0);
final ValidatorResources resources = (ValidatorResources) getDigester().peek(0);

final String language = attributes.getValue("language");
final String country = attributes.getValue("country");
Expand Down
33 changes: 21 additions & 12 deletions src/main/java/org/apache/commons/validator/ValidatorResources.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,10 @@
import java.util.Map;

import org.apache.commons.collections.FastHashMap; // DEPRECATED
import org.apache.commons.digester.Digester;
import org.apache.commons.digester.Rule;
import org.apache.commons.digester.xmlrules.DigesterLoader;
import org.apache.commons.digester3.Digester;
import org.apache.commons.digester3.Rule;
import org.apache.commons.digester3.binder.DigesterLoader;
import org.apache.commons.digester3.xmlrules.FromXmlRulesModule;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.xml.sax.Attributes;
Expand Down Expand Up @@ -557,15 +558,23 @@ public Map<String, ValidatorAction> getValidatorActions() {
* Initialize the digester.
*/
private Digester initDigester() {
URL rulesUrl = this.getClass().getResource(VALIDATOR_RULES);
if (rulesUrl == null) {
// Fix for Issue# VALIDATOR-195
rulesUrl = ValidatorResources.class.getResource(VALIDATOR_RULES);
}
if (getLog().isDebugEnabled()) {
getLog().debug("Loading rules from '" + rulesUrl + "'");
}
final Digester digester = DigesterLoader.createDigester(rulesUrl);
// Create a digester loader using FromXmlRulesModule
DigesterLoader loader = DigesterLoader.newLoader(new FromXmlRulesModule() {
@Override
protected void loadRules() {
URL rulesUrl = this.getClass().getResource(VALIDATOR_RULES);
if (rulesUrl == null) {
// Fix for Issue# VALIDATOR-195
rulesUrl = ValidatorResources.class.getResource(VALIDATOR_RULES);
}
if (getLog().isDebugEnabled()) {
getLog().debug("Loading rules from '" + rulesUrl + "'");
}
loadXMLRules(rulesUrl);
}
});
Digester digester = loader.newDigester();

digester.setNamespaceAware(true);
digester.setValidating(true);
digester.setUseContextClassLoader(true);
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/org/apache/commons/validator/digester-rules.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
-->


<!DOCTYPE digester-rules PUBLIC "-//Jakarta Apache //DTD digester-rules XML V1.0//EN"
"http://jakarta.apache.org/commons/digester/dtds/digester-rules.dtd">
<!DOCTYPE digester-rules PUBLIC "-//Apache Commons //DTD digester-rules XML V1.0//EN"
"http://commons.apache.org/digester/dtds/digester-rules-3.0.dtd">

<digester-rules>

Expand Down
Loading