Undo code deletion, but replace string concatenation by log+parameters

Author: kinow

src/main/java/org/commonwl/view/cwl/CWLToolRunner.java

@@ -19,6 +19,9 @@
 
 package org.commonwl.view.cwl;
 
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Date;
 import org.apache.jena.query.QueryException;
 import org.commonwl.view.git.GitDetails;
 import org.commonwl.view.git.GitLicenseException;
@@ -31,20 +34,16 @@
 import org.commonwl.view.workflow.Workflow;
 import org.commonwl.view.workflow.WorkflowRepository;
 import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.errors.MissingObjectException;
+import org.eclipse.jgit.errors.TransportException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.stereotype.Component;
 
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Date;
-
-/**
- * Replace an existing workflow with the one given by cwltool
- */
+/** Replace an existing workflow with the one given by cwltool */
 @Component
 @EnableAsync
 public class CWLToolRunner {
@@ -114,13 +113,47 @@ public void createWorkflowFromQueued(QueuedWorkflow queuedWorkflow) throws IOExc
       FileUtils.deleteGitRepository(repo);
     } catch (CWLValidationException | GitLicenseException ex) {
       String message = ex.getMessage();
-      logger.error("Workflow {} from {} : {}", queuedWorkflow.getId(), gitInfo.toSummary(), message, ex);
+      logger.error(
+          "Workflow {} from {} : {}", queuedWorkflow.getId(), gitInfo.toSummary(), message, ex);
       queuedWorkflow.setCwltoolStatus(CWLToolStatus.ERROR);
       queuedWorkflow.setMessage(message);
       FileUtils.deleteGitRepository(repo);
+    } catch (TransportException ex) {
+      String message = ex.getMessage();
+      logger.error(
+          "Workflow retrieval error while processing {} from {} : {}",
+          queuedWorkflow.getId(),
+          gitInfo.toSummary(),
+          message,
+          ex);
+      queuedWorkflow.setCwltoolStatus(CWLToolStatus.ERROR);
+      if (message.contains(
+          "Authentication is required but no CredentialsProvider has been registered")) {
+        queuedWorkflow.setMessage(
+            "Unable to retrieve the Git repository: it may be private, misnamed, or removed. "
+                + message);
+      } else {
+        queuedWorkflow.setMessage(message);
+      }
+      FileUtils.deleteGitRepository(repo);
+    } catch (MissingObjectException ex) {
+      String message = ex.getMessage();
+      logger.error(
+          "Workflow retrieval error while processing {} from {} : {}",
+          queuedWorkflow.getId(),
+          gitInfo.toSummary(),
+          message,
+          ex);
+      queuedWorkflow.setCwltoolStatus(CWLToolStatus.ERROR);
+      queuedWorkflow.setMessage("Unable to retrieve a needed Git object: " + message);
+      FileUtils.deleteGitRepository(repo);
     } catch (Exception ex) {
-      logger.error("Unexpected error processing workflow {} from {} : {}",
-          queuedWorkflow.getId(), gitInfo.toSummary(), ex.getMessage(), ex);
+      logger.error(
+          "Unexpected error processing workflow {} from {} : {}",
+          queuedWorkflow.getId(),
+          gitInfo.toSummary(),
+          ex.getMessage(),
+          ex);
       queuedWorkflow.setCwltoolStatus(CWLToolStatus.ERROR);
       queuedWorkflow.setMessage(
           "Whoops! Cwltool ran successfully, but an unexpected "

src/main/java/org/commonwl/view/workflow/WorkflowController.java

@@ -22,6 +22,11 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Path;
+import java.util.List;
 import org.apache.commons.lang.StringUtils;
 import org.commonwl.view.WebConfig;
 import org.commonwl.view.cwl.CWLNotAWorkflowException;
@@ -54,12 +59,6 @@
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Path;
-import java.util.List;
-
 @Controller
 public class WorkflowController {