diff --git a/codegens/java-native/lib/javanative.js b/codegens/java-native/lib/javanative.js index a04e2f521..a4978ff87 100644 --- 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 index 4114ad734..65ad9399b 100644 --- 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 index 6b6b472bd..224e790ef 100644 --- 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);