chore: update samples

OpenAPITools · Oct 2, 2024 · ec4051e · ec4051e
1 parent 2ad4a8e
commit ec4051e
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 35 deletions.
diff --git a/modules/openapi-generator/src/main/resources/zapier/utils.mustache b/modules/openapi-generator/src/main/resources/zapier/utils.mustache
@@ -64,6 +64,7 @@ module.exports = {
     isSearchAction: isSearchAction,
     searchMiddleware: searchMiddleware,
     requestOptionsMiddleware: requestOptionsMiddleware,
+    responseOptionsMiddleware: responseOptionsMiddleware,
     isTrigger: isTrigger,
     triggerMiddleware: triggerMiddleware,
     isCreateAction: isCreateAction,

diff --git a/samples/client/petstore/java/okhttp-gson-3.1/api/openapi.yaml b/samples/client/petstore/java/okhttp-gson-3.1/api/openapi.yaml
@@ -1099,7 +1099,9 @@ components:
         ref_array_prefix_items:
           description: |
             An item that was added to the queue.
-          items: {}
+          items:
+            description: TODO default missing array inner type to string
+            type: string
           maxItems: 5
           minItems: 3
           type: array
@@ -1110,7 +1112,9 @@ components:
     ArrayPrefixItems:
       description: |
         An item that was added to the queue.
-      items: {}
+      items:
+        description: TODO default missing array inner type to string
+        type: string
       maxItems: 5
       minItems: 3
       type: array

diff --git a/samples/client/petstore/java/okhttp-gson-3.1/docs/AnyTypeTest.md b/samples/client/petstore/java/okhttp-gson-3.1/docs/AnyTypeTest.md
@@ -9,7 +9,7 @@
 |------------ | ------------- | ------------- | -------------|
 |**anyTypeProperty** | **Object** |  |  [optional] |
 |**arrayProp** | **List&lt;String&gt;** | test array in 3.1 spec |  [optional] |
-|**refArrayPrefixItems** | **List&lt;Object&gt;** | An item that was added to the queue.  |  [optional] |
+|**refArrayPrefixItems** | **List&lt;String&gt;** | An item that was added to the queue.  |  [optional] |
 
 
 
diff --git a/...etstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/AnyTypeTest.java b/...etstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/AnyTypeTest.java
@@ -63,7 +63,7 @@ public class AnyTypeTest {
 
   public static final String SERIALIZED_NAME_REF_ARRAY_PREFIX_ITEMS = "ref_array_prefix_items";
   @SerializedName(SERIALIZED_NAME_REF_ARRAY_PREFIX_ITEMS)
-  private List<Object> refArrayPrefixItems = new ArrayList<>();
+  private List<String> refArrayPrefixItems = new ArrayList<>();
 
   public AnyTypeTest() {
   }
@@ -114,12 +114,12 @@ public void setArrayProp(List<String> arrayProp) {
   }
 
 
-  public AnyTypeTest refArrayPrefixItems(List<Object> refArrayPrefixItems) {
+  public AnyTypeTest refArrayPrefixItems(List<String> refArrayPrefixItems) {
     this.refArrayPrefixItems = refArrayPrefixItems;
     return this;
   }
 
-  public AnyTypeTest addRefArrayPrefixItemsItem(Object refArrayPrefixItemsItem) {
+  public AnyTypeTest addRefArrayPrefixItemsItem(String refArrayPrefixItemsItem) {
     if (this.refArrayPrefixItems == null) {
       this.refArrayPrefixItems = new ArrayList<>();
     }
@@ -132,11 +132,11 @@ public AnyTypeTest addRefArrayPrefixItemsItem(Object refArrayPrefixItemsItem) {
    * @return refArrayPrefixItems
    */
   @javax.annotation.Nullable
-  public List<Object> getRefArrayPrefixItems() {
+  public List<String> getRefArrayPrefixItems() {
     return refArrayPrefixItems;
   }
 
-  public void setRefArrayPrefixItems(List<Object> refArrayPrefixItems) {
+  public void setRefArrayPrefixItems(List<String> refArrayPrefixItems) {
     this.refArrayPrefixItems = refArrayPrefixItems;
   }
 

diff --git a/samples/client/petstore/zapier/apis/PetApi.js b/samples/client/petstore/zapier/apis/PetApi.js
@@ -37,7 +37,7 @@ module.exports = {
                 }
                 return z.request(utils.requestOptionsMiddleware(z, bundle, options)).then((response) => {
                     response.throwForStatus();
-                    const results = response.json;
+                    const results = utils.responseOptionsMiddleware(z, bundle, 'addPet', response.json);
                     return results;
                 })
             },
@@ -84,7 +84,7 @@ module.exports = {
                 }
                 return z.request(utils.requestOptionsMiddleware(z, bundle, options)).then((response) => {
                     response.throwForStatus();
-                    const results = response.json;
+                    const results = utils.responseOptionsMiddleware(z, bundle, 'deletePet', response.json);
                     return results;
                 })
             },
@@ -126,7 +126,7 @@ module.exports = {
                 }
                 return z.request(utils.requestOptionsMiddleware(z, bundle, options)).then((response) => {
                     response.throwForStatus();
-                    const results = response.json;
+                    const results = utils.responseOptionsMiddleware(z, bundle, 'findPetsByStatus', response.json);
                     return results;
                 })
             },
@@ -168,7 +168,7 @@ module.exports = {
                 }
                 return z.request(utils.requestOptionsMiddleware(z, bundle, options)).then((response) => {
                     response.throwForStatus();
-                    const results = response.json;
+                    const results = utils.responseOptionsMiddleware(z, bundle, 'findPetsByTags', response.json);
                     return results;
                 })
             },
@@ -211,7 +211,7 @@ module.exports = {
                 }
                 return z.request(utils.requestOptionsMiddleware(z, bundle, options)).then((response) => {
                     response.throwForStatus();
-                    const results = response.json;
+                    const results = utils.responseOptionsMiddleware(z, bundle, 'getPetById', response.json);
                     return results;
                 })
             },
@@ -250,7 +250,7 @@ module.exports = {
                 }
                 return z.request(utils.requestOptionsMiddleware(z, bundle, options)).then((response) => {
                     response.throwForStatus();
-                    const results = response.json;
+                    const results = utils.responseOptionsMiddleware(z, bundle, 'updatePet', response.json);
                     return results;
                 })
             },
@@ -302,7 +302,7 @@ module.exports = {
                 }
                 return z.request(utils.requestOptionsMiddleware(z, bundle, options)).then((response) => {
                     response.throwForStatus();
-                    const results = response.json;
+                    const results = utils.responseOptionsMiddleware(z, bundle, 'updatePetWithForm', response.json);
                     return results;
                 })
             },
@@ -358,7 +358,7 @@ module.exports = {
                 }
                 return z.request(utils.requestOptionsMiddleware(z, bundle, options)).then((response) => {
                     response.throwForStatus();
-                    const results = response.json;
+                    const results = utils.responseOptionsMiddleware(z, bundle, 'uploadFile', response.json);
                     return results;
                 })
             },

