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
12 changes: 4 additions & 8 deletions src/main/java/com/didww/sdk/DidwwClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
import com.didww.sdk.exception.DidwwClientException;
import com.didww.sdk.http.ApiKeyInterceptor;
import com.didww.sdk.http.JsonApiMediaType;
import com.didww.sdk.repository.BalanceRepository;
import com.didww.sdk.repository.ReadOnlyRepository;
import com.didww.sdk.repository.Repository;
import com.didww.sdk.repository.SingletonRepository;
import com.didww.sdk.resource.*;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
Expand Down Expand Up @@ -129,8 +129,8 @@ public ReadOnlyRepository<SupportingDocumentTemplate> supportingDocumentTemplate
}

// Singleton repository
public SingletonRepository<Balance> balance() {
return new SingletonRepository<>(httpClient, converter, baseUrl, "balance", Balance.class, objectMapper);
public BalanceRepository balance() {
return new BalanceRepository(httpClient, converter, baseUrl, "balance", objectMapper);
}
Comment on lines 131 to 134

// CRUD repositories
Expand Down Expand Up @@ -327,11 +327,7 @@ public void downloadAndDecompressExport(String url, Path destination) {
try (InputStream fis = Files.newInputStream(tempFile);
InputStream gzis = new GZIPInputStream(fis);
OutputStream out = Files.newOutputStream(destination)) {
byte[] buffer = new byte[8192];
int len;
while ((len = gzis.read(buffer)) != -1) {
out.write(buffer, 0, len);
}
gzis.transferTo(out);
}
} catch (IOException e) {
throw new DidwwClientException("Failed to download and decompress export", e);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.didww.sdk.exception.DidwwClientException;
import com.didww.sdk.http.QueryParams;
import com.didww.sdk.resource.Balance;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.jasminb.jsonapi.JSONAPIDocument;
import com.github.jasminb.jsonapi.ResourceConverter;
Expand All @@ -10,26 +11,25 @@
import okhttp3.Request;
import okhttp3.Response;

public class SingletonRepository<T> extends ReadOnlyRepository<T> {
public class BalanceRepository extends ReadOnlyRepository<Balance> {

public SingletonRepository(OkHttpClient httpClient, ResourceConverter converter,
String baseUrl, String endpoint, Class<T> resourceClass,
ObjectMapper objectMapper) {
super(httpClient, converter, baseUrl, endpoint, resourceClass, objectMapper);
public BalanceRepository(OkHttpClient httpClient, ResourceConverter converter,
String baseUrl, String endpoint, ObjectMapper objectMapper) {
super(httpClient, converter, baseUrl, endpoint, Balance.class, objectMapper);
}

public ApiResponse<T> find() {
public ApiResponse<Balance> find() {
return find((QueryParams) null);
}

public ApiResponse<T> find(QueryParams params) {
public ApiResponse<Balance> find(QueryParams params) {
String url = baseUrl + "/" + endpoint + (params != null ? params.toQueryString() : "");
Request request = new Request.Builder().url(url).get().build();

try (Response response = httpClient.newCall(request).execute()) {
handleErrorResponse(response);
byte[] body = getResponseBody(response);
JSONAPIDocument<T> document = converter.readDocument(body, resourceClass);
JSONAPIDocument<Balance> document = converter.readDocument(body, resourceClass);
return new ApiResponse<>(document.get(), extractMeta(document));
} catch (IOException e) {
throw new DidwwClientException("Failed to find " + endpoint, e);
Expand Down
3 changes: 1 addition & 2 deletions src/test/java/com/didww/sdk/resource/ExportTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,7 @@ void testDownloadAndDecompressExport() throws Exception {
try {
client.downloadAndDecompressExport(wireMock.baseUrl() + "/v3/exports/test-id.csv.gz", tempFile);
String content = Files.readString(tempFile);
assertThat(content).contains("Date/Time Start (UTC)");
assertThat(content).contains("972397239159652");
assertThat(content).isEqualTo(csvContent);
} finally {
Files.deleteIfExists(tempFile);
}
Expand Down
Loading