Merge pull request #10551 from swagger-api/nodejs-sample-update

updated samples

Author: HugoMario

samples/server/petstore/nodejs-petstore-mixed/.swagger-codegen/VERSION

@@ -1 +1 @@
-3.0.21-SNAPSHOT
+3.0.24-SNAPSHOT

samples/server/petstore/nodejs-petstore-mixed/api/openapi.yaml

@@ -105,11 +105,11 @@ paths:
           type: array
           items:
             type: string
-            default: available
             enum:
             - available
             - pending
             - sold
+            default: available
       responses:
         "200":
           description: successful operation
@@ -713,10 +713,10 @@ paths:
           type: array
           items:
             type: string
-            default: $
             enum:
             - '>'
             - $
+            default: $
       - name: enum_header_string
         in: header
         description: Header parameter enum test (string)
@@ -725,11 +725,11 @@ paths:
         explode: false
         schema:
           type: string
-          default: -efg
           enum:
           - _abc
           - -efg
           - (xyz)
+          default: -efg
       - name: enum_query_string_array
         in: query
         description: Query parameter enum test (string array)
@@ -740,10 +740,10 @@ paths:
           type: array
           items:
             type: string
-            default: $
             enum:
             - '>'
             - $
+            default: $
       - name: enum_query_string
         in: query
         description: Query parameter enum test (string)
@@ -752,11 +752,11 @@ paths:
         explode: true
         schema:
           type: string
-          default: -efg
           enum:
           - _abc
           - -efg
           - (xyz)
+          default: -efg
       - name: enum_query_integer
         in: query
         description: Query parameter enum test (double)
@@ -1378,6 +1378,15 @@ components:
         category: test-category-name
       xml:
         name: Category
+    UserWrapper:
+      type: object
+      properties:
+        users:
+          $ref: '#/components/schemas/Users'
+    Users:
+      type: array
+      items:
+        $ref: '#/components/schemas/User'
     User:
       type: object
       properties:
@@ -1508,11 +1517,11 @@ components:
         name: Name
     EnumClass:
       type: string
-      default: -efg
       enum:
       - _abc
       - -efg
       - (xyz)
+      default: -efg
     List:
       type: object
       properties:
@@ -2243,18 +2252,18 @@ components:
           description: Form parameter enum test (string array)
           items:
             type: string
-            default: $
             enum:
             - '>'
             - $
+            default: $
         enum_form_string:
           type: string
           description: Form parameter enum test (string)
-          default: -efg
           enum:
           - _abc
           - -efg
           - (xyz)
+          default: -efg
         enum_query_double:
           type: number
           description: Query parameter enum test (double)

samples/server/petstore/nodejs-petstore-mixed/controllers/Animal.js

@@ -43,8 +43,8 @@ module.exports.updateAnimal = function updateAnimal (req, res, next, body) {
     });
 };
 
-module.exports.updateAnimalWithForm = function updateAnimalWithForm (req, res, next, name, status, animalId) {
-  Animal.updateAnimalWithForm(name, status, animalId)
+module.exports.updateAnimalWithForm = function updateAnimalWithForm (req, res, next, animalId) {
+  Animal.updateAnimalWithForm(animalId)
     .then(function (response) {
       utils.writeJson(res, response);
     })

samples/server/petstore/nodejs-petstore-mixed/controllers/Dog.js

@@ -43,8 +43,8 @@ module.exports.updateDog = function updateDog (req, res, next, body) {
     });
 };
 
-module.exports.updateDogWithForm = function updateDogWithForm (req, res, next, name, status, dogId) {
-  Dog.updateDogWithForm(name, status, dogId)
+module.exports.updateDogWithForm = function updateDogWithForm (req, res, next, dogId) {
+  Dog.updateDogWithForm(dogId)
     .then(function (response) {
       utils.writeJson(res, response);
     })

samples/server/petstore/nodejs-petstore-mixed/controllers/Pet.js

@@ -93,8 +93,8 @@ module.exports.updatePet = function updatePet (req, res, next, body) {
     });
 };
 
-module.exports.updatePetWithForm = function updatePetWithForm (req, res, next, name, status, petId) {
-  Pet.updatePetWithForm(name, status, petId)
+module.exports.updatePetWithForm = function updatePetWithForm (req, res, next, petId) {
+  Pet.updatePetWithForm(petId)
     .then(function (response) {
       utils.writeJson(res, response);
     })
@@ -103,8 +103,8 @@ module.exports.updatePetWithForm = function updatePetWithForm (req, res, next, n
     });
 };
 
-module.exports.uploadFile = function uploadFile (req, res, next, additionalMetadata, file, petId) {
-  Pet.uploadFile(additionalMetadata, file, petId)
+module.exports.uploadFile = function uploadFile (req, res, next, petId) {
+  Pet.uploadFile(petId)
     .then(function (response) {
       utils.writeJson(res, response);
     })

samples/server/petstore/nodejs-petstore-mixed/index.js

@@ -8,11 +8,12 @@ var serverPort = 8080;
 
 // swaggerRouter configuration
 var options = {
-    controllers: path.join(__dirname, './controllers')
+    routing: {
+        controllers: path.join(__dirname, './controllers')
+    },
 };
 
 var expressAppConfig = oas3Tools.expressAppConfig(path.join(__dirname, 'api/openapi.yaml'), options);
-expressAppConfig.addValidator();
 var app = expressAppConfig.getApp();
 
 // Initialize the Swagger middleware