Merge pull request #907 from NASA-PDS/issue_903

903: retry 3 times
NASA-PDS · May 28, 2024 · de74bb4 · de74bb4
2 parents d311369 + c87ad22
commit de74bb4
Showing 1 changed file with 29 additions and 16 deletions.
diff --git a/src/main/java/gov/nasa/pds/tools/label/SchematronTransformer.java b/src/main/java/gov/nasa/pds/tools/label/SchematronTransformer.java
@@ -33,7 +33,10 @@
 import org.slf4j.LoggerFactory;
 import gov.nasa.pds.tools.util.Utility;
 import gov.nasa.pds.tools.util.XslURIResolver;
+import gov.nasa.pds.tools.validate.ProblemDefinition;
 import gov.nasa.pds.tools.validate.ProblemHandler;
+import gov.nasa.pds.tools.validate.ProblemType;
+import gov.nasa.pds.tools.validate.ValidationProblem;
 
 /**
  * A class that transforms Schematron files based on the isoSchematron stylesheet.
@@ -132,22 +135,32 @@ public String fetch(URL schematron) throws TransformerException {
    */
   public String fetch(URL schematron, ProblemHandler handler) throws TransformerException {
     LOG.debug("transform:schematron {}", schematron);
-    try (InputStream in = Utility.openConnection(schematron.openConnection())) {
-      String document = IOUtils.toString(in, StandardCharsets.UTF_8);
-      this.transform(document, handler); // test that document is valid
-      return document;
-    } catch (IOException io) {
-      String message = "";
-      if (io instanceof FileNotFoundException) {
-        message = "Cannot read schematron as URL cannot be found: " + io.getMessage();
-      } else {
-        // message = io.getMessage();
-        // Put a more detail message since io.getMessage only return the schematron file
-        // name.
-        message = "Cannot read schematron from URL " + schematron;
+    final int MAX_RETRIES = 3;
+    int retry = 0;
+    while (retry < MAX_RETRIES) {
+      try (InputStream in = Utility.openConnection(schematron.openConnection())) {
+        String document = IOUtils.toString(in, StandardCharsets.UTF_8);
+        this.transform(document, handler); // test that document is valid
+        return document;
+      } catch (IOException io) {
+        String message = "";
+        retry++;
+        if (io instanceof FileNotFoundException) {
+          message = "Cannot read schematron as URL cannot be found: " + io.getMessage();
+        } else {
+          // message = io.getMessage();
+          // Put a more detail message since io.getMessage only return the schematron file
+          // name.
+          message = "Cannot read schematron from URL " + schematron;
+        }
+        LOG.debug("transform:message {}", message);
+        if (retry < MAX_RETRIES) {
+          LOG.info(message);
+        } else {
+          throw new TransformerException(message);
+        }
       }
-      LOG.debug("transform:message {}", message);
-      throw new TransformerException(message);
-    } 
+    }
+    throw new RuntimeException("impossible to get here but static analysis cannot tell so adding this useless exception");
   }
 }