Skip to content

feat: java 8 compatibility #15

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

Merged
merged 4 commits into from
Oct 28, 2025
Merged

feat: java 8 compatibility #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
50a36f1
fix: add backwards compatibility for >= Java 8
DanielHougaard Oct 28, 2025
b608bfd
testing
DanielHougaard Oct 28, 2025
4e2e681
Revert "testing"
DanielHougaard Oct 28, 2025
8b6b189
Update pom.xml
DanielHougaard Oct 28, 2025
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
33 changes: 21 additions & 12 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.1.3</version>
<relativePath/> <!-- lookup parent from repository -->
<relativePath /> <!-- lookup parent from repository -->
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.infisical</groupId>
Expand Down Expand Up @@ -32,7 +35,8 @@
</developers>
<scm>
<connection>scm:git:git://github.com/infisical/java-sdk.git</connection>
<developerConnection>scm:git:ssh://git@github.com/infiscial/java-sdk.git</developerConnection>
<developerConnection
>scm:git:ssh://git@github.com/infiscial/java-sdk.git</developerConnection>
<url>https://github.com/infisical/java-sdk/</url>
</scm>

Expand All @@ -48,8 +52,12 @@
</distributionManagement>

<properties>
<maven.compiler.release>21</maven.compiler.release>
<java.version>21</java.version>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<maven.compiler.release>8</maven.compiler.release>


<!-- <maven.compiler.release>21</maven.compiler.release> -->
<okhttp-version>2.7.5</okhttp-version>
<gson-version>2.8.9</gson-version>
<gson-fire-version>1.8.3</gson-fire-version>
Expand Down Expand Up @@ -82,20 +90,20 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>1.5.19</version>
<version>1.3.14</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>2.1.0-alpha1</version>
<version>2.0.9</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.5.19</version>
<version>1.3.14</version>
</dependency>

<!-- HTTP request dependencies-->
Expand Down Expand Up @@ -152,7 +160,7 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<release>21</release>
<release>8</release>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
Expand Down Expand Up @@ -182,7 +190,7 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<release>21</release>
<release>8</release>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
Expand Down Expand Up @@ -235,7 +243,8 @@
<arg>--pinentry-mode</arg>
<arg>loopback</arg>
</gpgArguments>
<passphrase>${env.MAVEN_GPG_PASSPHRASE}</passphrase> <!-- GPG passphrase from environment -->
<passphrase
>${env.MAVEN_GPG_PASSPHRASE}</passphrase> <!-- GPG passphrase from environment -->
</configuration>
</execution>
</executions>
Expand Down
48 changes: 23 additions & 25 deletions src/main/java/com/infisical/sdk/api/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.google.gson.Gson;
import com.infisical.sdk.util.InfisicalException;
import com.squareup.okhttp.*;
import com.squareup.okhttp.Request;
import java.io.IOException;
import java.util.Map;

Expand Down Expand Up @@ -69,20 +70,19 @@ private String formatErrorMessage(Response response) throws IOException {
public <T, R> R post(String url, T requestBody, Class<R> responseType) throws InfisicalException {
try {
// convert request to json
var gson = new Gson();
Gson gson = new Gson();
String jsonBody = gson.toJson(requestBody);

// Build request
var requestBuilder =
new Request.Builder()
.url(url)
.post(RequestBody.create(JSON, jsonBody))
.header("Accept", "application/json");
Request.Builder requestBuilder = new Request.Builder()
.url(url)
.post(RequestBody.create(JSON, jsonBody))
.header("Accept", "application/json");

if (this.accessToken != null && !this.accessToken.isEmpty()) {
requestBuilder.addHeader("Authorization", "Bearer " + this.accessToken);
}
var request = requestBuilder.build();
Request request = requestBuilder.build();

Response response = client.newCall(request).execute();
try (ResponseBody responseBody = response.body()) {
Expand Down Expand Up @@ -111,14 +111,14 @@ public <R> R get(String baseUrl, Map<String, String> queryParams, Class<R> respo
queryParams.forEach(urlBuilder::addQueryParameter);
}

var requestBuilder =
new Request.Builder().url(urlBuilder.build()).get().header("Accept", "application/json");
Request.Builder requestBuilder = new Request.Builder().url(urlBuilder.build()).get().header("Accept",
"application/json");

if (this.accessToken != null && !this.accessToken.isEmpty()) {
requestBuilder.addHeader("Authorization", "Bearer " + this.accessToken);
}

var request = requestBuilder.build();
Request request = requestBuilder.build();

Response response = client.newCall(request).execute();
try (ResponseBody responseBody = response.body()) {
Expand All @@ -130,7 +130,7 @@ public <R> R get(String baseUrl, Map<String, String> queryParams, Class<R> respo
throw new IOException("Response body is null");
}

var gson = new Gson();
Gson gson = new Gson();
String responseJson = responseBody.string();
return gson.fromJson(responseJson, responseType);
}
Expand All @@ -143,20 +143,19 @@ public <T, R> R patch(String url, T requestBody, Class<R> responseType)
throws InfisicalException {
try {
// convert request to json
var gson = new Gson();
Gson gson = new Gson();
String jsonBody = gson.toJson(requestBody);

// Build request
var requestBuilder =
new Request.Builder()
.url(url)
.patch(RequestBody.create(JSON, jsonBody))
.header("Accept", "application/json");
Request.Builder requestBuilder = new Request.Builder()
.url(url)
.patch(RequestBody.create(JSON, jsonBody))
.header("Accept", "application/json");

if (this.accessToken != null && !this.accessToken.isEmpty()) {
requestBuilder.addHeader("Authorization", "Bearer " + this.accessToken);
}
var request = requestBuilder.build();
Request request = requestBuilder.build();

Response response = client.newCall(request).execute();
try (ResponseBody responseBody = response.body()) {
Expand All @@ -180,20 +179,19 @@ public <T, R> R delete(String url, T requestBody, Class<R> responseType)
throws InfisicalException {
try {
// convert request to json
var gson = new Gson();
Gson gson = new Gson();
String jsonBody = gson.toJson(requestBody);

// Build request
var requestBuilder =
new Request.Builder()
.url(url)
.delete(RequestBody.create(JSON, jsonBody))
.header("Accept", "application/json");
Request.Builder requestBuilder = new Request.Builder()
.url(url)
.delete(RequestBody.create(JSON, jsonBody))
.header("Accept", "application/json");

if (this.accessToken != null && !this.accessToken.isEmpty()) {
requestBuilder.addHeader("Authorization", "Bearer " + this.accessToken);
}
var request = requestBuilder.build();
Request request = requestBuilder.build();

Response response = client.newCall(request).execute();
try (ResponseBody responseBody = response.body()) {
Expand Down
Loading