Address cubic-dev comments

Author: gcatanese

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PostmanCollectionCodegen.java

@@ -332,6 +332,9 @@ public void addToMap(CodegenOperation codegenOperation) {
             }
         }
 
+        tagName = formatDescription(tagName);
+        tagDescription = formatDescription(tagDescription);
+
         PostmanRequestFolder folder = new PostmanRequestFolder(tagName, tagDescription);
         List<CodegenOperation> list = codegenOperationsByTag.get(folder);
 

modules/openapi-generator/src/main/resources/postman-collection/postman.mustache

@@ -12,8 +12,8 @@
 	{{#codegenOperationsByTag}}
 	{{#entrySet}}
 	        {
-	            "name": "{{key.name}}",
-	            "description": "{{key.description}}",
+	            "name": "{{{key.name}}}",
+	            "description": "{{{key.description}}}",
 	            "item": [{{#value}}
 	                        {{>item}}{{^-last}},{{/-last}}{{/value}}
 	                    ]

modules/openapi-generator/src/test/java/org/openapitools/codegen/postman/PostmanCollectionCodegenTest.java

@@ -77,9 +77,21 @@ public void testBasicGeneration() throws IOException {
         assertFileContains(path, "\"name\": \"Get User\"");
         // verify request endpoint
         TestUtils.assertFileContains(path, "\"name\": \"/users/:userId\"");
-        // verify folder name and description
-        TestUtils.assertFileContains(path, "\"name\": \"basic\"");
-        TestUtils.assertFileContains(path, "\"description\": \"Basic tag\"");
+
+        ObjectMapper objectMapper = new ObjectMapper();
+        JsonNode root = objectMapper.readTree(new File(output + "/postman.json"));
+        JsonNode folders = root.get("item");
+
+        JsonNode basicFolder = null;
+        for (JsonNode folder : folders) {
+            if ("basic".equals(folder.get("name").asText())) {
+                basicFolder = folder;
+                break;
+            }
+        }
+
+        assertNotNull(basicFolder);
+        assertEquals("Basic tag", basicFolder.get("description").asText());
 
     }
 
@@ -106,6 +118,38 @@ public void testBasicGenerationJson() throws IOException {
         assertFileContains(path, "\"schema\": \"https://schema.getpostman.com/json/collection/v2.1.0/collection.json\"");
     }
 
+    @Test
+    public void testTagDescriptionIsJsonEscaped() throws IOException {
+        File output = Files.createTempDirectory("postmantest_").toFile();
+        output.deleteOnExit();
+
+        final CodegenConfigurator configurator = new CodegenConfigurator()
+                .setGeneratorName("postman-collection")
+                .setInputSpec("src/test/resources/3_0/postman-collection/TagDescriptionEscaping.yaml")
+                .setOutputDir(output.getAbsolutePath().replace("\\", "/"));
+
+        final ClientOptInput clientOptInput = configurator.toClientOptInput();
+        DefaultGenerator generator = new DefaultGenerator();
+        List<File> files = generator.opts(clientOptInput).generate();
+
+        files.forEach(File::deleteOnExit);
+
+        ObjectMapper objectMapper = new ObjectMapper();
+        JsonNode root = objectMapper.readTree(new File(output + "/postman.json"));
+        JsonNode folders = root.get("item");
+
+        JsonNode basicFolder = null;
+        for (JsonNode folder : folders) {
+            if ("basic".equals(folder.get("name").asText())) {
+                basicFolder = folder;
+                break;
+            }
+        }
+
+        assertNotNull(basicFolder);
+        assertEquals("Basic \"quoted\" tag\nsecond line", basicFolder.get("description").asText());
+    }
+
     @Test
     public void testValidatePostmanJson() throws IOException {
 

modules/openapi-generator/src/test/resources/3_0/postman-collection/TagDescriptionEscaping.yaml

@@ -0,0 +1,35 @@
+openapi: 3.0.0
+info:
+  title: Tag Description Escaping
+  version: '1.0'
+servers:
+  - url: 'http://localhost:5001'
+paths:
+  '/users/{userId}':
+    get:
+      summary: Get User
+      operationId: get-users-userId
+      tags:
+        - basic
+      parameters:
+        - description: Unique identifier of the user
+          name: userId
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: User Found
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  id:
+                    type: integer
+tags:
+  - name: basic
+    description: |-
+      Basic "quoted" tag
+      second line