Skip to content

change version java jdk #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
brandoCarquin wants to merge 2 commits into
base: master
Choose a base branch
from
Open

change version java jdk #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b259b4c
change version java jdk
brandoCarquin Oct 15, 2024
eaf4d8f
change method deprecated
brandoCarquin Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@
</license>
</licenses>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<java.version>21</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
</properties>

<organization>
Expand Down Expand Up @@ -53,39 +54,39 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<version>1.50</version>
<version>1.70</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.9</version>
<version>2.11.0</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20230227</version>
<version>20240303</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>3.6.0</version>
<version>4.12.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.9.9</version>
<version>2.18.0</version>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-commons</artifactId>
<version>2.7.2</version>
<version>3.3.4</version>
</dependency>
</dependencies>

Expand Down Expand Up @@ -130,8 +131,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>8</source>
<target>8</target>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
</configuration>
</plugin>

Expand Down
37 changes: 9 additions & 28 deletions src/main/java/com/culqi/apioperation/ResponseHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -119,7 +119,7 @@ public ResponseCulqi create(String url, String jsonData, Map<String, String> 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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -177,7 +177,7 @@ public ResponseCulqi create(String url, String jsonData, String rsaId, Map<Strin
}
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)
Expand Down Expand Up @@ -205,7 +205,7 @@ public ResponseCulqi update(String url, String jsonData, String id) {
env = Config.X_CULQI_ENV_LIVE;
}
System.out.println(config.API_BASE+url+id);
RequestBody body = RequestBody.create(JSON, jsonData);
RequestBody body = RequestBody.create(jsonData, JSON);
Request request = new Request.Builder()
.url(config.API_BASE+url+id)
.header("Authorization","Bearer " + Culqi.secret_key)
Expand All @@ -230,7 +230,7 @@ public ResponseCulqi update(String url, String jsonData, String id, String rsaI
if(Culqi.secret_key.contains("live")) {
env = Config.X_CULQI_ENV_LIVE;
}
RequestBody body = RequestBody.create(JSON, jsonData);
RequestBody body = RequestBody.create(jsonData, JSON);
Request request = new Request.Builder()
.url(config.API_BASE+url+id)
.header("Authorization","Bearer " + Culqi.secret_key)
Expand Down Expand Up @@ -283,7 +283,7 @@ public ResponseCulqi capture(String url, String id) throws Exception {
if(Culqi.secret_key.contains("live")) {
env = Config.X_CULQI_ENV_LIVE;
}
RequestBody body = RequestBody.create(JSON, "");
RequestBody body = RequestBody.create("", JSON);
Request.Builder builder = new Request.Builder();
builder.url(config.API_BASE + url + id + "/capture/");
builder.header("Authorization", "Bearer " + Culqi.secret_key)
Expand All @@ -307,7 +307,7 @@ public ResponseCulqi capture(String url, String id, String jsonData, String rsaI
if(Culqi.secret_key.contains("live")) {
env = Config.X_CULQI_ENV_LIVE;
}
RequestBody body = RequestBody.create(JSON, jsonData);
RequestBody body = RequestBody.create(jsonData, JSON);
Request.Builder builder = new Request.Builder();
builder.url(config.API_BASE + url + id + "/capture/");
builder.header("Authorization", "Bearer " + Culqi.secret_key)
Expand All @@ -333,7 +333,7 @@ public ResponseCulqi confirm(String url, String id) throws Exception {
if(Culqi.public_key.contains("live")) {
env = Config.X_CULQI_ENV_LIVE;
}
RequestBody body = RequestBody.create(JSON, "");
RequestBody body = RequestBody.create("", JSON);
Request.Builder builder = new Request.Builder();
builder.url(config.API_BASE+url+id+"/confirm/");
builder.header("Authorization","Bearer " + Culqi.public_key)
Expand All @@ -359,25 +359,6 @@ private Request.Builder addCustomHeadersToRequest(Map<String, String> 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 = "";
Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/culqi/apioperation/service/Generic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.culqi.apioperation.service;

import java.io.IOException;
import java.util.Map;

import com.culqi.apioperation.All;
Expand Down