Merge branch 'master' of github.com:folio-org/mod-workflow

TAMULib · Dec 5, 2022 · b74b312 · b74b312
2 parents a25535a + 78cedbf
commit b74b312
Show file tree

Hide file tree

Showing 12 changed files with 84 additions and 46 deletions.
diff --git a/components/src/main/java/org/folio/rest/workflow/model/FileOp.java b/components/src/main/java/org/folio/rest/workflow/model/FileOp.java
@@ -1,5 +1,5 @@
 package org.folio.rest.workflow.model;
 
 public enum FileOp {
-  LIST, READ, WRITE, DELETE, LINE_COUNT, READ_LINE
+  LIST, READ, WRITE, COPY, MOVE, DELETE, LINE_COUNT, READ_LINE, PUSH, POP
 }
diff --git a/components/src/main/java/org/folio/rest/workflow/model/FileTask.java b/components/src/main/java/org/folio/rest/workflow/model/FileTask.java
@@ -27,15 +27,18 @@ public class FileTask extends Node implements DelegateTask {
   @Column(nullable = false)
   private boolean asyncAfter;
 
+  @Enumerated(EnumType.STRING)
+  @Column(nullable = false)
+  private FileOp op;
+
   @Column(nullable = false)
   private String path;
 
   @Column(nullable = true)
-  private String line;
+  private String target;
 
-  @Enumerated(EnumType.STRING)
-  @Column(nullable = false)
-  private FileOp op;
+  @Column(nullable = true)
+  private String line;
 
   public FileTask() {
     super();
@@ -76,6 +79,14 @@ public void setAsyncAfter(boolean asyncAfter) {
     this.asyncAfter = asyncAfter;
   }
 
+  public FileOp getOp() {
+    return op;
+  }
+
+  public void setOp(FileOp op) {
+    this.op = op;
+  }
+
   public String getPath() {
     return path;
   }
@@ -84,12 +95,12 @@ public void setPath(String path) {
     this.path = path;
   }
 
-  public FileOp getOp() {
-    return op;
+  public String getTarget() {
+    return target;
   }
 
-  public void setOp(FileOp op) {
-    this.op = op;
+  public void setTarget(String target) {
+    this.target = target;
   }
 
   public String getLine() {

diff --git a/pom.xml b/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.folio</groupId>
     <artifactId>spring-module-core</artifactId>
-    <version>1.1.1</version>
+    <version>1.1.2</version>
   </parent>
 
   <modules>

diff --git a/service/ramls/eventsubprocess.json b/service/ramls/eventsubprocess.json
@@ -1166,15 +1166,18 @@
         "asyncAfter" : {
           "type" : "boolean"
         },
+        "op" : {
+          "type" : "string",
+          "enum" : [ "LIST", "READ", "WRITE", "COPY", "MOVE", "DELETE", "LINE_COUNT", "READ_LINE", "PUSH", "POP" ]
+        },
         "path" : {
           "type" : "string"
         },
-        "line" : {
+        "target" : {
           "type" : "string"
         },
-        "op" : {
-          "type" : "string",
-          "enum" : [ "LIST", "READ", "WRITE", "DELETE", "LINE_COUNT", "READ_LINE" ]
+        "line" : {
+          "type" : "string"
         },
         "identifier" : {
           "type" : "string"

diff --git a/service/ramls/exclusivegateway.json b/service/ramls/exclusivegateway.json
@@ -1170,15 +1170,18 @@
         "asyncAfter" : {
           "type" : "boolean"
         },
+        "op" : {
+          "type" : "string",
+          "enum" : [ "LIST", "READ", "WRITE", "COPY", "MOVE", "DELETE", "LINE_COUNT", "READ_LINE", "PUSH", "POP" ]
+        },
         "path" : {
           "type" : "string"
         },
-        "line" : {
+        "target" : {
           "type" : "string"
         },
-        "op" : {
-          "type" : "string",
-          "enum" : [ "LIST", "READ", "WRITE", "DELETE", "LINE_COUNT", "READ_LINE" ]
+        "line" : {
+          "type" : "string"
         },
         "identifier" : {
           "type" : "string"

diff --git a/service/ramls/filetask.json b/service/ramls/filetask.json
@@ -36,15 +36,18 @@
     "asyncAfter" : {
       "type" : "boolean"
     },
+    "op" : {
+      "type" : "string",
+      "enum" : [ "LIST", "READ", "WRITE", "COPY", "MOVE", "DELETE", "LINE_COUNT", "READ_LINE", "PUSH", "POP" ]
+    },
     "path" : {
       "type" : "string"
     },
-    "line" : {
+    "target" : {
       "type" : "string"
     },
-    "op" : {
-      "type" : "string",
-      "enum" : [ "LIST", "READ", "WRITE", "DELETE", "LINE_COUNT", "READ_LINE" ]
+    "line" : {
+      "type" : "string"
     },
     "identifier" : {
       "type" : "string"

diff --git a/service/ramls/inclusivegateway.json b/service/ramls/inclusivegateway.json
@@ -1170,15 +1170,18 @@
         "asyncAfter" : {
           "type" : "boolean"
         },
+        "op" : {
+          "type" : "string",
+          "enum" : [ "LIST", "READ", "WRITE", "COPY", "MOVE", "DELETE", "LINE_COUNT", "READ_LINE", "PUSH", "POP" ]
+        },
         "path" : {
           "type" : "string"
         },
-        "line" : {
+        "target" : {
           "type" : "string"
         },
-        "op" : {
-          "type" : "string",
-          "enum" : [ "LIST", "READ", "WRITE", "DELETE", "LINE_COUNT", "READ_LINE" ]
+        "line" : {
+          "type" : "string"
         },
         "identifier" : {
           "type" : "string"

diff --git a/service/ramls/movetolastgateway.json b/service/ramls/movetolastgateway.json
@@ -1170,15 +1170,18 @@
         "asyncAfter" : {
           "type" : "boolean"
         },
+        "op" : {
+          "type" : "string",
+          "enum" : [ "LIST", "READ", "WRITE", "COPY", "MOVE", "DELETE", "LINE_COUNT", "READ_LINE", "PUSH", "POP" ]
+        },
         "path" : {
           "type" : "string"
         },
-        "line" : {
+        "target" : {
           "type" : "string"
         },
-        "op" : {
-          "type" : "string",
-          "enum" : [ "LIST", "READ", "WRITE", "DELETE", "LINE_COUNT", "READ_LINE" ]
+        "line" : {
+          "type" : "string"
         },
         "identifier" : {
           "type" : "string"

diff --git a/service/ramls/movetonode.json b/service/ramls/movetonode.json
@@ -1169,15 +1169,18 @@
         "asyncAfter" : {
           "type" : "boolean"
         },
+        "op" : {
+          "type" : "string",
+          "enum" : [ "LIST", "READ", "WRITE", "COPY", "MOVE", "DELETE", "LINE_COUNT", "READ_LINE", "PUSH", "POP" ]
+        },
         "path" : {
           "type" : "string"
         },
-        "line" : {
+        "target" : {
           "type" : "string"
         },
-        "op" : {
-          "type" : "string",
-          "enum" : [ "LIST", "READ", "WRITE", "DELETE", "LINE_COUNT", "READ_LINE" ]
+        "line" : {
+          "type" : "string"
         },
         "identifier" : {
           "type" : "string"

diff --git a/service/ramls/parallelgateway.json b/service/ramls/parallelgateway.json
@@ -1170,15 +1170,18 @@
         "asyncAfter" : {
           "type" : "boolean"
         },
+        "op" : {
+          "type" : "string",
+          "enum" : [ "LIST", "READ", "WRITE", "COPY", "MOVE", "DELETE", "LINE_COUNT", "READ_LINE", "PUSH", "POP" ]
+        },
         "path" : {
           "type" : "string"
         },
-        "line" : {
+        "target" : {
           "type" : "string"
         },
-        "op" : {
-          "type" : "string",
-          "enum" : [ "LIST", "READ", "WRITE", "DELETE", "LINE_COUNT", "READ_LINE" ]
+        "line" : {
+          "type" : "string"
         },
         "identifier" : {
           "type" : "string"

diff --git a/service/ramls/subprocess.json b/service/ramls/subprocess.json
@@ -1182,15 +1182,18 @@
         "asyncAfter" : {
           "type" : "boolean"
         },
+        "op" : {
+          "type" : "string",
+          "enum" : [ "LIST", "READ", "WRITE", "COPY", "MOVE", "DELETE", "LINE_COUNT", "READ_LINE", "PUSH", "POP" ]
+        },
         "path" : {
           "type" : "string"
         },
-        "line" : {
+        "target" : {
           "type" : "string"
         },
-        "op" : {
-          "type" : "string",
-          "enum" : [ "LIST", "READ", "WRITE", "DELETE", "LINE_COUNT", "READ_LINE" ]
+        "line" : {
+          "type" : "string"
         },
         "identifier" : {
           "type" : "string"

diff --git a/service/ramls/workflow.json b/service/ramls/workflow.json
@@ -1193,15 +1193,18 @@
         "asyncAfter" : {
           "type" : "boolean"
         },
+        "op" : {
+          "type" : "string",
+          "enum" : [ "LIST", "READ", "WRITE", "COPY", "MOVE", "DELETE", "LINE_COUNT", "READ_LINE", "PUSH", "POP" ]
+        },
         "path" : {
           "type" : "string"
         },
-        "line" : {
+        "target" : {
           "type" : "string"
         },
-        "op" : {
-          "type" : "string",
-          "enum" : [ "LIST", "READ", "WRITE", "DELETE", "LINE_COUNT", "READ_LINE" ]
+        "line" : {
+          "type" : "string"
         },
         "identifier" : {
           "type" : "string"