Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ Install the package using Maven:
<dependency>
<groupId>com.veryfi</groupId>
<artifactId>veryfi-java</artifactId>
<version>2.1.1</version>
<version>2.1.2</version>
</dependency>
```
Install the package using Gradle:
```bash
implementation group: 'com.veryfi', name: 'veryfi-java', version: '2.1.1'
implementation group: 'com.veryfi', name: 'veryfi-java', version: '2.1.2'
```

## Getting Started
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.veryfi</groupId>
<artifactId>veryfi-java</artifactId>
<version>2.1.1</version>
<version>2.1.2</version>
<packaging>jar</packaging>
<name>veryfi-java</name>
<description>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/veryfi/Constants.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ private Constants() {
/**
* header for HttpRequest
*/
public static final String USER_AGENT_JAVA = "Java Veryfi-Java/2.1.1";
public static final String USER_AGENT_JAVA = "Java Veryfi-Java/2.1.2";
/**
* header for HttpRequest
*/
Expand Down
44 changes: 38 additions & 6 deletions src/main/java/veryfi/NetworkClient.java
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
package veryfi;

import org.json.JSONArray;
import org.json.JSONObject;
import veryfi.enums.HttpMethod;

import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec;
import java.io.File;
import java.net.URI;
import java.net.URLEncoder;
import java.net.http.HttpClient;
import java.net.http.HttpHeaders;
import java.net.http.HttpRequest;
Expand Down Expand Up @@ -141,16 +143,46 @@ private HttpRequest getHttpRequest(HttpMethod httpVerb, String endpointName, JSO
.headers(headers.toArray(new String[0]))
.PUT(HttpRequest.BodyPublishers.ofString(requestArguments.toString()))
.build();
default -> request = HttpRequest.newBuilder()
.uri(URI.create(apiUrl))
.timeout(Duration.ofSeconds(timeOut))
.headers(headers.toArray(new String[0]))
.GET()
.build();
default -> {
String getUri = apiUrl;
String query = buildQueryString(requestArguments);
if (!query.isEmpty()) {
getUri = apiUrl + "?" + query;
}
request = HttpRequest.newBuilder()
.uri(URI.create(getUri))
.timeout(Duration.ofSeconds(timeOut))
.headers(headers.toArray(new String[0]))
.GET()
.build();
}
}
return request;
}

/**
* Builds an application/x-www-form-urlencoded query string from a JSON object (GET parameters).
*/
private static String buildQueryString(JSONObject requestArguments) {
if (requestArguments == null || requestArguments.isEmpty()) {
return "";
}
StringJoiner joiner = new StringJoiner("&");
for (String key : requestArguments.keySet()) {
Object value = requestArguments.opt(key);
if (value == null || JSONObject.NULL.equals(value)) {
continue;
}
String valueStr = (value instanceof JSONObject || value instanceof JSONArray)
? value.toString()
: String.valueOf(value);
joiner.add(URLEncoder.encode(key, StandardCharsets.UTF_8)
+ "="
+ URLEncoder.encode(valueStr, StandardCharsets.UTF_8));
}
return joiner.toString();
}

/**
* Prepares the headers needed for a request.
*
Expand Down
Loading