Caching for repositories supporting commit sha

Author: MarkRobbo

src/main/java/org/commonwl/view/git/GitDetails.java

@@ -170,7 +170,7 @@ public String getRawUrl() {
      * @param url The URL to be normalised
      * @return The normalised URL
      */
-    private String normaliseUrl(String url) {
+    public static String normaliseUrl(String url) {
         return url.replace("http://", "")
                   .replace("https://", "")
                   .replace("ssh://", "")

src/main/java/org/commonwl/view/git/GitService.java

@@ -19,23 +19,27 @@
 
 package org.commonwl.view.git;
 
+import org.apache.commons.codec.digest.DigestUtils;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.errors.GitAPIException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.io.File;
+import java.io.IOException;
 import java.nio.file.Path;
 
-import static java.util.Collections.singleton;
-import static org.apache.jena.ext.com.google.common.io.Files.createTempDir;
-
 /**
  * Handles Git related functionality
  */
 @Service
 public class GitService {
 
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
     // Location to check out git repositories into
     private Path gitStorage;
 
@@ -55,13 +59,44 @@ public GitService(@Value("${gitStorage}") Path gitStorage,
      */
     public Git cloneRepository(GitDetails gitDetails)
             throws GitAPIException {
-        return Git.cloneRepository()
-                .setCloneSubmodules(cloneSubmodules)
-                .setURI(gitDetails.getRepoUrl())
-                .setDirectory(createTempDir())
-                .setBranchesToClone(singleton("refs/heads/" + gitDetails.getBranch()))
-                .setBranch("refs/heads/" + gitDetails.getBranch())
-                .call();
+        Git repo = null;
+        try {
+            // Get base directory based on configuration
+            File baseDir = new File(gitStorage.toString());
+            String baseName = DigestUtils.shaHex(GitDetails.normaliseUrl(gitDetails.getRepoUrl()));
+
+            // Check if folder already exists
+            File repoDir = new File(baseDir, baseName);
+            if (repoDir.exists() && repoDir.isDirectory()) {
+                    repo = Git.open(repoDir);
+                    repo.fetch().call();
+            } else {
+                // Create a folder and clone repository into it
+                if (repoDir.mkdir()) {
+                    repo = Git.cloneRepository()
+                            .setCloneSubmodules(cloneSubmodules)
+                            .setURI(gitDetails.getRepoUrl())
+                            .setDirectory(repoDir)
+                            .setCloneAllBranches(true)
+                            .call();
+                }
+            }
+
+            // Checkout the specific branch or commit ID
+            if (repo != null) {
+                repo.checkout()
+                        .setName(gitDetails.getBranch())
+                        .call();
+                if (repo.getRepository().getFullBranch() != null) {
+                    repo.pull().call();
+                }
+            }
+        } catch (IOException ex) {
+            logger.error("Could not open existing Git repository for '"
+                    + gitDetails.getRepoUrl() + "'", ex);
+        }
+
+        return repo;
     }
 
 

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

@@ -122,6 +122,7 @@ public ModelAndView newWorkflowFromGithubURL(@Valid WorkflowForm workflowForm, B
                     workflow = workflowService.createQueuedWorkflow(gitInfo).getTempRepresentation();
                 } catch (GitAPIException ex) {
                     bindingResult.rejectValue("url", "git.retrievalError");
+                    logger.error("Github API Error", ex);
                     return new ModelAndView("index");
                 } catch (WorkflowNotFoundException ex) {
                     bindingResult.rejectValue("url", "git.pathTraversal");
@@ -451,6 +452,7 @@ private ModelAndView getWorkflow(GitDetails gitDetails, RedirectAttributes redir
                         queued = workflowService.createQueuedWorkflow(gitDetails);
                     } catch (GitAPIException ex) {
                         errors.rejectValue("url", "git.retrievalError", "The workflow could not be retrieved from the Git repository using the details given");
+                        logger.error("Github API Error", ex);
                     } catch (WorkflowNotFoundException ex) {
                         errors.rejectValue("url", "git.pathTraversal", "The path given did not resolve to a location within the repository");
                     } catch (IOException ex) {