rust codegen

2 files changed, 206 insertions, 310 deletions

diff --git a/rust/fatcat-api-spec/examples/client.rs b/rust/fatcat-api-spec/examples/client.rs
index 371d6ae2..3cb0df50 100644
--- a/rust/fatcat-api-spec/examples/client.rs
+++ b/rust/fatcat-api-spec/examples/client.rs
@@ -12,9 +12,9 @@ extern crate uuid;
 use clap::{App, Arg};
 #[allow(unused_imports)]
 use fatcat::{
-    AcceptEditgroupResponse, ApiError, ApiNoContext, AuthCheckResponse, AuthOidcResponse, ContextWrapperExt, CreateContainerBatchResponse, CreateContainerResponse, CreateCreatorBatchResponse,
-    CreateCreatorResponse, CreateEditgroupAnnotationResponse, CreateEditgroupResponse, CreateFileBatchResponse, CreateFileResponse, CreateFilesetBatchResponse, CreateFilesetResponse,
-    CreateReleaseBatchResponse, CreateReleaseResponse, CreateWebcaptureBatchResponse, CreateWebcaptureResponse, CreateWorkBatchResponse, CreateWorkResponse, DeleteContainerEditResponse,
+    AcceptEditgroupResponse, ApiError, ApiNoContext, AuthCheckResponse, AuthOidcResponse, ContextWrapperExt, CreateContainerAutoBatchResponse, CreateContainerResponse, CreateCreatorAutoBatchResponse,
+    CreateCreatorResponse, CreateEditgroupAnnotationResponse, CreateEditgroupResponse, CreateFileAutoBatchResponse, CreateFileResponse, CreateFilesetAutoBatchResponse, CreateFilesetResponse,
+    CreateReleaseAutoBatchResponse, CreateReleaseResponse, CreateWebcaptureAutoBatchResponse, CreateWebcaptureResponse, CreateWorkAutoBatchResponse, CreateWorkResponse, DeleteContainerEditResponse,
     DeleteContainerResponse, DeleteCreatorEditResponse, DeleteCreatorResponse, DeleteFileEditResponse, DeleteFileResponse, DeleteFilesetEditResponse, DeleteFilesetResponse, DeleteReleaseEditResponse,
     DeleteReleaseResponse, DeleteWebcaptureEditResponse, DeleteWebcaptureResponse, DeleteWorkEditResponse, DeleteWorkResponse, GetChangelogEntryResponse, GetChangelogResponse,
     GetContainerEditResponse, GetContainerHistoryResponse, GetContainerRedirectsResponse, GetContainerResponse, GetContainerRevisionResponse, GetCreatorEditResponse, GetCreatorHistoryResponse,
@@ -35,7 +35,6 @@ fn main() {
             Arg::with_name("operation")
                 .help("Sets the operation to run")
                 .possible_values(&[
-                    "CreateContainerBatch",
                     "DeleteContainer",
                     "DeleteContainerEdit",
                     "GetContainer",
@@ -44,7 +43,6 @@ fn main() {
                     "GetContainerRedirects",
                     "GetContainerRevision",
                     "LookupContainer",
-                    "CreateCreatorBatch",
                     "DeleteCreator",
                     "DeleteCreatorEdit",
                     "GetCreator",
@@ -64,7 +62,6 @@ fn main() {
                     "GetEditgroup",
                     "GetEditgroupAnnotations",
                     "GetEditorAnnotations",
-                    "CreateFileBatch",
                     "DeleteFile",
                     "DeleteFileEdit",
                     "GetFile",
@@ -73,7 +70,6 @@ fn main() {
                     "GetFileRedirects",
                     "GetFileRevision",
                     "LookupFile",
-                    "CreateFilesetBatch",
                     "DeleteFileset",
                     "DeleteFilesetEdit",
                     "GetFileset",
@@ -81,7 +77,6 @@ fn main() {
                     "GetFilesetHistory",
                     "GetFilesetRedirects",
                     "GetFilesetRevision",
-                    "CreateReleaseBatch",
                     "DeleteRelease",
                     "DeleteReleaseEdit",
                     "GetRelease",
@@ -93,7 +88,6 @@ fn main() {
                     "GetReleaseRevision",
                     "GetReleaseWebcaptures",
                     "LookupRelease",
-                    "CreateWebcaptureBatch",
                     "DeleteWebcapture",
                     "DeleteWebcaptureEdit",
                     "GetWebcapture",
@@ -101,7 +95,6 @@ fn main() {
                     "GetWebcaptureHistory",
                     "GetWebcaptureRedirects",
                     "GetWebcaptureRevision",
-                    "CreateWorkBatch",
                     "DeleteWork",
                     "DeleteWorkEdit",
                     "GetWork",
@@ -140,29 +133,22 @@ fn main() {
     match matches.value_of("operation") {
         // Disabled because there's no example.
         // Some("CreateContainer") => {
-        //     let result = client.create_container(???, "editgroup_id_example".to_string()).wait();
+        //     let result = client.create_container("editgroup_id_example".to_string(), ???).wait();
         //     println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         //  },
-        Some("CreateContainerBatch") => {
-            let result = client
-                .create_container_batch(
-                    &Vec::new(),
-                    Some(true),
-                    Some("editgroup_id_example".to_string()),
-                    Some("description_example".to_string()),
-                    Some("extra_example".to_string()),
-                )
-                .wait();
-            println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
-        }
 
+        // Disabled because there's no example.
+        // Some("CreateContainerAutoBatch") => {
+        //     let result = client.create_container_auto_batch(???).wait();
+        //     println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
+        //  },
         Some("DeleteContainer") => {
-            let result = client.delete_container("ident_example".to_string(), "editgroup_id_example".to_string()).wait();
+            let result = client.delete_container("editgroup_id_example".to_string(), "ident_example".to_string()).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
         Some("DeleteContainerEdit") => {
-            let result = client.delete_container_edit("edit_id_example".to_string()).wait();
+            let result = client.delete_container_edit("editgroup_id_example".to_string(), "edit_id_example".to_string()).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
@@ -209,35 +195,28 @@ fn main() {
 
         // Disabled because there's no example.
         // Some("UpdateContainer") => {
-        //     let result = client.update_container("ident_example".to_string(), ???, "editgroup_id_example".to_string()).wait();
+        //     let result = client.update_container("editgroup_id_example".to_string(), "ident_example".to_string(), ???).wait();
         //     println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         //  },
 
         // Disabled because there's no example.
         // Some("CreateCreator") => {
-        //     let result = client.create_creator(???, "editgroup_id_example".to_string()).wait();
+        //     let result = client.create_creator("editgroup_id_example".to_string(), ???).wait();
         //     println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         //  },
-        Some("CreateCreatorBatch") => {
-            let result = client
-                .create_creator_batch(
-                    &Vec::new(),
-                    Some(true),
-                    Some("editgroup_id_example".to_string()),
-                    Some("description_example".to_string()),
-                    Some("extra_example".to_string()),
-                )
-                .wait();
-            println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
-        }
 
+        // Disabled because there's no example.
+        // Some("CreateCreatorAutoBatch") => {
+        //     let result = client.create_creator_auto_batch(???).wait();
+        //     println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
+        //  },
         Some("DeleteCreator") => {
-            let result = client.delete_creator("ident_example".to_string(), "editgroup_id_example".to_string()).wait();
+            let result = client.delete_creator("editgroup_id_example".to_string(), "ident_example".to_string()).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
         Some("DeleteCreatorEdit") => {
-            let result = client.delete_creator_edit("edit_id_example".to_string()).wait();
+            let result = client.delete_creator_edit("editgroup_id_example".to_string(), "edit_id_example".to_string()).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
@@ -289,7 +268,7 @@ fn main() {
 
         // Disabled because there's no example.
         // Some("UpdateCreator") => {
-        //     let result = client.update_creator("ident_example".to_string(), ???, "editgroup_id_example".to_string()).wait();
+        //     let result = client.update_creator("editgroup_id_example".to_string(), "ident_example".to_string(), ???).wait();
         //     println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         //  },
         Some("AuthCheck") => {
@@ -371,29 +350,22 @@ fn main() {
 
         // Disabled because there's no example.
         // Some("CreateFile") => {
-        //     let result = client.create_file(???, "editgroup_id_example".to_string()).wait();
+        //     let result = client.create_file("editgroup_id_example".to_string(), ???).wait();
         //     println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         //  },
-        Some("CreateFileBatch") => {
-            let result = client
-                .create_file_batch(
-                    &Vec::new(),
-                    Some(true),
-                    Some("editgroup_id_example".to_string()),
-                    Some("description_example".to_string()),
-                    Some("extra_example".to_string()),
-                )
-                .wait();
-            println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
-        }
 
+        // Disabled because there's no example.
+        // Some("CreateFileAutoBatch") => {
+        //     let result = client.create_file_auto_batch(???).wait();
+        //     println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
+        //  },
         Some("DeleteFile") => {
-            let result = client.delete_file("ident_example".to_string(), "editgroup_id_example".to_string()).wait();
+            let result = client.delete_file("editgroup_id_example".to_string(), "ident_example".to_string()).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
         Some("DeleteFileEdit") => {
-            let result = client.delete_file_edit("edit_id_example".to_string()).wait();
+            let result = client.delete_file_edit("editgroup_id_example".to_string(), "edit_id_example".to_string()).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
@@ -441,35 +413,28 @@ fn main() {
 
         // Disabled because there's no example.
         // Some("UpdateFile") => {
-        //     let result = client.update_file("ident_example".to_string(), ???, "editgroup_id_example".to_string()).wait();
+        //     let result = client.update_file("editgroup_id_example".to_string(), "ident_example".to_string(), ???).wait();
         //     println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         //  },
 
         // Disabled because there's no example.
         // Some("CreateFileset") => {
-        //     let result = client.create_fileset(???, "editgroup_id_example".to_string()).wait();
+        //     let result = client.create_fileset("editgroup_id_example".to_string(), ???).wait();
         //     println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         //  },
-        Some("CreateFilesetBatch") => {
-            let result = client
-                .create_fileset_batch(
-                    &Vec::new(),
-                    Some(true),
-                    Some("editgroup_id_example".to_string()),
-                    Some("description_example".to_string()),
-                    Some("extra_example".to_string()),
-                )
-                .wait();
-            println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
-        }
 
+        // Disabled because there's no example.
+        // Some("CreateFilesetAutoBatch") => {
+        //     let result = client.create_fileset_auto_batch(???).wait();
+        //     println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
+        //  },
         Some("DeleteFileset") => {
-            let result = client.delete_fileset("ident_example".to_string(), "editgroup_id_example".to_string()).wait();
+            let result = client.delete_fileset("editgroup_id_example".to_string(), "ident_example".to_string()).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
         Some("DeleteFilesetEdit") => {
-            let result = client.delete_fileset_edit("edit_id_example".to_string()).wait();
+            let result = client.delete_fileset_edit("editgroup_id_example".to_string(), "edit_id_example".to_string()).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
@@ -504,40 +469,34 @@ fn main() {
 
         // Disabled because there's no example.
         // Some("UpdateFileset") => {
-        //     let result = client.update_fileset("ident_example".to_string(), ???, "editgroup_id_example".to_string()).wait();
+        //     let result = client.update_fileset("editgroup_id_example".to_string(), "ident_example".to_string(), ???).wait();
         //     println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         //  },
 
         // Disabled because there's no example.
         // Some("CreateRelease") => {
-        //     let result = client.create_release(???, "editgroup_id_example".to_string()).wait();
+        //     let result = client.create_release("editgroup_id_example".to_string(), ???).wait();
+        //     println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
+        //  },
+
+        // Disabled because there's no example.
+        // Some("CreateReleaseAutoBatch") => {
+        //     let result = client.create_release_auto_batch(???).wait();
         //     println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         //  },
-        Some("CreateReleaseBatch") => {
-            let result = client
-                .create_release_batch(
-                    &Vec::new(),
-                    Some(true),
-                    Some("editgroup_id_example".to_string()),
-                    Some("description_example".to_string()),
-                    Some("extra_example".to_string()),
-                )
-                .wait();
-            println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
-        }
 
         // Disabled because there's no example.
         // Some("CreateWork") => {
-        //     let result = client.create_work(???, "editgroup_id_example".to_string()).wait();
+        //     let result = client.create_work("editgroup_id_example".to_string(), ???).wait();
         //     println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         //  },
         Some("DeleteRelease") => {
-            let result = client.delete_release("ident_example".to_string(), "editgroup_id_example".to_string()).wait();
+            let result = client.delete_release("editgroup_id_example".to_string(), "ident_example".to_string()).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
         Some("DeleteReleaseEdit") => {
-            let result = client.delete_release_edit("edit_id_example".to_string()).wait();
+            let result = client.delete_release_edit("editgroup_id_example".to_string(), "edit_id_example".to_string()).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
@@ -607,35 +566,28 @@ fn main() {
 
         // Disabled because there's no example.
         // Some("UpdateRelease") => {
-        //     let result = client.update_release("ident_example".to_string(), ???, "editgroup_id_example".to_string()).wait();
+        //     let result = client.update_release("editgroup_id_example".to_string(), "ident_example".to_string(), ???).wait();
         //     println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         //  },
 
         // Disabled because there's no example.
         // Some("CreateWebcapture") => {
-        //     let result = client.create_webcapture(???, "editgroup_id_example".to_string()).wait();
+        //     let result = client.create_webcapture("editgroup_id_example".to_string(), ???).wait();
         //     println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         //  },
-        Some("CreateWebcaptureBatch") => {
-            let result = client
-                .create_webcapture_batch(
-                    &Vec::new(),
-                    Some(true),
-                    Some("editgroup_id_example".to_string()),
-                    Some("description_example".to_string()),
-                    Some("extra_example".to_string()),
-                )
-                .wait();
-            println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
-        }
 
+        // Disabled because there's no example.
+        // Some("CreateWebcaptureAutoBatch") => {
+        //     let result = client.create_webcapture_auto_batch(???).wait();
+        //     println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
+        //  },
         Some("DeleteWebcapture") => {
-            let result = client.delete_webcapture("ident_example".to_string(), "editgroup_id_example".to_string()).wait();
+            let result = client.delete_webcapture("editgroup_id_example".to_string(), "ident_example".to_string()).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
         Some("DeleteWebcaptureEdit") => {
-            let result = client.delete_webcapture_edit("edit_id_example".to_string()).wait();
+            let result = client.delete_webcapture_edit("editgroup_id_example".to_string(), "edit_id_example".to_string()).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
@@ -670,29 +622,22 @@ fn main() {
 
         // Disabled because there's no example.
         // Some("UpdateWebcapture") => {
-        //     let result = client.update_webcapture("ident_example".to_string(), ???, "editgroup_id_example".to_string()).wait();
+        //     let result = client.update_webcapture("editgroup_id_example".to_string(), "ident_example".to_string(), ???).wait();
         //     println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         //  },
-        Some("CreateWorkBatch") => {
-            let result = client
-                .create_work_batch(
-                    &Vec::new(),
-                    Some(true),
-                    Some("editgroup_id_example".to_string()),
-                    Some("description_example".to_string()),
-                    Some("extra_example".to_string()),
-                )
-                .wait();
-            println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
-        }
 
+        // Disabled because there's no example.
+        // Some("CreateWorkAutoBatch") => {
+        //     let result = client.create_work_auto_batch(???).wait();
+        //     println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
+        //  },
         Some("DeleteWork") => {
-            let result = client.delete_work("ident_example".to_string(), "editgroup_id_example".to_string()).wait();
+            let result = client.delete_work("editgroup_id_example".to_string(), "ident_example".to_string()).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
         Some("DeleteWorkEdit") => {
-            let result = client.delete_work_edit("edit_id_example".to_string()).wait();
+            let result = client.delete_work_edit("editgroup_id_example".to_string(), "edit_id_example".to_string()).wait();
             println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         }
 
@@ -732,7 +677,7 @@ fn main() {
 
         // Disabled because there's no example.
         // Some("UpdateWork") => {
-        //     let result = client.update_work("ident_example".to_string(), ???, "editgroup_id_example".to_string()).wait();
+        //     let result = client.update_work("editgroup_id_example".to_string(), "ident_example".to_string(), ???).wait();
         //     println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from("<none>")));
         //  },
         _ => panic!("Invalid operation provided"),
diff --git a/rust/fatcat-api-spec/examples/server_lib/server.rs b/rust/fatcat-api-spec/examples/server_lib/server.rs
index 378b4285..c9f92d33 100644
--- a/rust/fatcat-api-spec/examples/server_lib/server.rs
+++ b/rust/fatcat-api-spec/examples/server_lib/server.rs
@@ -11,72 +11,65 @@ use swagger;
 
 use fatcat::models;
 use fatcat::{
-    AcceptEditgroupResponse, Api, ApiError, AuthCheckResponse, AuthOidcResponse, Context, CreateContainerBatchResponse, CreateContainerResponse, CreateCreatorBatchResponse, CreateCreatorResponse,
-    CreateEditgroupAnnotationResponse, CreateEditgroupResponse, CreateFileBatchResponse, CreateFileResponse, CreateFilesetBatchResponse, CreateFilesetResponse, CreateReleaseBatchResponse,
-    CreateReleaseResponse, CreateWebcaptureBatchResponse, CreateWebcaptureResponse, CreateWorkBatchResponse, CreateWorkResponse, DeleteContainerEditResponse, DeleteContainerResponse,
-    DeleteCreatorEditResponse, DeleteCreatorResponse, DeleteFileEditResponse, DeleteFileResponse, DeleteFilesetEditResponse, DeleteFilesetResponse, DeleteReleaseEditResponse, DeleteReleaseResponse,
-    DeleteWebcaptureEditResponse, DeleteWebcaptureResponse, DeleteWorkEditResponse, DeleteWorkResponse, GetChangelogEntryResponse, GetChangelogResponse, GetContainerEditResponse,
-    GetContainerHistoryResponse, GetContainerRedirectsResponse, GetContainerResponse, GetContainerRevisionResponse, GetCreatorEditResponse, GetCreatorHistoryResponse, GetCreatorRedirectsResponse,
-    GetCreatorReleasesResponse, GetCreatorResponse, GetCreatorRevisionResponse, GetEditgroupAnnotationsResponse, GetEditgroupResponse, GetEditgroupsReviewableResponse, GetEditorAnnotationsResponse,
-    GetEditorEditgroupsResponse, GetEditorResponse, GetFileEditResponse, GetFileHistoryResponse, GetFileRedirectsResponse, GetFileResponse, GetFileRevisionResponse, GetFilesetEditResponse,
-    GetFilesetHistoryResponse, GetFilesetRedirectsResponse, GetFilesetResponse, GetFilesetRevisionResponse, GetReleaseEditResponse, GetReleaseFilesResponse, GetReleaseFilesetsResponse,
-    GetReleaseHistoryResponse, GetReleaseRedirectsResponse, GetReleaseResponse, GetReleaseRevisionResponse, GetReleaseWebcapturesResponse, GetWebcaptureEditResponse, GetWebcaptureHistoryResponse,
-    GetWebcaptureRedirectsResponse, GetWebcaptureResponse, GetWebcaptureRevisionResponse, GetWorkEditResponse, GetWorkHistoryResponse, GetWorkRedirectsResponse, GetWorkReleasesResponse,
-    GetWorkResponse, GetWorkRevisionResponse, LookupContainerResponse, LookupCreatorResponse, LookupFileResponse, LookupReleaseResponse, UpdateContainerResponse, UpdateCreatorResponse,
-    UpdateEditgroupResponse, UpdateEditorResponse, UpdateFileResponse, UpdateFilesetResponse, UpdateReleaseResponse, UpdateWebcaptureResponse, UpdateWorkResponse,
+    AcceptEditgroupResponse, Api, ApiError, AuthCheckResponse, AuthOidcResponse, Context, CreateContainerAutoBatchResponse, CreateContainerResponse, CreateCreatorAutoBatchResponse,
+    CreateCreatorResponse, CreateEditgroupAnnotationResponse, CreateEditgroupResponse, CreateFileAutoBatchResponse, CreateFileResponse, CreateFilesetAutoBatchResponse, CreateFilesetResponse,
+    CreateReleaseAutoBatchResponse, CreateReleaseResponse, CreateWebcaptureAutoBatchResponse, CreateWebcaptureResponse, CreateWorkAutoBatchResponse, CreateWorkResponse, DeleteContainerEditResponse,
+    DeleteContainerResponse, DeleteCreatorEditResponse, DeleteCreatorResponse, DeleteFileEditResponse, DeleteFileResponse, DeleteFilesetEditResponse, DeleteFilesetResponse, DeleteReleaseEditResponse,
+    DeleteReleaseResponse, DeleteWebcaptureEditResponse, DeleteWebcaptureResponse, DeleteWorkEditResponse, DeleteWorkResponse, GetChangelogEntryResponse, GetChangelogResponse,
+    GetContainerEditResponse, GetContainerHistoryResponse, GetContainerRedirectsResponse, GetContainerResponse, GetContainerRevisionResponse, GetCreatorEditResponse, GetCreatorHistoryResponse,
+    GetCreatorRedirectsResponse, GetCreatorReleasesResponse, GetCreatorResponse, GetCreatorRevisionResponse, GetEditgroupAnnotationsResponse, GetEditgroupResponse, GetEditgroupsReviewableResponse,
+    GetEditorAnnotationsResponse, GetEditorEditgroupsResponse, GetEditorResponse, GetFileEditResponse, GetFileHistoryResponse, GetFileRedirectsResponse, GetFileResponse, GetFileRevisionResponse,
+    GetFilesetEditResponse, GetFilesetHistoryResponse, GetFilesetRedirectsResponse, GetFilesetResponse, GetFilesetRevisionResponse, GetReleaseEditResponse, GetReleaseFilesResponse,
+    GetReleaseFilesetsResponse, GetReleaseHistoryResponse, GetReleaseRedirectsResponse, GetReleaseResponse, GetReleaseRevisionResponse, GetReleaseWebcapturesResponse, GetWebcaptureEditResponse,
+    GetWebcaptureHistoryResponse, GetWebcaptureRedirectsResponse, GetWebcaptureResponse, GetWebcaptureRevisionResponse, GetWorkEditResponse, GetWorkHistoryResponse, GetWorkRedirectsResponse,
+    GetWorkReleasesResponse, GetWorkResponse, GetWorkRevisionResponse, LookupContainerResponse, LookupCreatorResponse, LookupFileResponse, LookupReleaseResponse, UpdateContainerResponse,
+    UpdateCreatorResponse, UpdateEditgroupResponse, UpdateEditorResponse, UpdateFileResponse, UpdateFilesetResponse, UpdateReleaseResponse, UpdateWebcaptureResponse, UpdateWorkResponse,
 };
 
 #[derive(Copy, Clone)]
 pub struct Server;
 
 impl Api for Server {
-    fn create_container(&self, entity: models::ContainerEntity, editgroup_id: String, context: &Context) -> Box<Future<Item = CreateContainerResponse, Error = ApiError> + Send> {
+    fn create_container(&self, editgroup_id: String, entity: models::ContainerEntity, context: &Context) -> Box<Future<Item = CreateContainerResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
-            "create_container({:?}, \"{}\") - X-Span-ID: {:?}",
-            entity,
+            "create_container(\"{}\", {:?}) - X-Span-ID: {:?}",
             editgroup_id,
+            entity,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn create_container_batch(
-        &self,
-        entity_list: &Vec<models::ContainerEntity>,
-        autoaccept: Option<bool>,
-        editgroup_id: Option<String>,
-        description: Option<String>,
-        extra: Option<String>,
-        context: &Context,
-    ) -> Box<Future<Item = CreateContainerBatchResponse, Error = ApiError> + Send> {
+    fn create_container_auto_batch(&self, auto_batch: models::ContainerAutoBatch, context: &Context) -> Box<Future<Item = CreateContainerAutoBatchResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
-            "create_container_batch({:?}, {:?}, {:?}, {:?}, {:?}) - X-Span-ID: {:?}",
-            entity_list,
-            autoaccept,
-            editgroup_id,
-            description,
-            extra,
+            "create_container_auto_batch({:?}) - X-Span-ID: {:?}",
+            auto_batch,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn delete_container(&self, ident: String, editgroup_id: String, context: &Context) -> Box<Future<Item = DeleteContainerResponse, Error = ApiError> + Send> {
+    fn delete_container(&self, editgroup_id: String, ident: String, context: &Context) -> Box<Future<Item = DeleteContainerResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
             "delete_container(\"{}\", \"{}\") - X-Span-ID: {:?}",
-            ident,
             editgroup_id,
+            ident,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn delete_container_edit(&self, edit_id: String, context: &Context) -> Box<Future<Item = DeleteContainerEditResponse, Error = ApiError> + Send> {
+    fn delete_container_edit(&self, editgroup_id: String, edit_id: String, context: &Context) -> Box<Future<Item = DeleteContainerEditResponse, Error = ApiError> + Send> {
         let context = context.clone();
-        println!("delete_container_edit(\"{}\") - X-Span-ID: {:?}", edit_id, context.x_span_id.unwrap_or(String::from("<none>")).clone());
+        println!(
+            "delete_container_edit(\"{}\", \"{}\") - X-Span-ID: {:?}",
+            editgroup_id,
+            edit_id,
+            context.x_span_id.unwrap_or(String::from("<none>")).clone()
+        );
         Box::new(futures::failed("Generic failure".into()))
     }
 
@@ -147,65 +140,58 @@ impl Api for Server {
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn update_container(&self, ident: String, entity: models::ContainerEntity, editgroup_id: String, context: &Context) -> Box<Future<Item = UpdateContainerResponse, Error = ApiError> + Send> {
+    fn update_container(&self, editgroup_id: String, ident: String, entity: models::ContainerEntity, context: &Context) -> Box<Future<Item = UpdateContainerResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
-            "update_container(\"{}\", {:?}, \"{}\") - X-Span-ID: {:?}",
+            "update_container(\"{}\", \"{}\", {:?}) - X-Span-ID: {:?}",
+            editgroup_id,
             ident,
             entity,
-            editgroup_id,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn create_creator(&self, entity: models::CreatorEntity, editgroup_id: String, context: &Context) -> Box<Future<Item = CreateCreatorResponse, Error = ApiError> + Send> {
+    fn create_creator(&self, editgroup_id: String, entity: models::CreatorEntity, context: &Context) -> Box<Future<Item = CreateCreatorResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
-            "create_creator({:?}, \"{}\") - X-Span-ID: {:?}",
-            entity,
+            "create_creator(\"{}\", {:?}) - X-Span-ID: {:?}",
             editgroup_id,
+            entity,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn create_creator_batch(
-        &self,
-        entity_list: &Vec<models::CreatorEntity>,
-        autoaccept: Option<bool>,
-        editgroup_id: Option<String>,
-        description: Option<String>,
-        extra: Option<String>,
-        context: &Context,
-    ) -> Box<Future<Item = CreateCreatorBatchResponse, Error = ApiError> + Send> {
+    fn create_creator_auto_batch(&self, auto_batch: models::CreatorAutoBatch, context: &Context) -> Box<Future<Item = CreateCreatorAutoBatchResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
-            "create_creator_batch({:?}, {:?}, {:?}, {:?}, {:?}) - X-Span-ID: {:?}",
-            entity_list,
-            autoaccept,
-            editgroup_id,
-            description,
-            extra,
+            "create_creator_auto_batch({:?}) - X-Span-ID: {:?}",
+            auto_batch,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn delete_creator(&self, ident: String, editgroup_id: String, context: &Context) -> Box<Future<Item = DeleteCreatorResponse, Error = ApiError> + Send> {
+    fn delete_creator(&self, editgroup_id: String, ident: String, context: &Context) -> Box<Future<Item = DeleteCreatorResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
             "delete_creator(\"{}\", \"{}\") - X-Span-ID: {:?}",
-            ident,
             editgroup_id,
+            ident,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn delete_creator_edit(&self, edit_id: String, context: &Context) -> Box<Future<Item = DeleteCreatorEditResponse, Error = ApiError> + Send> {
+    fn delete_creator_edit(&self, editgroup_id: String, edit_id: String, context: &Context) -> Box<Future<Item = DeleteCreatorEditResponse, Error = ApiError> + Send> {
         let context = context.clone();
-        println!("delete_creator_edit(\"{}\") - X-Span-ID: {:?}", edit_id, context.x_span_id.unwrap_or(String::from("<none>")).clone());
+        println!(
+            "delete_creator_edit(\"{}\", \"{}\") - X-Span-ID: {:?}",
+            editgroup_id,
+            edit_id,
+            context.x_span_id.unwrap_or(String::from("<none>")).clone()
+        );
         Box::new(futures::failed("Generic failure".into()))
     }
 
@@ -287,13 +273,13 @@ impl Api for Server {
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn update_creator(&self, ident: String, entity: models::CreatorEntity, editgroup_id: String, context: &Context) -> Box<Future<Item = UpdateCreatorResponse, Error = ApiError> + Send> {
+    fn update_creator(&self, editgroup_id: String, ident: String, entity: models::CreatorEntity, context: &Context) -> Box<Future<Item = UpdateCreatorResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
-            "update_creator(\"{}\", {:?}, \"{}\") - X-Span-ID: {:?}",
+            "update_creator(\"{}\", \"{}\", {:?}) - X-Span-ID: {:?}",
+            editgroup_id,
             ident,
             entity,
-            editgroup_id,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
@@ -457,53 +443,46 @@ impl Api for Server {
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn create_file(&self, entity: models::FileEntity, editgroup_id: String, context: &Context) -> Box<Future<Item = CreateFileResponse, Error = ApiError> + Send> {
+    fn create_file(&self, editgroup_id: String, entity: models::FileEntity, context: &Context) -> Box<Future<Item = CreateFileResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
-            "create_file({:?}, \"{}\") - X-Span-ID: {:?}",
-            entity,
+            "create_file(\"{}\", {:?}) - X-Span-ID: {:?}",
             editgroup_id,
+            entity,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn create_file_batch(
-        &self,
-        entity_list: &Vec<models::FileEntity>,
-        autoaccept: Option<bool>,
-        editgroup_id: Option<String>,
-        description: Option<String>,
-        extra: Option<String>,
-        context: &Context,
-    ) -> Box<Future<Item = CreateFileBatchResponse, Error = ApiError> + Send> {
+    fn create_file_auto_batch(&self, auto_batch: models::FileAutoBatch, context: &Context) -> Box<Future<Item = CreateFileAutoBatchResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
-            "create_file_batch({:?}, {:?}, {:?}, {:?}, {:?}) - X-Span-ID: {:?}",
-            entity_list,
-            autoaccept,
-            editgroup_id,
-            description,
-            extra,
+            "create_file_auto_batch({:?}) - X-Span-ID: {:?}",
+            auto_batch,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn delete_file(&self, ident: String, editgroup_id: String, context: &Context) -> Box<Future<Item = DeleteFileResponse, Error = ApiError> + Send> {
+    fn delete_file(&self, editgroup_id: String, ident: String, context: &Context) -> Box<Future<Item = DeleteFileResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
             "delete_file(\"{}\", \"{}\") - X-Span-ID: {:?}",
-            ident,
             editgroup_id,
+            ident,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn delete_file_edit(&self, edit_id: String, context: &Context) -> Box<Future<Item = DeleteFileEditResponse, Error = ApiError> + Send> {
+    fn delete_file_edit(&self, editgroup_id: String, edit_id: String, context: &Context) -> Box<Future<Item = DeleteFileEditResponse, Error = ApiError> + Send> {
         let context = context.clone();
-        println!("delete_file_edit(\"{}\") - X-Span-ID: {:?}", edit_id, context.x_span_id.unwrap_or(String::from("<none>")).clone());
+        println!(
+            "delete_file_edit(\"{}\", \"{}\") - X-Span-ID: {:?}",
+            editgroup_id,
+            edit_id,
+            context.x_span_id.unwrap_or(String::from("<none>")).clone()
+        );
         Box::new(futures::failed("Generic failure".into()))
     }
 
@@ -576,65 +555,58 @@ impl Api for Server {
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn update_file(&self, ident: String, entity: models::FileEntity, editgroup_id: String, context: &Context) -> Box<Future<Item = UpdateFileResponse, Error = ApiError> + Send> {
+    fn update_file(&self, editgroup_id: String, ident: String, entity: models::FileEntity, context: &Context) -> Box<Future<Item = UpdateFileResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
-            "update_file(\"{}\", {:?}, \"{}\") - X-Span-ID: {:?}",
+            "update_file(\"{}\", \"{}\", {:?}) - X-Span-ID: {:?}",
+            editgroup_id,
             ident,
             entity,
-            editgroup_id,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn create_fileset(&self, entity: models::FilesetEntity, editgroup_id: String, context: &Context) -> Box<Future<Item = CreateFilesetResponse, Error = ApiError> + Send> {
+    fn create_fileset(&self, editgroup_id: String, entity: models::FilesetEntity, context: &Context) -> Box<Future<Item = CreateFilesetResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
-            "create_fileset({:?}, \"{}\") - X-Span-ID: {:?}",
-            entity,
+            "create_fileset(\"{}\", {:?}) - X-Span-ID: {:?}",
             editgroup_id,
+            entity,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn create_fileset_batch(
-        &self,
-        entity_list: &Vec<models::FilesetEntity>,
-        autoaccept: Option<bool>,
-        editgroup_id: Option<String>,
-        description: Option<String>,
-        extra: Option<String>,
-        context: &Context,
-    ) -> Box<Future<Item = CreateFilesetBatchResponse, Error = ApiError> + Send> {
+    fn create_fileset_auto_batch(&self, auto_batch: models::FilesetAutoBatch, context: &Context) -> Box<Future<Item = CreateFilesetAutoBatchResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
-            "create_fileset_batch({:?}, {:?}, {:?}, {:?}, {:?}) - X-Span-ID: {:?}",
-            entity_list,
-            autoaccept,
-            editgroup_id,
-            description,
-            extra,
+            "create_fileset_auto_batch({:?}) - X-Span-ID: {:?}",
+            auto_batch,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn delete_fileset(&self, ident: String, editgroup_id: String, context: &Context) -> Box<Future<Item = DeleteFilesetResponse, Error = ApiError> + Send> {
+    fn delete_fileset(&self, editgroup_id: String, ident: String, context: &Context) -> Box<Future<Item = DeleteFilesetResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
             "delete_fileset(\"{}\", \"{}\") - X-Span-ID: {:?}",
-            ident,
             editgroup_id,
+            ident,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn delete_fileset_edit(&self, edit_id: String, context: &Context) -> Box<Future<Item = DeleteFilesetEditResponse, Error = ApiError> + Send> {
+    fn delete_fileset_edit(&self, editgroup_id: String, edit_id: String, context: &Context) -> Box<Future<Item = DeleteFilesetEditResponse, Error = ApiError> + Send> {
         let context = context.clone();
-        println!("delete_fileset_edit(\"{}\") - X-Span-ID: {:?}", edit_id, context.x_span_id.unwrap_or(String::from("<none>")).clone());
+        println!(
+            "delete_fileset_edit(\"{}\", \"{}\") - X-Span-ID: {:?}",
+            editgroup_id,
+            edit_id,
+            context.x_span_id.unwrap_or(String::from("<none>")).clone()
+        );
         Box::new(futures::failed("Generic failure".into()))
     }
 
@@ -685,76 +657,69 @@ impl Api for Server {
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn update_fileset(&self, ident: String, entity: models::FilesetEntity, editgroup_id: String, context: &Context) -> Box<Future<Item = UpdateFilesetResponse, Error = ApiError> + Send> {
+    fn update_fileset(&self, editgroup_id: String, ident: String, entity: models::FilesetEntity, context: &Context) -> Box<Future<Item = UpdateFilesetResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
-            "update_fileset(\"{}\", {:?}, \"{}\") - X-Span-ID: {:?}",
+            "update_fileset(\"{}\", \"{}\", {:?}) - X-Span-ID: {:?}",
+            editgroup_id,
             ident,
             entity,
-            editgroup_id,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn create_release(&self, entity: models::ReleaseEntity, editgroup_id: String, context: &Context) -> Box<Future<Item = CreateReleaseResponse, Error = ApiError> + Send> {
+    fn create_release(&self, editgroup_id: String, entity: models::ReleaseEntity, context: &Context) -> Box<Future<Item = CreateReleaseResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
-            "create_release({:?}, \"{}\") - X-Span-ID: {:?}",
-            entity,
+            "create_release(\"{}\", {:?}) - X-Span-ID: {:?}",
             editgroup_id,
+            entity,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn create_release_batch(
-        &self,
-        entity_list: &Vec<models::ReleaseEntity>,
-        autoaccept: Option<bool>,
-        editgroup_id: Option<String>,
-        description: Option<String>,
-        extra: Option<String>,
-        context: &Context,
-    ) -> Box<Future<Item = CreateReleaseBatchResponse, Error = ApiError> + Send> {
+    fn create_release_auto_batch(&self, auto_batch: models::ReleaseAutoBatch, context: &Context) -> Box<Future<Item = CreateReleaseAutoBatchResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
-            "create_release_batch({:?}, {:?}, {:?}, {:?}, {:?}) - X-Span-ID: {:?}",
-            entity_list,
-            autoaccept,
-            editgroup_id,
-            description,
-            extra,
+            "create_release_auto_batch({:?}) - X-Span-ID: {:?}",
+            auto_batch,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn create_work(&self, entity: models::WorkEntity, editgroup_id: String, context: &Context) -> Box<Future<Item = CreateWorkResponse, Error = ApiError> + Send> {
+    fn create_work(&self, editgroup_id: String, entity: models::WorkEntity, context: &Context) -> Box<Future<Item = CreateWorkResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
-            "create_work({:?}, \"{}\") - X-Span-ID: {:?}",
-            entity,
+            "create_work(\"{}\", {:?}) - X-Span-ID: {:?}",
             editgroup_id,
+            entity,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn delete_release(&self, ident: String, editgroup_id: String, context: &Context) -> Box<Future<Item = DeleteReleaseResponse, Error = ApiError> + Send> {
+    fn delete_release(&self, editgroup_id: String, ident: String, context: &Context) -> Box<Future<Item = DeleteReleaseResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
             "delete_release(\"{}\", \"{}\") - X-Span-ID: {:?}",
-            ident,
             editgroup_id,
+            ident,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn delete_release_edit(&self, edit_id: String, context: &Context) -> Box<Future<Item = DeleteReleaseEditResponse, Error = ApiError> + Send> {
+    fn delete_release_edit(&self, editgroup_id: String, edit_id: String, context: &Context) -> Box<Future<Item = DeleteReleaseEditResponse, Error = ApiError> + Send> {
         let context = context.clone();
-        println!("delete_release_edit(\"{}\") - X-Span-ID: {:?}", edit_id, context.x_span_id.unwrap_or(String::from("<none>")).clone());
+        println!(
+            "delete_release_edit(\"{}\", \"{}\") - X-Span-ID: {:?}",
+            editgroup_id,
+            edit_id,
+            context.x_span_id.unwrap_or(String::from("<none>")).clone()
+        );
         Box::new(futures::failed("Generic failure".into()))
     }
 
@@ -874,65 +839,58 @@ impl Api for Server {
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn update_release(&self, ident: String, entity: models::ReleaseEntity, editgroup_id: String, context: &Context) -> Box<Future<Item = UpdateReleaseResponse, Error = ApiError> + Send> {
+    fn update_release(&self, editgroup_id: String, ident: String, entity: models::ReleaseEntity, context: &Context) -> Box<Future<Item = UpdateReleaseResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
-            "update_release(\"{}\", {:?}, \"{}\") - X-Span-ID: {:?}",
+            "update_release(\"{}\", \"{}\", {:?}) - X-Span-ID: {:?}",
+            editgroup_id,
             ident,
             entity,
-            editgroup_id,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn create_webcapture(&self, entity: models::WebcaptureEntity, editgroup_id: String, context: &Context) -> Box<Future<Item = CreateWebcaptureResponse, Error = ApiError> + Send> {
+    fn create_webcapture(&self, editgroup_id: String, entity: models::WebcaptureEntity, context: &Context) -> Box<Future<Item = CreateWebcaptureResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
-            "create_webcapture({:?}, \"{}\") - X-Span-ID: {:?}",
-            entity,
+            "create_webcapture(\"{}\", {:?}) - X-Span-ID: {:?}",
             editgroup_id,
+            entity,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn create_webcapture_batch(
-        &self,
-        entity_list: &Vec<models::WebcaptureEntity>,
-        autoaccept: Option<bool>,
-        editgroup_id: Option<String>,
-        description: Option<String>,
-        extra: Option<String>,
-        context: &Context,
-    ) -> Box<Future<Item = CreateWebcaptureBatchResponse, Error = ApiError> + Send> {
+    fn create_webcapture_auto_batch(&self, auto_batch: models::WebcaptureAutoBatch, context: &Context) -> Box<Future<Item = CreateWebcaptureAutoBatchResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
-            "create_webcapture_batch({:?}, {:?}, {:?}, {:?}, {:?}) - X-Span-ID: {:?}",
-            entity_list,
-            autoaccept,
-            editgroup_id,
-            description,
-            extra,
+            "create_webcapture_auto_batch({:?}) - X-Span-ID: {:?}",
+            auto_batch,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn delete_webcapture(&self, ident: String, editgroup_id: String, context: &Context) -> Box<Future<Item = DeleteWebcaptureResponse, Error = ApiError> + Send> {
+    fn delete_webcapture(&self, editgroup_id: String, ident: String, context: &Context) -> Box<Future<Item = DeleteWebcaptureResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
             "delete_webcapture(\"{}\", \"{}\") - X-Span-ID: {:?}",
-            ident,
             editgroup_id,
+            ident,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn delete_webcapture_edit(&self, edit_id: String, context: &Context) -> Box<Future<Item = DeleteWebcaptureEditResponse, Error = ApiError> + Send> {
+    fn delete_webcapture_edit(&self, editgroup_id: String, edit_id: String, context: &Context) -> Box<Future<Item = DeleteWebcaptureEditResponse, Error = ApiError> + Send> {
         let context = context.clone();
-        println!("delete_webcapture_edit(\"{}\") - X-Span-ID: {:?}", edit_id, context.x_span_id.unwrap_or(String::from("<none>")).clone());
+        println!(
+            "delete_webcapture_edit(\"{}\", \"{}\") - X-Span-ID: {:?}",
+            editgroup_id,
+            edit_id,
+            context.x_span_id.unwrap_or(String::from("<none>")).clone()
+        );
         Box::new(futures::failed("Generic failure".into()))
     }
 
@@ -983,54 +941,47 @@ impl Api for Server {
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn update_webcapture(&self, ident: String, entity: models::WebcaptureEntity, editgroup_id: String, context: &Context) -> Box<Future<Item = UpdateWebcaptureResponse, Error = ApiError> + Send> {
+    fn update_webcapture(&self, editgroup_id: String, ident: String, entity: models::WebcaptureEntity, context: &Context) -> Box<Future<Item = UpdateWebcaptureResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
-            "update_webcapture(\"{}\", {:?}, \"{}\") - X-Span-ID: {:?}",
+            "update_webcapture(\"{}\", \"{}\", {:?}) - X-Span-ID: {:?}",
+            editgroup_id,
             ident,
             entity,
-            editgroup_id,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn create_work_batch(
-        &self,
-        entity_list: &Vec<models::WorkEntity>,
-        autoaccept: Option<bool>,
-        editgroup_id: Option<String>,
-        description: Option<String>,
-        extra: Option<String>,
-        context: &Context,
-    ) -> Box<Future<Item = CreateWorkBatchResponse, Error = ApiError> + Send> {
+    fn create_work_auto_batch(&self, auto_batch: models::WorkAutoBatch, context: &Context) -> Box<Future<Item = CreateWorkAutoBatchResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
-            "create_work_batch({:?}, {:?}, {:?}, {:?}, {:?}) - X-Span-ID: {:?}",
-            entity_list,
-            autoaccept,
-            editgroup_id,
-            description,
-            extra,
+            "create_work_auto_batch({:?}) - X-Span-ID: {:?}",
+            auto_batch,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn delete_work(&self, ident: String, editgroup_id: String, context: &Context) -> Box<Future<Item = DeleteWorkResponse, Error = ApiError> + Send> {
+    fn delete_work(&self, editgroup_id: String, ident: String, context: &Context) -> Box<Future<Item = DeleteWorkResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
             "delete_work(\"{}\", \"{}\") - X-Span-ID: {:?}",
-            ident,
             editgroup_id,
+            ident,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn delete_work_edit(&self, edit_id: String, context: &Context) -> Box<Future<Item = DeleteWorkEditResponse, Error = ApiError> + Send> {
+    fn delete_work_edit(&self, editgroup_id: String, edit_id: String, context: &Context) -> Box<Future<Item = DeleteWorkEditResponse, Error = ApiError> + Send> {
         let context = context.clone();
-        println!("delete_work_edit(\"{}\") - X-Span-ID: {:?}", edit_id, context.x_span_id.unwrap_or(String::from("<none>")).clone());
+        println!(
+            "delete_work_edit(\"{}\", \"{}\") - X-Span-ID: {:?}",
+            editgroup_id,
+            edit_id,
+            context.x_span_id.unwrap_or(String::from("<none>")).clone()
+        );
         Box::new(futures::failed("Generic failure".into()))
     }
 
@@ -1092,13 +1043,13 @@ impl Api for Server {
         Box::new(futures::failed("Generic failure".into()))
     }
 
-    fn update_work(&self, ident: String, entity: models::WorkEntity, editgroup_id: String, context: &Context) -> Box<Future<Item = UpdateWorkResponse, Error = ApiError> + Send> {
+    fn update_work(&self, editgroup_id: String, ident: String, entity: models::WorkEntity, context: &Context) -> Box<Future<Item = UpdateWorkResponse, Error = ApiError> + Send> {
         let context = context.clone();
         println!(
-            "update_work(\"{}\", {:?}, \"{}\") - X-Span-ID: {:?}",
+            "update_work(\"{}\", \"{}\", {:?}) - X-Span-ID: {:?}",
+            editgroup_id,
             ident,
             entity,
-            editgroup_id,
             context.x_span_id.unwrap_or(String::from("<none>")).clone()
         );
         Box::new(futures::failed("Generic failure".into()))