commit faf8f6afdf5865250963ca711283fffc70b79344
author Gary Gregory <garydgregory@gmail.com> Tue May 16 15:06:10 2023 -0400
committer Gary Gregory <garydgregory@gmail.com> Tue May 16 15:06:10 2023 -0400
tree d9bacbd12b9d0e1084aa5f12d7ec121d2319446c
parent 35f43a63bd1689961ada7fcea4d3cab81747b5d7

Clean up Exceptions and formatting

src/main/java/org/apache/commons/validator/FormSetFactory.java

diff --git a/src/main/java/org/apache/commons/validator/FormSetFactory.java b/src/main/java/org/apache/commons/validator/FormSetFactory.java
index 763d62b..de42475 100644
--- a/src/main/java/org/apache/commons/validator/FormSetFactory.java
+++ b/src/main/java/org/apache/commons/validator/FormSetFactory.java
@@ -42,11 +42,11 @@
     @Override
     public Object createObject(final Attributes attributes) throws Exception {
 
-        final ValidatorResources resources = (ValidatorResources)digester.peek(0);
+        final ValidatorResources resources = (ValidatorResources) digester.peek(0);
 
         final String language = attributes.getValue("language");
-        final String country  = attributes.getValue("country");
-        final String variant  = attributes.getValue("variant");
+        final String country = attributes.getValue("country");
+        final String variant = attributes.getValue("variant");
 
         return createFormSet(resources, language, country, variant);
 
@@ -66,7 +66,7 @@
     private FormSet createFormSet(final ValidatorResources resources,
                                   final String language,
                                   final String country,
-                                  final String variant) throws Exception {
+                                  final String variant) {
 
         // Retrieve existing FormSet for the language/country/variant
         FormSet formSet = resources.getFormSet(language, country, variant);

src/main/java/org/apache/commons/validator/ValidatorResources.java

diff --git a/src/main/java/org/apache/commons/validator/ValidatorResources.java b/src/main/java/org/apache/commons/validator/ValidatorResources.java
index d18f258..d6aba6f 100644
--- a/src/main/java/org/apache/commons/validator/ValidatorResources.java
+++ b/src/main/java/org/apache/commons/validator/ValidatorResources.java
@@ -274,12 +274,10 @@
      * working.
      */
     private void addOldArgRules(final Digester digester) {
-
         // Create a new rule to process args elements
         final Rule rule = new Rule() {
             @Override
-            public void begin(final String namespace, final String name,
-                               final Attributes attributes) throws Exception {
+            public void begin(final String namespace, final String name, final Attributes attributes) {
                 // Create the Arg
                 final Arg arg = new Arg();
                 arg.setKey(attributes.getValue("key"));
@@ -291,12 +289,11 @@
                     final int length = "arg".length(); // skip the arg prefix
                     arg.setPosition(Integer.parseInt(name.substring(length)));
                 } catch (final Exception ex) {
-                    getLog().error("Error parsing Arg position: "
-                               + name + " " + arg + " " + ex);
+                    getLog().error("Error parsing Arg position: " + name + " " + arg + " " + ex);
                 }
 
                 // Add the arg to the parent field
-                ((Field)getDigester().peek(0)).addArg(arg);
+                ((Field) getDigester().peek(0)).addArg(arg);
             }
         };