diff --git a/samples/client/petstore/zapier/apis/StoreApi.js b/samples/client/petstore/zapier/apis/StoreApi.js
@@ -38,7 +38,7 @@ module.exports = {
                 }
                 return z.request(utils.requestOptionsMiddleware(z, bundle, options)).then((response) => {
                     response.throwForStatus();
-                    const results = response.json;
+                    const results = utils.responseOptionsMiddleware(z, bundle, 'deleteOrder', response.json);
                     return results;
                 })
             },
@@ -74,7 +74,7 @@ module.exports = {
                 }
                 return z.request(utils.requestOptionsMiddleware(z, bundle, options)).then((response) => {
                     response.throwForStatus();
-                    const results = response.json;
+                    const results = utils.responseOptionsMiddleware(z, bundle, 'getInventory', response.json);
                     return { data: results };
                 })
             },
@@ -117,7 +117,7 @@ module.exports = {
                 }
                 return z.request(utils.requestOptionsMiddleware(z, bundle, options)).then((response) => {
                     response.throwForStatus();
-                    const results = response.json;
+                    const results = utils.responseOptionsMiddleware(z, bundle, 'getOrderById', response.json);
                     return results;
                 })
             },
@@ -156,7 +156,7 @@ module.exports = {
                 }
                 return z.request(utils.requestOptionsMiddleware(z, bundle, options)).then((response) => {
                     response.throwForStatus();
-                    const results = response.json;
+                    const results = utils.responseOptionsMiddleware(z, bundle, 'placeOrder', response.json);
                     return results;
                 })
             },

diff --git a/samples/client/petstore/zapier/apis/UserApi.js b/samples/client/petstore/zapier/apis/UserApi.js
@@ -34,7 +34,7 @@ module.exports = {
                 }
                 return z.request(utils.requestOptionsMiddleware(z, bundle, options)).then((response) => {
                     response.throwForStatus();
-                    const results = response.json;
+                    const results = utils.responseOptionsMiddleware(z, bundle, 'createUser', response.json);
                     return results;
                 })
             },
