From 779f71bd70899f8f739699d5e2767f2adaa02e4b Mon Sep 17 00:00:00 2001
From: Patrick Dowler <pdowler.cadc@gmail.com>
Date: Mon, 6 Dec 2021 11:12:25 -0800
Subject: [PATCH] checkstyle fixes

---
 .../src/main/java/ca/nrc/cadc/vodml/Main.java | 67 +++++++------------
 .../vodml/SchematronValidationException.java  | 15 ++---
 .../java/ca/nrc/cadc/vodml/VOModelWriter.java |  2 +-
 3 files changed, 33 insertions(+), 51 deletions(-)

diff --git a/cadc-vodml/src/main/java/ca/nrc/cadc/vodml/Main.java b/cadc-vodml/src/main/java/ca/nrc/cadc/vodml/Main.java
index 1a8b0498..6d0d209e 100644
--- a/cadc-vodml/src/main/java/ca/nrc/cadc/vodml/Main.java
+++ b/cadc-vodml/src/main/java/ca/nrc/cadc/vodml/Main.java
@@ -63,11 +63,10 @@
 *                                       <http://www.gnu.org/licenses/>.
 *
 ************************************************************************
-*/
+ */
 
 package ca.nrc.cadc.vodml;
 
-
 import ca.nrc.cadc.util.ArgumentMap;
 import ca.nrc.cadc.util.Log4jInit;
 import java.io.File;
@@ -83,78 +82,64 @@
  *
  * @author pdowler
  */
-public class Main 
-{
+public class Main {
+
     private static final Logger log = Logger.getLogger(Main.class);
     private static final String PKG = Main.class.getPackage().getName();
-    
-    private Main() { }
-    
-    public static void main(String[] args)
-    {
-        try
-        {
+
+    private Main() {
+    }
+
+    public static void main(String[] args) {
+        try {
             ArgumentMap am = new ArgumentMap(args);
-            if (am.isSet("h") || am.isSet("help"))
-            {
+            if (am.isSet("h") || am.isSet("help")) {
                 usage();
                 System.exit(0);
             }
-            
-            if (am.isSet("d") || am.isSet("debug"))
-            {
+
+            if (am.isSet("d") || am.isSet("debug")) {
                 Log4jInit.setLevel(PKG, Level.DEBUG);
-            }
-            else if (am.isSet("v") || am.isSet("verbose"))
-            {
+            } else if (am.isSet("v") || am.isSet("verbose")) {
                 Log4jInit.setLevel(PKG, Level.INFO);
-            }
-            else
+            } else {
                 Log4jInit.setLevel(PKG, Level.WARN);
+            }
 
             List<String> pargs = am.getPositionalArgs();
-            if (pargs.isEmpty())
-            {
+            if (pargs.isEmpty()) {
                 usage();
                 System.exit(1);
             }
-            
+
             boolean warn = am.isSet("warn");
             VOModelReader validator = new VOModelReader(true, true, warn);
-            for (String fname : pargs)
-            {
-                try
-                {
+            for (String fname : pargs) {
+                try {
                     log.info("validating: " + fname + " ...");
                     File f = new File(fname);
                     Reader fr = new FileReader(f);
                     Document doc = validator.read(fr);
                     log.info("validating: " + fname + " ... [OK]");
-                }
-                catch(JDOMException ex)
-                {
+                } catch (JDOMException ex) {
                     log.error("failed basic XML validation", ex);
                     System.exit(-1);
-                }
-                catch(SchematronValidationException ex)
-                {
+                } catch (SchematronValidationException ex) {
                     log.error("failed Schematron validation: " + ex.getMessage());
-                    for (String msg : ex.getFailures())
+                    for (String msg : ex.getFailures()) {
                         log.error(msg);
+                    }
                     System.exit(-1);
                 }
             }
-        }
-        catch(Throwable t)
-        {
+        } catch (Throwable t) {
             log.error("uncaught exception", t);
             System.exit(-1);
         }
         System.exit(0);
     }
-    
-    private static void usage()
-    {
+
+    private static void usage() {
         System.out.println("usage: cadc-vodml [-v|--verbose|-d|--debug|-h|--help] <VO-DML/XML filename> ...");
     }
 }
diff --git a/cadc-vodml/src/main/java/ca/nrc/cadc/vodml/SchematronValidationException.java b/cadc-vodml/src/main/java/ca/nrc/cadc/vodml/SchematronValidationException.java
index 98935855..41a3fc2a 100644
--- a/cadc-vodml/src/main/java/ca/nrc/cadc/vodml/SchematronValidationException.java
+++ b/cadc-vodml/src/main/java/ca/nrc/cadc/vodml/SchematronValidationException.java
@@ -63,11 +63,10 @@
 *                                       <http://www.gnu.org/licenses/>.
 *
 ************************************************************************
-*/
+ */
 
 package ca.nrc.cadc.vodml;
 
-
 import java.util.List;
 import org.apache.log4j.Logger;
 
@@ -75,20 +74,18 @@
  *
  * @author pdowler
  */
-public class SchematronValidationException extends Exception
-{
+public class SchematronValidationException extends Exception {
+
     private static final Logger log = Logger.getLogger(SchematronValidationException.class);
 
     private final List<String> msgs;
-    
-    public SchematronValidationException(int numFails, List<String> msgs) 
-    { 
+
+    public SchematronValidationException(int numFails, List<String> msgs) {
         super(numFails + " failed assertions");
         this.msgs = msgs;
     }
 
-    public List<String> getFailures()
-    {
+    public List<String> getFailures() {
         return msgs;
     }
 }
diff --git a/cadc-vodml/src/main/java/ca/nrc/cadc/vodml/VOModelWriter.java b/cadc-vodml/src/main/java/ca/nrc/cadc/vodml/VOModelWriter.java
index f1bf54fd..2f3be66c 100644
--- a/cadc-vodml/src/main/java/ca/nrc/cadc/vodml/VOModelWriter.java
+++ b/cadc-vodml/src/main/java/ca/nrc/cadc/vodml/VOModelWriter.java
@@ -99,7 +99,7 @@ public void write(Document doc, OutputStream out)
         OutputStreamWriter osw = new OutputStreamWriter(out);
         write(doc, osw);
     }
-    
+
     public void write(Document doc, Writer out) throws IOException {
         XMLOutputter outputter = new XMLOutputter();
         if (prettyPrint) {