Skip to content

Commit

Permalink
Merge pull request #43 from hyperwallet/feature/HW-54847-remove-relat…
Browse files Browse the repository at this point in the history
…ionship-field-from-server-sdk

HW-54847 Remove Relationship field from Server SDK
  • Loading branch information
yherasym-hw committed Nov 22, 2019
2 parents 7072c57 + 540dd0e commit eb5fd8c
Show file tree
Hide file tree
Showing 13 changed files with 3 additions and 86 deletions.
7 changes: 3 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
language: java
jdk:
- oraclejdk8
- openjdk7
- openjdk8
after_success:
- if [ $TRAVIS_JDK_VERSION = 'oraclejdk7' ] && [ $TRAVIS_BRANCH = 'master' ] && [ $TRAVIS_PULL_REQUEST = 'false' ]; then sh ./scripts/travisPublishDocs.sh; fi
- if [ $TRAVIS_JDK_VERSION = 'oraclejdk7' ]; then mvn clean cobertura:cobertura coveralls:report; fi
- if [ $TRAVIS_JDK_VERSION = 'openjdk8' ] && [ $TRAVIS_BRANCH = 'master' ] && [ $TRAVIS_PULL_REQUEST = 'false' ]; then sh ./scripts/travisPublishDocs.sh; fi
- if [ $TRAVIS_JDK_VERSION = 'openjdk8' ]; then mvn clean cobertura:cobertura coveralls:report; fi
env:
global:
secure: LsOj/2HbbRfMvUQd2RMR6ycM8BLn4SrnGtaitR3cJfqkoi25GuiLQBVv19XaAe0FWyrkX8YE9ciVLtVX1lQ1fx3BTMrSbCVhmV5I3AE2gK1sKaC598SlRflUPY6kl97/UNAHE+5JlMv7op66syngQgaZ+eKVxoo69o1SqxC5CqdyC+zrEgzj1q5JA2y+/R/k2lkGFus6qJCbADEmiChoWyBN99Kmw+lhW9HSan/+bbmwpe99TlvHOX+CrXlHTq9T/4VCRRJL1OYi6eI5npWGU3UzmWnNab3vBRl/B67AC2mbH8Y1da/uxgjY/1uxNVfB4FoiGQwZodcV3pSzt3tGcPM7ONIsodWJpcZ0h2Lp1J1tZBGMfg9yiL98guDJuFF+kCGrTgpTm58c26yT6U7ezL/L5d1uX8FUyCn3F9Du6cQ+VRwwgx6Km8n1Xd6/l5AQzCYwVqZq+gsgavqHiYAAJ6MaUJ6vkR9COzK2bi/2qjprHrC4ftRdzVgPkVCLnz/YiSA54xJsz1Y5HOIyYJF2UEWd+BRfGSZC7Z1sbNyCh38OnAJSU1ECV3f+ROCZjNyad5GYfAvIsjNPuY+4IuMCR9WWHfTLDFg3DYJFzppCmYfE6utVGJF7Wlm/vb1qlRbHhHLnVhf11UagRkojWDss14h0PQGY+dOOxR8hGCiXbyQ=
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ public static enum Status {ACTIVATED, INVALID, DE_ACTIVATED}
private String branchName;
private String branchId;
private String bankAccountId;
private HyperwalletTransferMethod.BankAccountRelationship bankAccountRelationship;
private String bankAccountPurpose;

private String branchAddressLine1;
Expand Down Expand Up @@ -311,27 +310,6 @@ public HyperwalletBankAccount clearBankAccountId() {
return this;
}

public HyperwalletTransferMethod.BankAccountRelationship getBankAccountRelationship() {
return bankAccountRelationship;
}

public void setBankAccountRelationship(HyperwalletTransferMethod.BankAccountRelationship bankAccountRelationship) {
addField("bankAccountRelationship", bankAccountRelationship);
this.bankAccountRelationship = bankAccountRelationship;
}

public HyperwalletBankAccount bankAccountRelationship(HyperwalletTransferMethod.BankAccountRelationship bankAccountRelationship) {
addField("bankAccountRelationship", bankAccountRelationship);
this.bankAccountRelationship = bankAccountRelationship;
return this;
}

