fixed json body and head2

This commit is contained in:
Apoorv Dwivedi
2024-03-24 01:54:33 +05:30
parent d91b5c059b
commit 3886755ae9
2 changed files with 13 additions and 31 deletions

View File

@ -17,8 +17,6 @@ import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.ArrayList;{% endif %} import java.util.ArrayList;{% endif %}
{% if hasJsonBody %}import com.google.gson.Gson;
import java.nio.charset.StandardCharsets;{% endif %}
public class Main { public class Main {
public static void main(String[] args) { public static void main(String[] args) {
@ -57,8 +55,8 @@ multipart/form-data; boundary={{boundary}}''';
"""; """;
String kTemplateJsonBody = """ String kTemplateJsonBody = """
HttpRequest.BodyPublisher bodyPublisher = HttpRequest.BodyPublishers.ofString(new Gson().toJson(\"\"\" HttpRequest.BodyPublisher bodyPublisher = HttpRequest.BodyPublishers.ofString(\"\"\"
{{body}}\"\"\"), StandardCharsets.UTF_8); {{body}}\"\"\");
"""; """;
String kTemplateFormData = """ String kTemplateFormData = """
@ -121,7 +119,6 @@ multipart/form-data; boundary={{boundary}}''';
String url = requestModel.url; String url = requestModel.url;
result += jj.Template(kTemplateStart).render({ result += jj.Template(kTemplateStart).render({
"hasJsonBody": requestModel.hasJsonData,
"hasFormData": requestModel.hasFormData, "hasFormData": requestModel.hasFormData,
}); });

View File

@ -428,7 +428,7 @@ public class Main {
}'''; }''';
expect( expect(
codeGen.getCode( codeGen.getCode(
CodegenLanguage.javaHttpClient, requestModelHead2, "https"), CodegenLanguage.javaHttpClient, requestModelHead2, "http"),
expectedCode); expectedCode);
}); });
}); });
@ -477,15 +477,12 @@ import java.net.http.HttpRequest;
import java.net.http.HttpResponse; import java.net.http.HttpResponse;
import java.io.IOException; import java.io.IOException;
import com.google.gson.Gson;
import java.nio.charset.StandardCharsets;
public class Main { public class Main {
public static void main(String[] args) { public static void main(String[] args) {
try { try {
HttpClient client = HttpClient.newHttpClient(); HttpClient client = HttpClient.newHttpClient();
URI uri = URI.create("https://api.apidash.dev/case/lower"); URI uri = URI.create("https://api.apidash.dev/case/lower");
HttpRequest.BodyPublisher bodyPublisher = HttpRequest.BodyPublishers.ofString(new Gson().toJson(""" HttpRequest.BodyPublisher bodyPublisher = HttpRequest.BodyPublishers.ofString("""
{ {
"text": "I LOVE Flutter", "text": "I LOVE Flutter",
"flag": null, "flag": null,
@ -493,7 +490,7 @@ public class Main {
"female": false, "female": false,
"no": 1.2, "no": 1.2,
"arr": ["null", "true", "false", null] "arr": ["null", "true", "false", null]
}"""), StandardCharsets.UTF_8); }""");
HttpRequest.Builder requestBuilder = HttpRequest.newBuilder(uri).POST(bodyPublisher); HttpRequest.Builder requestBuilder = HttpRequest.newBuilder(uri).POST(bodyPublisher);
requestBuilder = requestBuilder.headers( requestBuilder = requestBuilder.headers(
"Content-Type", "application/json" "Content-Type", "application/json"
@ -520,18 +517,15 @@ import java.net.http.HttpRequest;
import java.net.http.HttpResponse; import java.net.http.HttpResponse;
import java.io.IOException; import java.io.IOException;
import com.google.gson.Gson;
import java.nio.charset.StandardCharsets;
public class Main { public class Main {
public static void main(String[] args) { public static void main(String[] args) {
try { try {
HttpClient client = HttpClient.newHttpClient(); HttpClient client = HttpClient.newHttpClient();
URI uri = URI.create("https://api.apidash.dev/case/lower"); URI uri = URI.create("https://api.apidash.dev/case/lower");
HttpRequest.BodyPublisher bodyPublisher = HttpRequest.BodyPublishers.ofString(new Gson().toJson(""" HttpRequest.BodyPublisher bodyPublisher = HttpRequest.BodyPublishers.ofString("""
{ {
"text": "I LOVE Flutter" "text": "I LOVE Flutter"
}"""), StandardCharsets.UTF_8); }""");
HttpRequest.Builder requestBuilder = HttpRequest.newBuilder(uri).POST(bodyPublisher); HttpRequest.Builder requestBuilder = HttpRequest.newBuilder(uri).POST(bodyPublisher);
requestBuilder = requestBuilder.headers( requestBuilder = requestBuilder.headers(
"User-Agent", "Test Agent", "User-Agent", "Test Agent",
@ -970,19 +964,16 @@ import java.net.http.HttpRequest;
import java.net.http.HttpResponse; import java.net.http.HttpResponse;
import java.io.IOException; import java.io.IOException;
import com.google.gson.Gson;
import java.nio.charset.StandardCharsets;
public class Main { public class Main {
public static void main(String[] args) { public static void main(String[] args) {
try { try {
HttpClient client = HttpClient.newHttpClient(); HttpClient client = HttpClient.newHttpClient();
URI uri = URI.create("https://reqres.in/api/users/2"); URI uri = URI.create("https://reqres.in/api/users/2");
HttpRequest.BodyPublisher bodyPublisher = HttpRequest.BodyPublishers.ofString(new Gson().toJson(""" HttpRequest.BodyPublisher bodyPublisher = HttpRequest.BodyPublishers.ofString("""
{ {
"name": "morpheus", "name": "morpheus",
"job": "zion resident" "job": "zion resident"
}"""), StandardCharsets.UTF_8); }""");
HttpRequest.Builder requestBuilder = HttpRequest.newBuilder(uri).PUT(bodyPublisher); HttpRequest.Builder requestBuilder = HttpRequest.newBuilder(uri).PUT(bodyPublisher);
requestBuilder = requestBuilder.headers( requestBuilder = requestBuilder.headers(
"Content-Type", "application/json" "Content-Type", "application/json"
@ -1012,19 +1003,16 @@ import java.net.http.HttpRequest;
import java.net.http.HttpResponse; import java.net.http.HttpResponse;
import java.io.IOException; import java.io.IOException;
import com.google.gson.Gson;
import java.nio.charset.StandardCharsets;
public class Main { public class Main {
public static void main(String[] args) { public static void main(String[] args) {
try { try {
HttpClient client = HttpClient.newHttpClient(); HttpClient client = HttpClient.newHttpClient();
URI uri = URI.create("https://reqres.in/api/users/2"); URI uri = URI.create("https://reqres.in/api/users/2");
HttpRequest.BodyPublisher bodyPublisher = HttpRequest.BodyPublishers.ofString(new Gson().toJson(""" HttpRequest.BodyPublisher bodyPublisher = HttpRequest.BodyPublishers.ofString("""
{ {
"name": "marfeus", "name": "marfeus",
"job": "accountant" "job": "accountant"
}"""), StandardCharsets.UTF_8); }""");
HttpRequest.Builder requestBuilder = HttpRequest.newBuilder(uri).method("PATCH", bodyPublisher); HttpRequest.Builder requestBuilder = HttpRequest.newBuilder(uri).method("PATCH", bodyPublisher);
requestBuilder = requestBuilder.headers( requestBuilder = requestBuilder.headers(
"Content-Type", "application/json" "Content-Type", "application/json"
@ -1083,19 +1071,16 @@ import java.net.http.HttpRequest;
import java.net.http.HttpResponse; import java.net.http.HttpResponse;
import java.io.IOException; import java.io.IOException;
import com.google.gson.Gson;
import java.nio.charset.StandardCharsets;
public class Main { public class Main {
public static void main(String[] args) { public static void main(String[] args) {
try { try {
HttpClient client = HttpClient.newHttpClient(); HttpClient client = HttpClient.newHttpClient();
URI uri = URI.create("https://reqres.in/api/users/2"); URI uri = URI.create("https://reqres.in/api/users/2");
HttpRequest.BodyPublisher bodyPublisher = HttpRequest.BodyPublishers.ofString(new Gson().toJson(""" HttpRequest.BodyPublisher bodyPublisher = HttpRequest.BodyPublishers.ofString("""
{ {
"name": "marfeus", "name": "marfeus",
"job": "accountant" "job": "accountant"
}"""), StandardCharsets.UTF_8); }""");
HttpRequest.Builder requestBuilder = HttpRequest.newBuilder(uri).method("DELETE", bodyPublisher); HttpRequest.Builder requestBuilder = HttpRequest.newBuilder(uri).method("DELETE", bodyPublisher);
requestBuilder = requestBuilder.headers( requestBuilder = requestBuilder.headers(
"Content-Type", "application/json" "Content-Type", "application/json"