fix first word in name

victorlissoviy · Jan 20, 2023 · dfdd712 · dfdd712
1 parent 0b19d5b
commit dfdd712
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/transliteration/src/main/java/transliteration/Transliteration.java b/transliteration/src/main/java/transliteration/Transliteration.java
@@ -70,9 +70,7 @@ private String convertSymbol(final Character symbol) {
    * @return custom format string
    */
   public String convert(final String name, final String lastname) {
-    if (masLinks == null) {
-      readFile();
-    }
+    readFile();
 
     String lowerLastName = lastname.toLowerCase();
     String prepareLastName = lowerLastName.replace(masLinks[0][0], masLinks[0][1]);
@@ -81,7 +79,7 @@ public String convert(final String name, final String lastname) {
 
     firstSymbol = true;
 
-    resultLine.append(convertSymbol(name.charAt(0)));
+    resultLine.append(convertSymbol(name.charAt(0)).charAt(0));
     resultLine.append(convertSymbol(prepareLastName.charAt(0)));
 
     firstSymbol = false;
@@ -94,7 +92,10 @@ public String convert(final String name, final String lastname) {
     return resultLine.toString();
   }
 
-  private static void readFile() {
+  private synchronized static void readFile() {
+    if (masLinks != null) {
+      return;
+    }
 
     List<String> list = new ArrayList<>();
 

diff --git a/transliteration/src/test/java/transliteration/TransliterationTest.java b/transliteration/src/test/java/transliteration/TransliterationTest.java
@@ -28,9 +28,9 @@ void convertTest() {
     assertEquals("GGorgany", tr.convert("Ґ", "Ґорґани"));
     assertEquals("DDonetsk", tr.convert("Дмитро", "Донецьк"));
     assertEquals("ORivne", tr.convert("Олег", "Рівне"));
-    assertEquals("YeYenakiieve", tr.convert("Є", "Єнакієве"));
-    assertEquals("ZhZhytomyr", tr.convert("Жанна", "Житомир"));
-    assertEquals("ZhZhezheliv", tr.convert("Жежелів", "Жежелів"));
+    assertEquals("YYenakiieve", tr.convert("Є", "Єнакієве"));
+    assertEquals("ZZhytomyr", tr.convert("Жанна", "Житомир"));
+    assertEquals("ZZhezheliv", tr.convert("Жежелів", "Жежелів"));
     assertEquals("ZZakarpattia", tr.convert("З", "Закарпаття"));
     assertEquals("KKazymyrchuk", tr.convert("К", "Казимирчук"));
     assertEquals("MMedvyn", tr.convert("М", "Медвин"));