public HyperwalletBankAccount clearBankAccountRelationship() {
clearField("bankAccountRelationship");
bankAccountRelationship = null;
return this;
}

public String getBankAccountPurpose() {
return bankAccountPurpose;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ public enum GovernmentIdType {PASSPORT,NATIONAL_ID_CARD}
private Boolean isDefaultTransferMethod;
private String addressLine1;
private String addressLine2;
private HyperwalletTransferMethod.BankAccountRelationship bankAccountRelationship;
private HyperwalletUser.BusinessContactRole businessContactRole;
private String businessName;
private String businessRegistrationCountry;
Expand Down Expand Up @@ -245,27 +244,6 @@ public HyperwalletPaperCheck clearAddressLine2() {
return this;
}

public HyperwalletTransferMethod.BankAccountRelationship getBankAccountRelationship() {
return bankAccountRelationship;
}

public void setBankAccountRelationship(HyperwalletTransferMethod.BankAccountRelationship bankAccountRelationship) {
addField("bankAccountRelationship", bankAccountRelationship);
this.bankAccountRelationship = bankAccountRelationship;
}

public HyperwalletPaperCheck bankAccountRelationship(HyperwalletTransferMethod.BankAccountRelationship bankAccountRelationship) {
addField("bankAccountRelationship", bankAccountRelationship);
this.bankAccountRelationship = bankAccountRelationship;
return this;
}

public HyperwalletPaperCheck clearBankAccountRelationship() {
clearField("bankAccountRelationship");
this.bankAccountRelationship = null;
return this;
}

public HyperwalletUser.BusinessContactRole getBusinessContactRole() {
return businessContactRole;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ public enum Type {BANK_ACCOUNT, WIRE_ACCOUNT, PREPAID_CARD, BANK_CARD, PAPER_CHE

public enum Status {ACTIVATED, INVALID, DE_ACTIVATED, PRE_ACTIVATED, SUSPENDED, LOST_OR_STOLEN, QUEUED, DECLINED, LOCKED, COMPLIANCE_HOLE, KYC_HOLD, VERIFIED}

public enum BankAccountRelationship {SELF, JOINT_ACCOUNT, SPOUSE, RELATIVE, BUSINESS_PARTNER, UPLINE, DOWNLINE, OTHER, OWN_COMPANY, BILL_PAYMENT}

public enum CardType {PERSONALIZED, INSTANT_ISSUE, VIRTUAL}

private String token;
Expand All @@ -33,7 +31,6 @@ public enum CardType {PERSONALIZED, INSTANT_ISSUE, VIRTUAL}
private String branchName;
private String branchId;
private String bankAccountId;
private BankAccountRelationship bankAccountRelationship;
private String bankAccountPurpose;
private String branchAddressLine1;
private String branchAddressLine2;
Expand Down Expand Up @@ -318,27 +315,6 @@ public HyperwalletTransferMethod clearBankAccountId() {
return this;
}

public BankAccountRelationship getBankAccountRelationship() {
return bankAccountRelationship;
}

public void setBankAccountRelationship(BankAccountRelationship bankAccountRelationship) {
addField("bankAccountRelationship", bankAccountRelationship);
this.bankAccountRelationship = bankAccountRelationship;
}

public HyperwalletTransferMethod bankAccountRelationship(BankAccountRelationship bankAccountRelationship) {
addField("bankAccountRelationship", bankAccountRelationship);
this.bankAccountRelationship = bankAccountRelationship;
return this;
}

public HyperwalletTransferMethod clearBankAccountRelationship() {
clearField("bankAccountRelationship");
bankAccountRelationship = null;
return this;
}

public String getBankAccountPurpose() {
return bankAccountPurpose;
}
Expand Down
4 changes: 0 additions & 4 deletions src/test/java/com/hyperwallet/clientsdk/HyperwalletIT.java
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,6 @@ public void testCreatePaperCheck() throws Exception {
assertThat(returnValue.getCreatedOn(), is(equalTo(dateFormat.parse("2017-10-31T22:32:57 UTC"))));
assertThat(returnValue.getTransferMethodCountry(), is(equalTo("US")));
assertThat(returnValue.getTransferMethodCurrency(), is(equalTo("USD")));
assertThat(returnValue.getBankAccountRelationship(), is(equalTo(HyperwalletTransferMethod.BankAccountRelationship.SELF)));
assertThat(returnValue.getProfileType(), is(equalTo(HyperwalletUser.ProfileType.INDIVIDUAL)));
assertThat(returnValue.getFirstName(), is(equalTo("Some")));
assertThat(returnValue.getLastName(), is(equalTo("Guy")));
Expand Down Expand Up @@ -442,7 +441,6 @@ public void testUpdatePaperCheck() throws Exception {
assertThat(returnValue.getCreatedOn(), is(equalTo(dateFormat.parse("2017-10-31T22:42:46 UTC"))));
assertThat(returnValue.getTransferMethodCountry(), is(equalTo("US")));
assertThat(returnValue.getTransferMethodCurrency(), is(equalTo("USD")));
assertThat(returnValue.getBankAccountRelationship(), is(equalTo(HyperwalletTransferMethod.BankAccountRelationship.SELF)));
assertThat(returnValue.getProfileType(), is(equalTo(HyperwalletUser.ProfileType.INDIVIDUAL)));
assertThat(returnValue.getFirstName(), is(equalTo("Some")));
assertThat(returnValue.getLastName(), is(equalTo("Guy")));
Expand Down Expand Up @@ -475,7 +473,6 @@ public void testGetPaperCheck() throws Exception {
assertThat(returnValue.getCreatedOn(), is(equalTo(dateFormat.parse("2017-10-31T22:32:57 UTC"))));
assertThat(returnValue.getTransferMethodCountry(), is(equalTo("US")));
assertThat(returnValue.getTransferMethodCurrency(), is(equalTo("USD")));
assertThat(returnValue.getBankAccountRelationship(), is(equalTo(HyperwalletTransferMethod.BankAccountRelationship.SELF)));
assertThat(returnValue.getProfileType(), is(equalTo(HyperwalletUser.ProfileType.INDIVIDUAL)));
assertThat(returnValue.getFirstName(), is(equalTo("Some")));
assertThat(returnValue.getLastName(), is(equalTo("Guy")));
Expand Down Expand Up @@ -508,7 +505,6 @@ public void testListPaperCheck() throws Exception {
assertThat(returnValue.getData().get(0).getCreatedOn(), is(equalTo(dateFormat.parse("2017-10-31T22:32:57 UTC"))));
assertThat(returnValue.getData().get(0).getTransferMethodCountry(), is(equalTo("US")));
assertThat(returnValue.getData().get(0).getTransferMethodCurrency(), is(equalTo("USD")));
assertThat(returnValue.getData().get(0).getBankAccountRelationship(), is(equalTo(HyperwalletTransferMethod.BankAccountRelationship.SELF)));
assertThat(returnValue.getData().get(0).getProfileType(), is(equalTo(HyperwalletUser.ProfileType.INDIVIDUAL)));
assertThat(returnValue.getData().get(0).getFirstName(), is(equalTo("Some")));
assertThat(returnValue.getData().get(0).getLastName(), is(equalTo("Guy")));
Expand Down
3 changes: 0 additions & 3 deletions src/test/java/com/hyperwallet/clientsdk/HyperwalletTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -5431,7 +5431,6 @@ public void testCreateTransferMethod_CompletedUserToken() throws Exception{
assertThat(apiClientTransferMethod.getBranchName(), is(nullValue()));
assertThat(apiClientTransferMethod.getBranchId(), is(nullValue()));
assertThat(apiClientTransferMethod.getBankAccountId(), is(nullValue()));
assertThat(apiClientTransferMethod.getBankAccountRelationship(), is(nullValue()));
assertThat(apiClientTransferMethod.getBankAccountPurpose(), is(nullValue()));
assertThat(apiClientTransferMethod.getBranchAddressLine1(), is(nullValue()));
assertThat(apiClientTransferMethod.getBranchAddressLine2(), is(nullValue()));
Expand Down Expand Up @@ -5512,7 +5511,6 @@ public void testCreateTransferMethod_Completed() throws Exception{
assertThat(apiClientTransferMethod.getBranchName(), is(equalTo("test-branch-name")));
assertThat(apiClientTransferMethod.getBranchId(), is(equalTo("test-branch-id")));
assertThat(apiClientTransferMethod.getBankAccountId(), is(equalTo("test-bank-account-id")));
assertThat(apiClientTransferMethod.getBankAccountRelationship(), is(equalTo(HyperwalletTransferMethod.BankAccountRelationship.SELF)));
assertThat(apiClientTransferMethod.getBankAccountPurpose(), is(equalTo("test-bank-account-purpose")));
assertThat(apiClientTransferMethod.getBranchAddressLine1(), is(equalTo("test-branch-address-line1")));
assertThat(apiClientTransferMethod.getBranchAddressLine2(), is(equalTo("test-branch-address-line2")));
Expand Down Expand Up @@ -5574,7 +5572,6 @@ private HyperwalletTransferMethod createPrePopulatedTransferMethod() {
.branchName("test-branch-name")
.branchId("test-branch-id")
.bankAccountId("test-bank-account-id")
.bankAccountRelationship(HyperwalletTransferMethod.BankAccountRelationship.SELF)
.bankAccountPurpose("test-bank-account-purpose")
.branchAddressLine1("test-branch-address-line1")
.branchAddressLine2("test-branch-address-line2")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ protected HyperwalletBankAccount createBaseModel() {
.branchName("test-branch-name")
.branchId("test-branch-id")
.bankAccountId("test-bank-account-id")
.bankAccountRelationship(HyperwalletTransferMethod.BankAccountRelationship.SELF)
.bankAccountPurpose("test-bank-account-purpose")

.branchAddressLine1("test-branch-address-line1")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ protected HyperwalletPaperCheck createBaseModel() {

.addressLine1("test-address-line1")
.addressLine2("test-address-line2")
.bankAccountRelationship(HyperwalletTransferMethod.BankAccountRelationship.SELF)
.businessContactRole(HyperwalletUser.BusinessContactRole.OWNER)
.businessName("test-business-name")
.businessRegistrationCountry("test-business-registration-country")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ protected HyperwalletTransferMethod createBaseModel() {
.branchName("test-branch-name")
.branchId("test-branch-id")
.bankAccountId("test-bank-account-id")
.bankAccountRelationship(HyperwalletTransferMethod.BankAccountRelationship.SELF)
.bankAccountPurpose("test-bank-account-purpose")

.branchAddressLine1("test-branch-address-line1")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"createdOn": "2017-10-31T22:32:57",
"transferMethodCountry": "US",
"transferMethodCurrency": "USD",
"bankAccountRelationship": "SELF",
"profileType": "INDIVIDUAL",
"firstName": "Some",
"lastName": "Guy",
Expand Down
1 change: 0 additions & 1 deletion src/test/resources/integration/getPaperCheck-response.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"createdOn": "2017-10-31T22:32:57",
"transferMethodCountry": "US",
"transferMethodCurrency": "USD",
"bankAccountRelationship": "SELF",
"profileType": "INDIVIDUAL",
"firstName": "Some",
"lastName": "Guy",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"createdOn": "2017-10-31T22:32:57",
"transferMethodCountry": "US",
"transferMethodCurrency": "USD",
"bankAccountRelationship": "SELF",
"profileType": "INDIVIDUAL",
"firstName": "Some",
"lastName": "Guy",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"createdOn": "2017-10-31T22:42:46",
"transferMethodCountry": "US",
"transferMethodCurrency": "USD",
"bankAccountRelationship": "SELF",
"profileType": "INDIVIDUAL",
"firstName": "Some",
"lastName": "Guy",
Expand Down

0 comments on commit eb5fd8c

Please sign in to comment.