Switch EMLValidator to using File param in constructor.

NCEAS · Feb 2, 2019 · 64746ce · 64746ce
1 parent a8a2010
commit 64746ce
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/lib/eml.jar b/lib/eml.jar
diff --git a/src/main/java/org/ecoinformatics/eml/EMLParser.java b/src/main/java/org/ecoinformatics/eml/EMLParser.java
@@ -117,7 +117,7 @@ public EMLParser(File xml, File configFile) throws EMLParserException {
         this.xml = xml;
         try {
             if (isRecentVersion(xml)) {
-                EMLValidator validator = new EMLValidator(xml.getPath());
+                EMLValidator validator = new EMLValidator(xml);
                 boolean isValid = validator.validate();
                 if (!isValid) {
                     throw new EMLParserException(String.join("\n", validator.getErrors()));

diff --git a/src/main/java/org/ecoinformatics/eml/EMLParserServlet.java b/src/main/java/org/ecoinformatics/eml/EMLParserServlet.java
@@ -213,7 +213,7 @@ private String parse(File tempfile) {
 
         try {
             if(tempfile != null) {
-                EMLValidator val = new EMLValidator(tempfile.getAbsolutePath());
+                EMLValidator val = new EMLValidator(tempfile);
                 boolean isValid = val.validate();
                 if (isValid) {
                     html.append("<h4>EML specific tests: Passed.</h4><p>The tests which ");

diff --git a/src/main/java/org/ecoinformatics/eml/EMLValidator.java b/src/main/java/org/ecoinformatics/eml/EMLValidator.java
@@ -38,11 +38,11 @@ public class EMLValidator {
 
     /**
      * Construct an EMLValidator for use on a given file path.
-     * @param filename the relative or absolute path to a file to be validated
+     * @param file a File containing the EML text to validate
      */
-    public EMLValidator(String filename) {
+    public EMLValidator(File file) {
         try {
-            FileInputStream f = new FileInputStream(new File(filename));
+            FileInputStream f = new FileInputStream(file);
             doc = parseDocument(new InputSource(f));
             errors = new ArrayList<String>();
         } catch (Exception e) {
@@ -56,7 +56,8 @@ public EMLValidator(String filename) {
      */
     public static void main(String[] args) {
         String emlfile = args[0];
-        EMLValidator validator = new EMLValidator(emlfile);
+        File file = new File(emlfile);
+        EMLValidator validator = new EMLValidator(file);
         boolean isValid = validator.validate();
         System.err.println("isValid: " + (new Boolean(isValid)).toString());
     }

diff --git a/src/test/java/org/ecoinformatics/emltest/EMLValidatorTest.java b/src/test/java/org/ecoinformatics/emltest/EMLValidatorTest.java
@@ -95,7 +95,7 @@ public void testValidDocs()
             File testFile = (File)fileList.get(i);
             try {
                 System.err.println("Validating file: " + testFile.getName());
-                EMLValidator validator = new EMLValidator(testFile.getPath());
+                EMLValidator validator = new EMLValidator(testFile);
                 boolean isValid = validator.validate();
                 if (!isValid) {
                     for (String e : validator.getErrors()) {
@@ -123,7 +123,7 @@ public void testInvalidDocs() {
             File invalidFile = (File)invalidList.get(i);
             System.err.println("Invalidating file: " + invalidFile.getName());
             try {
-                EMLValidator validator = new EMLValidator(invalidFile.getPath());
+                EMLValidator validator = new EMLValidator(invalidFile);
                 boolean isValid = validator.validate();
                 if (!isValid) {
                     System.err.println("    Invalid, which is right.");