From 2348aaea0e3ba72e94ec7d9fcd5b6b51be903ec9 Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Tue, 8 Oct 2019 10:34:26 -0400
Subject: Refactor groovy to match structure

---
 src/edu/stsci/jscu/BuildConfig.groovy | 1 +
 src/edu/stsci/jscu/DataConfig.groovy  | 6 ++++++
 src/edu/stsci/jscu/JobConfig.groovy   | 1 +
 3 files changed, 8 insertions(+)

(limited to 'src')

diff --git a/src/edu/stsci/jscu/BuildConfig.groovy b/src/edu/stsci/jscu/BuildConfig.groovy
index 0b3cc06..c6cbd00 100644
--- a/src/edu/stsci/jscu/BuildConfig.groovy
+++ b/src/edu/stsci/jscu/BuildConfig.groovy
@@ -1,4 +1,5 @@
 // src/BuildConfig.groovy
+package edu.stsci.jscu
 
 class BuildConfig implements Serializable {
     def nodetype = ""
diff --git a/src/edu/stsci/jscu/DataConfig.groovy b/src/edu/stsci/jscu/DataConfig.groovy
index 37adf88..9d2c909 100644
--- a/src/edu/stsci/jscu/DataConfig.groovy
+++ b/src/edu/stsci/jscu/DataConfig.groovy
@@ -1,5 +1,9 @@
+package edu.stsci.jscu
+
 import groovy.json.JsonOutput
 import org.apache.commons.io.FileUtils
+import com.cloudbees.groovy.cps.NonCPS
+
 
 class DataConfig implements Serializable {
     String root = '.'
@@ -20,10 +24,12 @@ class DataConfig implements Serializable {
         //}
     }
 
+    @NonCPS
     def isUpload() {
         return this.direction.startsWith('u')
     }
 
+    @NonCPS
     def isDownload() {
         return this.direction.startswith('d')
     }
diff --git a/src/edu/stsci/jscu/JobConfig.groovy b/src/edu/stsci/jscu/JobConfig.groovy
index cd299b6..4403047 100644
--- a/src/edu/stsci/jscu/JobConfig.groovy
+++ b/src/edu/stsci/jscu/JobConfig.groovy
@@ -1,4 +1,5 @@
 // src/JobConfig.groovy
+package edu.stsci.jscu
 
 class JobConfig implements Serializable {
 
-- 
cgit