Fix DOI parsing error (#10405)

* Fix DOI parsing error Reported by Thilo * fix import
JabRef · Sep 19, 2023 · e53c390 · e53c390
1 parent c66f863
commit e53c390
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/src/main/java/org/jabref/gui/fieldeditors/contextmenu/EditorMenus.java b/src/main/java/org/jabref/gui/fieldeditors/contextmenu/EditorMenus.java
@@ -10,14 +10,14 @@
 import javafx.scene.control.TextInputControl;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.Globals;
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.edit.CopyDoiUrlAction;
 import org.jabref.logic.formatter.bibtexfields.CleanupUrlFormatter;
 import org.jabref.logic.formatter.bibtexfields.NormalizeNamesFormatter;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.strings.StringUtil;
+import org.jabref.preferences.PreferencesService;
 
 import com.tobiasdiez.easybind.EasyBind;
 
@@ -53,9 +53,9 @@ public static Supplier<List<MenuItem>> getNameMenu(final TextInputControl textIn
      * @param textArea text-area that this menu will be connected to
      * @return menu containing items of the default menu and an item for copying a DOI/DOI URL
      */
-    public static Supplier<List<MenuItem>> getDOIMenu(TextArea textArea, DialogService dialogService) {
+    public static Supplier<List<MenuItem>> getDOIMenu(TextArea textArea, DialogService dialogService, PreferencesService preferencesService) {
         return () -> {
-            ActionFactory factory = new ActionFactory(Globals.getKeyPrefs());
+            ActionFactory factory = new ActionFactory(preferencesService.getKeyBindingRepository());
             MenuItem copyDoiMenuItem = factory.createMenuItem(StandardActions.COPY_DOI, new CopyDoiUrlAction(textArea, StandardActions.COPY_DOI, dialogService));
             MenuItem copyDoiUrlMenuItem = factory.createMenuItem(StandardActions.COPY_DOI_URL, new CopyDoiUrlAction(textArea, StandardActions.COPY_DOI_URL, dialogService));
             List<MenuItem> menuItems = new ArrayList<>();

diff --git a/src/main/java/org/jabref/gui/fieldeditors/identifier/IdentifierEditor.java b/src/main/java/org/jabref/gui/fieldeditors/identifier/IdentifierEditor.java
@@ -75,7 +75,7 @@ public IdentifierEditor(Field field,
                 new Tooltip(Localization.lang("Look up %0", field.getDisplayName())));
 
         if (field.equals(StandardField.DOI)) {
-            textArea.initContextMenu(EditorMenus.getDOIMenu(textArea, dialogService));
+            textArea.initContextMenu(EditorMenus.getDOIMenu(textArea, dialogService, preferencesService));
         } else {
             textArea.initContextMenu(new DefaultMenu(textArea));
         }

diff --git a/src/main/java/org/jabref/model/entry/identifier/DOI.java b/src/main/java/org/jabref/model/entry/identifier/DOI.java
@@ -171,6 +171,9 @@ public static Optional<DOI> parse(String doi) {
             cleanedDOI = cleanedDOI.replaceAll(CHARS_TO_REMOVE, "");
 
             if (cleanedDOI.startsWith("_") && cleanedDOI.endsWith("_")) {
+                if (cleanedDOI.length() == 1) {
+                    return Optional.empty();
+                }
                 cleanedDOI = cleanedDOI.substring(1, cleanedDOI.length() - 1);
             }
 

diff --git a/src/test/java/org/jabref/model/entry/identifier/DOITest.java b/src/test/java/org/jabref/model/entry/identifier/DOITest.java
@@ -266,6 +266,13 @@ public void rejectInvalidDirectoryIndicatorInShortDoi() {
         assertThrows(IllegalArgumentException.class, () -> new DOI("20/abcd"));
     }
 
+    @Test
+    public void emptyOrUndescoreOnlyReturnsEmpty() {
+       assertEquals(Optional.empty(), DOI.parse("_"));
+       assertEquals(Optional.empty(), DOI.parse("\t_"));
+       assertEquals(Optional.empty(), DOI.parse("___"));
+    }
+
     @Test
     public void rejectInvalidDoiUri() {
         assertThrows(IllegalArgumentException.class, () -> new DOI("https://thisisnouri"));