Issue postmanlabs#155 pure java codegen. Adding fix for empty form da…

…ta. Updating newman.test run command
virenderm01 · May 29, 2020 · 688059f · 688059f
1 parent d626d78
commit 688059f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/codegens/java-native/lib/javanative.js b/codegens/java-native/lib/javanative.js
@@ -102,7 +102,8 @@ function makeSnippet (request, indentString, options) {
         mode: 'formdata',
         formdata: formdataArray
       });
-      snippet += multiPartSnippet();
+      snippet += formdataArray.length > 0 ? multiPartSnippet() :
+        'con.setRequestProperty("Content-Type", "application/json");\n';
     }
     if (request.body && request.body.mode === 'file') {
       snippet += multiPartSnippet();

diff --git a/codegens/java-native/lib/parseRequest.js b/codegens/java-native/lib/parseRequest.js
@@ -179,16 +179,13 @@ function parseBody (requestBody, indentString, trimFields) {
                   'out.close();\n';
         return snippet;
       case 'formdata':
-        snippet += generateBoilerPlateHeader();
+        // snippet += generateBoilerPlateHeader();
         snippet += requestBody.formdata.length ?
-          `${parseFormData(requestBody, indentString, trimFields)}` :
-          'writer.append("--" + boundary).append(LINE_FEED)\n' +
-          indentString + '.append("Content-Disposition: form-data;")\n' +
-          indentString + '.append(LINE_FEED)\n' +
-          indentString + '.append("Content-Type: text/plain; charset=UTF-8")\n' +
-          indentString + '.append(LINE_FEED);\n' +
-          'writer.flush();\n';
-        snippet += generateBoilerPlateFooter();
+          generateBoilerPlateHeader() + parseFormData(requestBody, indentString, trimFields) +
+          generateBoilerPlateFooter() :
+          'out.writeBytes("{}");\n' +
+                  'out.close();\n';
+        // snippet += generateBoilerPlateFooter();
         return snippet;
 
       case 'file':

diff --git a/codegens/java-native/test/newman/newman.test.js b/codegens/java-native/test/newman/newman.test.js
@@ -5,7 +5,7 @@ describe('convert for different request types', function () {
   var options = {indentCount: 3, indentType: 'Space', includeBoilerplate: true},
     testConfig = {
       compileScript: 'javac -cp *: main.java',
-      runScript: 'java -cp *: main',
+      runScript: 'java main',
       fileName: 'main.java'
     };
   runNewmanTest(convert, options, testConfig);