Switch back to single response object.

This reverts commit 6ab079e.

This commit was designed to increase backwards compatibility but after
further discussion it was decided that the added complexity was less
desirable.  Additionally there are already breaking changes in this new
version that will need address and this would be a minor one.

Author: David Ronk

docraptor.yaml

@@ -171,7 +171,7 @@ paths:
         200:
           description: Successful response
           schema:
-            $ref: '#/definitions/AsyncDocStatus'
+            $ref: '#/definitions/DocStatus'
         401:
           description: Unauthorized
         403:
@@ -436,7 +436,7 @@ definitions:
         type: string
         description: The identifier used to get the status of the document using the status API.
 
-  AsyncDocStatus:
+  DocStatus:
     type: object
     properties:
       status:
@@ -457,7 +457,4 @@ definitions:
       validation_errors:
         type: string
         description: Error information.
-  DocStatus:
-    type: object
-    allOf:
-      - $ref: '#/definitions/AsyncDocStatus'
+

examples/async.cs

@@ -38,7 +38,7 @@ static void Main(string[] args) {
 
       AsyncDoc response = docraptor.CreateAsyncDoc(doc);
 
-      AsyncDocStatus status_response;
+      DocStatus status_response;
       Boolean done = false;
       while(!done) {
         status_response = docraptor.GetAsyncDocStatus(response.StatusId);

examples/hosted_async.cs

@@ -47,7 +47,7 @@ static void Main(string[] args) {
 
       AsyncDoc response = docraptor.CreateHostedAsyncDoc(doc);
 
-      AsyncDocStatus status_response;
+      DocStatus status_response;
       Boolean done = false;
       while(!done) {
         status_response = docraptor.GetAsyncDocStatus(response.StatusId);

src/DocRaptor/Api/DocApi.cs

@@ -158,8 +158,8 @@ public interface IDocApi : IApiAccessor
         /// </remarks>
         /// <exception cref="DocRaptor.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="id">The status_id returned when creating an asynchronous document.</param>
-        /// <returns>AsyncDocStatus</returns>
-        AsyncDocStatus GetAsyncDocStatus (string id);
+        /// <returns>DocStatus</returns>
+        DocStatus GetAsyncDocStatus (string id);
 
         /// <summary>
         ///
@@ -169,8 +169,8 @@ public interface IDocApi : IApiAccessor
         /// </remarks>
         /// <exception cref="DocRaptor.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="id">The status_id returned when creating an asynchronous document.</param>
-        /// <returns>ApiResponse of AsyncDocStatus</returns>
-        ApiResponse<AsyncDocStatus> GetAsyncDocStatusWithHttpInfo (string id);
+        /// <returns>ApiResponse of DocStatus</returns>
+        ApiResponse<DocStatus> GetAsyncDocStatusWithHttpInfo (string id);
         #endregion Synchronous Operations
         #region Asynchronous Operations
         /// <summary>
@@ -307,8 +307,8 @@ public interface IDocApi : IApiAccessor
         /// </remarks>
         /// <exception cref="DocRaptor.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="id">The status_id returned when creating an asynchronous document.</param>
-        /// <returns>Task of AsyncDocStatus</returns>
-        System.Threading.Tasks.Task<AsyncDocStatus> GetAsyncDocStatusAsync (string id);
+        /// <returns>Task of DocStatus</returns>
+        System.Threading.Tasks.Task<DocStatus> GetAsyncDocStatusAsync (string id);
 
         /// <summary>
         ///
@@ -318,8 +318,8 @@ public interface IDocApi : IApiAccessor
         /// </remarks>
         /// <exception cref="DocRaptor.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="id">The status_id returned when creating an asynchronous document.</param>
-        /// <returns>Task of ApiResponse (AsyncDocStatus)</returns>
-        System.Threading.Tasks.Task<ApiResponse<AsyncDocStatus>> GetAsyncDocStatusAsyncWithHttpInfo (string id);
+        /// <returns>Task of ApiResponse (DocStatus)</returns>
+        System.Threading.Tasks.Task<ApiResponse<DocStatus>> GetAsyncDocStatusAsyncWithHttpInfo (string id);
         #endregion Asynchronous Operations
     }
 
@@ -1397,10 +1397,10 @@ public async System.Threading.Tasks.Task<ApiResponse<byte[]>> GetAsyncDocAsyncWi
         /// </summary>
         /// <exception cref="DocRaptor.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="id">The status_id returned when creating an asynchronous document.</param>
-        /// <returns>AsyncDocStatus</returns>
-        public AsyncDocStatus GetAsyncDocStatus (string id)
+        /// <returns>DocStatus</returns>
+        public DocStatus GetAsyncDocStatus (string id)
         {
-             ApiResponse<AsyncDocStatus> localVarResponse = GetAsyncDocStatusWithHttpInfo(id);
+             ApiResponse<DocStatus> localVarResponse = GetAsyncDocStatusWithHttpInfo(id);
              return localVarResponse.Data;
         }
 
@@ -1409,8 +1409,8 @@ public AsyncDocStatus GetAsyncDocStatus (string id)
         /// </summary>
         /// <exception cref="DocRaptor.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="id">The status_id returned when creating an asynchronous document.</param>
-        /// <returns>ApiResponse of AsyncDocStatus</returns>
-        public ApiResponse< AsyncDocStatus > GetAsyncDocStatusWithHttpInfo (string id)
+        /// <returns>ApiResponse of DocStatus</returns>
+        public ApiResponse< DocStatus > GetAsyncDocStatusWithHttpInfo (string id)
         {
             // verify the required parameter 'id' is set
             if (id == null)
@@ -1463,20 +1463,20 @@ public ApiResponse< AsyncDocStatus > GetAsyncDocStatusWithHttpInfo (string id)
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<AsyncDocStatus>(localVarStatusCode,
+            return new ApiResponse<DocStatus>(localVarStatusCode,
                 localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (AsyncDocStatus) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(AsyncDocStatus)));
+                (DocStatus) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(DocStatus)));
         }
 
         /// <summary>
         ///  Check on the status of an asynchronously created document.
         /// </summary>
         /// <exception cref="DocRaptor.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="id">The status_id returned when creating an asynchronous document.</param>
-        /// <returns>Task of AsyncDocStatus</returns>
-        public async System.Threading.Tasks.Task<AsyncDocStatus> GetAsyncDocStatusAsync (string id)
+        /// <returns>Task of DocStatus</returns>
+        public async System.Threading.Tasks.Task<DocStatus> GetAsyncDocStatusAsync (string id)
         {
-             ApiResponse<AsyncDocStatus> localVarResponse = await GetAsyncDocStatusAsyncWithHttpInfo(id);
+             ApiResponse<DocStatus> localVarResponse = await GetAsyncDocStatusAsyncWithHttpInfo(id);
              return localVarResponse.Data;
 
         }
@@ -1486,8 +1486,8 @@ public async System.Threading.Tasks.Task<AsyncDocStatus> GetAsyncDocStatusAsync
         /// </summary>
         /// <exception cref="DocRaptor.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="id">The status_id returned when creating an asynchronous document.</param>
-        /// <returns>Task of ApiResponse (AsyncDocStatus)</returns>
-        public async System.Threading.Tasks.Task<ApiResponse<AsyncDocStatus>> GetAsyncDocStatusAsyncWithHttpInfo (string id)
+        /// <returns>Task of ApiResponse (DocStatus)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<DocStatus>> GetAsyncDocStatusAsyncWithHttpInfo (string id)
         {
             // verify the required parameter 'id' is set
             if (id == null)
@@ -1540,9 +1540,9 @@ public async System.Threading.Tasks.Task<ApiResponse<AsyncDocStatus>> GetAsyncDo
                 if (exception != null) throw exception;
             }
 
-            return new ApiResponse<AsyncDocStatus>(localVarStatusCode,
+            return new ApiResponse<DocStatus>(localVarStatusCode,
                 localVarResponse.Headers.ToDictionary(x => x.Name, x => x.Value.ToString()),
-                (AsyncDocStatus) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(AsyncDocStatus)));
+                (DocStatus) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(DocStatus)));
         }
 
     }

src/DocRaptor/Model/AsyncDocStatus.cs

@@ -21,7 +21,7 @@ static void Main(string[] args) {
 
     AsyncDoc response = docraptor.CreateAsyncDoc(doc);
 
-    AsyncDocStatus status_response;
+    DocStatus status_response;
     while(true) {
       status_response = docraptor.GetAsyncDocStatus(response.StatusId);
       if (status_response.Status == "completed") {

test/async.cs

@@ -25,7 +25,7 @@ static void Main(string[] args) {
 
     AsyncDoc response = docraptor.CreateHostedAsyncDoc(doc);
 
-    AsyncDocStatus status_response;
+    DocStatus status_response;
     while(true) {
       status_response = docraptor.GetAsyncDocStatus(response.StatusId);
       if (status_response.Status == "completed") {