@@ -76,7 +76,7 @@ module.exports = {
                 }
                 return z.request(utils.requestOptionsMiddleware(z, bundle, options)).then((response) => {
                     response.throwForStatus();
-                    const results = response.json;
+                    const results = utils.responseOptionsMiddleware(z, bundle, 'createUsersWithArrayInput', response.json);
                     return results;
                 })
             },
@@ -118,7 +118,7 @@ module.exports = {
                 }
                 return z.request(utils.requestOptionsMiddleware(z, bundle, options)).then((response) => {
                     response.throwForStatus();
-                    const results = response.json;
+                    const results = utils.responseOptionsMiddleware(z, bundle, 'createUsersWithListInput', response.json);
                     return results;
                 })
             },
@@ -160,7 +160,7 @@ module.exports = {
                 }
                 return z.request(utils.requestOptionsMiddleware(z, bundle, options)).then((response) => {
                     response.throwForStatus();
-                    const results = response.json;
+                    const results = utils.responseOptionsMiddleware(z, bundle, 'deleteUser', response.json);
                     return results;
                 })
             },
@@ -203,7 +203,7 @@ module.exports = {
                 }
                 return z.request(utils.requestOptionsMiddleware(z, bundle, options)).then((response) => {
                     response.throwForStatus();
-                    const results = response.json;
+                    const results = utils.responseOptionsMiddleware(z, bundle, 'getUserByName', response.json);
                     return results;
                 })
             },
@@ -253,7 +253,7 @@ module.exports = {
                 }
                 return z.request(utils.requestOptionsMiddleware(z, bundle, options)).then((response) => {
                     response.throwForStatus();
-                    const results = response.json;
+                    const results = utils.responseOptionsMiddleware(z, bundle, 'loginUser', response.json);
                     return { data: results };
                 })
             },
@@ -289,7 +289,7 @@ module.exports = {
                 }
                 return z.request(utils.requestOptionsMiddleware(z, bundle, options)).then((response) => {
                     response.throwForStatus();
-                    const results = response.json;
+                    const results = utils.responseOptionsMiddleware(z, bundle, 'logoutUser', response.json);
                     return results;
                 })
             },
@@ -333,7 +333,7 @@ module.exports = {
                 }
                 return z.request(utils.requestOptionsMiddleware(z, bundle, options)).then((response) => {
                     response.throwForStatus();
-                    const results = response.json;
+                    const results = utils.responseOptionsMiddleware(z, bundle, 'updateUser', response.json);
                     return results;
                 })
             },

diff --git a/samples/client/petstore/zapier/utils/utils.js b/samples/client/petstore/zapier/utils/utils.js
@@ -28,13 +28,6 @@ const isCreateAction = (key) => {
     return !isSearchAction(key);
 }
 
-const requestOptionsMiddleware = (z, bundle, requestOptions) => {
-  // TODO: modify the request options for all outgoing request to your api
-  //       if you are using session authentication without a Bearer token.
-  //       This may be true if your API uses basic authentication or api keys.
-  return requestOptions
-}
-
 const isTrigger = (key) => {
     // TODO: custom logic
     return false
@@ -44,6 +37,24 @@ const triggerMiddleware = (action) => {
     return action
 }
 
+const requestOptionsMiddleware = (z, bundle, requestOptions) => {
+  // TODO: modify the request options for all outgoing request to your api
+  //       if you are using session authentication without a Bearer token.
+  //       This may be true if your API uses basic authentication or api keys.
+  return requestOptions
+}
+
+const responseOptionsMiddleware = (z, bundle, key, json) => {
+  // TODO: modify if your response needs to be transformed before returning the
+  //      data to Zapier. For example, you may need to map an id field to the
+  //      "id" field. For example, map "contactId": 1 to "id": 1. Or wrap your
+  //      response in a json object. For example, { data: response }.
+  //
+  //      Note that if the type being returned from the endpoint is a primitive
+  //      type, the response is automatically wrapped like this: { data: response }.
+  return json
+}
+
 module.exports = {
     replacePathParameters: replacePathParameters,
     childMapping: childMapping,
@@ -53,6 +64,7 @@ module.exports = {
     isSearchAction: isSearchAction,
     searchMiddleware: searchMiddleware,
     requestOptionsMiddleware: requestOptionsMiddleware,
+    responseOptionsMiddleware: responseOptionsMiddleware,
     isTrigger: isTrigger,
     triggerMiddleware: triggerMiddleware,
     isCreateAction: isCreateAction,