Skip to content
This repository is currently being migrated. It's locked while the migration is in progress.
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
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>com.hyperwallet</groupId>
<artifactId>sdk</artifactId>
<version>1.6.2-SNAPSHOT</version>
<version>1.7.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>hyperwallet-java-sdk</name>
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/com/hyperwallet/clientsdk/Hyperwallet.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*/
public class Hyperwallet {

public static final String VERSION = "1.4.2";
public static final String VERSION = "1.7.0";

private final HyperwalletApiClient apiClient;
private final String programToken;
Expand Down Expand Up @@ -840,6 +840,7 @@ public HyperwalletStatusTransition deactivatePaperCheck(String userToken, String
*
* @param userToken User token
* @param paperCheckToken Paper Check token
* @param notes notes for deactivating paper check
* @return The status transition
*/
public HyperwalletStatusTransition deactivatePaperCheck(String userToken, String paperCheckToken, String notes) {
Expand Down Expand Up @@ -1000,6 +1001,7 @@ public HyperwalletList<HyperwalletTransfer> listTransfers() {
* Create Transfer Status Transition
*
* @param transferToken Transfer token assigned
* @param transition HyperwalletStatusTransition object passed
* @return HyperwalletStatusTransition new status for Transfer Request
*/
public HyperwalletStatusTransition createTransferStatusTransition(String transferToken, HyperwalletStatusTransition transition) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,22 @@
import java.io.IOException;
import java.text.ParseException;
import java.util.HashMap;
import java.util.UUID;

public class HyperwalletApiClient {

private static final String CONTENT_TYPE_HEADER = "Content-Type";
private static final String VALID_JSON_CONTENT_TYPE = "application/json";
private static final String VALID_JSON_JOSE_CONTENT_TYPE = "application/jose+json";
private static final String SDK_TYPE = "java";

private final String username;
private final String password;
private final String version;
private final HyperwalletEncryption hyperwalletEncryption;
private final boolean isEncrypted;
private final String contextId;


public HyperwalletApiClient(final String username, final String password, final String version) {
this(username, password, version, null);
Expand All @@ -35,6 +39,7 @@ public HyperwalletApiClient(final String username, final String password, final
this.version = version;
this.hyperwalletEncryption = hyperwalletEncryption;
this.isEncrypted = hyperwalletEncryption != null;
this.contextId = String.valueOf(UUID.randomUUID());

// TLS fix
if (System.getProperty("java.version").startsWith("1.7.")) {
Expand Down Expand Up @@ -156,18 +161,17 @@ private String getAuthorizationHeader() {

private Request getService(final String url, boolean isHttpGet) {
String contentType = "application/" + ((isEncrypted) ? "jose+json" : "json");
if (isHttpGet) {
return new Request(url)
.addHeader("Authorization", getAuthorizationHeader())
.addHeader("Accept", contentType)
.addHeader("User-Agent", "Hyperwallet Java SDK v" + version);
} else {
return new Request(url)
.addHeader("Authorization", getAuthorizationHeader())
.addHeader("Accept", contentType)
.addHeader("Content-Type", contentType)
.addHeader("User-Agent", "Hyperwallet Java SDK v" + version);
Request request = new Request(url)
.addHeader("Authorization", getAuthorizationHeader())
.addHeader("Accept", contentType)
.addHeader("User-Agent", "Hyperwallet Java SDK v" + this.version)
.addHeader("x-sdk-version", this.version)
.addHeader("x-sdk-type", SDK_TYPE)
.addHeader("x-sdk-contextId", this.contextId);
if (!isHttpGet) {
request.addHeader("Content-Type", contentType);
}
return request;
}

private <T> T convert(final String responseBody, final Class<T> type) {
Expand Down Expand Up @@ -195,5 +199,4 @@ private String decryptResponse(String responseBody) throws ParseException, IOExc
}
return isEncrypted ? hyperwalletEncryption.decrypt(responseBody) : responseBody;
}

}
}