Fix journal abbbrev checker for curly braces

CHANGELOG.md

@@ -31,6 +31,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - The tab "deprecated fields" is shown in biblatex-mode only. [#7757](https://github.com/JabRef/jabref/issues/7757)
 - We fixed an issue where the last opened libraries were not remembered when a new unsaved libray was open as well [#9190](https://github.com/JabRef/jabref/issues/9190)
 - We fixed an issue where no context menu for the group "All entries" was present [forum#3682](https://discourse.jabref.org/t/how-sort-groups-a-z-not-subgroups/3682)
+- We fixed an issue where extra curly braces in some fields would trigger an exception when selecting the entry or doing an integrity check [#9475](https://github.com/JabRef/jabref/issues/9475), [#9503](https://github.com/JabRef/jabref/issues/9503)
 
 ### Removed
 

src/main/java/org/jabref/gui/journals/UndoableUnabbreviator.java

@@ -36,7 +36,7 @@ public boolean unabbreviate(BibDatabase database, BibEntry entry, Field field, C
             return true;
         }
 
-        String text = entry.getField(field).get();
+        String text = entry.getLatexFreeField(field).get();
         String origText = text;
         if (database != null) {
             text = database.resolveForStrings(text);

src/main/java/org/jabref/logic/integrity/AbbreviationChecker.java

@@ -1,29 +1,34 @@
 package org.jabref.logic.integrity;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.model.strings.StringUtil;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.FieldFactory;
 
-public class AbbreviationChecker implements ValueChecker {
+public class AbbreviationChecker implements EntryChecker {
 
     private final JournalAbbreviationRepository abbreviationRepository;
+    private final Set<Field> fields = FieldFactory.getBookNameFields();
 
     public AbbreviationChecker(JournalAbbreviationRepository abbreviationRepository) {
         this.abbreviationRepository = abbreviationRepository;
     }
 
     @Override
-    public Optional<String> checkValue(String value) {
-        if (StringUtil.isBlank(value)) {
-            return Optional.empty();
-        }
+    public List<IntegrityMessage> check(BibEntry entry) {
 
-        if (abbreviationRepository.isAbbreviatedName(value)) {
-            return Optional.of(Localization.lang("abbreviation detected"));
+        List<IntegrityMessage> messages = new ArrayList<>();
+        for (Field field : fields) {
+            Optional<String> value = entry.getLatexFreeField(field);
+            value.filter(abbreviationRepository::isAbbreviatedName)
+                 .ifPresent(val -> messages.add(new IntegrityMessage(Localization.lang("abbreviation detected"), entry, field)));
         }
-
-        return Optional.empty();
+        return messages;
     }
 }

src/main/java/org/jabref/logic/integrity/FieldCheckers.java

@@ -27,9 +27,6 @@ public FieldCheckers(BibDatabaseContext databaseContext, FilePreferences filePre
     private static Multimap<Field, ValueChecker> getAllMap(BibDatabaseContext databaseContext, FilePreferences filePreferences, JournalAbbreviationRepository abbreviationRepository, boolean allowIntegerEdition) {
         ArrayListMultimap<Field, ValueChecker> fieldCheckers = ArrayListMultimap.create(50, 10);
 
-        for (Field field : FieldFactory.getBookNameFields()) {
-            fieldCheckers.put(field, new AbbreviationChecker(abbreviationRepository));
-        }
         for (Field field : FieldFactory.getPersonNameFields()) {
             fieldCheckers.put(field, new PersonNamesChecker(databaseContext));
         }

src/main/java/org/jabref/logic/integrity/JournalInAbbreviationListChecker.java

@@ -22,7 +22,7 @@ public JournalInAbbreviationListChecker(Field field, JournalAbbreviationReposito
 
     @Override
     public List<IntegrityMessage> check(BibEntry entry) {
-        Optional<String> value = entry.getField(field);
+        Optional<String> value = entry.getLatexFreeField(field);
         if (value.isEmpty()) {
             return Collections.emptyList();
         }

src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java

@@ -65,7 +65,7 @@ public boolean isKnownName(String journalName) {
         }
 
         return fullToAbbreviation.containsKey(journal) || abbreviationToFull.containsKey(journal)
-                || findDottedAbbrFromDotless(journal).length() > 0;
+                || (findDottedAbbrFromDotless(journal).length() > 0);
     }
 
     /**
@@ -80,7 +80,7 @@ public boolean isAbbreviatedName(String journalName) {
 
         return customAbbreviations.stream().anyMatch(abbreviation -> isMatchedAbbreviated(journal, abbreviation))
                 || abbreviationToFull.containsKey(journal)
-                || (isMoreThanTwoWords && findDottedAbbrFromDotless(journal).length() > 0);
+                || (isMoreThanTwoWords && (findDottedAbbrFromDotless(journal).length() > 0));
     }
 
     public String findDottedAbbrFromDotless(String journalName) {
@@ -94,6 +94,7 @@ public String findDottedAbbrFromDotless(String journalName) {
         // check for a dot-less abbreviation
         if (!DOT.matcher(journalName).find()) {
             // use dot-less abbr to find full name using regex
+
             String[] journalSplit = journalName.split(" ");
 
             for (int i = 0; i < journalSplit.length; i++) {

src/test/java/org/jabref/logic/integrity/AbbreviationCheckerTest.java

@@ -1,10 +1,13 @@
 package org.jabref.logic.integrity;
 
-import java.util.Optional;
+import java.util.Collections;
 
 import org.jabref.logic.journals.Abbreviation;
 import org.jabref.logic.journals.JournalAbbreviationLoader;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.types.StandardEntryType;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -16,32 +19,43 @@ class AbbreviationCheckerTest {
 
     private JournalAbbreviationRepository abbreviationRepository;
     private AbbreviationChecker checker;
+    private BibEntry entry;
 
     @BeforeEach
     void setUp() {
         abbreviationRepository = JournalAbbreviationLoader.loadBuiltInRepository();
         abbreviationRepository.addCustomAbbreviation(new Abbreviation("Test Journal", "T. J."));
+        entry = new BibEntry(StandardEntryType.InProceedings);
         checker = new AbbreviationChecker(abbreviationRepository);
     }
 
     @Test
     void checkValueComplainsAboutAbbreviatedJournalName() {
-        assertNotEquals(Optional.empty(), checker.checkValue("T. J."));
+        entry.setField(StandardField.BOOKTITLE, "T. J.");
+        assertNotEquals(Collections.emptyList(), checker.check(entry));
     }
 
     @Test
     void checkValueDoesNotComplainAboutJournalNameThatHasSameAbbreviation() {
+        entry.setField(StandardField.BOOKTITLE, "Journal");
         abbreviationRepository.addCustomAbbreviation(new Abbreviation("Journal", "Journal"));
-        assertEquals(Optional.empty(), checker.checkValue("Journal"));
+        assertEquals(Collections.emptyList(), checker.check(entry));
     }
 
     @Test
     void checkValueDoesNotComplainAboutJournalNameThatHasΝοAbbreviation() {
-        assertEquals(Optional.empty(), checker.checkValue("IEEE Software"));
+        entry.setField(StandardField.BOOKTITLE, "IEEE Software");
+        assertEquals(Collections.emptyList(), checker.check(entry));
     }
 
     @Test
     void checkValueDoesNotComplainAboutJournalNameThatHasΝοInput() {
-        assertEquals(Optional.empty(), checker.checkValue(""));
+        assertEquals(Collections.emptyList(), checker.check(entry));
+    }
+
+    @Test
+    void checkValueWorksForLaTeXFields() {
+        entry.setField(StandardField.BOOKTITLE, "Subject-Oriented Business Process Management - Second International Conference, {S-BPM} {ONE} 2010, Karlsruhe, Germany, October 14, 2010. Selected Papers");
+        assertEquals(Collections.emptyList(), checker.check(entry));
     }
 }

src/test/java/org/jabref/logic/journals/JournalAbbreviationRepositoryTest.java

@@ -267,4 +267,19 @@ void testJournalDotlessAbbreviation() {
                 .withField(StandardField.JOURNAL, "ACS Applied Materials & Interfaces");
         assertEquals(expectedAbbreviatedJournalEntry, abbreviatedJournalEntry);
     }
+
+    @Test
+    void testJournalDotlessAbbreviationWithCurlyBraces() {
+        BibDatabase bibDatabase = new BibDatabase();
+        JournalAbbreviationRepository journalAbbreviationRepository = JournalAbbreviationLoader.loadBuiltInRepository();
+        UndoableUnabbreviator undoableUnabbreviator = new UndoableUnabbreviator(journalAbbreviationRepository);
+
+        BibEntry abbreviatedJournalEntry = new BibEntry(StandardEntryType.Article);
+        abbreviatedJournalEntry.setField(StandardField.JOURNAL, "{ACS Appl Mater Interfaces}");
+
+        undoableUnabbreviator.unabbreviate(bibDatabase, abbreviatedJournalEntry, StandardField.JOURNAL, new CompoundEdit());
+        BibEntry expectedAbbreviatedJournalEntry = new BibEntry(StandardEntryType.Article)
+                .withField(StandardField.JOURNAL, "ACS Applied Materials & Interfaces");
+        assertEquals(expectedAbbreviatedJournalEntry, abbreviatedJournalEntry);
+    }
 }