Refactor groovy to match structure

5 files changed, 9 insertions, 1 deletions

diff --git a/resources/edu/stsci/jscu/.keep b/resources/edu/stsci/jscu/.keep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/resources/edu/stsci/jscu/.keep
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 {
 
diff --git a/vars/utils.groovy b/vars/utils.groovy
index 76a6762..8e2911e 100644
--- a/vars/utils.groovy
+++ b/vars/utils.groovy
@@ -1,5 +1,5 @@
 // Jenkinsfile support utilities
-import BuildConfig
+import edu.stsci.jscu
 import groovy.io.FileType
 import groovy.json.JsonOutput
 import org.apache.commons.lang3.SerializationUtils