mass reformatting

Author: mr-c

load.py

@@ -12,51 +12,49 @@
 
 isCommit = re.compile("^[0-9a-fA-F]{40}$")
 
-HEADERS = {
-    'User-Agent': 'cwlviewer-load/0.0.1',
-    'Accept': 'application/json'
-}
+HEADERS = {"User-Agent": "cwlviewer-load/0.0.1", "Accept": "application/json"}
 
 
 def parse_gitinfos(sourceFp):
     doc = json.load(sourceFp)
     for wf in doc["content"]:
         yield wf["retrievedFrom"]
 
+
 def is_not_commit(gitinfo):
     return not isCommit.match(gitinfo["branch"])
 
+
 def make_requests(gitinfos):
     for git in gitinfos:
         # dict_keys(['repoUrl', 'branch', 'path', 'packedId', 'url', 'rawUrl', 'type'])
-        req = {
-            "url": git["repoUrl"],
-            "branch": git["branch"],
-            "path": git["path"]
-        }
+        req = {"url": git["repoUrl"], "branch": git["branch"], "path": git["path"]}
         if git["packedId"]:
             req["packedId"] = git["packedId"]
         yield req
 
+
 def send(base, req):
     url = urljoin(base, "/workflows")
     r = requests.post(url, data=req, allow_redirects=False, headers=HEADERS)
-    print("Posted: %s" % req)
+    print("Posted: %s" % req, file=sys.stderr)
     if r.status_code == 202:
-        location =  urljoin(url, r.headers["Location"]) 
-        print("  queued: %s" % location)
+        location = urljoin(url, r.headers["Location"])
+        print("  queued: %s" % location, file=sys.stderr)
         # need to check later
         return location
     if r.status_code == 303:
-        print ("  done: %s" % r.headers["Location"])
-        return None # Already there, all OK
-    print("Unhandled HTTP status code: %s  %s" % 
-                    (r.status_code, r.text))
+        print("  done: %s" % r.headers["Location"], file=sys.stderr)
+        return None  # Already there, all OK
+    print(f"Unhandled HTTP status code: {r.status_code}  {r.text}", file=sys.stderr)
+    print(req)
+
 
 def send_requests(base, requests):
     for req in requests:
         yield send(base, req)
 
+
 def is_running(location):
     if not location:
         return True
@@ -68,23 +66,26 @@ def is_running(location):
     if j["cwltoolStatus"] == "RUNNING":
         return True
     elif j["cwltoolStatus"] == "ERROR":
-        print("Failed %s: %s" % (location, j["message"]))
+        print(f"Failed {location}: {j['message']}", file=sys.stderr)
         return False
     else:
-        raise Exception("Unhandled queue status: %s %s" % (queued.status_code, queued.text))
+        raise Exception(f"Unhandled queue status: {queued.status_code} {queued.text}")
+
 
-MAX_CONCURRENT=6 # Maximum number in queue
-SLEEP=0.5 # wait SLEEP seconds if queue is full
+MAX_CONCURRENT = 2  # Maximum number in queue
+SLEEP = 0.5  # wait SLEEP seconds if queue is full
 
-def trim_queue(queue):    
+
+def trim_queue(queue):
     new_queue = []
     for q in queue:
         if is_running(q):
-            #print("Still running %s" % q)
+            # print("Still running %s" % q)
             new_queue.append(q)
-    print("Trimmed queue from %s to %s" % (len(queue), len(new_queue)))
+    print(f"Trimmed queue from {len(queue)} to {len(new_queue)}", file=sys.stderr)
     return new_queue
 
+
 def main(jsonfile="-", base="http://view.commonwl.org:8082/", *args):
     if jsonfile == "-":
         source = sys.stdin
@@ -96,23 +97,23 @@ def main(jsonfile="-", base="http://view.commonwl.org:8082/", *args):
     gitinfos = parse_gitinfos(source)
     if "--no-commits" in args:
         gitinfos = filter(is_not_commit, gitinfos)
-    
+
     requests = make_requests(gitinfos)
     queued = []
     for q in send_requests(base, requests):
         if q:
-            queued.append(q)        
+            queued.append(q)
         while len(queued) >= MAX_CONCURRENT:
             time.sleep(SLEEP)
-            queued = trim_queue(queued)    
+            queued = trim_queue(queued)
     # Finish the rest of the queue
     while queued:
         queued = trim_queue(queued)
 
+
 if __name__ == "__main__":
     if "-h" in sys.argv:
         print("load.py [jsonfile] [baseurl] [--no-commits]")
         sys.exit(1)
 
     main(*sys.argv[1:])
-

pom.xml

@@ -214,6 +214,18 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+          <groupId>com.spotify.fmt</groupId>
+          <artifactId>fmt-maven-plugin</artifactId>
+          <version>2.19</version>
+          <executions>
+              <execution>
+                  <goals>
+                      <goal>format</goal>
+                  </goals>
+              </execution>
+          </executions>
+      </plugin>
     </plugins>
   </build>
 

src/main/java/org/commonwl/view/CwlViewerApplication.java

@@ -31,7 +31,7 @@
 @EnableTransactionManagement
 public class CwlViewerApplication {
 
-	public static void main(String[] args) {
-		SpringApplication.run(CwlViewerApplication.class, args);
-	}
-}
+  public static void main(String[] args) {
+    SpringApplication.run(CwlViewerApplication.class, args);
+  }
+}

src/main/java/org/commonwl/view/GlobalControllerErrorHandling.java

@@ -20,7 +20,6 @@
 package org.commonwl.view;
 
 import java.util.Collections;
-
 import org.commonwl.view.workflow.MultipleWorkflowsException;
 import org.commonwl.view.workflow.RepresentationNotFoundException;
 import org.commonwl.view.workflow.WorkflowNotFoundException;
