diff --git a/pom.xml b/pom.xml index f699a9f..0a59a0e 100644 --- a/pom.xml +++ b/pom.xml @@ -20,8 +20,9 @@ - 8 - 8 + 21 + ${java.version} + ${java.version} @@ -53,39 +54,39 @@ org.bouncycastle bcpkix-jdk15on - 1.50 + 1.70 com.google.code.gson gson - 2.8.9 + 2.11.0 org.json json - 20230227 + 20240303 junit junit - 4.12 + 4.13.2 test com.squareup.okhttp3 okhttp - 3.6.0 + 4.12.0 com.fasterxml.jackson.core jackson-databind - 2.9.9 + 2.18.0 org.springframework.data spring-data-commons - 2.7.2 + 3.3.4 @@ -130,8 +131,8 @@ org.apache.maven.plugins maven-compiler-plugin - 8 - 8 + ${maven.compiler.source} + ${maven.compiler.target} diff --git a/src/main/java/com/culqi/apioperation/ResponseHelper.java b/src/main/java/com/culqi/apioperation/ResponseHelper.java index 16f4b9a..6f1a7d1 100644 --- a/src/main/java/com/culqi/apioperation/ResponseHelper.java +++ b/src/main/java/com/culqi/apioperation/ResponseHelper.java @@ -91,7 +91,7 @@ public ResponseCulqi list(String url, String params) { } String base_url = url.contains("tokens") ? config.API_SECURE : config.API_BASE; url = (url.contains("plans") || url.contains("subscriptions")) ? url + "create" : url; - RequestBody body = RequestBody.create(JSON, jsonData); + RequestBody body = RequestBody.create(jsonData, JSON); Request request = new Request.Builder() .url(base_url+url) .header("Authorization","Bearer " + api_key) @@ -119,7 +119,7 @@ public ResponseCulqi create(String url, String jsonData, Map cus } String base_url = url.contains("tokens") ? config.API_SECURE : config.API_BASE; url = (url.contains("plans") || url.contains("subscriptions")) ? url + "create" : url; - RequestBody body = RequestBody.create(JSON, jsonData); + RequestBody body = RequestBody.create(jsonData, JSON); Request.Builder builder = new Request.Builder() .url(base_url+url) .header("Authorization","Bearer " + api_key) @@ -148,7 +148,7 @@ public ResponseCulqi create(String url, String jsonData, String rsaId) { } String base_url = url.contains("tokens") ? config.API_SECURE : config.API_BASE; url = (url.contains("plans") || url.contains("subscriptions")) ? url + "create" : url; - RequestBody body = RequestBody.create(JSON, jsonData); + RequestBody body = RequestBody.create(jsonData, JSON); Request request = new Request.Builder() .url(base_url+url) .header("Authorization","Bearer " + api_key) @@ -177,7 +177,7 @@ public ResponseCulqi create(String url, String jsonData, String rsaId, Map customHead return builder; } - private String generateCurlCommand(Request request, String jsonData) { - StringBuilder curlCmd = new StringBuilder("curl -X ").append(request.method().toUpperCase() + " "); - - // Añadimos la URL - curlCmd.append("\"").append(request.url().toString()).append("\" "); - - // Añadimos los headers - for (String headerName : request.headers().names()) { - String headerValue = request.header(headerName); - curlCmd.append("-H \"").append(headerName).append(": ").append(headerValue).append("\" "); - } - - // Añadimos el body (si es necesario) - if (jsonData != null && !jsonData.isEmpty()) { - curlCmd.append("-d '").append(jsonData).append("' "); - } - - return curlCmd.toString(); - } private String exceptionError() { String result = ""; diff --git a/src/main/java/com/culqi/apioperation/service/Generic.java b/src/main/java/com/culqi/apioperation/service/Generic.java index 7e5f875..15168b5 100644 --- a/src/main/java/com/culqi/apioperation/service/Generic.java +++ b/src/main/java/com/culqi/apioperation/service/Generic.java @@ -1,6 +1,5 @@ package com.culqi.apioperation.service; -import java.io.IOException; import java.util.Map; import com.culqi.apioperation.All;