v0.2.47..v0.2.48 changeset GrailParams.java

diff --git a/hoot-services/src/main/java/hoot/services/controllers/grail/GrailParams.java b/hoot-services/src/main/java/hoot/services/controllers/grail/GrailParams.java
index 6241fae..92d11be 100644
--- a/hoot-services/src/main/java/hoot/services/controllers/grail/GrailParams.java
+++ b/hoot-services/src/main/java/hoot/services/controllers/grail/GrailParams.java
@@ -61,8 +61,8 @@ public class GrailParams {
     @JsonProperty("output")
     private String output;
 
-    @JsonProperty("folder")
-    private String folder;
+    @JsonProperty("parentId")
+    private String parentId;
 
     @JsonProperty("pullUrl")
     private String pullUrl;
@@ -79,6 +79,16 @@ public class GrailParams {
 
     private File workDir;
 
+    private String conflationType;
+
+    public String getConflationType() {
+        return conflationType;
+    }
+
+    public void setConflationType(String conflationType) {
+        this.conflationType = conflationType;
+    }
+
     public File getWorkDir() {
         return workDir;
     }
@@ -135,12 +145,12 @@ public class GrailParams {
         this.output = output;
     }
 
-    public String getFolder() {
-        return folder;
+    public String getParentId() {
+        return parentId;
     }
 
-    public void setFolder(String folder) {
-        this.folder = folder;
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
     }
 
     public String getPushUrl() {
@@ -191,7 +201,7 @@ public class GrailParams {
                 ", input1='" + input1 + '\'' +
                 ", input2='" + input2 + '\'' +
                 ", output='" + output + '\'' +
-                ", folder='" + folder + '\'' +
+                ", parentId='" + parentId + '\'' +
                 ", pushUrl='" + pushUrl + '\'' +
                 ", pullUrl='" + pullUrl + '\'' +
                 ", maxBBoxSize='" + maxSize + '\'' +