Skip to content
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

Jump to bottom

#4 Introduce BunqResponse #5

Merged
merged 6 commits into from
Aug 14, 2017
Merged

#4 Introduce BunqResponse #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
698df52
#4 switch to BunqResponse
dnl-blkv Aug 9, 2017
678cbba
#4 fix tests to work with BunqResponse
dnl-blkv Aug 9, 2017
58088f8
#4 generate missing models, objects and methods
dnl-blkv Aug 9, 2017
f8f503a
#4 resurrect response validation
dnl-blkv Aug 9, 2017
e7e1aa0
#4 remove junk lines
dnl-blkv Aug 9, 2017
626826a
#4 fix location of BunqResponse
dnl-blkv Aug 9, 2017
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
18 changes: 17 additions & 1 deletion .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/modules.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 18 additions & 4 deletions src/main/java/com/bunq/sdk/context/ApiContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.bunq.sdk.exception.BunqException;
import com.bunq.sdk.json.BunqGsonBuilder;
import com.bunq.sdk.model.DeviceServer;
import com.bunq.sdk.model.generated.DeviceServer;
import com.bunq.sdk.model.Installation;
import com.bunq.sdk.model.SessionServer;
import com.bunq.sdk.model.generated.Session;
Expand All @@ -18,7 +18,9 @@
import java.security.KeyPair;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.io.FileUtils;

/**
Expand Down Expand Up @@ -146,19 +148,31 @@ private void initializeInstallation() {
Installation installation = Installation.create(
this,
SecurityUtils.getPublicKeyFormattedString(keyPairClient.getPublic())
);
).getValue();
installationContext = new InstallationContext(installation, keyPairClient);
}

private void initializeDeviceRegistration(String deviceDescription, List<String> permittedIps) {
DeviceServer.create(this, deviceDescription, permittedIps);
Map<String, Object> deviceServerRequestBody = generateDeviceServerRequestBodyBytes(
deviceDescription, permittedIps);
DeviceServer.create(this, deviceServerRequestBody);
}

private Map<String, Object> generateDeviceServerRequestBodyBytes(String description,
List<String> permittedIps) {
HashMap<String, Object> deviceServerRequestBody = new HashMap<>();
deviceServerRequestBody.put(DeviceServer.FIELD_DESCRIPTION, description);
deviceServerRequestBody.put(DeviceServer.FIELD_SECRET, apiKey);
deviceServerRequestBody.put(DeviceServer.FIELD_PERMITTED_IPS, permittedIps);

return deviceServerRequestBody;
}

/**
* Create a new session and its data in a SessionContext.
*/
private void initializeSession() {
sessionContext = new SessionContext(SessionServer.create(this));
sessionContext = new SessionContext(SessionServer.create(this).getValue());
}

