refactor(transliteration): refactor code after reviewing PR changes

Author: InAnYan

jablib/src/main/java/org/jabref/logic/bibtex/BibtexStandard.java

@@ -0,0 +1,11 @@
+package org.jabref.logic.bibtex;
+
+import java.util.Arrays;
+import java.util.List;
+
+/// Contains various information or constants about the BibTeX standard.
+public class BibtexStandard {
+    /// Source of disallowed characters: <https://tex.stackexchange.com/a/408548/9075>
+    /// These characters are disallowed in BibTeX keys.
+    public static final List<Character> DISALLOWED_CHARACTERS = Arrays.asList('{', '}', '(', ')', ',', '=', '\\', '"', '#', '%', '~', '\'');
+}

jablib/src/main/java/org/jabref/logic/citationkeypattern/CitationKeyGenerator.java

@@ -1,12 +1,12 @@
 package org.jabref.logic.citationkeypattern;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Function;
 import java.util.regex.PatternSyntaxException;
 
+import org.jabref.logic.bibtex.BibtexStandard;
 import org.jabref.logic.util.strings.Transliteration;
 import org.jabref.model.FieldChange;
 import org.jabref.model.database.BibDatabase;
@@ -35,10 +35,6 @@ public class CitationKeyGenerator extends BracketedPattern {
     /// See also #DISALLOWED_CHARACTERS
     public static final String DEFAULT_UNWANTED_CHARACTERS = "?!;^`ʹ";
 
-    /// Source of disallowed characters: <https://tex.stackexchange.com/a/408548/9075>
-    /// These characters are disallowed in BibTeX keys.
-    public static final List<Character> DISALLOWED_CHARACTERS = Arrays.asList('{', '}', '(', ')', ',', '=', '\\', '"', '#', '%', '~', '\'');
-
     private static final Logger LOGGER = LoggerFactory.getLogger(CitationKeyGenerator.class);
 
     private final AbstractCitationKeyPatterns citeKeyPattern;
@@ -81,7 +77,7 @@ public static String removeDefaultUnwantedCharacters(String key) {
     public static String removeUnwantedCharacters(String key, String unwantedCharacters) {
         String newKey = key.chars()
                            .filter(c -> unwantedCharacters.indexOf(c) == -1)
-                           .filter(c -> !DISALLOWED_CHARACTERS.contains((char) c))
+                           .filter(c -> !BibtexStandard.DISALLOWED_CHARACTERS.contains((char) c))
                            .collect(StringBuilder::new,
                                    StringBuilder::appendCodePoint, StringBuilder::append)
                            .toString();
@@ -160,7 +156,8 @@ public String transliterateIfNeeded(String key) {
             return key;
         }
 
-        return Transliteration.transliterate(key, false);
+        String result = Transliteration.transliterate(key);
+        return result.replace(" ", "");
     }
 
     /**

jablib/src/main/java/org/jabref/logic/formatter/bibtexfields/TransliterateFormatter.java

@@ -17,7 +17,7 @@ public String getKey() {
 
     @Override
     public String format(String value) {
-        return Transliteration.transliterate(value, false);
+        return Transliteration.transliterate(value);
     }
 
     @Override

jablib/src/main/java/org/jabref/logic/util/strings/Transliteration.java

@@ -1,6 +1,6 @@
 package org.jabref.logic.util.strings;
 
-import org.jabref.logic.citationkeypattern.CitationKeyGenerator;
+import org.jabref.logic.bibtex.BibtexStandard;
 
 import com.ibm.icu.text.Transliterator;
 
@@ -11,21 +11,14 @@ public class Transliteration {
     private static final String TRANSLITERATOR_CONFIG = buildTransliteratorConfig();
     private static final Transliterator TRANSLITERATOR = Transliterator.getInstance(TRANSLITERATOR_CONFIG);
 
-    public static String transliterate(String input, boolean removeSpaces) {
-        String result = TRANSLITERATOR.transliterate(input);
-
-        // For some reason, icu4j sometimes leaves spaces in the result, so we remove them here if needed.
-        if (removeSpaces) {
-            result = result.replace(" ", "");
-        }
-
-        return result;
+    public static String transliterate(String input) {
+        return TRANSLITERATOR.transliterate(input);
     }
 
     private static String buildTransliteratorConfig() {
         StringBuilder pattern = new StringBuilder();
 
-        for (Character c : CitationKeyGenerator.DISALLOWED_CHARACTERS) {
+        for (Character c : BibtexStandard.DISALLOWED_CHARACTERS) {
             // Generally, only characters like `-` or `[` need to be escaped with a backslash,
             // but for future proofing we escape all characters.
             pattern.append("\\").append(c);

jablib/src/test/java/org/jabref/logic/util/strings/TransliterationTest.java

@@ -1,6 +1,5 @@
 package org.jabref.logic.util.strings;
 
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
@@ -14,22 +13,12 @@ class TransliterationTest {
             "संस्कृतम्, Sanskrtam",        // Sanskrit
             "नमस्ते, Namaste",            // Hindi
             "Привет, Privet",          // Russian
-            "Привіт, Privit",          // Ukrainian, though "Pryvit" is better for expected result.
+            "Привіт, Privit",          // Ukrainian, though "Pryvit" is better for the expected result.
             "你好, Ni Hao",             // Chinese
             "안녕하세요, Annyeonghaseyo", // Korean
             "مرحبا, Mrhba"             // Arabic
     })
     void transliterates(String string, String expected) {
-        assertEquals(expected, Transliteration.transliterate(string, false));
-    }
-
-    @Test
-    void removesSpaces(){
-        assertEquals("DzabRef", Transliteration.transliterate("Джаб Реф", true));
-    }
-
-    @Test
-    void keepsSpaces(){
-        assertEquals("Dzab Ref", Transliteration.transliterate("Джаб Реф", false));
+        assertEquals(expected, Transliteration.transliterate(string));
     }
 }