Resolve conflict

pom.xml

@@ -58,6 +58,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.release>8</maven.compiler.release>
         <jdk7Signature>java17</jdk7Signature>
         <skipSigning>true</skipSigning>
         <junit-jupiter.version>5.9.2</junit-jupiter.version>
@@ -125,7 +126,7 @@
                     <!-- Sets the VM argument line used when unit tests are run. -->
                     <argLine>${surefireArgLine}</argLine>
                     <!-- Skips unit tests if the value of skip.unit.tests property is true -->
-                    <skipTests>${skip.unit.tests}</skipTests>
+                    <skipTests>${skipTests}</skipTests>
                     <!-- Excludes integration tests when unit tests are run. -->
                     <excludes>
                         <exclude>**/IT*.java</exclude>
@@ -265,30 +266,6 @@
                 <version>2.5.3</version>
             </plugin>
 
-            <!-- Checking a project against API signatures  -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>animal-sniffer-maven-plugin</artifactId>
-                <version>1.22</version>
-                <executions>
-                    <execution>
-                        <id>check-java-api</id>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                        <configuration>
-                            <signature>
-                                <groupId>org.codehaus.mojo.signature
-                                </groupId>
-                                <artifactId>${jdk7Signature}</artifactId>
-                                <version>1.0</version>
-                            </signature>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>

src/main/java/org/iban4j/Iban.java

@@ -386,7 +386,7 @@ public Iban build(boolean validate) throws IbanFormatException,
                 IllegalArgumentException, UnsupportedCountryException {
 
             // null checks
-            require(countryCode, bankCode, accountNumber);
+            require(countryCode, bankCode, accountNumber, nationalCheckDigit);
 
             // iban is formatted with default check digit.
             final String formattedIban = formatIban();
@@ -486,7 +486,8 @@ private String formatIban() {
 
         private void require(final CountryCode countryCode,
                              final String bankCode,
-                             final String accountNumber)
+                             final String accountNumber,
+                             final String nationalCheckDigit)
                 throws IbanFormatException {
             if(countryCode == null) {
                 throw new IbanFormatException(COUNTRY_CODE_NOT_NULL,
@@ -502,6 +503,12 @@ private void require(final CountryCode countryCode,
                 throw new IbanFormatException(ACCOUNT_NUMBER_NOT_NULL,
                         "accountNumber is required; it cannot be null");
             }
+            if (BbanStructure.hasNationalCheckDigit(countryCode)) {
+                if (nationalCheckDigit == null) {
+                    throw new IbanFormatException(NATIONAL_CHECK_DIGIT_NOT_NULL,
+                            "nationalCheckDigit is required; it cannot be null");
+                }
+            }
         }
 
         private void fillMissingFieldsRandomly() {

src/main/java/org/iban4j/IbanFormatException.java

@@ -183,7 +183,8 @@ public static enum IbanFormatViolation {
         BBAN_ONLY_DIGITS_OR_LETTERS,
 
         BANK_CODE_NOT_NULL,
-        ACCOUNT_NUMBER_NOT_NULL
+        ACCOUNT_NUMBER_NOT_NULL,
+        NATIONAL_CHECK_DIGIT_NOT_NULL
 
     }
 }

src/main/java/org/iban4j/bban/BbanStructure.java

@@ -192,6 +192,12 @@ private BbanStructure(final BbanStructureEntry... entries) {
         structures.put(CountryCode.PM, BbanStructure.FRENCH_STRUCTURE);
         structures.put(CountryCode.WF, BbanStructure.FRENCH_STRUCTURE);
 
+        structures.put(CountryCode.GA,
+                new BbanStructure(
+                        BbanStructureEntry.bankCode(5, 'n'),
+                        BbanStructureEntry.branchCode(5, 'n'),
+                        BbanStructureEntry.accountNumber(13, 'c')));
+
         structures.put(CountryCode.GA,
                 new BbanStructure(
                         BbanStructureEntry.bankCode(5, 'n'),
@@ -534,6 +540,20 @@ public static BbanStructure forCountry(final CountryCode countryCode) {
         return structures.get(countryCode);
     }
 
+    /**
+     * Checks whether national Check digit is mandatory for specific country
+     *
+     * @param countryCode the country code
+     * @return true/false
+     */
+    public static boolean hasNationalCheckDigit(final CountryCode countryCode) {
+        Optional<BbanStructure> bbanStructure = Optional.ofNullable(forCountry(countryCode));
+        return bbanStructure.map(structure -> structure.getEntries()
+                .stream()
+                .anyMatch(e -> BbanEntryType.national_check_digit.equals(e.getEntryType())))
+                .orElse(false);
+    }
+
     public List<BbanStructureEntry> getEntries() {
         return Collections.unmodifiableList(Arrays.asList(entries));
     }

src/test/java/org/iban4j/BicUtilTest.java

@@ -20,6 +20,7 @@
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.iban4j.TestDataHelper.defaultExceptionMessage;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
@@ -29,7 +30,6 @@ public class BicUtilTest {
 
     public static class InvalidBicValidationTest {
 
-        String defaultExceptionMessage ="Expected doThing() to throw, but it didn't";
 
         @Test
         public void bicValidationWithNullShouldThrowException() {

src/test/java/org/iban4j/IbanTest.java

@@ -15,13 +15,13 @@
  */
 package org.iban4j;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import java.util.Random;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.*;
+import static org.iban4j.TestDataHelper.defaultExceptionMessage;
 import static org.junit.jupiter.api.Assertions.*;
 
 @DisplayName("Iban general test")
@@ -286,7 +286,6 @@ public void ibanConstructionRandom() {
         }
 
         @Test
-        @Disabled
         public void ibanConstructionSeeded() {
             assertIbanUtilRandomWithSeedEquals("FR87 8734 4468 89P1 RIYK UO5K 809", 1);
             assertIbanUtilRandomWithSeedEquals("FI79 2079 0697 8464 44", 2);
@@ -306,7 +305,6 @@ private static void assertIbanUtilRandomWithSeedEquals(
         }
 
         @Test
-        @Disabled
         public void ibanBuilderConstructionSeeded() {
             assertIbanBuilderRandomWithSeedEquals("FR87 8734 4468 89P1 RIYK UO5K 809", 1);
             assertIbanBuilderRandomWithSeedEquals("FI79 2079 0697 8464 44", 2);
@@ -416,5 +414,18 @@ public void ibanConstructionRandomDoesNotOverwriteIdentificationNumber() {
                     .buildRandom();
             assertThat(iban.getIdentificationNumber(), is(equalTo("1234567890")));
         }
+
+        @Test
+        public void ibanConstructionWithLackingNationalCheckDigitShouldThrowExceptionIfValidationRequested() {
+            IbanFormatException thrown = assertThrows(
+                    IbanFormatException.class,
+                    () ->                         new Iban.Builder()
+                            .countryCode(CountryCode.NO)
+                            .bankCode("4435")
+                            .accountNumber("0343730")
+                            .build(true),
+                    defaultExceptionMessage);
+            assertThat(thrown.getMessage(), containsString("nationalCheckDigit is required; it cannot be null"));
+        }
     }
 }

src/test/java/org/iban4j/TestDataHelper.java

@@ -19,6 +19,7 @@
 import java.util.Collection;
 
 final class TestDataHelper {
+    public static final String defaultExceptionMessage ="Expected doThing() to throw, but it didn't";
 
     private TestDataHelper() {
     }