/**
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/com/bunq/sdk/examples/AttachmentPublicExample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.bunq.sdk.context.ApiContext;
import com.bunq.sdk.http.ApiClient;
import com.bunq.sdk.http.BunqResponse;
import com.bunq.sdk.model.generated.AttachmentPublic;
import com.bunq.sdk.model.generated.AttachmentPublicContent;
import java.io.File;
Expand Down Expand Up @@ -32,9 +33,9 @@ public static void main(String[] args) throws IOException {

try {
byte[] requestBytes = FileUtils.readFileToByteArray(new File(PATH_ATTACHMENT_IN));
String uuid = AttachmentPublic.create(apiContext, requestBytes, customHeaders);
byte[] responseBytes = AttachmentPublicContent.list(apiContext, uuid);
FileUtils.writeByteArrayToFile(new File(PATH_ATTACHMENT_OUT), responseBytes);
String uuid = AttachmentPublic.create(apiContext, requestBytes, customHeaders).getValue();
BunqResponse<byte[]> response = AttachmentPublicContent.list(apiContext, uuid);
FileUtils.writeByteArrayToFile(new File(PATH_ATTACHMENT_OUT), response.getValue());
apiContext.save();
} catch (IOException exception) {
System.out.print(exception.getMessage());
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/bunq/sdk/examples/CardDebitExample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public static void main(String[] args) throws IOException {
pointer.setName(POINTER_NAME_TEST);
requestMap.put(CardDebit.FIELD_ALIAS, pointer);

System.out.println(CardDebit.create(apiContext, requestMap, USER_ITEM_ID).getId());
System.out.println(CardDebit.create(apiContext, requestMap, USER_ITEM_ID).getValue().getId());
}

private static String generateRandomSecondLine() {
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/com/bunq/sdk/examples/CustomerStatementExportExample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,11 @@ public static void main(String[] args) {
Date dateEnd = new Date();

customerStatementMap.put(CustomerStatementExport.FIELD_DATE_END, formatDate.format(dateEnd));
int userId = User.list(apiContext).get(INDEX_FIRST).getUserCompany().getId();
int monetaryAccountId = MonetaryAccountBank.list(apiContext, userId).get(INDEX_FIRST).getId();
int userId = User.list(apiContext).getValue().get(INDEX_FIRST).getUserCompany().getId();
int monetaryAccountId = MonetaryAccountBank.list(apiContext, userId).getValue().get(INDEX_FIRST)
.getId();
int customerStatementId = CustomerStatementExport.create(apiContext, customerStatementMap,
userId, monetaryAccountId);
userId, monetaryAccountId).getValue();

CustomerStatementExport.delete(apiContext, userId, monetaryAccountId, customerStatementId);

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/bunq/sdk/examples/MonetaryAccountExample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public static void main(String[] args) {
apiContext,
USER_ITEM_ID,
MONETARY_ACCOUNT_ITEM_ID
);
).getValue();

System.out.println(monetaryAccount.getMonetaryAccountBank());
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/bunq/sdk/examples/PaymentBatchExample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public static void main(String[] args) {
paymentBatchMap,
USER_ITEM_ID,
MONETARY_ACCOUNT_ITEM_ID
);
).getValue();

System.out.println(
PaymentBatch.get(apiContext, USER_ITEM_ID, MONETARY_ACCOUNT_ITEM_ID, paymentBatchId)
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/com/bunq/sdk/examples/PaymentExample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ public static void main(String[] args) {
generateExamplePaymentMap(),
USER_ITEM_ID,
MONETARY_ACCOUNT_ITEM_ID
);
Payment payment = Payment.get(apiContext, USER_ITEM_ID, MONETARY_ACCOUNT_ITEM_ID, paymentId);
).getValue();
Payment payment = Payment.get(apiContext, USER_ITEM_ID, MONETARY_ACCOUNT_ITEM_ID, paymentId)
.getValue();
System.out.println(payment);
}

Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/bunq/sdk/examples/PaymentListExample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ public class PaymentListExample {
*/
public static void main(String[] args) {
ApiContext apiContext = ApiContext.restore(API_CONTEXT_FILE_PATH);
List<Payment> payments = Payment.list(apiContext, USER_ITEM_ID, MONETARY_ACCOUNT_ITEM_ID);
List<Payment> payments = Payment.list(apiContext, USER_ITEM_ID, MONETARY_ACCOUNT_ITEM_ID)
.getValue();
printPayments(payments);
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/bunq/sdk/examples/RequestExample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public static void main(String[] args) {
requestMap,
USER_ITEM_ID,
MONETARY_ACCOUNT_ITEM_ID
);
).getValue();

System.out.println(
RequestInquiry.get(apiContext, USER_ITEM_ID, MONETARY_ACCOUNT_ITEM_ID, requestId)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/bunq/sdk/examples/UserListExample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class UserListExample {
*/
public static void main(String[] args) {
ApiContext apiContext = ApiContext.restore(API_CONTEXT_FILE_PATH);
List<User> users = User.list(apiContext);
List<User> users = User.list(apiContext).getValue();
apiContext.save();

for (User oneUser : users) {
Expand Down
Loading