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

Separate account and prefix #36

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Separate account and prefix #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
695e982
Separate Bank account number from number prefix for czech and slovak …
May 17, 2017
1590f45
Revert organized imports
May 17, 2017
3ad3c41
Tests with account separated from prefix
May 17, 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
29 changes: 29 additions & 0 deletions src/main/java/org/iban4j/Iban.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,15 @@ public String getCheckDigit() {
return IbanUtil.getCheckDigit(value);
}

/**
* Returns iban's account number prefix.
*
* @return accountNumberPrefix String
*/
public String getAccountNumberPrefix() {
return IbanUtil.getAccountNumberPrefix(value);
}

/**
* Returns iban's account number.
*
Expand Down Expand Up @@ -224,6 +233,7 @@ public final static class Builder {
private String branchCode;
private String nationalCheckDigit;
private String accountType;
private String accountNumberPrefix;
private String accountNumber;
private String ownerAccountType;
private String identificationNumber;
Expand Down Expand Up @@ -269,6 +279,17 @@ public Builder branchCode(final String branchCode) {
return this;
}

/**
* Sets iban's account number prefix
*
* @param accountNumberPrefix String
* @return builder Builder
*/
public Builder accountNumberPrefix(final String accountNumberPrefix) {
this.accountNumberPrefix = accountNumberPrefix;
return this;
}

/**
* Sets iban's account number.
*
Expand Down Expand Up @@ -406,6 +427,9 @@ private String formatBban() {
case branch_code:
sb.append(branchCode);
break;
case account_number_prefix:
sb.append(accountNumberPrefix);
break;
case account_number:
sb.append(accountNumber);
break;
Expand Down Expand Up @@ -477,6 +501,11 @@ private void fillMissingFieldsRandomly() {
branchCode = entry.getRandom();
}
break;
case account_number_prefix:
if (accountNumberPrefix == null) {
accountNumberPrefix = entry.getRandom();
}
break;
case account_number:
if (accountNumber == null) {
accountNumber = entry.getRandom();
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/org/iban4j/IbanUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,16 @@ public static String getBban(final String iban) {
return iban.substring(BBAN_INDEX);
}

/**
* Returns iban's account number.
*
* @param iban String
* @return accountNumberPrefix String
*/
public static String getAccountNumberPrefix(final String iban) {
return extractBbanEntry(iban, BbanEntryType.account_number_prefix);
}

/**
* Returns iban's account number.
*
Expand Down
1 change: 1 addition & 0 deletions src/main/java/org/iban4j/bban/BbanEntryType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
public enum BbanEntryType {
bank_code,
branch_code,
account_number_prefix,
account_number,
national_check_digit,
account_type,
Expand Down
14 changes: 10 additions & 4 deletions src/main/java/org/iban4j/bban/BbanStructure.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,13 @@
*/
package org.iban4j.bban;

import org.iban4j.CountryCode;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.EnumMap;
import java.util.List;

import java.util.*;
import org.iban4j.CountryCode;


/**
Expand Down Expand Up @@ -118,7 +122,8 @@ private BbanStructure(final BbanStructureEntry... entries) {
structures.put(CountryCode.CZ,
new BbanStructure(
BbanStructureEntry.bankCode(4, 'n'),
BbanStructureEntry.accountNumber(16, 'n')));
BbanStructureEntry.accountNumberPrefix(6, 'n'),
BbanStructureEntry.accountNumber(10, 'n')));

structures.put(CountryCode.DK,
new BbanStructure(
Expand Down Expand Up @@ -370,7 +375,8 @@ private BbanStructure(final BbanStructureEntry... entries) {
structures.put(CountryCode.SK,
new BbanStructure(
BbanStructureEntry.bankCode(4, 'n'),
BbanStructureEntry.accountNumber(16, 'n')));
BbanStructureEntry.accountNumberPrefix(6, 'n'),
BbanStructureEntry.accountNumber(10, 'n')));

structures.put(CountryCode.SI,
new BbanStructure(
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/org/iban4j/bban/BbanStructureEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ public static BbanStructureEntry branchCode(final int length, final char charact
EntryCharacterType.valueOf(String.valueOf(characterType)), length);
}

public static BbanStructureEntry accountNumberPrefix(final int length, final char characterType) {
return new BbanStructureEntry(BbanEntryType.account_number_prefix,
EntryCharacterType.valueOf(String.valueOf(characterType)), length);
}

public static BbanStructureEntry accountNumber(final int length, final char characterType) {
return new BbanStructureEntry(BbanEntryType.account_number,
EntryCharacterType.valueOf(String.valueOf(characterType)), length);
Expand Down
31 changes: 31 additions & 0 deletions src/test/java/org/iban4j/IbanTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,18 @@ public void ibanShouldReturnValidBankCode() {
assertThat(iban.getBankCode(), is(equalTo("19043")));
}

@Test
public void ibanShouldReturnValidAccountNumberPrefix() {
Iban iban = new Iban.Builder()
.countryCode(CountryCode.SK)
.bankCode("1200")
.accountNumberPrefix("000019")
.accountNumber("8742637541")
.build();

assertThat(iban.getAccountNumberPrefix(), is(equalTo("000019")));
}

@Test
public void ibanShouldReturnValidAccountNumber() {
Iban iban = new Iban.Builder()
Expand Down Expand Up @@ -377,6 +389,16 @@ public void ibanConstructionWithShortBankCodeShouldThrowException() {
.build();
}

@Test(expected = IbanFormatException.class)
public void ibanConstructionWithShortAccountPrefixShouldThrowException() {
new Iban.Builder()
.countryCode(CountryCode.SK)
.bankCode("1200")
.accountNumberPrefix("19")
.accountNumber("8742637541")
.build();
}

@Test(expected = IbanFormatException.class)
public void ibanConstructionWithShortBankCodeShouldThrowExceptionIfValidationRequested() {
new Iban.Builder()
Expand Down Expand Up @@ -412,6 +434,15 @@ public void ibanContructionRandomRetainsSpecifiedBankCode() {
assertThat(iban.getBankCode(), is(equalTo("12345")));
}

@Test
public void ibanContructionRandomDoesNotOverwriteBankAccountPrefix() {
Iban iban = new Iban.Builder()
.countryCode(CountryCode.SK)
.accountNumberPrefix("078901")
.buildRandom();
assertThat(iban.getAccountNumberPrefix(), is(equalTo("078901")));
}

@Test
public void ibanContructionRandomDoesNotOverwriteBankAccount() {
Iban iban = new Iban.Builder()
Expand Down
6 changes: 4 additions & 2 deletions src/test/java/org/iban4j/TestDataHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@ public static Collection<Object[]> getIbanData() {
{new Iban.Builder()
.countryCode(CountryCode.CZ)
.bankCode("0800")
.accountNumber("0000192000145399")
.accountNumberPrefix("000019")
.accountNumber("2000145399")
.build(), "CZ6508000000192000145399"},
{new Iban.Builder()
.countryCode(CountryCode.DK)
Expand Down Expand Up @@ -342,7 +343,8 @@ public static Collection<Object[]> getIbanData() {
{new Iban.Builder()
.countryCode(CountryCode.SK)
.bankCode("1200")
.accountNumber("0000198742637541")
.accountNumberPrefix("000019")
.accountNumber("8742637541")
.build(), "SK3112000000198742637541"},
{new Iban.Builder()
.countryCode(CountryCode.SI)
Expand Down