Merge pull request #1135 from restlet/fix/nodejs_server_swagger_invalid_json

[Node.js] fix invalid JSON being generated in swagger.json

Author: wing328

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NodeJSServerCodegen.java

@@ -207,11 +207,14 @@ public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
     }
 
     @SuppressWarnings("unchecked")
-    private Map<String, Object> getOperations(Map<String, Object> objs) {
+    private List<Map<String, Object>> getOperations(Map<String, Object> objs) {
+        List<Map<String, Object>> result = new ArrayList<Map<String, Object>>();
         Map<String, Object> apiInfo = (Map<String, Object>) objs.get("apiInfo");
         List<Map<String, Object>> apis = (List<Map<String, Object>>) apiInfo.get("apis");
-        Map<String, Object> api = apis.get(0);
-        return (Map<String, Object>) api.get("operations");
+        for (Map<String, Object> api : apis) {
+            result.add((Map<String, Object>) api.get("operations"));
+        }
+        return result;
     }
 
     private List<Map<String, Object>> sortOperationsByPath(List<CodegenOperation> ops) {
@@ -221,7 +224,7 @@ private List<Map<String, Object>> sortOperationsByPath(List<CodegenOperation> op
             opsByPath.put(op.path, op);
         }
 
-    	List<Map<String, Object>> opsByPathList = new ArrayList<Map<String, Object>>();
+        List<Map<String, Object>> opsByPathList = new ArrayList<Map<String, Object>>();
         for (Entry<String, Collection<CodegenOperation>> entry : opsByPath.asMap().entrySet()) {
             Map<String, Object> opsByPathEntry = new HashMap<String, Object>();
             opsByPathList.add(opsByPathEntry);
@@ -239,16 +242,13 @@ private List<Map<String, Object>> sortOperationsByPath(List<CodegenOperation> op
 
     @Override
     public Map<String, Object> postProcessSupportingFileData(Map<String, Object> objs) {
-        Map<String, Object> operations = getOperations(objs);
-
-        if (operations != null) {
+        for (Map<String, Object> operations : getOperations(objs)) {
             @SuppressWarnings("unchecked")
             List<CodegenOperation> ops = (List<CodegenOperation>) operations.get("operation");
 
             List<Map<String, Object>> opsByPathList = sortOperationsByPath(ops);
             operations.put("operationsByPath", opsByPathList);
         }
-
         return super.postProcessSupportingFileData(objs);
     }
 }

modules/swagger-codegen/src/main/resources/nodejs/swagger.mustache

@@ -14,7 +14,7 @@
 {{#operations}}
   {{#operationsByPath}}
   "{{{path}}}": {
-  	{{#operation}}
+    {{#operation}}
     "{{httpMethod}}": {
       "summary": "{{summary}}",
       "description":"{{notes}}",
@@ -34,7 +34,6 @@
     {{/operation}}
   } {{#hasMore}},{{/hasMore}}
   {{/operationsByPath}}
-   {{#hasMore}},{{/hasMore}}
 {{/operations}}
 {{/apis}}
 {{/apiInfo}}