fix: revert to openapi-generator 4.3.0

because of OpenAPITools/openapi-generator#6273
Ircam-WAM · May 12, 2020 · 94ef375 · 94ef375
1 parent 7d738c7
commit 94ef375
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 48 deletions.
diff --git a/.openapi-generator/VERSION b/.openapi-generator/VERSION
@@ -1 +1 @@
-4.3.1
+4.3.0
diff --git a/Makefile b/Makefile
@@ -22,7 +22,7 @@ api: $(spec-openapi)
 	docker run --rm \
          -v ${PWD}:/local \
          --user "$$(id -u):$$(id -g)" \
-         openapitools/openapi-generator-cli:v4.3.1 generate \
+         openapitools/openapi-generator-cli:v4.3.0 generate \
          -i /local/$(spec-openapi) \
          -g typescript-fetch \
          -c /local/$(generator-config) \

diff --git a/src/apis/TimesideApi.ts b/src/apis/TimesideApi.ts
@@ -27,9 +27,6 @@ import {
     AnnotationTrack,
     AnnotationTrackFromJSON,
     AnnotationTrackToJSON,
-    AnyType,
-    AnyTypeFromJSON,
-    AnyTypeToJSON,
     AuthToken,
     AuthTokenFromJSON,
     AuthTokenToJSON,
@@ -361,7 +358,7 @@ export interface UpdateTaskRequest {
 }
 
 /**
- * 
+ * no description
  */
 export class TimesideApi extends runtime.BaseAPI {
 
@@ -1117,7 +1114,7 @@ export class TimesideApi extends runtime.BaseAPI {
 
     /**
      */
-    async listCsrfTokensRaw(): Promise<runtime.ApiResponse<Array<AnyType>>> {
+    async listCsrfTokensRaw(): Promise<runtime.ApiResponse<Array<object>>> {
         const queryParameters: runtime.HTTPQuery = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
@@ -1129,12 +1126,12 @@ export class TimesideApi extends runtime.BaseAPI {
             query: queryParameters,
         });
 
-        return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(AnyTypeFromJSON));
+        return new runtime.JSONApiResponse<any>(response);
     }
 
     /**
      */
-    async listCsrfTokens(): Promise<Array<AnyType>> {
+    async listCsrfTokens(): Promise<Array<object>> {
         const response = await this.listCsrfTokensRaw();
         return await response.value();
     }
@@ -2127,7 +2124,7 @@ export class TimesideApi extends runtime.BaseAPI {
     /**
      * PNG rendering of 2D numerical data (example: a spectrogram).
      */
-    async retrieveResultVisualizationRaw(requestParameters: RetrieveResultVisualizationRequest): Promise<runtime.ApiResponse<AnyType>> {
+    async retrieveResultVisualizationRaw(requestParameters: RetrieveResultVisualizationRequest): Promise<runtime.ApiResponse<object>> {
         if (requestParameters.uuid === null || requestParameters.uuid === undefined) {
             throw new runtime.RequiredError('uuid','Required parameter requestParameters.uuid was null or undefined when calling retrieveResultVisualization.');
         }
@@ -2143,13 +2140,13 @@ export class TimesideApi extends runtime.BaseAPI {
             query: queryParameters,
         });
 
-        return new runtime.JSONApiResponse(response, (jsonValue) => AnyTypeFromJSON(jsonValue));
+        return new runtime.JSONApiResponse<any>(response);
     }
 
     /**
      * PNG rendering of 2D numerical data (example: a spectrogram).
      */
-    async retrieveResultVisualization(requestParameters: RetrieveResultVisualizationRequest): Promise<AnyType> {
+    async retrieveResultVisualization(requestParameters: RetrieveResultVisualizationRequest): Promise<object> {
         const response = await this.retrieveResultVisualizationRaw(requestParameters);
         return await response.value();
     }

diff --git a/src/models/Item.ts b/src/models/Item.ts
@@ -87,21 +87,13 @@ export interface Item {
      */
     readonly audioDuration?: number;
     /**
-     * Provider's URI of the audio source.
-     * 
-     * e.g. for Deezer preview: http://www.deezer.com/track/4763165
-     * 
-     * e.g. for YouTube: https://www.youtube.com/watch?v=oRdxUFDoQe0
+     * Provider\'s URI of the audio source.  e.g. for Deezer preview: http://www.deezer.com/track/4763165  e.g. for YouTube: https://www.youtube.com/watch?v=oRdxUFDoQe0
      * @type {string}
      * @memberof Item
      */
     externalUri?: string;
     /**
-     * Provider's id of the audio source.
-     * 
-     * e.g. for Deezer preview: 4763165
-     * 
-     * e.g. for YouTube: oRdxUFDoQe0
+     * Provider\'s id of the audio source.  e.g. for Deezer preview: 4763165  e.g. for YouTube: oRdxUFDoQe0
      * @type {string}
      * @memberof Item
      */

diff --git a/src/models/Result.ts b/src/models/Result.ts
@@ -44,17 +44,7 @@ export interface Result {
      */
     preset?: string | null;
     /**
-     * Status of the task giving the result:
-     * 
-     * failed: 0
-     * 
-     * draft: 1
-     * 
-     * pending: 2
-     * 
-     * running: 3
-     * 
-     * done: 4
+     * Status of the task giving the result:  failed: 0  draft: 1  pending: 2  running: 3  done: 4
      * @type {number}
      * @memberof Result
      */
@@ -72,8 +62,7 @@ export interface Result {
      */
     hdf5?: Blob;
     /**
-     * Non numerical result stored in a file
-     * (image, transcoded audio, etc.)
+     * Non numerical result stored in a file (image, transcoded audio, etc.)
      * @type {Blob}
      * @memberof Result
      */

diff --git a/src/models/Task.ts b/src/models/Task.ts
@@ -44,17 +44,7 @@ export interface Task {
      */
     selection?: string | null;
     /**
-     * Task's status:
-     * 
-     * failed: 0
-     * 
-     * draft: 1
-     * 
-     * pending: 2
-     * 
-     * running: 3
-     * 
-     * done: 4
+     * Task\'s status:  failed: 0  draft: 1  pending: 2  running: 3  done: 4
      * @type {number}
      * @memberof Task
      */

diff --git a/src/runtime.ts b/src/runtime.ts
@@ -61,7 +61,7 @@ export class BaseAPI {
             // do not handle correctly sometimes.
             url += '?' + this.configuration.queryParamsStringify(context.query);
         }
-        const body = ((typeof FormData !== "undefined" && context.body instanceof FormData) || context.body instanceof URLSearchParams || isBlob(context.body))
+        const body = (context.body instanceof FormData || context.body instanceof URLSearchParams || isBlob(context.body))
 	    ? context.body
 	    : JSON.stringify(context.body);
 
@@ -193,7 +193,7 @@ export class Configuration {
 }
 
 export type Json = any;
-export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS' | 'HEAD';
+export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS';
 export type HTTPHeaders = { [key: string]: string };
 export type HTTPQuery = { [key: string]: string | number | null | boolean | Array<string | number | null | boolean> | HTTPQuery };
 export type HTTPBody = Json | FormData | URLSearchParams;