From 38041bbf0fda74dd7c7192816604f2b375eaeaae Mon Sep 17 00:00:00 2001
From: cooljj <1009839598@qq.com>
Date: Wed, 6 Apr 2022 20:13:37 +0800
Subject: [PATCH 01/11] Add battlefield1 feature. battlefield1.yml not
 complete.

---
 .../com/github/javafaker/Battlefield1.java    | 30 ++++++++++++++++
 src/main/java/com/github/javafaker/Faker.java |  6 ++++
 .../javafaker/service/files/EnFile.java       |  1 +
 src/main/resources/en/battlefield1.yml        |  8 +++++
 .../github/javafaker/Battlefield1Test.java    | 34 +++++++++++++++++++
 5 files changed, 79 insertions(+)
 create mode 100644 src/main/java/com/github/javafaker/Battlefield1.java
 create mode 100644 src/main/resources/en/battlefield1.yml
 create mode 100644 src/test/java/com/github/javafaker/Battlefield1Test.java

diff --git a/src/main/java/com/github/javafaker/Battlefield1.java b/src/main/java/com/github/javafaker/Battlefield1.java
new file mode 100644
index 00000000..7aed2d06
--- /dev/null
+++ b/src/main/java/com/github/javafaker/Battlefield1.java
@@ -0,0 +1,30 @@
+package com.github.javafaker;
+
+public class Battlefield1 {
+
+    private final Faker faker;
+
+    protected Battlefield1(final Faker faker) {
+        this.faker = faker;
+    }
+
+    public String classes() {
+        return faker.resolve("battlefield1.classes");
+    }
+
+    public String weapon() {
+        return faker.resolve("battlefield1.weapon");
+    }
+
+    public String vehicle() {
+        return faker.resolve("battlefield1.vehicle");
+    }
+
+    public String map() {
+        return faker.resolve("battlefield1.map");
+    }
+
+    public String faction() {
+        return faker.resolve("battlefield1.faction");
+    }
+}
diff --git a/src/main/java/com/github/javafaker/Faker.java b/src/main/java/com/github/javafaker/Faker.java
index 751fb779..b467e7ba 100644
--- a/src/main/java/com/github/javafaker/Faker.java
+++ b/src/main/java/com/github/javafaker/Faker.java
@@ -107,6 +107,7 @@ public class Faker {
     private final Sip sip;
     private final EnglandFootBall englandfootball;
     private final Mountain mountain;
+    private final Battlefield1 battlefield1;
 
     public Faker() {
         this(Locale.ENGLISH);
@@ -223,6 +224,7 @@ public Faker(FakeValuesService fakeValuesService, RandomService random) {
         this.sip = new Sip(this);
         this.englandfootball = new EnglandFootBall(this);
         this.mountain = new Mountain(this);
+        this.battlefield1 = new Battlefield1(this);
     }
 
     /**
@@ -691,6 +693,10 @@ public StarCraft starCraft() {
 
     public Mountain mountain() { return mountain; }
 
+    public Battlefield1 battlefield1() {
+        return battlefield1;
+    }
+
     public String resolve(String key) {
         return this.fakeValuesService.resolve(key, this, this);
     }
diff --git a/src/main/java/com/github/javafaker/service/files/EnFile.java b/src/main/java/com/github/javafaker/service/files/EnFile.java
index 4a77ac01..8ff79d2d 100644
--- a/src/main/java/com/github/javafaker/service/files/EnFile.java
+++ b/src/main/java/com/github/javafaker/service/files/EnFile.java
@@ -38,6 +38,7 @@ public String getPath() {
             "barcode.yml",
             "bank.yml",
             "basketball.yml",
+            "battlefield1.yml",
             "beer.yml",
             "bojack_horseman.yml",
             "book.yml",
diff --git a/src/main/resources/en/battlefield1.yml b/src/main/resources/en/battlefield1.yml
new file mode 100644
index 00000000..87c24f82
--- /dev/null
+++ b/src/main/resources/en/battlefield1.yml
@@ -0,0 +1,8 @@
+en:
+  faker:
+    battlefield1:
+      classes: ["Assault", "Medic", "Support", "Scout", "Tanker", "Pilot", "Cavalry", "FlamTrooper", "Sentry", "Tank Hunter", "Trench Raider", "Infiltrator"]
+      weapon: []
+      vehicle: []
+      map: ["Amiens" , "Argonne Forest" , "Ballroom Blitz" , "Empire's Edge" , "Fao Fortress" , "Monte Grappa", "St. Quentin Scar", "Sinai Desert", "Suez", "Giant's Shadow","Verdun Heights", "Fort De Vaux", "Soissons" , "Rupture","Nivelle Nights", "Prise de Tahure","Łupków Pass","Albion" , "Galicia", "Brusilov Keep", "Tsaritsyn", "Volga River","Achi Baba","Cape Helles" , "Heligoland Bight" , "Zeebrugge", "Caporetto", "Passchendaele" ,"River Somme" , "London Calling", "Razor's Edge"]
+      faction: ["British Empire", "Kingdom of Italy", "United States", "German Empire", "Austro-Hungarian Empire", "Ottoman Empire", "French Republic", "Russian Empire", "Soviet Union"]
\ No newline at end of file
diff --git a/src/test/java/com/github/javafaker/Battlefield1Test.java b/src/test/java/com/github/javafaker/Battlefield1Test.java
new file mode 100644
index 00000000..6f5bcddd
--- /dev/null
+++ b/src/test/java/com/github/javafaker/Battlefield1Test.java
@@ -0,0 +1,34 @@
+package com.github.javafaker;
+
+import org.junit.Test;
+
+import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
+import static org.junit.Assert.assertThat;
+
+public class Battlefield1Test extends AbstractFakerTest {
+
+    @Test
+    public void classes() {
+        assertThat(faker.battlefield1().classes(), matchesRegularExpression("[A-Za-z,\\-\\.\\(\\) ]+"));
+    }
+
+    @Test
+    public void weapon() {
+        assertThat(faker.battlefield1().weapon(), matchesRegularExpression("[A-Za-z,\\-\\.\\(\\) ]+"));
+    }
+
+    @Test
+    public void vehicle() {
+        assertThat(faker.battlefield1().vehicle(), matchesRegularExpression("[A-Za-z,\\-\\.\\(\\) ]+"));
+    }
+
+    @Test
+    public void map() {
+        assertThat(faker.battlefield1().map(), matchesRegularExpression("[A-Za-z,\\-\\.\\(\\) ]+"));
+    }
+
+    @Test
+    public void faction() {
+        assertThat(faker.battlefield1().faction(), matchesRegularExpression("[A-Za-z,\\-\\.\\(\\) ]+"));
+    }
+}

From a76738ca76a77a2e44562b0428d30aaadd9bf3a5 Mon Sep 17 00:00:00 2001
From: cooljj <1009839598@qq.com>
Date: Wed, 6 Apr 2022 20:28:32 +0800
Subject: [PATCH 02/11] Add battlefield1 feature. battlefield1.yml complete

---
 src/main/resources/en/battlefield1.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/en/battlefield1.yml b/src/main/resources/en/battlefield1.yml
index 87c24f82..21368d82 100644
--- a/src/main/resources/en/battlefield1.yml
+++ b/src/main/resources/en/battlefield1.yml
@@ -2,7 +2,7 @@ en:
   faker:
     battlefield1:
       classes: ["Assault", "Medic", "Support", "Scout", "Tanker", "Pilot", "Cavalry", "FlamTrooper", "Sentry", "Tank Hunter", "Trench Raider", "Infiltrator"]
-      weapon: []
-      vehicle: []
+      weapon: ["MP 18 "," Automatico M1918 "," Hellriegel 1915 "," Annihilator "," M1919 SMG "," Ribeyrolles 1918 (TSNP) "," SMG 08/18 (TSAR) "," M1917 Trench Carbine (TIDE) "," Maschinenpistole M1912/P.16 (TIDE) "," RSC SMG (APOC)","M97 Trench Gun "," Model 10-A "," 12g Automatic "," Sawed Off Shotgun "," Sjögren Inertial (TSNP) "," Model 1900 (TSAR)","Cei-Rigotti "," Selbstlader M1916 "," M1907 SL "," Mondragón "," Autoloading 8 "," Selbstlader 1906 "," Fedorov-Degtyarev "," RSC 1917 (TSNP) "," Fedorov Avtomat (TSAR) "," General Liu Rifle (TSAR) "," Farquhar-Hill (TIDE) "," Howell Automatic (APOC)","Lewis Gun "," M1909 Benét-Mercié "," Madsen MG "," MG15 n.A. "," BAR M1918 "," Huot Automatic "," BAR M1918A2 "," Burton LMR "," Chauchat (TSNP) "," Parabellum MG14/17 (TSAR) "," Perino Model 1908 (TSAR) "," M1917 MG (TIDE) "," lMG 08/18 (APOC)","C96 Carbine "," M1911 Extended "," P08 Artillerie "," Pieper M1893 "," Mle 1903 Extended (TSNP) "," C93 Carbine (TSAR)","SMLE MKIII "," Gewehr 98 "," Russian 1895 "," Gewehr M.95 "," M1903 "," Martini-Henry "," Mosin-Nagant M38 Carbine "," Lebel Model 1886 (TSNP) "," Mosin-Nagant M91 (TSAR) "," Vetterli-Vitali M1870/87 (TSAR) "," Carcano M91 Carbine (TIDE) "," Type 38 Arisaka (TIDE) "," Ross MkIII (APOC) "," M1917 Enfield (APOC)","C96 Carbine "," Frommer Stop Auto "," M1911 Extended "," Pieper M1893 "," P08 Artillerie "," Mle 1903 Extended (TSNP) "," C93 Carbine (TSAR)","Bodeo 1889 "," Frommer Stop "," Mars Automatic","Sawed Off Shotgun","M1911 "," P08 Pistol "," Mle 1903 "," No. 3 Revolver "," C93 "," Kolibri "," M1911A1 "," Peacekeeper "," Nagant Revolver (TSAR) "," Obrez Pistol (TSAR) "," Revolver Mk VI (APOC)","Wex "," MG 08/15 "," Villar Perosa "," Tankgewehr M1918 "," Martini-Henry Grenade Launcher (TIDE)"," Sawed Off Shotgun "," No. 3 Revolver"]
+      vehicle: ["M.A.S. Torpedo Boat "," Y-Lighter (TSAR) "," Barrage Balloon "," Type UE II Submarine "," Horse "," Carrier Pigeon "," Illumination flares (TSNP) "," Livens Projector (APOC) "," FK 96 n.A. "," Heavy Machine Gun "," QF 1 AA "," Fortress Gun "," HE Auto-Cannon "," Vickers "," Hotchkiss M1914 (TSNP) "," BL 9.2 Siege Gun (TSNP) "," 305/52 O Coastal Gun (TSAR) "," SK45 Coastal Cannon (TIDE) "," Caproni Ca.5 "," Gotha G.IV "," Ilya-Muromets (TSAR) "," Hansa-Brandenburg G.I (APOC) "," Airco DH.10 (APOC) "," Bristol F2.B "," Halberstadt CL.II "," Rumpler C.I "," A.E.F 2-A2 "," FT-17 Light Tank "," A7V "," Mark V Landship "," Artillery Truck "," St Chamond (TSNP) "," Putilov-Garford (TSAR) "," RNAS Armored Car "," EV4 Armored Car "," F.T Armored Car "," Romfell Armored Car "," KFT Scout "," M30 Scout "," 37/95 Scout "," MC 3.5HP Sidecar "," MC 18J Sidecar"]
       map: ["Amiens" , "Argonne Forest" , "Ballroom Blitz" , "Empire's Edge" , "Fao Fortress" , "Monte Grappa", "St. Quentin Scar", "Sinai Desert", "Suez", "Giant's Shadow","Verdun Heights", "Fort De Vaux", "Soissons" , "Rupture","Nivelle Nights", "Prise de Tahure","Łupków Pass","Albion" , "Galicia", "Brusilov Keep", "Tsaritsyn", "Volga River","Achi Baba","Cape Helles" , "Heligoland Bight" , "Zeebrugge", "Caporetto", "Passchendaele" ,"River Somme" , "London Calling", "Razor's Edge"]
       faction: ["British Empire", "Kingdom of Italy", "United States", "German Empire", "Austro-Hungarian Empire", "Ottoman Empire", "French Republic", "Russian Empire", "Soviet Union"]
\ No newline at end of file

From dee2e7146b7fbca1708e510ae2d7719226ac9de1 Mon Sep 17 00:00:00 2001
From: cooljj <1009839598@qq.com>
Date: Fri, 22 Apr 2022 19:46:07 +0800
Subject: [PATCH 03/11] Added Javadoc. Modified tests. Updated README.md

---
 README.md                                     |  1 +
 .../com/github/javafaker/Battlefield1.java    | 25 +++++++++++++++++++
 src/main/resources/en/battlefield1.yml        |  2 +-
 .../github/javafaker/Battlefield1Test.java    | 15 +++++++----
 4 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index d1385324..2da3cdba 100644
--- a/README.md
+++ b/README.md
@@ -66,6 +66,7 @@ Fakers
 * Back To The Future
 * Aviation
 * Basketball
+* Battlefield1
 * Beer
 * Bojack Horseman
 * Book
diff --git a/src/main/java/com/github/javafaker/Battlefield1.java b/src/main/java/com/github/javafaker/Battlefield1.java
index 7aed2d06..eaf8b8d4 100644
--- a/src/main/java/com/github/javafaker/Battlefield1.java
+++ b/src/main/java/com/github/javafaker/Battlefield1.java
@@ -1,5 +1,10 @@
 package com.github.javafaker;
 
+/**
+ * CS304 Issue link: https://github.com/DiUS/java-faker/issues/711
+ * A class for generating random value of Battlefield1 contents
+ */
+
 public class Battlefield1 {
 
     private final Faker faker;
@@ -8,22 +13,42 @@ protected Battlefield1(final Faker faker) {
         this.faker = faker;
     }
 
+    /**
+     *
+     * @return a random unit class name as a string value
+     */
     public String classes() {
         return faker.resolve("battlefield1.classes");
     }
 
+    /**
+     *
+     * @return a random weapon name as a string value
+     */
     public String weapon() {
         return faker.resolve("battlefield1.weapon");
     }
 
+    /**
+     *
+     * @return a random vehicle name as a string value
+     */
     public String vehicle() {
         return faker.resolve("battlefield1.vehicle");
     }
 
+    /**
+     *
+     * @return a random map title as a string value
+     */
     public String map() {
         return faker.resolve("battlefield1.map");
     }
 
+    /**
+     *
+     * @return a random faction name as a string value
+     */
     public String faction() {
         return faker.resolve("battlefield1.faction");
     }
diff --git a/src/main/resources/en/battlefield1.yml b/src/main/resources/en/battlefield1.yml
index 21368d82..21afd74c 100644
--- a/src/main/resources/en/battlefield1.yml
+++ b/src/main/resources/en/battlefield1.yml
@@ -2,7 +2,7 @@ en:
   faker:
     battlefield1:
       classes: ["Assault", "Medic", "Support", "Scout", "Tanker", "Pilot", "Cavalry", "FlamTrooper", "Sentry", "Tank Hunter", "Trench Raider", "Infiltrator"]
-      weapon: ["MP 18 "," Automatico M1918 "," Hellriegel 1915 "," Annihilator "," M1919 SMG "," Ribeyrolles 1918 (TSNP) "," SMG 08/18 (TSAR) "," M1917 Trench Carbine (TIDE) "," Maschinenpistole M1912/P.16 (TIDE) "," RSC SMG (APOC)","M97 Trench Gun "," Model 10-A "," 12g Automatic "," Sawed Off Shotgun "," Sjögren Inertial (TSNP) "," Model 1900 (TSAR)","Cei-Rigotti "," Selbstlader M1916 "," M1907 SL "," Mondragón "," Autoloading 8 "," Selbstlader 1906 "," Fedorov-Degtyarev "," RSC 1917 (TSNP) "," Fedorov Avtomat (TSAR) "," General Liu Rifle (TSAR) "," Farquhar-Hill (TIDE) "," Howell Automatic (APOC)","Lewis Gun "," M1909 Benét-Mercié "," Madsen MG "," MG15 n.A. "," BAR M1918 "," Huot Automatic "," BAR M1918A2 "," Burton LMR "," Chauchat (TSNP) "," Parabellum MG14/17 (TSAR) "," Perino Model 1908 (TSAR) "," M1917 MG (TIDE) "," lMG 08/18 (APOC)","C96 Carbine "," M1911 Extended "," P08 Artillerie "," Pieper M1893 "," Mle 1903 Extended (TSNP) "," C93 Carbine (TSAR)","SMLE MKIII "," Gewehr 98 "," Russian 1895 "," Gewehr M.95 "," M1903 "," Martini-Henry "," Mosin-Nagant M38 Carbine "," Lebel Model 1886 (TSNP) "," Mosin-Nagant M91 (TSAR) "," Vetterli-Vitali M1870/87 (TSAR) "," Carcano M91 Carbine (TIDE) "," Type 38 Arisaka (TIDE) "," Ross MkIII (APOC) "," M1917 Enfield (APOC)","C96 Carbine "," Frommer Stop Auto "," M1911 Extended "," Pieper M1893 "," P08 Artillerie "," Mle 1903 Extended (TSNP) "," C93 Carbine (TSAR)","Bodeo 1889 "," Frommer Stop "," Mars Automatic","Sawed Off Shotgun","M1911 "," P08 Pistol "," Mle 1903 "," No. 3 Revolver "," C93 "," Kolibri "," M1911A1 "," Peacekeeper "," Nagant Revolver (TSAR) "," Obrez Pistol (TSAR) "," Revolver Mk VI (APOC)","Wex "," MG 08/15 "," Villar Perosa "," Tankgewehr M1918 "," Martini-Henry Grenade Launcher (TIDE)"," Sawed Off Shotgun "," No. 3 Revolver"]
+      weapon: ["MP 18 "," Automatico M1918 "," Hellriegel 1915 "," Annihilator "," M1919 SMG "," Ribeyrolles 1918 (TSNP) "," SMG 08/18 (TSAR) "," M1917 Trench Carbine (TIDE) "," Maschinenpistole M1912/P.16 (TIDE) "," RSC SMG (APOC)","M97 Trench Gun "," Model 10-A "," 12g Automatic "," Sawed Off Shotgun "," Sjögren Inertial (TSNP) "," Model 1900 (TSAR)","Cei-Rigotti "," Selbstlader M1916 "," M1907 SL "," Mondragón "," Autoloading 8 "," Selbstlader 1906 "," Fedorov-Degtyarev "," RSC 1917 (TSNP) "," Fedorov Avtomat (TSAR) "," General Liu Rifle (TSAR) "," Farquhar-Hill (TIDE) "," Howell Automatic (APOC)","Lewis Gun "," M1909 Benét-Mercié "," Madsen MG "," MG15 n.A. "," BAR M1918 "," Huot Automatic "," BAR M1918A2 "," Burton LMR "," Chauchat (TSNP) "," Parabellum MG14/17 (TSAR) "," Perino Model 1908 (TSAR) "," M1917 MG (TIDE) "," lMG 08/18 (APOC)","C96 Carbine "," M1911 Extended "," P08 Artillerie "," Pieper M1893 "," Mle 1903 Extended (TSNP) "," C93 Carbine (TSAR)","SMLE MKIII "," Gewehr 98 "," Russian 1895 "," Gewehr M.95 "," M1903 "," Martini-Henry "," Mosin-Nagant M38 Carbine "," Lebel Model 1886 (TSNP) "," Mosin-Nagant M91 (TSAR) "," Vetterli-Vitali M1870/87 (TSAR) "," Carcano M91 Carbine (TIDE) "," Type 38 Arisaka (TIDE) "," Ross MkIII (APOC) "," M1917 Enfield (APOC)","C96 Carbine "," Frommer Stop Auto "," M1911 Extended "," Pieper M1893 "," P08 Artillerie "," Mle 1903 Extended (TSNP) "," C93 Carbine (TSAR)","Bodeo 1889 "," Frommer Stop "," Mars Automatic","Sawed Off Shotgun","M1911 "," P08 Pistol "," Mle 1903 "," No. 3 Revolver ","C93"," Kolibri "," M1911A1 "," Peacekeeper "," Nagant Revolver (TSAR) "," Obrez Pistol (TSAR) "," Revolver Mk VI (APOC)","Wex "," MG 08/15 "," Villar Perosa "," Tankgewehr M1918 "," Martini-Henry Grenade Launcher (TIDE)"," Sawed Off Shotgun "," No. 3 Revolver"]
       vehicle: ["M.A.S. Torpedo Boat "," Y-Lighter (TSAR) "," Barrage Balloon "," Type UE II Submarine "," Horse "," Carrier Pigeon "," Illumination flares (TSNP) "," Livens Projector (APOC) "," FK 96 n.A. "," Heavy Machine Gun "," QF 1 AA "," Fortress Gun "," HE Auto-Cannon "," Vickers "," Hotchkiss M1914 (TSNP) "," BL 9.2 Siege Gun (TSNP) "," 305/52 O Coastal Gun (TSAR) "," SK45 Coastal Cannon (TIDE) "," Caproni Ca.5 "," Gotha G.IV "," Ilya-Muromets (TSAR) "," Hansa-Brandenburg G.I (APOC) "," Airco DH.10 (APOC) "," Bristol F2.B "," Halberstadt CL.II "," Rumpler C.I "," A.E.F 2-A2 "," FT-17 Light Tank "," A7V "," Mark V Landship "," Artillery Truck "," St Chamond (TSNP) "," Putilov-Garford (TSAR) "," RNAS Armored Car "," EV4 Armored Car "," F.T Armored Car "," Romfell Armored Car "," KFT Scout "," M30 Scout "," 37/95 Scout "," MC 3.5HP Sidecar "," MC 18J Sidecar"]
       map: ["Amiens" , "Argonne Forest" , "Ballroom Blitz" , "Empire's Edge" , "Fao Fortress" , "Monte Grappa", "St. Quentin Scar", "Sinai Desert", "Suez", "Giant's Shadow","Verdun Heights", "Fort De Vaux", "Soissons" , "Rupture","Nivelle Nights", "Prise de Tahure","Łupków Pass","Albion" , "Galicia", "Brusilov Keep", "Tsaritsyn", "Volga River","Achi Baba","Cape Helles" , "Heligoland Bight" , "Zeebrugge", "Caporetto", "Passchendaele" ,"River Somme" , "London Calling", "Razor's Edge"]
       faction: ["British Empire", "Kingdom of Italy", "United States", "German Empire", "Austro-Hungarian Empire", "Ottoman Empire", "French Republic", "Russian Empire", "Soviet Union"]
\ No newline at end of file
diff --git a/src/test/java/com/github/javafaker/Battlefield1Test.java b/src/test/java/com/github/javafaker/Battlefield1Test.java
index 6f5bcddd..7149ab16 100644
--- a/src/test/java/com/github/javafaker/Battlefield1Test.java
+++ b/src/test/java/com/github/javafaker/Battlefield1Test.java
@@ -7,28 +7,33 @@
 
 public class Battlefield1Test extends AbstractFakerTest {
 
+    //CS304 (manually written) Issue link: https://github.com/DiUS/java-faker/issues/711
     @Test
     public void classes() {
-        assertThat(faker.battlefield1().classes(), matchesRegularExpression("[A-Za-z,\\-\\.\\(\\) ]+"));
+        assertThat(faker.battlefield1().classes(), matchesRegularExpression("[A-Za-z ]+"));
     }
 
+    //CS304 (manually written) Issue link: https://github.com/DiUS/java-faker/issues/711
     @Test
     public void weapon() {
-        assertThat(faker.battlefield1().weapon(), matchesRegularExpression("[A-Za-z,\\-\\.\\(\\) ]+"));
+        assertThat(faker.battlefield1().weapon(), matchesRegularExpression("[A-Za-z0-9,\\.\\(\\)\\/ ]+"));
     }
 
+    //CS304 (manually written) Issue link: https://github.com/DiUS/java-faker/issues/711
     @Test
     public void vehicle() {
-        assertThat(faker.battlefield1().vehicle(), matchesRegularExpression("[A-Za-z,\\-\\.\\(\\) ]+"));
+        assertThat(faker.battlefield1().vehicle(), matchesRegularExpression("[A-Za-z0-9,\\-\\.\\(\\)\\/ ]+"));
     }
 
+    //CS304 (manually written) Issue link: https://github.com/DiUS/java-faker/issues/711
     @Test
     public void map() {
-        assertThat(faker.battlefield1().map(), matchesRegularExpression("[A-Za-z,\\-\\.\\(\\) ]+"));
+        assertThat(faker.battlefield1().map(), matchesRegularExpression("[A-Za-z0-9,\\-\\.\\(\\)\\' ]+"));
     }
 
+    //CS304 (manually written) Issue link: https://github.com/DiUS/java-faker/issues/711
     @Test
     public void faction() {
-        assertThat(faker.battlefield1().faction(), matchesRegularExpression("[A-Za-z,\\-\\.\\(\\) ]+"));
+        assertThat(faker.battlefield1().faction(), matchesRegularExpression("[A-Za-z,\\- ]+"));
     }
 }

From 8d0d27ac8d1d53cbf18725c7a5362bf6adbf9591 Mon Sep 17 00:00:00 2001
From: cooljj <1009839598@qq.com>
Date: Sat, 23 Apr 2022 20:54:08 +0800
Subject: [PATCH 04/11] Added Javadoc. Modified tests. Updated README.md

---
 src/main/java/com/github/javafaker/Battlefield1.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/github/javafaker/Battlefield1.java b/src/main/java/com/github/javafaker/Battlefield1.java
index eaf8b8d4..a89b0523 100644
--- a/src/main/java/com/github/javafaker/Battlefield1.java
+++ b/src/main/java/com/github/javafaker/Battlefield1.java
@@ -3,6 +3,7 @@
 /**
  * CS304 Issue link: https://github.com/DiUS/java-faker/issues/711
  * A class for generating random value of Battlefield1 contents
+ * @author coolestjj
  */
 
 public class Battlefield1 {

From 5e7ed5835ecf705d22e7adb0a2afe9f314d280a0 Mon Sep 17 00:00:00 2001
From: cooljj <1009839598@qq.com>
Date: Sun, 24 Apr 2022 21:49:30 +0800
Subject: [PATCH 05/11] Update Javadoc in

---
 src/main/resources/en/battlefield1.yml        |  4 +--
 .../github/javafaker/Battlefield1Test.java    | 25 +++++++++++++++----
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/en/battlefield1.yml b/src/main/resources/en/battlefield1.yml
index 21afd74c..116b1016 100644
--- a/src/main/resources/en/battlefield1.yml
+++ b/src/main/resources/en/battlefield1.yml
@@ -2,7 +2,7 @@ en:
   faker:
     battlefield1:
       classes: ["Assault", "Medic", "Support", "Scout", "Tanker", "Pilot", "Cavalry", "FlamTrooper", "Sentry", "Tank Hunter", "Trench Raider", "Infiltrator"]
-      weapon: ["MP 18 "," Automatico M1918 "," Hellriegel 1915 "," Annihilator "," M1919 SMG "," Ribeyrolles 1918 (TSNP) "," SMG 08/18 (TSAR) "," M1917 Trench Carbine (TIDE) "," Maschinenpistole M1912/P.16 (TIDE) "," RSC SMG (APOC)","M97 Trench Gun "," Model 10-A "," 12g Automatic "," Sawed Off Shotgun "," Sjögren Inertial (TSNP) "," Model 1900 (TSAR)","Cei-Rigotti "," Selbstlader M1916 "," M1907 SL "," Mondragón "," Autoloading 8 "," Selbstlader 1906 "," Fedorov-Degtyarev "," RSC 1917 (TSNP) "," Fedorov Avtomat (TSAR) "," General Liu Rifle (TSAR) "," Farquhar-Hill (TIDE) "," Howell Automatic (APOC)","Lewis Gun "," M1909 Benét-Mercié "," Madsen MG "," MG15 n.A. "," BAR M1918 "," Huot Automatic "," BAR M1918A2 "," Burton LMR "," Chauchat (TSNP) "," Parabellum MG14/17 (TSAR) "," Perino Model 1908 (TSAR) "," M1917 MG (TIDE) "," lMG 08/18 (APOC)","C96 Carbine "," M1911 Extended "," P08 Artillerie "," Pieper M1893 "," Mle 1903 Extended (TSNP) "," C93 Carbine (TSAR)","SMLE MKIII "," Gewehr 98 "," Russian 1895 "," Gewehr M.95 "," M1903 "," Martini-Henry "," Mosin-Nagant M38 Carbine "," Lebel Model 1886 (TSNP) "," Mosin-Nagant M91 (TSAR) "," Vetterli-Vitali M1870/87 (TSAR) "," Carcano M91 Carbine (TIDE) "," Type 38 Arisaka (TIDE) "," Ross MkIII (APOC) "," M1917 Enfield (APOC)","C96 Carbine "," Frommer Stop Auto "," M1911 Extended "," Pieper M1893 "," P08 Artillerie "," Mle 1903 Extended (TSNP) "," C93 Carbine (TSAR)","Bodeo 1889 "," Frommer Stop "," Mars Automatic","Sawed Off Shotgun","M1911 "," P08 Pistol "," Mle 1903 "," No. 3 Revolver ","C93"," Kolibri "," M1911A1 "," Peacekeeper "," Nagant Revolver (TSAR) "," Obrez Pistol (TSAR) "," Revolver Mk VI (APOC)","Wex "," MG 08/15 "," Villar Perosa "," Tankgewehr M1918 "," Martini-Henry Grenade Launcher (TIDE)"," Sawed Off Shotgun "," No. 3 Revolver"]
-      vehicle: ["M.A.S. Torpedo Boat "," Y-Lighter (TSAR) "," Barrage Balloon "," Type UE II Submarine "," Horse "," Carrier Pigeon "," Illumination flares (TSNP) "," Livens Projector (APOC) "," FK 96 n.A. "," Heavy Machine Gun "," QF 1 AA "," Fortress Gun "," HE Auto-Cannon "," Vickers "," Hotchkiss M1914 (TSNP) "," BL 9.2 Siege Gun (TSNP) "," 305/52 O Coastal Gun (TSAR) "," SK45 Coastal Cannon (TIDE) "," Caproni Ca.5 "," Gotha G.IV "," Ilya-Muromets (TSAR) "," Hansa-Brandenburg G.I (APOC) "," Airco DH.10 (APOC) "," Bristol F2.B "," Halberstadt CL.II "," Rumpler C.I "," A.E.F 2-A2 "," FT-17 Light Tank "," A7V "," Mark V Landship "," Artillery Truck "," St Chamond (TSNP) "," Putilov-Garford (TSAR) "," RNAS Armored Car "," EV4 Armored Car "," F.T Armored Car "," Romfell Armored Car "," KFT Scout "," M30 Scout "," 37/95 Scout "," MC 3.5HP Sidecar "," MC 18J Sidecar"]
+      weapon: ["MP 18","Automatico M1918","Hellriegel 1915","Annihilator","M1919 SMG","Ribeyrolles 1918 (TSNP)","SMG 08/18 (TSAR)","M1917 Trench Carbine (TIDE)","Maschinenpistole M1912/P.16 (TIDE)","RSC SMG (APOC)","M97 Trench Gun","Model 10-A","12g Automatic","Sawed Off Shotgun","Sjögren Inertial (TSNP)","Model 1900 (TSAR)","Cei-Rigotti","Selbstlader M1916","M1907 SL","Mondragón","Autoloading 8","Selbstlader 1906","Fedorov-Degtyarev","RSC 1917 (TSNP)","Fedorov Avtomat (TSAR)","General Liu Rifle (TSAR)","Farquhar-Hill (TIDE)","Howell Automatic (APOC)","Lewis Gun","M1909 Benét-Mercié","Madsen MG","MG15 n.A.","BAR M1918","Huot Automatic","BAR M1918A2","Burton LMR","Chauchat (TSNP)","Parabellum MG14/17 (TSAR)","Perino Model 1908 (TSAR)","M1917 MG (TIDE)","lMG 08/18 (APOC)","C96 Carbine","M1911 Extended","P08 Artillerie","Pieper M1893","Mle 1903 Extended (TSNP)","C93 Carbine (TSAR)","SMLE MKIII","Gewehr 98","Russian 1895","Gewehr M.95","M1903","Martini-Henry","Mosin-Nagant M38 Carbine","Lebel Model 1886 (TSNP)","Mosin-Nagant M91 (TSAR)","Vetterli-Vitali M1870/87 (TSAR)","Carcano M91 Carbine (TIDE)","Type 38 Arisaka (TIDE)","Ross MkIII (APOC)","M1917 Enfield (APOC)","C96 Carbine","Frommer Stop Auto","M1911 Extended","Pieper M1893","P08 Artillerie","Mle 1903 Extended (TSNP)","C93 Carbine (TSAR)","Bodeo 1889","Frommer Stop","Mars Automatic","Sawed Off Shotgun","M1911","P08 Pistol","Mle 1903","No. 3 Revolver","C93","Kolibri","M1911A1","Peacekeeper","Nagant Revolver (TSAR)","Obrez Pistol (TSAR)","Revolver Mk VI (APOC)","Wex","MG 08/15","Villar Perosa","Tankgewehr M1918","Martini-Henry Grenade Launcher (TIDE)","Sawed Off Shotgun","No. 3 Revolver"]
+      vehicle: ["M.A.S. Torpedo Boat","Y-Lighter (TSAR)","Barrage Balloon","Type UE II Submarine","Horse","Carrier Pigeon","Illumination flares (TSNP)","Livens Projector (APOC)","FK 96 n.A.","Heavy Machine Gun","QF 1 AA","Fortress Gun","HE Auto-Cannon","Vickers","Hotchkiss M1914 (TSNP)","BL 9.2 Siege Gun (TSNP)","305/52 O Coastal Gun (TSAR)","SK45 Coastal Cannon (TIDE)","Caproni Ca.5","Gotha G.IV","Ilya-Muromets (TSAR)","Hansa-Brandenburg G.I (APOC)","Airco DH.10","Bristol F2.B","Halberstadt CL.II","Rumpler C.I","A.E.F 2-A2","FT-17 Light Tank"," A7V ","Mark V Landship","Artillery Truck","St Chamond","Putilov-Garford","RNAS Armored Car","EV4 Armored Car","F.T Armored Car","Romfell Armored Car","KFT Scout","M30 Scout","37/95 Scout","MC 3.5HP Sidecar","MC 18J Sidecar"]
       map: ["Amiens" , "Argonne Forest" , "Ballroom Blitz" , "Empire's Edge" , "Fao Fortress" , "Monte Grappa", "St. Quentin Scar", "Sinai Desert", "Suez", "Giant's Shadow","Verdun Heights", "Fort De Vaux", "Soissons" , "Rupture","Nivelle Nights", "Prise de Tahure","Łupków Pass","Albion" , "Galicia", "Brusilov Keep", "Tsaritsyn", "Volga River","Achi Baba","Cape Helles" , "Heligoland Bight" , "Zeebrugge", "Caporetto", "Passchendaele" ,"River Somme" , "London Calling", "Razor's Edge"]
       faction: ["British Empire", "Kingdom of Italy", "United States", "German Empire", "Austro-Hungarian Empire", "Ottoman Empire", "French Republic", "Russian Empire", "Soviet Union"]
\ No newline at end of file
diff --git a/src/test/java/com/github/javafaker/Battlefield1Test.java b/src/test/java/com/github/javafaker/Battlefield1Test.java
index 7149ab16..3466a32f 100644
--- a/src/test/java/com/github/javafaker/Battlefield1Test.java
+++ b/src/test/java/com/github/javafaker/Battlefield1Test.java
@@ -7,31 +7,46 @@
 
 public class Battlefield1Test extends AbstractFakerTest {
 
-    //CS304 (manually written) Issue link: https://github.com/DiUS/java-faker/issues/711
+    /**
+     *
+     * CS304 (manually written) Issue link: https://github.com/DiUS/java-faker/issues/711
+     */
     @Test
     public void classes() {
         assertThat(faker.battlefield1().classes(), matchesRegularExpression("[A-Za-z ]+"));
     }
 
-    //CS304 (manually written) Issue link: https://github.com/DiUS/java-faker/issues/711
+    /**
+     *
+     * CS304 (manually written) Issue link: https://github.com/DiUS/java-faker/issues/711
+     */
     @Test
     public void weapon() {
         assertThat(faker.battlefield1().weapon(), matchesRegularExpression("[A-Za-z0-9,\\.\\(\\)\\/ ]+"));
     }
 
-    //CS304 (manually written) Issue link: https://github.com/DiUS/java-faker/issues/711
+    /**
+     *
+     * CS304 (manually written) Issue link: https://github.com/DiUS/java-faker/issues/711
+     */
     @Test
     public void vehicle() {
         assertThat(faker.battlefield1().vehicle(), matchesRegularExpression("[A-Za-z0-9,\\-\\.\\(\\)\\/ ]+"));
     }
 
-    //CS304 (manually written) Issue link: https://github.com/DiUS/java-faker/issues/711
+    /**
+     *
+     * CS304 (manually written) Issue link: https://github.com/DiUS/java-faker/issues/711
+     */
     @Test
     public void map() {
         assertThat(faker.battlefield1().map(), matchesRegularExpression("[A-Za-z0-9,\\-\\.\\(\\)\\' ]+"));
     }
 
-    //CS304 (manually written) Issue link: https://github.com/DiUS/java-faker/issues/711
+    /**
+     *
+     * CS304 (manually written) Issue link: https://github.com/DiUS/java-faker/issues/711
+     */
     @Test
     public void faction() {
         assertThat(faker.battlefield1().faction(), matchesRegularExpression("[A-Za-z,\\- ]+"));

From 74e28f4b0fa96150abdbafda7fe5a715ba2afdf8 Mon Sep 17 00:00:00 2001
From: cooljj <1009839598@qq.com>
Date: Sun, 24 Apr 2022 22:40:10 +0800
Subject: [PATCH 06/11] Add two tests for each public method in battlefield1

---
 .../github/javafaker/Battlefield1Test.java    | 49 ++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

diff --git a/src/test/java/com/github/javafaker/Battlefield1Test.java b/src/test/java/com/github/javafaker/Battlefield1Test.java
index 3466a32f..ae00fc36 100644
--- a/src/test/java/com/github/javafaker/Battlefield1Test.java
+++ b/src/test/java/com/github/javafaker/Battlefield1Test.java
@@ -3,6 +3,8 @@
 import org.junit.Test;
 
 import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
+import static org.hamcrest.Matchers.isEmptyOrNullString;
+import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.assertThat;
 
 public class Battlefield1Test extends AbstractFakerTest {
@@ -16,13 +18,31 @@ public void classes() {
         assertThat(faker.battlefield1().classes(), matchesRegularExpression("[A-Za-z ]+"));
     }
 
+    /**
+     *
+     * CS304 (manually written) Issue link: https://github.com/DiUS/java-faker/issues/711
+     */
+    @Test
+    public void classesNotNull() {
+        assertThat(faker.battlefield1().classes(), not(isEmptyOrNullString()));
+    }
+
     /**
      *
      * CS304 (manually written) Issue link: https://github.com/DiUS/java-faker/issues/711
      */
     @Test
     public void weapon() {
-        assertThat(faker.battlefield1().weapon(), matchesRegularExpression("[A-Za-z0-9,\\.\\(\\)\\/ ]+"));
+        assertThat(faker.battlefield1().weapon(), matchesRegularExpression("[A-Za-z0-9, \\-\\.\\(\\)\\/ ]+"));
+    }
+
+    /**
+     *
+     * CS304 (manually written) Issue link: https://github.com/DiUS/java-faker/issues/711
+     */
+    @Test
+    public void weaponNotNull() {
+        assertThat(faker.battlefield1().weapon(), not(isEmptyOrNullString()));
     }
 
     /**
@@ -34,6 +54,15 @@ public void vehicle() {
         assertThat(faker.battlefield1().vehicle(), matchesRegularExpression("[A-Za-z0-9,\\-\\.\\(\\)\\/ ]+"));
     }
 
+    /**
+     *
+     * CS304 (manually written) Issue link: https://github.com/DiUS/java-faker/issues/711
+     */
+    @Test
+    public void vehicleNotNull() {
+        assertThat(faker.battlefield1().vehicle(), not(isEmptyOrNullString()));
+    }
+
     /**
      *
      * CS304 (manually written) Issue link: https://github.com/DiUS/java-faker/issues/711
@@ -43,6 +72,15 @@ public void map() {
         assertThat(faker.battlefield1().map(), matchesRegularExpression("[A-Za-z0-9,\\-\\.\\(\\)\\' ]+"));
     }
 
+    /**
+     *
+     * CS304 (manually written) Issue link: https://github.com/DiUS/java-faker/issues/711
+     */
+    @Test
+    public void mapNotNull() {
+        assertThat(faker.battlefield1().map(), not(isEmptyOrNullString()));
+    }
+
     /**
      *
      * CS304 (manually written) Issue link: https://github.com/DiUS/java-faker/issues/711
@@ -51,4 +89,13 @@ public void map() {
     public void faction() {
         assertThat(faker.battlefield1().faction(), matchesRegularExpression("[A-Za-z,\\- ]+"));
     }
+
+    /**
+     *
+     * CS304 (manually written) Issue link: https://github.com/DiUS/java-faker/issues/711
+     */
+    @Test
+    public void factionNotNull() {
+        assertThat(faker.battlefield1().faction(), not(isEmptyOrNullString()));
+    }
 }

From 1787f1daeb961fa99db51e3257ff767dd689a4cd Mon Sep 17 00:00:00 2001
From: cooljj <1009839598@qq.com>
Date: Mon, 23 May 2022 00:19:05 +0800
Subject: [PATCH 07/11] Add swiftcode feature

---
 src/main/java/com/github/javafaker/Faker.java |  6 ++
 .../java/com/github/javafaker/SwiftCode.java  | 62 +++++++++++++++++++
 .../com/github/javafaker/SwiftCodeTest.java   | 54 ++++++++++++++++
 3 files changed, 122 insertions(+)
 create mode 100644 src/main/java/com/github/javafaker/SwiftCode.java
 create mode 100644 src/test/java/com/github/javafaker/SwiftCodeTest.java

diff --git a/src/main/java/com/github/javafaker/Faker.java b/src/main/java/com/github/javafaker/Faker.java
index b467e7ba..e6fb366b 100644
--- a/src/main/java/com/github/javafaker/Faker.java
+++ b/src/main/java/com/github/javafaker/Faker.java
@@ -108,6 +108,7 @@ public class Faker {
     private final EnglandFootBall englandfootball;
     private final Mountain mountain;
     private final Battlefield1 battlefield1;
+    private final SwiftCode swiftCode;
 
     public Faker() {
         this(Locale.ENGLISH);
@@ -225,6 +226,7 @@ public Faker(FakeValuesService fakeValuesService, RandomService random) {
         this.englandfootball = new EnglandFootBall(this);
         this.mountain = new Mountain(this);
         this.battlefield1 = new Battlefield1(this);
+        this.swiftCode = new SwiftCode(this);
     }
 
     /**
@@ -697,6 +699,10 @@ public Battlefield1 battlefield1() {
         return battlefield1;
     }
 
+    public SwiftCode swiftCode() {
+        return swiftCode;
+    }
+
     public String resolve(String key) {
         return this.fakeValuesService.resolve(key, this, this);
     }
diff --git a/src/main/java/com/github/javafaker/SwiftCode.java b/src/main/java/com/github/javafaker/SwiftCode.java
new file mode 100644
index 00000000..b8a79330
--- /dev/null
+++ b/src/main/java/com/github/javafaker/SwiftCode.java
@@ -0,0 +1,62 @@
+package com.github.javafaker;
+
+/**
+ * CS304 Issue link: https://github.com/DiUS/java-faker/issues/721
+ * A class for generating random swift code
+ */
+
+public class SwiftCode {
+
+    private final Faker faker;
+
+    protected SwiftCode(final Faker faker) {
+        this.faker = faker;
+    }
+
+    /**
+     *
+     * @return a random swift code of a bank's headquarter as a string value
+     */
+    public String headquarterSwiftcode() {
+        String chars1 = "ABCDEFGHIZKLMNOPQRSTUVWXYZ";
+        String chars2 = "0123456789ABCDEFGHIZKLMNOPQRSTUVWXYZ";
+        String swiftcode = "";
+        for (int i = 0 ; i < 4 ; i++) {
+            String bank = String.valueOf(chars1.charAt((int) (Math.random() * 26)));
+            swiftcode += bank;
+        }
+        String country = faker.address().countryCode();
+        swiftcode += country;
+        for (int i = 0 ; i < 2 ; i++) {
+            String region = String.valueOf(chars2.charAt((int) (Math.random() * 36)));
+            swiftcode += region;
+        }
+        swiftcode += "XXX";
+        return swiftcode;
+    }
+
+    /**
+     *
+     * @return a random swift code of a bank's branch as a string value
+     */
+    public String branchSwiftcode() {
+        String chars1 = "ABCDEFGHIZKLMNOPQRSTUVWXYZ";
+        String chars2 = "0123456789ABCDEFGHIZKLMNOPQRSTUVWXYZ";
+        String swiftcode = "";
+        for (int i = 0 ; i < 4 ; i++) {
+            String bank = String.valueOf(chars1.charAt((int) (Math.random() * 26)));
+            swiftcode += bank;
+        }
+        String country = faker.address().countryCode();
+        swiftcode += country;
+        for (int i = 0 ; i < 2 ; i++) {
+            String region = String.valueOf(chars2.charAt((int) (Math.random() * 36)));
+            swiftcode += region;
+        }
+        for (int i = 0 ; i < 3 ; i++) {
+            String branch = String.valueOf(chars2.charAt((int) (Math.random() * 36)));
+            swiftcode += branch;
+        }
+        return swiftcode;
+    }
+}
diff --git a/src/test/java/com/github/javafaker/SwiftCodeTest.java b/src/test/java/com/github/javafaker/SwiftCodeTest.java
new file mode 100644
index 00000000..03942d18
--- /dev/null
+++ b/src/test/java/com/github/javafaker/SwiftCodeTest.java
@@ -0,0 +1,54 @@
+package com.github.javafaker;
+
+import com.github.javafaker.repeating.Repeat;
+import org.junit.Test;
+
+import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression;
+import static org.hamcrest.Matchers.isEmptyOrNullString;
+import static org.hamcrest.Matchers.not;
+import static org.junit.Assert.assertThat;
+
+public class SwiftCodeTest extends AbstractFakerTest {
+
+    /**
+     *
+     * CS304 (manually written) Issue link: https://github.com/DiUS/java-faker/issues/721
+     */
+    @Test
+    @Repeat(times = 100)
+    public void headquarterSwiftCodeTest() {
+        String swiftcode = faker.swiftCode().headquarterSwiftcode();
+        assertThat(swiftcode, matchesRegularExpression("[0-9A-Z ]+"));
+    }
+
+    /**
+     *
+     * CS304 (manually written) Issue link: https://github.com/DiUS/java-faker/issues/721
+     */
+    @Test
+    @Repeat(times = 100)
+    public void headquarterSwiftCodeNotNull() {
+        assertThat(faker.swiftCode().headquarterSwiftcode(), not(isEmptyOrNullString()));
+    }
+
+    /**
+     *
+     * CS304 (manually written) Issue link: https://github.com/DiUS/java-faker/issues/721
+     */
+    @Test
+    @Repeat(times = 100)
+    public void BranchSwiftCodeTest() {
+        String swiftcode = faker.swiftCode().branchSwiftcode();
+        assertThat(swiftcode, matchesRegularExpression("[0-9A-Z ]+"));
+    }
+
+    /**
+     *
+     * CS304 (manually written) Issue link: https://github.com/DiUS/java-faker/issues/721
+     */
+    @Test
+    @Repeat(times = 100)
+    public void branchSwiftCodeNotNull() {
+        assertThat(faker.swiftCode().branchSwiftcode(), not(isEmptyOrNullString()));
+    }
+}

From ce508c8ff7d2afbfefd1519cc2a577482c3215da Mon Sep 17 00:00:00 2001
From: cooljj <1009839598@qq.com>
Date: Sat, 28 May 2022 16:42:24 +0800
Subject: [PATCH 08/11] Update test

---
 src/test/java/com/github/javafaker/SwiftCodeTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/com/github/javafaker/SwiftCodeTest.java b/src/test/java/com/github/javafaker/SwiftCodeTest.java
index 03942d18..0a9616d6 100644
--- a/src/test/java/com/github/javafaker/SwiftCodeTest.java
+++ b/src/test/java/com/github/javafaker/SwiftCodeTest.java
@@ -37,7 +37,7 @@ public void headquarterSwiftCodeNotNull() {
      */
     @Test
     @Repeat(times = 100)
-    public void BranchSwiftCodeTest() {
+    public void branchSwiftCodeTest() {
         String swiftcode = faker.swiftCode().branchSwiftcode();
         assertThat(swiftcode, matchesRegularExpression("[0-9A-Z ]+"));
     }

From 2a38c2a001413e42225dcc669d12622a60e64688 Mon Sep 17 00:00:00 2001
From: cooljj <1009839598@qq.com>
Date: Sun, 29 May 2022 21:45:53 +0800
Subject: [PATCH 09/11] Bug update

---
 .../java/com/github/javafaker/SwiftCode.java  | 98 ++++++++++---------
 1 file changed, 51 insertions(+), 47 deletions(-)

diff --git a/src/main/java/com/github/javafaker/SwiftCode.java b/src/main/java/com/github/javafaker/SwiftCode.java
index b8a79330..99b7fd46 100644
--- a/src/main/java/com/github/javafaker/SwiftCode.java
+++ b/src/main/java/com/github/javafaker/SwiftCode.java
@@ -1,5 +1,7 @@
 package com.github.javafaker;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 /**
  * CS304 Issue link: https://github.com/DiUS/java-faker/issues/721
  * A class for generating random swift code
@@ -7,56 +9,58 @@
 
 public class SwiftCode {
 
-    private final Faker faker;
+  private final Faker faker;
 
-    protected SwiftCode(final Faker faker) {
-        this.faker = faker;
-    }
+  protected SwiftCode(final Faker faker) {
+    this.faker = faker;
+  }
 
-    /**
-     *
-     * @return a random swift code of a bank's headquarter as a string value
-     */
-    public String headquarterSwiftcode() {
-        String chars1 = "ABCDEFGHIZKLMNOPQRSTUVWXYZ";
-        String chars2 = "0123456789ABCDEFGHIZKLMNOPQRSTUVWXYZ";
-        String swiftcode = "";
-        for (int i = 0 ; i < 4 ; i++) {
-            String bank = String.valueOf(chars1.charAt((int) (Math.random() * 26)));
-            swiftcode += bank;
-        }
-        String country = faker.address().countryCode();
-        swiftcode += country;
-        for (int i = 0 ; i < 2 ; i++) {
-            String region = String.valueOf(chars2.charAt((int) (Math.random() * 36)));
-            swiftcode += region;
-        }
-        swiftcode += "XXX";
-        return swiftcode;
+  /**
+  * The
+  * @return a random swift code of a bank's headquarter as a string value
+  */
+  @SuppressFBWarnings({"DM_NEXTINT_VIA_NEXTDOUBLE", "PREDICTABLE_RANDOM"})
+  public String headquarterSwiftcode() {
+    String chars1 = "ABCDEFGHIZKLMNOPQRSTUVWXYZ";
+    String chars2 = "0123456789ABCDEFGHIZKLMNOPQRSTUVWXYZ";
+    StringBuffer swiftcode = new StringBuffer();
+    for (int i = 0; i < 4; i++) {
+      String bank = String.valueOf(chars1.charAt((int) (Math.random() * 26)));
+      swiftcode.append(bank);
+    }
+    String country = faker.address().countryCode();
+    swiftcode.append(country);
+    for (int i = 0; i < 2; i++) {
+      String region = String.valueOf(chars2.charAt((int) (Math.random() * 36)));
+      swiftcode.append(region);
     }
+    swiftcode.append("XXX");
+    return swiftcode.toString();
+  }
 
-    /**
-     *
-     * @return a random swift code of a bank's branch as a string value
-     */
-    public String branchSwiftcode() {
-        String chars1 = "ABCDEFGHIZKLMNOPQRSTUVWXYZ";
-        String chars2 = "0123456789ABCDEFGHIZKLMNOPQRSTUVWXYZ";
-        String swiftcode = "";
-        for (int i = 0 ; i < 4 ; i++) {
-            String bank = String.valueOf(chars1.charAt((int) (Math.random() * 26)));
-            swiftcode += bank;
-        }
-        String country = faker.address().countryCode();
-        swiftcode += country;
-        for (int i = 0 ; i < 2 ; i++) {
-            String region = String.valueOf(chars2.charAt((int) (Math.random() * 36)));
-            swiftcode += region;
-        }
-        for (int i = 0 ; i < 3 ; i++) {
-            String branch = String.valueOf(chars2.charAt((int) (Math.random() * 36)));
-            swiftcode += branch;
-        }
-        return swiftcode;
+  /**
+   *
+   * @return a random swift code of a bank's branch as a string value
+   */
+  @SuppressFBWarnings({"PREDICTABLE_RANDOM", "DM_NEXTINT_VIA_NEXTDOUBLE"})
+  public String branchSwiftcode() {
+    String chars1 = "ABCDEFGHIZKLMNOPQRSTUVWXYZ";
+    String chars2 = "0123456789ABCDEFGHIZKLMNOPQRSTUVWXYZ";
+    StringBuffer swiftcode = new StringBuffer();
+    for (int i = 0; i < 4; i++) {
+      String bank = String.valueOf(chars1.charAt((int) (Math.random() * 26)));
+      swiftcode.append(bank);
+    }
+    String country = faker.address().countryCode();
+    swiftcode.append(country);
+    for (int i = 0; i < 2; i++) {
+      String region = String.valueOf(chars2.charAt((int) (Math.random() * 36)));
+      swiftcode.append(region);
+    }
+    for (int i = 0; i < 3; i++) {
+      String branch = String.valueOf(chars2.charAt((int) (Math.random() * 36)));
+      swiftcode.append(branch);
     }
+    return swiftcode.toString();
+  }
 }

From 9a9fcfacc2b7db76751edefde3b3b7902390ce3e Mon Sep 17 00:00:00 2001
From: cooljj <1009839598@qq.com>
Date: Sun, 29 May 2022 21:50:02 +0800
Subject: [PATCH 10/11] Checkstyle Update

---
 src/main/java/com/github/javafaker/SwiftCode.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main/java/com/github/javafaker/SwiftCode.java b/src/main/java/com/github/javafaker/SwiftCode.java
index 99b7fd46..20a43efb 100644
--- a/src/main/java/com/github/javafaker/SwiftCode.java
+++ b/src/main/java/com/github/javafaker/SwiftCode.java
@@ -1,7 +1,5 @@
 package com.github.javafaker;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
 /**
  * CS304 Issue link: https://github.com/DiUS/java-faker/issues/721
  * A class for generating random swift code
@@ -19,7 +17,6 @@ protected SwiftCode(final Faker faker) {
   * The
   * @return a random swift code of a bank's headquarter as a string value
   */
-  @SuppressFBWarnings({"DM_NEXTINT_VIA_NEXTDOUBLE", "PREDICTABLE_RANDOM"})
   public String headquarterSwiftcode() {
     String chars1 = "ABCDEFGHIZKLMNOPQRSTUVWXYZ";
     String chars2 = "0123456789ABCDEFGHIZKLMNOPQRSTUVWXYZ";
@@ -42,7 +39,6 @@ public String headquarterSwiftcode() {
    *
    * @return a random swift code of a bank's branch as a string value
    */
-  @SuppressFBWarnings({"PREDICTABLE_RANDOM", "DM_NEXTINT_VIA_NEXTDOUBLE"})
   public String branchSwiftcode() {
     String chars1 = "ABCDEFGHIZKLMNOPQRSTUVWXYZ";
     String chars2 = "0123456789ABCDEFGHIZKLMNOPQRSTUVWXYZ";

From e7c6babd05337a60f28fb1e233d9e7cea60079c9 Mon Sep 17 00:00:00 2001
From: cooljj <1009839598@qq.com>
Date: Sun, 29 May 2022 21:59:10 +0800
Subject: [PATCH 11/11] Update checkstyle again

---
 src/main/java/com/github/javafaker/SwiftCode.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/javafaker/SwiftCode.java b/src/main/java/com/github/javafaker/SwiftCode.java
index 20a43efb..61477a68 100644
--- a/src/main/java/com/github/javafaker/SwiftCode.java
+++ b/src/main/java/com/github/javafaker/SwiftCode.java
@@ -14,7 +14,8 @@ protected SwiftCode(final Faker faker) {
   }
 
   /**
-  * The
+  * This function generates a random swift code of a bank's headquarter.
+
   * @return a random swift code of a bank's headquarter as a string value
   */
   public String headquarterSwiftcode() {
@@ -36,7 +37,8 @@ public String headquarterSwiftcode() {
   }
 
   /**
-   *
+   * This function generates a random swift code of a bank's branch.
+
    * @return a random swift code of a bank's branch as a string value
    */
   public String branchSwiftcode() {