@@ -33,51 +32,53 @@
 
 /**
  * Handles exception handling across the application.
- * <p>
- * Because of Spring Boot's content negotiation these handlers are needed when
- * the error is returned with an otherwise "non acceptable" content type (e.g.
- * Accept: image/svg+xml but we have to say 404 Not Found)
  *
+ * <p>Because of Spring Boot's content negotiation these handlers are needed when the error is
+ * returned with an otherwise "non acceptable" content type (e.g. Accept: image/svg+xml but we have
+ * to say 404 Not Found)
  */
 @ControllerAdvice
 public class GlobalControllerErrorHandling {
 
-    /**
-     * Workflow can not be found
-     * @return A plain text error message
-     */
-    @ExceptionHandler(WorkflowNotFoundException.class)
-    public ResponseEntity<?> handleNotFound() {
-        final HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(MediaType.TEXT_PLAIN);
-        return new ResponseEntity<>("Workflow or git commit could not be found", headers, HttpStatus.NOT_FOUND);
-    }
-
-    /**
-     * More than one workflow (or workflow parts) found
-     *
-     * @return A text/uri-list of potential representations
-     */
-    @ExceptionHandler(MultipleWorkflowsException.class)
-    public ResponseEntity<?> handleMultipleWorkflows(MultipleWorkflowsException ex) {
-        final HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(MediaType.parseMediaType("text/uri-list"));
-        return new ResponseEntity<>(ex.toString(), headers, HttpStatus.MULTIPLE_CHOICES);
-    }
+  /**
+   * Workflow can not be found
+   *
+   * @return A plain text error message
+   */
+  @ExceptionHandler(WorkflowNotFoundException.class)
+  public ResponseEntity<?> handleNotFound() {
+    final HttpHeaders headers = new HttpHeaders();
+    headers.setContentType(MediaType.TEXT_PLAIN);
+    return new ResponseEntity<>(
+        "Workflow or git commit could not be found", headers, HttpStatus.NOT_FOUND);
+  }
 
-    /**
-     * Workflow exists but representation is not found eg Generic git workflow
-     * asking for raw workflow URL
-     *
-     * @return A plain text error message
-     */
-    @ExceptionHandler(RepresentationNotFoundException.class)
-    public ResponseEntity<?> handleNoRepresentation() {
-        final HttpHeaders headers = new HttpHeaders();
-        headers.setVary(Collections.singletonList("Accept"));
-        headers.setContentType(MediaType.TEXT_PLAIN);
-        return new ResponseEntity<>("The workflow exists but the requested representation could not be found",
-                headers, HttpStatus.NOT_ACCEPTABLE);
-    }
+  /**
+   * More than one workflow (or workflow parts) found
+   *
+   * @return A text/uri-list of potential representations
+   */
+  @ExceptionHandler(MultipleWorkflowsException.class)
+  public ResponseEntity<?> handleMultipleWorkflows(MultipleWorkflowsException ex) {
+    final HttpHeaders headers = new HttpHeaders();
+    headers.setContentType(MediaType.parseMediaType("text/uri-list"));
+    return new ResponseEntity<>(ex.toString(), headers, HttpStatus.MULTIPLE_CHOICES);
+  }
 
+  /**
+   * Workflow exists but representation is not found eg Generic git workflow asking for raw workflow
+   * URL
+   *
+   * @return A plain text error message
+   */
+  @ExceptionHandler(RepresentationNotFoundException.class)
+  public ResponseEntity<?> handleNoRepresentation() {
+    final HttpHeaders headers = new HttpHeaders();
+    headers.setVary(Collections.singletonList("Accept"));
+    headers.setContentType(MediaType.TEXT_PLAIN);
+    return new ResponseEntity<>(
+        "The workflow exists but the requested representation could not be found",
+        headers,
+        HttpStatus.NOT_ACCEPTABLE);
+  }
 }

src/main/java/org/commonwl/view/PageController.java

@@ -28,35 +28,38 @@
 @Controller
 public class PageController {
 
-    /**
-     * Main page of the application
-     * @param model The model for the home page where the workflow form is added
-     * @return The view for this page
-     */
-    @GetMapping("/")
-    public String homePage(Model model, @RequestParam(value = "url", required = false) String defaultURL) {
-        model.addAttribute("workflowForm", new WorkflowForm(defaultURL));
-        return "index";
-    }
+  /**
+   * Main page of the application
+   *
+   * @param model The model for the home page where the workflow form is added
+   * @return The view for this page
+   */
+  @GetMapping("/")
+  public String homePage(
+      Model model, @RequestParam(value = "url", required = false) String defaultURL) {
+    model.addAttribute("workflowForm", new WorkflowForm(defaultURL));
+    return "index";
+  }
 
-    /**
-     * About page
-     * @param model The model for the about page
-     * @return The view for this page
-     */
-    @GetMapping("/about")
-    public String about(Model model) {
-        return "about";
-    }
-
-    /**
-     * API documentation page
-     * @param model The model for the API documentation page
-     * @return The view for this page
-     */
-    @GetMapping("/apidocs")
-    public String apiDocumentation(Model model) {
-        return "apidocs";
-    }
+  /**
+   * About page
+   *
+   * @param model The model for the about page
+   * @return The view for this page
+   */
+  @GetMapping("/about")
+  public String about(Model model) {
+    return "about";
+  }
 
+  /**
+   * API documentation page
+   *
+   * @param model The model for the API documentation page
+   * @return The view for this page
+   */
+  @GetMapping("/apidocs")
+  public String apiDocumentation(Model model) {
+    return "apidocs";
+  }
 }