From afca0efdc2d09104ce3d7752b47df5e275cab179 Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Thu, 7 Oct 2021 15:06:59 +0200
Subject: [PATCH 01/47] add prototype

---
 src/main/java/org/jabref/gui/JabRefFrame.java | 39 ++++++---
 .../jabref/gui/actions/StandardActions.java   |  1 -
 .../importer/GenerateEntryFromIdAction.java   | 39 +++++++++
 .../importer/GenerateEntryFromIdDialog.fxml   | 21 +++++
 .../importer/GenerateEntryFromIdDialog.java   | 48 +++++++++++
 .../logic/importer/CompositeIdFetcher.java    | 79 +++++++++++++++++++
 6 files changed, 217 insertions(+), 10 deletions(-)
 create mode 100644 src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
 create mode 100644 src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.fxml
 create mode 100644 src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
 create mode 100644 src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java

diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 22ab411189c..69e5e609baf 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -40,11 +40,7 @@
 import javafx.scene.control.skin.TabPaneSkin;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.input.TransferMode;
-import javafx.scene.layout.BorderPane;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.Priority;
-import javafx.scene.layout.Region;
-import javafx.scene.layout.VBox;
+import javafx.scene.layout.*;
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
 
@@ -86,10 +82,8 @@
 import org.jabref.gui.help.ErrorConsoleAction;
 import org.jabref.gui.help.HelpAction;
 import org.jabref.gui.help.SearchForUpdateAction;
-import org.jabref.gui.importer.ImportCommand;
-import org.jabref.gui.importer.ImportEntriesDialog;
-import org.jabref.gui.importer.NewDatabaseAction;
-import org.jabref.gui.importer.NewEntryAction;
+import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.importer.*;
 import org.jabref.gui.importer.actions.OpenDatabaseAction;
 import org.jabref.gui.importer.fetcher.LookupIdentifierAction;
 import org.jabref.gui.integrity.IntegrityCheckAction;
@@ -172,6 +166,7 @@ public class JabRefFrame extends BorderPane {
     private TabPane tabbedPane;
     private SidePane sidePane;
     private PopOver progressViewPopOver;
+    private PopOver entryFromIdPopOver;
 
     private final TaskExecutor taskExecutor;
 
@@ -475,6 +470,31 @@ private Node createToolbar() {
         final Button pushToApplicationButton = factory.createIconButton(pushToApplicationAction.getActionInformation(), pushToApplicationAction);
         pushToApplicationsManager.registerReconfigurable(pushToApplicationButton);
 
+        // Create New Entry From ID Button
+
+        Button newEntryFromIdButton = new Button();
+        newEntryFromIdButton.setGraphic(IconTheme.JabRefIcons.IMPORT.getGraphicNode());
+        newEntryFromIdButton.setStyle("-fx-background-color: transparent;");
+        newEntryFromIdButton.setStyle("-fx-border-color: transparent;");
+        newEntryFromIdButton.setOnMouseClicked(event -> {
+            GenerateEntryFromIdDialog entryFromId = new GenerateEntryFromIdDialog(this, dialogService, prefs, factory);
+
+            if (entryFromIdPopOver == null) {
+                entryFromIdPopOver = new PopOver(entryFromId.getDialogPane());
+                entryFromIdPopOver.setTitle(Localization.lang("Entry From ID"));
+                entryFromIdPopOver.setArrowLocation(PopOver.ArrowLocation.TOP_CENTER);
+                entryFromIdPopOver.setContentNode(entryFromId.getDialogPane());
+                entryFromIdPopOver.show(newEntryFromIdButton);
+            } else if (entryFromIdPopOver.isShowing()) {
+                entryFromIdPopOver.hide();
+            } else {
+                entryFromIdPopOver.setContentNode(entryFromId.getDialogPane());
+                entryFromIdPopOver.show(newEntryFromIdButton);
+            }
+        });
+
+        // Setup Toolbar
+
         ToolBar toolBar = new ToolBar(
 
                 new HBox(
@@ -491,6 +511,7 @@ private Node createToolbar() {
                 new HBox(
                         factory.createIconButton(StandardActions.NEW_ARTICLE, new NewEntryAction(this, StandardEntryType.Article, dialogService, prefs, stateManager)),
                         factory.createIconButton(StandardActions.NEW_ENTRY, new NewEntryAction(this, dialogService, prefs, stateManager)),
+                        newEntryFromIdButton,
                         factory.createIconButton(StandardActions.NEW_ENTRY_FROM_PLAIN_TEXT, new ExtractBibtexAction(dialogService, prefs, stateManager)),
                         factory.createIconButton(StandardActions.DELETE_ENTRY, new EditAction(StandardActions.DELETE_ENTRY, this, stateManager))
                 ),
diff --git a/src/main/java/org/jabref/gui/actions/StandardActions.java b/src/main/java/org/jabref/gui/actions/StandardActions.java
index cbe51b9db9e..9c2b75fe9e1 100644
--- a/src/main/java/org/jabref/gui/actions/StandardActions.java
+++ b/src/main/java/org/jabref/gui/actions/StandardActions.java
@@ -131,7 +131,6 @@ public enum StandardActions implements Action {
     LIBRARY_PROPERTIES(Localization.lang("Library properties")),
     EDIT_PREAMBLE(Localization.lang("Edit preamble")),
     EDIT_STRINGS(Localization.lang("Edit string constants"), IconTheme.JabRefIcons.EDIT_STRINGS, KeyBinding.EDIT_STRINGS),
-
     FIND_DUPLICATES(Localization.lang("Find duplicates"), IconTheme.JabRefIcons.FIND_DUPLICATES),
     MERGE_ENTRIES(Localization.lang("Merge entries"), IconTheme.JabRefIcons.MERGE_ENTRIES, KeyBinding.MERGE_ENTRIES),
     RESOLVE_DUPLICATE_KEYS(Localization.lang("Resolve duplicate citation keys"), Localization.lang("Find and remove duplicate citation keys"), KeyBinding.RESOLVE_DUPLICATE_CITATION_KEYS),
diff --git a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
new file mode 100644
index 00000000000..763df8e54d0
--- /dev/null
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
@@ -0,0 +1,39 @@
+package org.jabref.gui.importer;
+
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.actions.SimpleCommand;
+import org.jabref.logic.importer.CompositeIdFetcher;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.preferences.PreferencesService;
+
+import java.util.Optional;
+
+public class GenerateEntryFromIdAction extends SimpleCommand {
+    private final JabRefFrame jabRefFrame;
+    private final DialogService dialogService;
+    private final PreferencesService preferencesService;
+    private final String id;
+
+    public GenerateEntryFromIdAction(JabRefFrame jabRefFrame, DialogService dialogService, PreferencesService preferencesService, String id) {
+        this.jabRefFrame = jabRefFrame;
+        this.dialogService = dialogService;
+        this.preferencesService = preferencesService;
+        this.id = id;
+    }
+
+    @Override
+    public void execute() {
+        Optional<BibEntry> fetchedEntry;
+
+        CompositeIdFetcher compositeIdFetcher = new CompositeIdFetcher(preferencesService.getImportFormatPreferences());
+        fetchedEntry = compositeIdFetcher.performSearchById(id);
+
+        fetchedEntry.ifPresentOrElse(
+                bibEntry -> jabRefFrame.getCurrentLibraryTab().insertEntry(bibEntry),
+                () -> dialogService.showErrorDialogAndWait("Could not generate an entry from this ID")
+        );
+    }
+
+}
diff --git a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.fxml b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.fxml
new file mode 100644
index 00000000000..5778143bc91
--- /dev/null
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.fxml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.DialogPane?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.Pane?>
+<DialogPane fx:id="dialogPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="92.0" prefWidth="392.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.importer.GenerateEntryFromIdDialog">
+   <content>
+       <Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="102.0"
+             prefWidth="360.0">
+           <TextField fx:id="idTextField" layoutX="14.0" layoutY="40.0" maxHeight="-Infinity" maxWidth="-Infinity"
+                      minHeight="-Infinity" minWidth="-Infinity" prefHeight="29.0" prefWidth="238.0"/>
+           <Button fx:id="generateButton" layoutX="273.0" layoutY="40.0" maxHeight="-Infinity" maxWidth="-Infinity"
+                   minHeight="-Infinity" minWidth="-Infinity" mnemonicParsing="false" onAction="#generateEntry"
+                   prefHeight="30.0" prefWidth="96.0" text="Generate" textAlignment="CENTER"/>
+           <Label layoutX="14.0" layoutY="14.0" prefHeight="16.0" prefWidth="328.0"
+                  text="Fetch and generate an entry from an ID:"/>
+       </Pane>
+   </content>
+</DialogPane>
diff --git a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
new file mode 100644
index 00000000000..602300dc400
--- /dev/null
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
@@ -0,0 +1,48 @@
+package org.jabref.gui.importer;
+
+import com.airhacks.afterburner.views.ViewLoader;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.DialogPane;
+import javafx.scene.control.TextField;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.Globals;
+import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.actions.ActionFactory;
+import org.jabref.gui.actions.StandardActions;
+import org.jabref.preferences.PreferencesService;
+
+public class GenerateEntryFromIdDialog {
+
+    private final PreferencesService preferencesService;
+    private final DialogService dialogService;
+    private final JabRefFrame jabRefFrame;
+
+    @FXML
+    DialogPane dialogPane;
+    @FXML
+    TextField idTextField;
+    @FXML
+    Button generateButton;
+
+    public GenerateEntryFromIdDialog(JabRefFrame jabRefFrame, DialogService dialogService, PreferencesService preferencesService, ActionFactory factory) {
+        ViewLoader.view(this).load();
+        this.preferencesService = preferencesService;
+        this.dialogService = dialogService;
+        this.jabRefFrame = jabRefFrame;
+    }
+
+    @FXML private void generateEntry() {
+        new GenerateEntryFromIdAction(
+                jabRefFrame,
+                dialogService,
+                preferencesService,
+                idTextField.getText()
+        ).execute();
+    }
+
+    public DialogPane getDialogPane() {
+        return dialogPane;
+    }
+
+}
diff --git a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
new file mode 100644
index 00000000000..c2c9ec6d538
--- /dev/null
+++ b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
@@ -0,0 +1,79 @@
+package org.jabref.logic.importer;
+
+import org.jabref.logic.importer.fetcher.*;
+import org.jabref.model.entry.BibEntry;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Optional;
+
+public class CompositeIdFetcher implements IdBasedFetcher {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(CompositeIdFetcher.class);
+
+    private final ImportFormatPreferences importFormatPreferences;
+
+    public CompositeIdFetcher(ImportFormatPreferences importFormatPreferences) {
+        this.importFormatPreferences = importFormatPreferences;
+    }
+
+
+    @Override
+    public Optional<BibEntry> performSearchById(String identifier) {
+
+        Optional<BibEntry> fetchedEntry;
+
+        try {
+            if ((fetchedEntry = new ArXiv(importFormatPreferences).performSearchById(identifier)).isPresent()) {
+                return fetchedEntry;
+            }
+
+        } catch (FetcherException fetcherException) {
+            LOGGER.debug(fetcherException.getMessage());
+        }
+
+        try {
+            if ((fetchedEntry = new IsbnFetcher(importFormatPreferences).performSearchById(identifier)).isPresent()) {
+                return fetchedEntry;
+            }
+
+        } catch (FetcherException fetcherException) {
+            LOGGER.debug(fetcherException.getMessage());
+        }
+
+        try {
+            if ((fetchedEntry = new DoiFetcher(importFormatPreferences).performSearchById(identifier)).isPresent()) {
+                return fetchedEntry;
+            }
+
+        } catch (FetcherException fetcherException) {
+            LOGGER.debug(fetcherException.getMessage());
+        }
+
+        try {
+            if ((fetchedEntry = new IacrEprintFetcher(importFormatPreferences).performSearchById(identifier)).isPresent()) {
+                return fetchedEntry;
+            }
+
+        } catch (FetcherException fetcherException) {
+            LOGGER.debug(fetcherException.getMessage());
+        }
+
+        try {
+            if ((fetchedEntry = new CrossRef().performSearchById(identifier)).isPresent()) {
+                return fetchedEntry;
+            }
+
+        } catch (FetcherException fetcherException) {
+            LOGGER.debug(fetcherException.getMessage());
+        }
+
+        return Optional.empty();
+
+    }
+
+    @Override
+    public String getName() {
+        return "CompositeIdFetcher";
+    }
+}

From a9f6aec985fcf44df48d805377e3b46dd382054a Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Fri, 8 Oct 2021 20:04:52 +0200
Subject: [PATCH 02/47] Add CompositeIdFetcherTest

---
 .../fetcher/CompositeIdFetcherTest.java       | 126 ++++++++++++++++++
 1 file changed, 126 insertions(+)
 create mode 100644 src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java

diff --git a/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java
new file mode 100644
index 00000000000..4ae8ac175dd
--- /dev/null
+++ b/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java
@@ -0,0 +1,126 @@
+package org.jabref.logic.importer.fetcher;
+
+
+import java.util.Optional;
+
+import org.jabref.logic.bibtex.FieldContentFormatterPreferences;
+import org.jabref.logic.importer.CompositeIdFetcher;
+import org.jabref.logic.importer.ImportFormatPreferences;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.field.UnknownField;
+import org.jabref.model.entry.types.StandardEntryType;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+/**
+ * Tests the CompositeIdFetcher, for which Fetchers implementing the
+ * IdBasedFetcher interface are a prerequisite. Excluding TitleFetcher.
+ */
+class CompositeIdFetcherTest {
+    private CompositeIdFetcher compositeIdFetcher;
+
+    private static String groundInvalidArXivId;
+    private static String groundArXivId;
+    private static String groundDOIId;
+    private static String groundIsbnId;
+    private static String groundIacrEprintId;
+
+    private static BibEntry groundEntryArXiv;
+    private static BibEntry groundDOIEntry;
+    private static BibEntry groundIsbnEntry;
+    private static BibEntry groundIacrEprintEntry;
+
+    @BeforeAll
+    static void setUpGroundEntriesAndIds() {
+        groundInvalidArXivId = "arZiv:2110.02957";
+
+        groundArXivId = "arXiv:2110.02957";
+        groundEntryArXiv = new BibEntry(StandardEntryType.Article)
+                .withField(StandardField.AUTHOR, "Emily C. Cunningham and Robyn E. Sanderson and Kathryn V. Johnston and Nondh Panithanpaisal and Melissa K. Ness and Andrew Wetzel and Sarah R. Loebman and Ivanna Escala and Danny Horta and Claude-André Faucher-Giguère")
+                .withField(StandardField.TITLE, "Reading the CARDs: the Imprint of Accretion History in the Chemical Abundances of the Milky Way's Stellar Halo")
+                .withField(StandardField.DATE, "2021-10-06")
+                .withField(StandardField.ABSTRACT, "In the era of large-scale spectroscopic surveys in the Local Group (LG), we can explore using chemical abundances of halo stars to study the star formation and chemical enrichment histories of the dwarf galaxy progenitors of the Milky Way (MW) and M31 stellar halos. In this paper, we investigate using the Chemical Abundance Ratio Distributions (CARDs) of seven stellar halos from the Latte suite of FIRE-2 simulations. We attempt to infer galaxies' assembly histories by modelling the CARDs of the stellar halos of the Latte galaxies as a linear combination of template CARDs from disrupted dwarfs, with different stellar masses $M_{\\star}$ and quenching times $t_{100}$. We present a method for constructing these templates using present-day dwarf galaxies. For four of the seven Latte halos studied in this work, we recover the mass spectrum of accreted dwarfs to a precision of $<10\\%$. For the fraction of mass accreted as a function of $t_{100}$, we find residuals of $20-30\\%$ for five of the seven simulations. We discuss the failure modes of this method, which arise from the diversity of star formation and chemical enrichment histories dwarf galaxies can take. These failure cases can be robustly identified by the high model residuals. Though the CARDs modeling method does not successfully infer the assembly histories in these cases, the CARDs of these disrupted dwarfs contain signatures of their unusual formation histories. Our results are promising for using CARDs to learn more about the histories of the progenitors of the MW and M31 stellar halos.")
+                .withField(StandardField.EPRINT, "2110.02957")
+                .withField(StandardField.FILE, ":http\\://arxiv.org/pdf/2110.02957v1:PDF")
+                .withField(StandardField.EPRINTTYPE, "arXiv")
+                .withField(StandardField.EPRINTCLASS, "astro-ph.GA")
+                .withField(StandardField.KEYWORDS, "astro-ph.GA");
+
+        groundDOIId = "10.1002/9781118257517";
+        groundDOIEntry = new BibEntry(StandardEntryType.Book)
+                .withField(StandardField.TITLE, "Java{\\textregistered} For Dummies{\\textregistered}")
+                .withField(StandardField.PUBLISHER, "Wiley Publishing, Inc.")
+                .withField(StandardField.YEAR, "2011")
+                .withField(StandardField.AUTHOR, "Barry Burd")
+                .withField(StandardField.MONTH, "jul")
+                .withField(StandardField.DOI, "10.1002/9781118257517");
+        groundDOIEntry.setCitationKey("Burd_2011");
+
+        groundIsbnId = "9780134685991";
+        groundIsbnEntry = new BibEntry(StandardEntryType.Book)
+                .withField(StandardField.TITLE, "Effective Java")
+                .withField(StandardField.PUBLISHER, "Addison Wesley")
+                .withField(StandardField.YEAR, "2018")
+                .withField(StandardField.AUTHOR, "Bloch, Joshua")
+                .withField(StandardField.DATE, "2018-01-01")
+                .withField(new UnknownField("ean"), "9780134685991")
+                .withField(StandardField.ISBN, "0134685997")
+                .withField(StandardField.URL, "https://www.ebook.de/de/product/28983211/joshua_bloch_effective_java.html");
+        groundIsbnEntry.setCitationKey("9780134685991");
+
+        groundIacrEprintId = "2017/1118";
+        groundIacrEprintEntry = new BibEntry(StandardEntryType.Misc)
+                .withField(StandardField.ABSTRACT, "The decentralized cryptocurrency Bitcoin has experienced great success but also encountered many challenges. One of the challenges has been the long confirmation time. Another challenge is the lack of incentives at certain steps of the protocol, raising concerns for transaction withholding, selfish mining, etc. To address these challenges, we propose Solida, a decentralized blockchain protocol based on reconfigurable Byzantine consensus augmented by proof-of-work. Solida improves on Bitcoin in confirmation time,  and provides safety  and liveness assuming the adversary control less than (roughly) one-third of the total mining power.\n")
+                .withField(StandardField.AUTHOR, "Ittai Abraham and Dahlia Malkhi and Kartik Nayak and Ling Ren and Alexander Spiegelman")
+                .withField(StandardField.DATE, "2017-11-18")
+                .withField(StandardField.HOWPUBLISHED, "Cryptology ePrint Archive, Report 2017/1118")
+                .withField(StandardField.NOTE, "\\url{https://ia.cr/2017/1118}")
+                .withField(StandardField.TITLE, "Solida: A Blockchain Protocol Based on Reconfigurable Byzantine Consensus")
+                .withField(StandardField.URL, "https://eprint.iacr.org/2017/1118/20171124:064527")
+                .withField(StandardField.VERSION, "20171124:064527")
+                .withField(StandardField.YEAR, "2017");
+        groundIacrEprintEntry.setCitationKey("cryptoeprint:2017:1118");
+    }
+
+
+    @BeforeEach
+    void setUp() throws Exception {
+        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class);
+        FieldContentFormatterPreferences fieldContentFormatterPreferences = mock(FieldContentFormatterPreferences.class);
+        when(importFormatPreferences.getFieldContentFormatterPreferences()).thenReturn(fieldContentFormatterPreferences);
+        compositeIdFetcher = new CompositeIdFetcher(importFormatPreferences);
+    }
+
+    @Test
+    void performSearchByIdReturnsEmptyForInvalidId() {
+        assertEquals(Optional.empty(), compositeIdFetcher.performSearchById(groundInvalidArXivId));
+    }
+
+    @Test
+    void performSearchByIdReturnsCorrectEntryForDOIId() {
+        assertEquals(Optional.of(groundDOIEntry), compositeIdFetcher.performSearchById(groundDOIId));
+    }
+
+    @Test
+    void performSearchByIdReturnsCorrectEntryForIsbnId() {
+        assertEquals(Optional.of(groundIsbnEntry), compositeIdFetcher.performSearchById(groundIsbnId));
+    }
+
+    @Test
+    void performSearchByIdReturnsCorrectEntryForIacrEprintId() {
+        assertEquals(Optional.of(groundIacrEprintEntry), compositeIdFetcher.performSearchById(groundIacrEprintId));
+    }
+
+    @Test
+    void performSearchByIdReturnsCorrectEntryForArXivId() {
+        assertEquals(Optional.of(groundEntryArXiv), compositeIdFetcher.performSearchById(groundArXivId));
+    }
+
+}

From 899784e9f783959480fed22733ca32b7e4d56204 Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Fri, 8 Oct 2021 20:05:15 +0200
Subject: [PATCH 03/47] Add CHANGELOG.md update

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d432a948b41..10cff61a17c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,7 +23,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We readded the possibility to keep the search string when switching tabs. It is implemented by a toggle button. [#4096](https://github.com/JabRef/jabref/issues/4096#issuecomment-575986882)
 - We allowed the user to also preview the available citation styles in the preferences besides the selected ones [#8108](https://github.com/JabRef/jabref/issues/8108)
 - We added an option to search the available citation styles by name in the preferences [#8108](https://github.com/JabRef/jabref/issues/8108)
-
+- We added an option to generate bib-entries from ID through a popover in the toolbar. [#4183](https://github.com/JabRef/jabref/issues/4183)
 ### Changed
 
 - We slightly changed the layout of the Journal tab in the preferences for ui consistency. [#7937](https://github.com/JabRef/jabref/pull/7937)

From 549626b3cdf3a230ebb9c8bf823040a38abf9830 Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Fri, 8 Oct 2021 20:06:27 +0200
Subject: [PATCH 04/47] clean checkstyle warnings

---
 src/main/java/org/jabref/gui/JabRefFrame.java | 14 ++++++--
 .../importer/GenerateEntryFromIdAction.java   |  3 +-
 .../importer/GenerateEntryFromIdDialog.java   | 20 +++++-------
 .../logic/importer/CompositeIdFetcher.java    | 32 +++++++++++--------
 4 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 69e5e609baf..f3641cd8046 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -40,7 +40,11 @@
 import javafx.scene.control.skin.TabPaneSkin;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.input.TransferMode;
-import javafx.scene.layout.*;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.Region;
+import javafx.scene.layout.VBox;
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
 
@@ -83,7 +87,11 @@
 import org.jabref.gui.help.HelpAction;
 import org.jabref.gui.help.SearchForUpdateAction;
 import org.jabref.gui.icon.IconTheme;
-import org.jabref.gui.importer.*;
+import org.jabref.gui.importer.GenerateEntryFromIdDialog;
+import org.jabref.gui.importer.ImportCommand;
+import org.jabref.gui.importer.ImportEntriesDialog;
+import org.jabref.gui.importer.NewDatabaseAction;
+import org.jabref.gui.importer.NewEntryAction;
 import org.jabref.gui.importer.actions.OpenDatabaseAction;
 import org.jabref.gui.importer.fetcher.LookupIdentifierAction;
 import org.jabref.gui.integrity.IntegrityCheckAction;
@@ -477,7 +485,7 @@ private Node createToolbar() {
         newEntryFromIdButton.setStyle("-fx-background-color: transparent;");
         newEntryFromIdButton.setStyle("-fx-border-color: transparent;");
         newEntryFromIdButton.setOnMouseClicked(event -> {
-            GenerateEntryFromIdDialog entryFromId = new GenerateEntryFromIdDialog(this, dialogService, prefs, factory);
+            GenerateEntryFromIdDialog entryFromId = new GenerateEntryFromIdDialog(this, dialogService, prefs);
 
             if (entryFromIdPopOver == null) {
                 entryFromIdPopOver = new PopOver(entryFromId.getDialogPane());
diff --git a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
index 763df8e54d0..8bef9b7ff4a 100644
--- a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
@@ -1,5 +1,6 @@
 package org.jabref.gui.importer;
 
+import java.util.Optional;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefFrame;
@@ -8,8 +9,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.PreferencesService;
 
-import java.util.Optional;
-
 public class GenerateEntryFromIdAction extends SimpleCommand {
     private final JabRefFrame jabRefFrame;
     private final DialogService dialogService;
diff --git a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
index 602300dc400..da3455004c8 100644
--- a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
@@ -1,31 +1,27 @@
 package org.jabref.gui.importer;
 
-import com.airhacks.afterburner.views.ViewLoader;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.DialogPane;
 import javafx.scene.control.TextField;
+
 import org.jabref.gui.DialogService;
-import org.jabref.gui.Globals;
 import org.jabref.gui.JabRefFrame;
-import org.jabref.gui.actions.ActionFactory;
-import org.jabref.gui.actions.StandardActions;
 import org.jabref.preferences.PreferencesService;
 
+import com.airhacks.afterburner.views.ViewLoader;
+
 public class GenerateEntryFromIdDialog {
 
+    @FXML DialogPane dialogPane;
+    @FXML TextField idTextField;
+    @FXML Button generateButton;
+
     private final PreferencesService preferencesService;
     private final DialogService dialogService;
     private final JabRefFrame jabRefFrame;
 
-    @FXML
-    DialogPane dialogPane;
-    @FXML
-    TextField idTextField;
-    @FXML
-    Button generateButton;
-
-    public GenerateEntryFromIdDialog(JabRefFrame jabRefFrame, DialogService dialogService, PreferencesService preferencesService, ActionFactory factory) {
+    public GenerateEntryFromIdDialog(JabRefFrame jabRefFrame, DialogService dialogService, PreferencesService preferencesService) {
         ViewLoader.view(this).load();
         this.preferencesService = preferencesService;
         this.dialogService = dialogService;
diff --git a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
index c2c9ec6d538..3b2dab55156 100644
--- a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
@@ -1,12 +1,17 @@
 package org.jabref.logic.importer;
 
-import org.jabref.logic.importer.fetcher.*;
+import java.util.Optional;
+
+import org.jabref.logic.importer.fetcher.ArXiv;
+import org.jabref.logic.importer.fetcher.CrossRef;
+import org.jabref.logic.importer.fetcher.DoiFetcher;
+import org.jabref.logic.importer.fetcher.IacrEprintFetcher;
+import org.jabref.logic.importer.fetcher.IsbnFetcher;
 import org.jabref.model.entry.BibEntry;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Optional;
-
 public class CompositeIdFetcher implements IdBasedFetcher {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CompositeIdFetcher.class);
@@ -17,53 +22,52 @@ public CompositeIdFetcher(ImportFormatPreferences importFormatPreferences) {
         this.importFormatPreferences = importFormatPreferences;
     }
 
-
     @Override
     public Optional<BibEntry> performSearchById(String identifier) {
 
         Optional<BibEntry> fetchedEntry;
 
         try {
-            if ((fetchedEntry = new ArXiv(importFormatPreferences).performSearchById(identifier)).isPresent()) {
+            fetchedEntry = new ArXiv(importFormatPreferences).performSearchById(identifier);
+            if (fetchedEntry.isPresent()) {
                 return fetchedEntry;
             }
-
         } catch (FetcherException fetcherException) {
             LOGGER.debug(fetcherException.getMessage());
         }
 
         try {
-            if ((fetchedEntry = new IsbnFetcher(importFormatPreferences).performSearchById(identifier)).isPresent()) {
+            fetchedEntry = new IsbnFetcher(importFormatPreferences).performSearchById(identifier);
+            if (fetchedEntry.isPresent()) {
                 return fetchedEntry;
             }
-
         } catch (FetcherException fetcherException) {
             LOGGER.debug(fetcherException.getMessage());
         }
 
         try {
-            if ((fetchedEntry = new DoiFetcher(importFormatPreferences).performSearchById(identifier)).isPresent()) {
+            fetchedEntry = new DoiFetcher(importFormatPreferences).performSearchById(identifier);
+            if (fetchedEntry.isPresent()) {
                 return fetchedEntry;
             }
-
         } catch (FetcherException fetcherException) {
             LOGGER.debug(fetcherException.getMessage());
         }
 
         try {
-            if ((fetchedEntry = new IacrEprintFetcher(importFormatPreferences).performSearchById(identifier)).isPresent()) {
+            fetchedEntry = new IacrEprintFetcher(importFormatPreferences).performSearchById(identifier);
+            if (fetchedEntry.isPresent()) {
                 return fetchedEntry;
             }
-
         } catch (FetcherException fetcherException) {
             LOGGER.debug(fetcherException.getMessage());
         }
 
         try {
-            if ((fetchedEntry = new CrossRef().performSearchById(identifier)).isPresent()) {
+            fetchedEntry = new CrossRef().performSearchById(identifier);
+            if (fetchedEntry.isPresent()) {
                 return fetchedEntry;
             }
-
         } catch (FetcherException fetcherException) {
             LOGGER.debug(fetcherException.getMessage());
         }

From 73e0f370ab03f9c667ccbe701c05ee46c2276543 Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Fri, 8 Oct 2021 20:58:14 +0200
Subject: [PATCH 05/47] update prototype

---
 src/main/java/org/jabref/gui/JabRefFrame.java | 53 ++++++++++---------
 .../importer/GenerateEntryFromIdAction.java   | 10 ++--
 .../importer/GenerateEntryFromIdDialog.java   | 13 +++--
 3 files changed, 42 insertions(+), 34 deletions(-)

diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index f3641cd8046..85cb7d48f1f 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -478,29 +478,6 @@ private Node createToolbar() {
         final Button pushToApplicationButton = factory.createIconButton(pushToApplicationAction.getActionInformation(), pushToApplicationAction);
         pushToApplicationsManager.registerReconfigurable(pushToApplicationButton);
 
-        // Create New Entry From ID Button
-
-        Button newEntryFromIdButton = new Button();
-        newEntryFromIdButton.setGraphic(IconTheme.JabRefIcons.IMPORT.getGraphicNode());
-        newEntryFromIdButton.setStyle("-fx-background-color: transparent;");
-        newEntryFromIdButton.setStyle("-fx-border-color: transparent;");
-        newEntryFromIdButton.setOnMouseClicked(event -> {
-            GenerateEntryFromIdDialog entryFromId = new GenerateEntryFromIdDialog(this, dialogService, prefs);
-
-            if (entryFromIdPopOver == null) {
-                entryFromIdPopOver = new PopOver(entryFromId.getDialogPane());
-                entryFromIdPopOver.setTitle(Localization.lang("Entry From ID"));
-                entryFromIdPopOver.setArrowLocation(PopOver.ArrowLocation.TOP_CENTER);
-                entryFromIdPopOver.setContentNode(entryFromId.getDialogPane());
-                entryFromIdPopOver.show(newEntryFromIdButton);
-            } else if (entryFromIdPopOver.isShowing()) {
-                entryFromIdPopOver.hide();
-            } else {
-                entryFromIdPopOver.setContentNode(entryFromId.getDialogPane());
-                entryFromIdPopOver.show(newEntryFromIdButton);
-            }
-        });
-
         // Setup Toolbar
 
         ToolBar toolBar = new ToolBar(
@@ -519,7 +496,7 @@ private Node createToolbar() {
                 new HBox(
                         factory.createIconButton(StandardActions.NEW_ARTICLE, new NewEntryAction(this, StandardEntryType.Article, dialogService, prefs, stateManager)),
                         factory.createIconButton(StandardActions.NEW_ENTRY, new NewEntryAction(this, dialogService, prefs, stateManager)),
-                        newEntryFromIdButton,
+                        createNewEntryFromIdButton(),
                         factory.createIconButton(StandardActions.NEW_ENTRY_FROM_PLAIN_TEXT, new ExtractBibtexAction(dialogService, prefs, stateManager)),
                         factory.createIconButton(StandardActions.DELETE_ENTRY, new EditAction(StandardActions.DELETE_ENTRY, this, stateManager))
                 ),
@@ -935,6 +912,34 @@ private MenuBar createMenu() {
         return menu;
     }
 
+    private Button createNewEntryFromIdButton() {
+        // Create New Entry From ID Button
+        Button newEntryFromIdButton = new Button();
+        newEntryFromIdButton.setGraphic(IconTheme.JabRefIcons.IMPORT.getGraphicNode());
+        newEntryFromIdButton.setStyle("-fx-background-color: transparent;");
+        newEntryFromIdButton.setStyle("-fx-border-color: transparent;");
+        newEntryFromIdButton.setOnMouseClicked(event -> {
+            GenerateEntryFromIdDialog entryFromId = new GenerateEntryFromIdDialog(getCurrentLibraryTab(), dialogService, prefs);
+
+            if (entryFromIdPopOver == null) {
+                entryFromIdPopOver = new PopOver(entryFromId.getDialogPane());
+                entryFromIdPopOver.setTitle(Localization.lang("Entry From ID"));
+                entryFromIdPopOver.setArrowLocation(PopOver.ArrowLocation.TOP_CENTER);
+                entryFromIdPopOver.setContentNode(entryFromId.getDialogPane());
+                entryFromIdPopOver.show(newEntryFromIdButton);
+            } else if (entryFromIdPopOver.isShowing()) {
+                entryFromIdPopOver.hide();
+            } else {
+                entryFromIdPopOver.setContentNode(entryFromId.getDialogPane());
+                entryFromIdPopOver.show(newEntryFromIdButton);
+            }
+        });
+
+        // Todo create binding to disable Button if no libraryTab is opened.
+
+        return newEntryFromIdButton;
+    }
+
     private Group createTaskIndicator() {
         ProgressIndicator indicator = new ProgressIndicator();
         indicator.getStyleClass().add("progress-indicatorToolbar");
diff --git a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
index 8bef9b7ff4a..68365ab61c5 100644
--- a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
@@ -3,20 +3,20 @@
 import java.util.Optional;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.LibraryTab;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.logic.importer.CompositeIdFetcher;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.PreferencesService;
 
 public class GenerateEntryFromIdAction extends SimpleCommand {
-    private final JabRefFrame jabRefFrame;
+    private final LibraryTab libraryTab;
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
     private final String id;
 
-    public GenerateEntryFromIdAction(JabRefFrame jabRefFrame, DialogService dialogService, PreferencesService preferencesService, String id) {
-        this.jabRefFrame = jabRefFrame;
+    public GenerateEntryFromIdAction(LibraryTab libraryTab, DialogService dialogService, PreferencesService preferencesService, String id) {
+        this.libraryTab = libraryTab;
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
         this.id = id;
@@ -30,7 +30,7 @@ public void execute() {
         fetchedEntry = compositeIdFetcher.performSearchById(id);
 
         fetchedEntry.ifPresentOrElse(
-                bibEntry -> jabRefFrame.getCurrentLibraryTab().insertEntry(bibEntry),
+                libraryTab::insertEntry,
                 () -> dialogService.showErrorDialogAndWait("Could not generate an entry from this ID")
         );
     }
diff --git a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
index da3455004c8..96f54340225 100644
--- a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
@@ -1,12 +1,14 @@
 package org.jabref.gui.importer;
 
+import java.util.Objects;
+
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.DialogPane;
 import javafx.scene.control.TextField;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.LibraryTab;
 import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
@@ -19,18 +21,19 @@ public class GenerateEntryFromIdDialog {
 
     private final PreferencesService preferencesService;
     private final DialogService dialogService;
-    private final JabRefFrame jabRefFrame;
+    private final LibraryTab libraryTab;
 
-    public GenerateEntryFromIdDialog(JabRefFrame jabRefFrame, DialogService dialogService, PreferencesService preferencesService) {
+    public GenerateEntryFromIdDialog(LibraryTab libraryTab, DialogService dialogService, PreferencesService preferencesService) {
+        Objects.requireNonNull(libraryTab);
         ViewLoader.view(this).load();
         this.preferencesService = preferencesService;
         this.dialogService = dialogService;
-        this.jabRefFrame = jabRefFrame;
+        this.libraryTab = libraryTab;
     }
 
     @FXML private void generateEntry() {
         new GenerateEntryFromIdAction(
-                jabRefFrame,
+                libraryTab,
                 dialogService,
                 preferencesService,
                 idTextField.getText()

From 0863df74ed25b9746f1ef54b4ea43b7d19506888 Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Fri, 8 Oct 2021 21:23:58 +0200
Subject: [PATCH 06/47] clean up checkstyle in test

---
 .../importer/fetcher/CompositeIdFetcherTest.java    | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java
index 4ae8ac175dd..c938cad2bc0 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java
@@ -1,6 +1,5 @@
 package org.jabref.logic.importer.fetcher;
 
-
 import java.util.Optional;
 
 import org.jabref.logic.bibtex.FieldContentFormatterPreferences;
@@ -24,18 +23,17 @@
  * IdBasedFetcher interface are a prerequisite. Excluding TitleFetcher.
  */
 class CompositeIdFetcherTest {
-    private CompositeIdFetcher compositeIdFetcher;
-
+    private static BibEntry groundEntryArXiv;
+    private static BibEntry groundDOIEntry;
+    private static BibEntry groundIsbnEntry;
+    private static BibEntry groundIacrEprintEntry;
     private static String groundInvalidArXivId;
     private static String groundArXivId;
     private static String groundDOIId;
     private static String groundIsbnId;
     private static String groundIacrEprintId;
 
-    private static BibEntry groundEntryArXiv;
-    private static BibEntry groundDOIEntry;
-    private static BibEntry groundIsbnEntry;
-    private static BibEntry groundIacrEprintEntry;
+    private CompositeIdFetcher compositeIdFetcher;
 
     @BeforeAll
     static void setUpGroundEntriesAndIds() {
@@ -89,7 +87,6 @@ static void setUpGroundEntriesAndIds() {
         groundIacrEprintEntry.setCitationKey("cryptoeprint:2017:1118");
     }
 
-
     @BeforeEach
     void setUp() throws Exception {
         ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class);

From 04e65eaeba3369aff69746fa6e390e2a2440032e Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Fri, 8 Oct 2021 23:03:13 +0200
Subject: [PATCH 07/47] add binding for newEntryFromIdButton

---
 src/main/java/org/jabref/gui/JabRefFrame.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 85cb7d48f1f..c99bdef9b7f 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -13,7 +13,9 @@
 
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanExpression;
 import javafx.beans.binding.StringBinding;
+import javafx.beans.property.Property;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.transformation.FilteredList;
@@ -935,7 +937,7 @@ private Button createNewEntryFromIdButton() {
             }
         });
 
-        // Todo create binding to disable Button if no libraryTab is opened.
+        newEntryFromIdButton.disableProperty().bind(ActionHelper.needsDatabase(stateManager).not());
 
         return newEntryFromIdButton;
     }

From 195b3be0faa46acb6bd7494f0106de63d122ac03 Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Fri, 8 Oct 2021 23:06:36 +0200
Subject: [PATCH 08/47] optimize

---
 src/main/java/org/jabref/gui/JabRefFrame.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index c99bdef9b7f..cca87ec75ec 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -13,9 +13,7 @@
 
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
-import javafx.beans.binding.BooleanExpression;
 import javafx.beans.binding.StringBinding;
-import javafx.beans.property.Property;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.transformation.FilteredList;

From 993edbcb70d4dc1bad253d952c0d4955837c390f Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Fri, 8 Oct 2021 23:32:10 +0200
Subject: [PATCH 09/47] delete unnecessary lines

---
 src/main/java/org/jabref/gui/JabRefFrame.java                  | 1 -
 .../org/jabref/gui/importer/GenerateEntryFromIdDialog.java     | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index cca87ec75ec..a3a923bef09 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -913,7 +913,6 @@ private MenuBar createMenu() {
     }
 
     private Button createNewEntryFromIdButton() {
-        // Create New Entry From ID Button
         Button newEntryFromIdButton = new Button();
         newEntryFromIdButton.setGraphic(IconTheme.JabRefIcons.IMPORT.getGraphicNode());
         newEntryFromIdButton.setStyle("-fx-background-color: transparent;");
diff --git a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
index 96f54340225..699bda92d9e 100644
--- a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.importer;
 
-import java.util.Objects;
-
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.DialogPane;
@@ -24,7 +22,6 @@ public class GenerateEntryFromIdDialog {
     private final LibraryTab libraryTab;
 
     public GenerateEntryFromIdDialog(LibraryTab libraryTab, DialogService dialogService, PreferencesService preferencesService) {
-        Objects.requireNonNull(libraryTab);
         ViewLoader.view(this).load();
         this.preferencesService = preferencesService;
         this.dialogService = dialogService;

From 6478b1117694b4d8d88a8ef0628fa75ef43a96db Mon Sep 17 00:00:00 2001
From: ColinHex <71373524+colinhex@users.noreply.github.com>
Date: Sat, 9 Oct 2021 13:22:52 +0200
Subject: [PATCH 10/47] Update CHANGELOG.md

Co-authored-by: Oliver Kopp <kopp.dev@gmail.com>
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10cff61a17c..ef3eac814c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We allowed the user to also preview the available citation styles in the preferences besides the selected ones [#8108](https://github.com/JabRef/jabref/issues/8108)
 - We added an option to search the available citation styles by name in the preferences [#8108](https://github.com/JabRef/jabref/issues/8108)
 - We added an option to generate bib-entries from ID through a popover in the toolbar. [#4183](https://github.com/JabRef/jabref/issues/4183)
+
 ### Changed
 
 - We slightly changed the layout of the Journal tab in the preferences for ui consistency. [#7937](https://github.com/JabRef/jabref/pull/7937)

From 3a0b625dd15083a0d239dae4c7eb6200a8a0d074 Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Sat, 9 Oct 2021 13:49:37 +0200
Subject: [PATCH 11/47] adjust button style class and focus

---
 src/main/java/org/jabref/gui/JabRefFrame.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index a3a923bef09..5511a2b62d1 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -934,6 +934,8 @@ private Button createNewEntryFromIdButton() {
             }
         });
 
+        newEntryFromIdButton.getStyleClass().setAll("icon-button");
+        newEntryFromIdButton.setFocusTraversable(false);
         newEntryFromIdButton.disableProperty().bind(ActionHelper.needsDatabase(stateManager).not());
 
         return newEntryFromIdButton;

From 8c48be07a2b4f89af9e57eaa04a332d848a45e70 Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Sat, 9 Oct 2021 14:44:22 +0200
Subject: [PATCH 12/47] exclude CompositeIdFetcher from WebFetchersTest

---
 src/test/java/org/jabref/logic/importer/WebFetchersTest.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/test/java/org/jabref/logic/importer/WebFetchersTest.java b/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
index 6c1aa5aeb4d..7b235f39671 100644
--- a/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
+++ b/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
@@ -59,6 +59,9 @@ void getIdBasedFetchersReturnsAllFetcherDerivingFromIdBasedFetcher() throws Exce
             expected.remove(JstorFetcher.class);
             expected.remove(GoogleScholar.class);
 
+            // Remove CompositeIdFetcher for now
+            expected.remove(CompositeIdFetcher.class);
+
             assertEquals(expected, getClasses(idFetchers));
         }
     }

From 79da4e9e3a71ef569c55f449e17ad145a425187d Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Sat, 9 Oct 2021 15:35:45 +0200
Subject: [PATCH 13/47] add key in en.properties

---
 src/main/java/org/jabref/gui/JabRefFrame.java | 2 +-
 src/main/resources/l10n/JabRef_en.properties  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 5511a2b62d1..34b4d11f4f0 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -922,7 +922,7 @@ private Button createNewEntryFromIdButton() {
 
             if (entryFromIdPopOver == null) {
                 entryFromIdPopOver = new PopOver(entryFromId.getDialogPane());
-                entryFromIdPopOver.setTitle(Localization.lang("Entry From ID"));
+                entryFromIdPopOver.setTitle(Localization.lang("New entry from ID"));
                 entryFromIdPopOver.setArrowLocation(PopOver.ArrowLocation.TOP_CENTER);
                 entryFromIdPopOver.setContentNode(entryFromId.getDialogPane());
                 entryFromIdPopOver.show(newEntryFromIdButton);
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index fa058688e00..09891a58c6d 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -1850,6 +1850,7 @@ JabRef\ resources=JabRef resources
 Manage\ journal\ abbreviations=Manage journal abbreviations
 Manage\ protected\ terms=Manage protected terms
 New\ entry\ from\ plain\ text=New entry from plain text
+New\ entry\ from\ ID=New entry from ID
 New\ sublibrary\ based\ on\ AUX\ file=New sublibrary based on AUX file
 Push\ entries\ to\ external\ application\ (%0)=Push entries to external application (%0)
 Quit=Quit

From 871e413f72a81fa61ae2b3fa58a577739ef7d802 Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Sun, 10 Oct 2021 15:21:58 +0200
Subject: [PATCH 14/47] optimize CompositeIdFetcher.java

---
 .../logic/importer/CompositeIdFetcher.java    | 39 +++++++------------
 .../logic/importer/WebFetchersTest.java       |  3 --
 2 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
index 3b2dab55156..e2deef2575b 100644
--- a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
@@ -8,11 +8,15 @@
 import org.jabref.logic.importer.fetcher.IacrEprintFetcher;
 import org.jabref.logic.importer.fetcher.IsbnFetcher;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.identifier.ArXivIdentifier;
+import org.jabref.model.entry.identifier.DOI;
+import org.jabref.model.entry.identifier.Eprint;
+import org.jabref.model.entry.identifier.ISBN;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class CompositeIdFetcher implements IdBasedFetcher {
+public class CompositeIdFetcher {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CompositeIdFetcher.class);
 
@@ -22,51 +26,42 @@ public CompositeIdFetcher(ImportFormatPreferences importFormatPreferences) {
         this.importFormatPreferences = importFormatPreferences;
     }
 
-    @Override
     public Optional<BibEntry> performSearchById(String identifier) {
-
-        Optional<BibEntry> fetchedEntry;
-
         try {
-            fetchedEntry = new ArXiv(importFormatPreferences).performSearchById(identifier);
-            if (fetchedEntry.isPresent()) {
-                return fetchedEntry;
+            if (ArXivIdentifier.parse(identifier).isPresent()) {
+                return new ArXiv(importFormatPreferences).performSearchById(identifier);
             }
         } catch (FetcherException fetcherException) {
             LOGGER.debug(fetcherException.getMessage());
         }
 
         try {
-            fetchedEntry = new IsbnFetcher(importFormatPreferences).performSearchById(identifier);
-            if (fetchedEntry.isPresent()) {
-                return fetchedEntry;
+            if (ISBN.parse(identifier).isPresent()) {
+                return new IsbnFetcher(importFormatPreferences).performSearchById(identifier);
             }
         } catch (FetcherException fetcherException) {
             LOGGER.debug(fetcherException.getMessage());
         }
 
         try {
-            fetchedEntry = new DoiFetcher(importFormatPreferences).performSearchById(identifier);
-            if (fetchedEntry.isPresent()) {
-                return fetchedEntry;
+            if (DOI.parse(identifier).isPresent()) {
+                return new DoiFetcher(importFormatPreferences).performSearchById(identifier);
             }
         } catch (FetcherException fetcherException) {
             LOGGER.debug(fetcherException.getMessage());
         }
 
         try {
-            fetchedEntry = new IacrEprintFetcher(importFormatPreferences).performSearchById(identifier);
-            if (fetchedEntry.isPresent()) {
-                return fetchedEntry;
+            if (DOI.parse(identifier).isPresent()) {
+                return new CrossRef().performSearchById(identifier);
             }
         } catch (FetcherException fetcherException) {
             LOGGER.debug(fetcherException.getMessage());
         }
 
         try {
-            fetchedEntry = new CrossRef().performSearchById(identifier);
-            if (fetchedEntry.isPresent()) {
-                return fetchedEntry;
+            if (Eprint.build(identifier).isPresent()) {
+                return new IacrEprintFetcher(importFormatPreferences).performSearchById(identifier);
             }
         } catch (FetcherException fetcherException) {
             LOGGER.debug(fetcherException.getMessage());
@@ -76,8 +71,4 @@ public Optional<BibEntry> performSearchById(String identifier) {
 
     }
 
-    @Override
-    public String getName() {
-        return "CompositeIdFetcher";
-    }
 }
diff --git a/src/test/java/org/jabref/logic/importer/WebFetchersTest.java b/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
index 7b235f39671..6c1aa5aeb4d 100644
--- a/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
+++ b/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
@@ -59,9 +59,6 @@ void getIdBasedFetchersReturnsAllFetcherDerivingFromIdBasedFetcher() throws Exce
             expected.remove(JstorFetcher.class);
             expected.remove(GoogleScholar.class);
 
-            // Remove CompositeIdFetcher for now
-            expected.remove(CompositeIdFetcher.class);
-
             assertEquals(expected, getClasses(idFetchers));
         }
     }

From 92c1bb784b25d8f28bafdbdcc26e8d64e9536cd0 Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Mon, 11 Oct 2021 23:51:52 +0200
Subject: [PATCH 15/47] Revert "optimize CompositeIdFetcher.java"

This reverts commit 871e413f72a81fa61ae2b3fa58a577739ef7d802.

revert to trying fetchers because of issue with parser methods
---
 .../logic/importer/CompositeIdFetcher.java    | 39 ++++++++++++-------
 .../logic/importer/WebFetchersTest.java       |  3 ++
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
index e2deef2575b..3b2dab55156 100644
--- a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
@@ -8,15 +8,11 @@
 import org.jabref.logic.importer.fetcher.IacrEprintFetcher;
 import org.jabref.logic.importer.fetcher.IsbnFetcher;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.identifier.ArXivIdentifier;
-import org.jabref.model.entry.identifier.DOI;
-import org.jabref.model.entry.identifier.Eprint;
-import org.jabref.model.entry.identifier.ISBN;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class CompositeIdFetcher {
+public class CompositeIdFetcher implements IdBasedFetcher {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CompositeIdFetcher.class);
 
@@ -26,42 +22,51 @@ public CompositeIdFetcher(ImportFormatPreferences importFormatPreferences) {
         this.importFormatPreferences = importFormatPreferences;
     }
 
+    @Override
     public Optional<BibEntry> performSearchById(String identifier) {
+
+        Optional<BibEntry> fetchedEntry;
+
         try {
-            if (ArXivIdentifier.parse(identifier).isPresent()) {
-                return new ArXiv(importFormatPreferences).performSearchById(identifier);
+            fetchedEntry = new ArXiv(importFormatPreferences).performSearchById(identifier);
+            if (fetchedEntry.isPresent()) {
+                return fetchedEntry;
             }
         } catch (FetcherException fetcherException) {
             LOGGER.debug(fetcherException.getMessage());
         }
 
         try {
-            if (ISBN.parse(identifier).isPresent()) {
-                return new IsbnFetcher(importFormatPreferences).performSearchById(identifier);
+            fetchedEntry = new IsbnFetcher(importFormatPreferences).performSearchById(identifier);
+            if (fetchedEntry.isPresent()) {
+                return fetchedEntry;
             }
         } catch (FetcherException fetcherException) {
             LOGGER.debug(fetcherException.getMessage());
         }
 
         try {
-            if (DOI.parse(identifier).isPresent()) {
-                return new DoiFetcher(importFormatPreferences).performSearchById(identifier);
+            fetchedEntry = new DoiFetcher(importFormatPreferences).performSearchById(identifier);
+            if (fetchedEntry.isPresent()) {
+                return fetchedEntry;
             }
         } catch (FetcherException fetcherException) {
             LOGGER.debug(fetcherException.getMessage());
         }
 
         try {
-            if (DOI.parse(identifier).isPresent()) {
-                return new CrossRef().performSearchById(identifier);
+            fetchedEntry = new IacrEprintFetcher(importFormatPreferences).performSearchById(identifier);
+            if (fetchedEntry.isPresent()) {
+                return fetchedEntry;
             }
         } catch (FetcherException fetcherException) {
             LOGGER.debug(fetcherException.getMessage());
         }
 
         try {
-            if (Eprint.build(identifier).isPresent()) {
-                return new IacrEprintFetcher(importFormatPreferences).performSearchById(identifier);
+            fetchedEntry = new CrossRef().performSearchById(identifier);
+            if (fetchedEntry.isPresent()) {
+                return fetchedEntry;
             }
         } catch (FetcherException fetcherException) {
             LOGGER.debug(fetcherException.getMessage());
@@ -71,4 +76,8 @@ public Optional<BibEntry> performSearchById(String identifier) {
 
     }
 
+    @Override
+    public String getName() {
+        return "CompositeIdFetcher";
+    }
 }
diff --git a/src/test/java/org/jabref/logic/importer/WebFetchersTest.java b/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
index 6c1aa5aeb4d..7b235f39671 100644
--- a/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
+++ b/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
@@ -59,6 +59,9 @@ void getIdBasedFetchersReturnsAllFetcherDerivingFromIdBasedFetcher() throws Exce
             expected.remove(JstorFetcher.class);
             expected.remove(GoogleScholar.class);
 
+            // Remove CompositeIdFetcher for now
+            expected.remove(CompositeIdFetcher.class);
+
             assertEquals(expected, getClasses(idFetchers));
         }
     }

From fd6cf56c89f69d334f8e35f03f8870ac94a4e8b2 Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Tue, 12 Oct 2021 03:41:07 +0200
Subject: [PATCH 16/47] UI tweaks

---
 src/main/java/org/jabref/gui/JabRefFrame.java |  5 +-
 .../importer/GenerateEntryFromIdAction.java   | 90 ++++++++++++++++---
 .../importer/GenerateEntryFromIdDialog.fxml   | 14 ++-
 .../importer/GenerateEntryFromIdDialog.java   | 33 ++++++-
 .../logic/importer/CompositeIdFetcher.java    | 30 ++++---
 src/main/resources/l10n/JabRef_en.properties  |  2 +-
 6 files changed, 136 insertions(+), 38 deletions(-)

diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 34b4d11f4f0..9267744d759 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -18,6 +18,7 @@
 import javafx.beans.value.ObservableValue;
 import javafx.collections.transformation.FilteredList;
 import javafx.concurrent.Task;
+import javafx.css.PseudoClass;
 import javafx.geometry.Orientation;
 import javafx.scene.Group;
 import javafx.scene.Node;
@@ -918,11 +919,11 @@ private Button createNewEntryFromIdButton() {
         newEntryFromIdButton.setStyle("-fx-background-color: transparent;");
         newEntryFromIdButton.setStyle("-fx-border-color: transparent;");
         newEntryFromIdButton.setOnMouseClicked(event -> {
-            GenerateEntryFromIdDialog entryFromId = new GenerateEntryFromIdDialog(getCurrentLibraryTab(), dialogService, prefs);
+            GenerateEntryFromIdDialog entryFromId = new GenerateEntryFromIdDialog(getCurrentLibraryTab(), dialogService, prefs, stateManager, taskExecutor);
 
             if (entryFromIdPopOver == null) {
                 entryFromIdPopOver = new PopOver(entryFromId.getDialogPane());
-                entryFromIdPopOver.setTitle(Localization.lang("New entry from ID"));
+                entryFromIdPopOver.setTitle(Localization.lang("Import by ID"));
                 entryFromIdPopOver.setArrowLocation(PopOver.ArrowLocation.TOP_CENTER);
                 entryFromIdPopOver.setContentNode(entryFromId.getDialogPane());
                 entryFromIdPopOver.show(newEntryFromIdButton);
diff --git a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
index 68365ab61c5..231600b9f25 100644
--- a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
@@ -3,36 +3,106 @@
 import java.util.Optional;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.Globals;
 import org.jabref.gui.LibraryTab;
+import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.SimpleCommand;
+import org.jabref.gui.duplicationFinder.DuplicateResolverDialog;
+import org.jabref.gui.util.BackgroundTask;
+import org.jabref.gui.util.TaskExecutor;
+import org.jabref.logic.JabRefException;
+import org.jabref.logic.database.DuplicateCheck;
 import org.jabref.logic.importer.CompositeIdFetcher;
+import org.jabref.logic.importer.ImportCleanup;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.PreferencesService;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class GenerateEntryFromIdAction extends SimpleCommand {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(GenerateEntryFromIdDialog.class);
+
     private final LibraryTab libraryTab;
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
-    private final String id;
+    private final String identifier;
+    private final StateManager stateManager;
+    private final TaskExecutor taskExecutor;
 
-    public GenerateEntryFromIdAction(LibraryTab libraryTab, DialogService dialogService, PreferencesService preferencesService, String id) {
+    public GenerateEntryFromIdAction(LibraryTab libraryTab, DialogService dialogService, PreferencesService preferencesService, StateManager stateManager, TaskExecutor taskExecutor, String identifier) {
         this.libraryTab = libraryTab;
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
-        this.id = id;
+        this.identifier = identifier;
+        this.stateManager = stateManager;
+        this.taskExecutor = taskExecutor;
     }
 
     @Override
     public void execute() {
-        Optional<BibEntry> fetchedEntry;
+        BackgroundTask<Optional<BibEntry>> backgroundTask = searchAndImportEntryInBackground();
+        backgroundTask.titleProperty().set("Search and import new BibEntry by ID");
+        backgroundTask.showToUser(true);
+        backgroundTask.onRunning(() -> dialogService.notify("%s".formatted(backgroundTask.messageProperty().get())));
+        backgroundTask.onFailure((e) -> dialogService.notify("Failed adding new entry: %s.".formatted(e.getMessage())));
+        backgroundTask.onSuccess((entry) -> entry.ifPresentOrElse((e) -> {
+                dialogService.notify("Successfully added new entry.");
+                libraryTab.insertEntry(e);
+                },
+                () -> dialogService.notify("Generation cancelled.")
+        ));
+        backgroundTask.executeWith(taskExecutor);
+    }
+
+    private BackgroundTask<Optional<BibEntry>> searchAndImportEntryInBackground() {
+        return new BackgroundTask<>() {
+            @Override
+            protected Optional<BibEntry> call() throws JabRefException {
+                if (isCanceled()) {
+                    return Optional.empty();
+                }
+
+                this.updateMessage("Searching for entry...");
+
+                // later catch more exceptions here and notify user
+                Optional<BibEntry> result = new CompositeIdFetcher(preferencesService.getImportFormatPreferences()).performSearchById(identifier);
+                LOGGER.debug("Resulted in " + result);
 
-        CompositeIdFetcher compositeIdFetcher = new CompositeIdFetcher(preferencesService.getImportFormatPreferences());
-        fetchedEntry = compositeIdFetcher.performSearchById(id);
+                this.updateMessage("Creating an entry...");
 
-        fetchedEntry.ifPresentOrElse(
-                libraryTab::insertEntry,
-                () -> dialogService.showErrorDialogAndWait("Could not generate an entry from this ID")
-        );
+                if (result.isPresent()) {
+                    final BibEntry entry = result.get();
+                    ImportCleanup cleanup = new ImportCleanup(libraryTab.getBibDatabaseContext().getMode());
+                    cleanup.doPostCleanup(entry);
+                    Optional<BibEntry> duplicate = new DuplicateCheck(Globals.entryTypesManager).containsDuplicate(libraryTab.getDatabase(), entry, libraryTab.getBibDatabaseContext().getMode());
+                    if ((duplicate.isPresent())) {
+                        DuplicateResolverDialog dialog = new DuplicateResolverDialog(entry, duplicate.get(), DuplicateResolverDialog.DuplicateResolverType.IMPORT_CHECK, libraryTab.getBibDatabaseContext(), stateManager);
+                        switch (dialogService.showCustomDialogAndWait(dialog).orElse(DuplicateResolverDialog.DuplicateResolverResult.BREAK)) {
+                            case KEEP_LEFT -> {
+                                libraryTab.getDatabase().removeEntry(duplicate.get());
+                                libraryTab.getDatabase().insertEntry(entry);
+                            }
+                            case KEEP_BOTH -> libraryTab.getDatabase().insertEntry(entry);
+                            case KEEP_MERGE -> {
+                                libraryTab.getDatabase().removeEntry(duplicate.get());
+                                libraryTab.getDatabase().insertEntry(dialog.getMergedEntry());
+                            }
+                            default -> {
+                            }
+                        }
+                    }
+                } else {
+                    updateMessage("Failed.");
+                    // There could be more exact feedback if the CompositeIdFetcher.java / future IdFetcherManager
+                    // had a better structure or there would be individual exceptions for fetchers.
+                    throw new JabRefException("Invalid identifier or connection failure.");
+                }
+                updateMessage("Success.");
+                return result;
+            }
+        };
     }
 
 }
diff --git a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.fxml b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.fxml
index 5778143bc91..5e052dc5c15 100644
--- a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.fxml
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.fxml
@@ -5,17 +5,13 @@
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.Pane?>
+
 <DialogPane fx:id="dialogPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="92.0" prefWidth="392.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.importer.GenerateEntryFromIdDialog">
    <content>
-       <Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="102.0"
-             prefWidth="360.0">
-           <TextField fx:id="idTextField" layoutX="14.0" layoutY="40.0" maxHeight="-Infinity" maxWidth="-Infinity"
-                      minHeight="-Infinity" minWidth="-Infinity" prefHeight="29.0" prefWidth="238.0"/>
-           <Button fx:id="generateButton" layoutX="273.0" layoutY="40.0" maxHeight="-Infinity" maxWidth="-Infinity"
-                   minHeight="-Infinity" minWidth="-Infinity" mnemonicParsing="false" onAction="#generateEntry"
-                   prefHeight="30.0" prefWidth="96.0" text="Generate" textAlignment="CENTER"/>
-           <Label layoutX="14.0" layoutY="14.0" prefHeight="16.0" prefWidth="328.0"
-                  text="Fetch and generate an entry from an ID:"/>
+       <Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="102.0" prefWidth="360.0">
+           <TextField fx:id="idTextField" layoutX="14.0" layoutY="40.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="29.0" prefWidth="287.0" />
+           <Button fx:id="generateButton" layoutX="314.0" layoutY="40.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" mnemonicParsing="false" onAction="#generateEntry" prefHeight="30.0" prefWidth="55.0" textAlignment="CENTER" />
+           <Label layoutX="14.0" layoutY="14.0" prefHeight="16.0" prefWidth="328.0" text="Import a BibEntry by its identifier..." />
        </Pane>
    </content>
 </DialogPane>
diff --git a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
index 699bda92d9e..c35aa93b596 100644
--- a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
@@ -7,12 +7,19 @@
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTab;
+import org.jabref.gui.StateManager;
+import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.util.TaskExecutor;
 import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class GenerateEntryFromIdDialog {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(GenerateEntryFromIdDialog.class);
+
     @FXML DialogPane dialogPane;
     @FXML TextField idTextField;
     @FXML Button generateButton;
@@ -20,21 +27,41 @@ public class GenerateEntryFromIdDialog {
     private final PreferencesService preferencesService;
     private final DialogService dialogService;
     private final LibraryTab libraryTab;
+    private final StateManager stateManager;
+    private final TaskExecutor taskExecutor;
 
-    public GenerateEntryFromIdDialog(LibraryTab libraryTab, DialogService dialogService, PreferencesService preferencesService) {
+    public GenerateEntryFromIdDialog(LibraryTab libraryTab, DialogService dialogService, PreferencesService preferencesService, StateManager stateManager, TaskExecutor taskExecutor) {
         ViewLoader.view(this).load();
         this.preferencesService = preferencesService;
         this.dialogService = dialogService;
         this.libraryTab = libraryTab;
+        this.stateManager = stateManager;
+        this.taskExecutor = taskExecutor;
+
+        this.generateButton.setGraphic(IconTheme.JabRefIcons.IMPORT.getGraphicNode());
+
+        // a good idea would be to make to enter key correspond to the generateButton while the popup is in focus
+
     }
 
     @FXML private void generateEntry() {
-        new GenerateEntryFromIdAction(
+        if (idTextField.getText().isEmpty()) {
+            dialogService.notify("Enter an valid identifier...");
+            return;
+        }
+
+        // auto shift focus back to textfield for workflow
+        this.idTextField.requestFocus();
+
+        GenerateEntryFromIdAction generateEntryFromIdAction = new GenerateEntryFromIdAction(
                 libraryTab,
                 dialogService,
                 preferencesService,
+                stateManager,
+                taskExecutor,
                 idTextField.getText()
-        ).execute();
+        );
+        generateEntryFromIdAction.execute();
     }
 
     public DialogPane getDialogPane() {
diff --git a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
index 3b2dab55156..160091d672b 100644
--- a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
@@ -22,54 +22,58 @@ public CompositeIdFetcher(ImportFormatPreferences importFormatPreferences) {
         this.importFormatPreferences = importFormatPreferences;
     }
 
-    @Override
-    public Optional<BibEntry> performSearchById(String identifier) {
+    public Optional<BibEntry> performSearchById(String identifier) throws FetcherException {
 
         Optional<BibEntry> fetchedEntry;
 
         try {
-            fetchedEntry = new ArXiv(importFormatPreferences).performSearchById(identifier);
+            ArXiv arXiv = new ArXiv(importFormatPreferences);
+            fetchedEntry = arXiv.performSearchById(identifier);
             if (fetchedEntry.isPresent()) {
                 return fetchedEntry;
             }
         } catch (FetcherException fetcherException) {
-            LOGGER.debug(fetcherException.getMessage());
+            LOGGER.info(fetcherException.getMessage());
         }
 
         try {
-            fetchedEntry = new IsbnFetcher(importFormatPreferences).performSearchById(identifier);
+            IsbnFetcher isbnFetcher = new IsbnFetcher(importFormatPreferences);
+            fetchedEntry = isbnFetcher.performSearchById(identifier);
             if (fetchedEntry.isPresent()) {
                 return fetchedEntry;
             }
         } catch (FetcherException fetcherException) {
-            LOGGER.debug(fetcherException.getMessage());
+            LOGGER.info(fetcherException.getMessage());
         }
 
         try {
-            fetchedEntry = new DoiFetcher(importFormatPreferences).performSearchById(identifier);
+            DoiFetcher doiFetcher = new DoiFetcher(importFormatPreferences);
+            fetchedEntry = doiFetcher.performSearchById(identifier);
             if (fetchedEntry.isPresent()) {
                 return fetchedEntry;
             }
         } catch (FetcherException fetcherException) {
-            LOGGER.debug(fetcherException.getMessage());
+            LOGGER.info(fetcherException.getMessage());
         }
 
         try {
-            fetchedEntry = new IacrEprintFetcher(importFormatPreferences).performSearchById(identifier);
+            IacrEprintFetcher iacrEprintFetcher = new IacrEprintFetcher(importFormatPreferences);
+            fetchedEntry = iacrEprintFetcher.performSearchById(identifier);
             if (fetchedEntry.isPresent()) {
                 return fetchedEntry;
             }
         } catch (FetcherException fetcherException) {
-            LOGGER.debug(fetcherException.getMessage());
+            LOGGER.info(fetcherException.getMessage());
         }
 
         try {
-            fetchedEntry = new CrossRef().performSearchById(identifier);
+            CrossRef crossRef = new CrossRef();
+            fetchedEntry = crossRef.performSearchById(identifier);
             if (fetchedEntry.isPresent()) {
                 return fetchedEntry;
             }
         } catch (FetcherException fetcherException) {
-            LOGGER.debug(fetcherException.getMessage());
+            LOGGER.info(fetcherException.getMessage());
         }
 
         return Optional.empty();
@@ -78,6 +82,6 @@ public Optional<BibEntry> performSearchById(String identifier) {
 
     @Override
     public String getName() {
-        return "CompositeIdFetcher";
+        return null;
     }
 }
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 09891a58c6d..e8372fb7bcc 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -1850,7 +1850,7 @@ JabRef\ resources=JabRef resources
 Manage\ journal\ abbreviations=Manage journal abbreviations
 Manage\ protected\ terms=Manage protected terms
 New\ entry\ from\ plain\ text=New entry from plain text
-New\ entry\ from\ ID=New entry from ID
+Import\ by\ ID=Import by ID
 New\ sublibrary\ based\ on\ AUX\ file=New sublibrary based on AUX file
 Push\ entries\ to\ external\ application\ (%0)=Push entries to external application (%0)
 Quit=Quit

From 6aa788a166a0fd9acdc48e92474916d804450893 Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Tue, 12 Oct 2021 11:50:22 +0200
Subject: [PATCH 17/47] optimize imports

---
 src/main/java/org/jabref/gui/JabRefFrame.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 9267744d759..010febec7df 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -18,7 +18,6 @@
 import javafx.beans.value.ObservableValue;
 import javafx.collections.transformation.FilteredList;
 import javafx.concurrent.Task;
-import javafx.css.PseudoClass;
 import javafx.geometry.Orientation;
 import javafx.scene.Group;
 import javafx.scene.Node;

From 0e1570a9f1551528309e2bbe2b6a676bf83a4736 Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Tue, 12 Oct 2021 11:54:38 +0200
Subject: [PATCH 18/47] change log level in CompositeFetcher

---
 .../org/jabref/logic/importer/CompositeIdFetcher.java  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
index 160091d672b..a6d8d4d9b99 100644
--- a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
@@ -33,7 +33,7 @@ public Optional<BibEntry> performSearchById(String identifier) throws FetcherExc
                 return fetchedEntry;
             }
         } catch (FetcherException fetcherException) {
-            LOGGER.info(fetcherException.getMessage());
+            LOGGER.debug(fetcherException.getMessage());
         }
 
         try {
@@ -43,7 +43,7 @@ public Optional<BibEntry> performSearchById(String identifier) throws FetcherExc
                 return fetchedEntry;
             }
         } catch (FetcherException fetcherException) {
-            LOGGER.info(fetcherException.getMessage());
+            LOGGER.debug(fetcherException.getMessage());
         }
 
         try {
@@ -53,7 +53,7 @@ public Optional<BibEntry> performSearchById(String identifier) throws FetcherExc
                 return fetchedEntry;
             }
         } catch (FetcherException fetcherException) {
-            LOGGER.info(fetcherException.getMessage());
+            LOGGER.debug(fetcherException.getMessage());
         }
 
         try {
@@ -63,7 +63,7 @@ public Optional<BibEntry> performSearchById(String identifier) throws FetcherExc
                 return fetchedEntry;
             }
         } catch (FetcherException fetcherException) {
-            LOGGER.info(fetcherException.getMessage());
+            LOGGER.debug(fetcherException.getMessage());
         }
 
         try {
@@ -73,7 +73,7 @@ public Optional<BibEntry> performSearchById(String identifier) throws FetcherExc
                 return fetchedEntry;
             }
         } catch (FetcherException fetcherException) {
-            LOGGER.info(fetcherException.getMessage());
+            LOGGER.debug(fetcherException.getMessage());
         }
 
         return Optional.empty();

From 2534f1f556eb4e6b1086b2a070df6d81fdebee0e Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Tue, 12 Oct 2021 12:01:49 +0200
Subject: [PATCH 19/47] optimize code

---
 src/main/java/org/jabref/gui/JabRefFrame.java | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 010febec7df..2ba25ccfe2d 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -914,9 +914,11 @@ private MenuBar createMenu() {
 
     private Button createNewEntryFromIdButton() {
         Button newEntryFromIdButton = new Button();
+
         newEntryFromIdButton.setGraphic(IconTheme.JabRefIcons.IMPORT.getGraphicNode());
-        newEntryFromIdButton.setStyle("-fx-background-color: transparent;");
-        newEntryFromIdButton.setStyle("-fx-border-color: transparent;");
+        newEntryFromIdButton.getStyleClass().setAll("icon-button");
+        newEntryFromIdButton.setFocusTraversable(false);
+        newEntryFromIdButton.disableProperty().bind(ActionHelper.needsDatabase(stateManager).not());
         newEntryFromIdButton.setOnMouseClicked(event -> {
             GenerateEntryFromIdDialog entryFromId = new GenerateEntryFromIdDialog(getCurrentLibraryTab(), dialogService, prefs, stateManager, taskExecutor);
 
@@ -934,10 +936,6 @@ private Button createNewEntryFromIdButton() {
             }
         });
 
-        newEntryFromIdButton.getStyleClass().setAll("icon-button");
-        newEntryFromIdButton.setFocusTraversable(false);
-        newEntryFromIdButton.disableProperty().bind(ActionHelper.needsDatabase(stateManager).not());
-
         return newEntryFromIdButton;
     }
 

From d10cc26b57fad7c6ef8c72b50312cfcaecca8c2c Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Tue, 12 Oct 2021 15:41:19 +0200
Subject: [PATCH 20/47] fix checkstyle warnings

---
 src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
index a6d8d4d9b99..87f3ae37f0c 100644
--- a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
@@ -22,7 +22,7 @@ public CompositeIdFetcher(ImportFormatPreferences importFormatPreferences) {
         this.importFormatPreferences = importFormatPreferences;
     }
 
-    public Optional<BibEntry> performSearchById(String identifier) throws FetcherException {
+    public Optional<BibEntry> performSearchById(String identifier) {
 
         Optional<BibEntry> fetchedEntry;
 

From cea0eabe9c3ffc412639f437f8ca317530620063 Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Sun, 17 Oct 2021 03:44:49 +0200
Subject: [PATCH 21/47] pass strings to localization.lang

---
 .../importer/GenerateEntryFromIdAction.java   | 20 ++++++++-----------
 .../importer/GenerateEntryFromIdDialog.java   |  3 ++-
 src/main/resources/l10n/JabRef_en.properties  |  3 +++
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
index 231600b9f25..50ac8a3e1ef 100644
--- a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
@@ -14,6 +14,7 @@
 import org.jabref.logic.database.DuplicateCheck;
 import org.jabref.logic.importer.CompositeIdFetcher;
 import org.jabref.logic.importer.ImportCleanup;
+import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.PreferencesService;
 
@@ -43,15 +44,12 @@ public GenerateEntryFromIdAction(LibraryTab libraryTab, DialogService dialogServ
     @Override
     public void execute() {
         BackgroundTask<Optional<BibEntry>> backgroundTask = searchAndImportEntryInBackground();
-        backgroundTask.titleProperty().set("Search and import new BibEntry by ID");
+        backgroundTask.titleProperty().set(Localization.lang("Import by ID"));
         backgroundTask.showToUser(true);
         backgroundTask.onRunning(() -> dialogService.notify("%s".formatted(backgroundTask.messageProperty().get())));
-        backgroundTask.onFailure((e) -> dialogService.notify("Failed adding new entry: %s.".formatted(e.getMessage())));
-        backgroundTask.onSuccess((entry) -> entry.ifPresentOrElse((e) -> {
-                dialogService.notify("Successfully added new entry.");
-                libraryTab.insertEntry(e);
-                },
-                () -> dialogService.notify("Generation cancelled.")
+        backgroundTask.onFailure((e) -> dialogService.notify(Localization.lang("Entry could not be created")));
+        backgroundTask.onSuccess((entry) -> entry.ifPresentOrElse(libraryTab::insertEntry,
+                () -> dialogService.notify(Localization.lang("Import canceled"))
         ));
         backgroundTask.executeWith(taskExecutor);
     }
@@ -64,14 +62,12 @@ protected Optional<BibEntry> call() throws JabRefException {
                     return Optional.empty();
                 }
 
-                this.updateMessage("Searching for entry...");
+                this.updateMessage(Localization.lang("Searching..."));
 
                 // later catch more exceptions here and notify user
                 Optional<BibEntry> result = new CompositeIdFetcher(preferencesService.getImportFormatPreferences()).performSearchById(identifier);
                 LOGGER.debug("Resulted in " + result);
 
-                this.updateMessage("Creating an entry...");
-
                 if (result.isPresent()) {
                     final BibEntry entry = result.get();
                     ImportCleanup cleanup = new ImportCleanup(libraryTab.getBibDatabaseContext().getMode());
@@ -94,12 +90,12 @@ protected Optional<BibEntry> call() throws JabRefException {
                         }
                     }
                 } else {
-                    updateMessage("Failed.");
+                    updateMessage(Localization.lang("Error"));
                     // There could be more exact feedback if the CompositeIdFetcher.java / future IdFetcherManager
                     // had a better structure or there would be individual exceptions for fetchers.
                     throw new JabRefException("Invalid identifier or connection failure.");
                 }
-                updateMessage("Success.");
+                updateMessage(Localization.lang("Imported one entry"));
                 return result;
             }
         };
diff --git a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
index c35aa93b596..4e111e26712 100644
--- a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
@@ -10,6 +10,7 @@
 import org.jabref.gui.StateManager;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.util.TaskExecutor;
+import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
@@ -46,7 +47,7 @@ public GenerateEntryFromIdDialog(LibraryTab libraryTab, DialogService dialogServ
 
     @FXML private void generateEntry() {
         if (idTextField.getText().isEmpty()) {
-            dialogService.notify("Enter an valid identifier...");
+            dialogService.notify(Localization.lang("Enter a valid ID"));
             return;
         }
 
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index e8372fb7bcc..cdc4ed2a294 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -1851,6 +1851,9 @@ Manage\ journal\ abbreviations=Manage journal abbreviations
 Manage\ protected\ terms=Manage protected terms
 New\ entry\ from\ plain\ text=New entry from plain text
 Import\ by\ ID=Import by ID
+Enter\ a\ valid\ ID=Enter a valid ID
+Entry\ could\ not\ be\ created=Entry could not be created
+Imported\ one\ entry=Imported one entry
 New\ sublibrary\ based\ on\ AUX\ file=New sublibrary based on AUX file
 Push\ entries\ to\ external\ application\ (%0)=Push entries to external application (%0)
 Quit=Quit

From d89a84be8d96c58d02c13eb0d33f83df84ca8c30 Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Sun, 17 Oct 2021 04:16:52 +0200
Subject: [PATCH 22/47] optimize code

---
 .../importer/GenerateEntryFromIdAction.java   |   2 +-
 .../logic/importer/CompositeIdFetcher.java    |   5 +-
 .../logic/importer/WebFetchersTest.java       |   3 -
 .../fetcher/CompositeIdFetcherTest.java       | 154 ++++++++++--------
 4 files changed, 85 insertions(+), 79 deletions(-)

diff --git a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
index 50ac8a3e1ef..b0c12a85a7a 100644
--- a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
@@ -62,7 +62,7 @@ protected Optional<BibEntry> call() throws JabRefException {
                     return Optional.empty();
                 }
 
-                this.updateMessage(Localization.lang("Searching..."));
+                updateMessage(Localization.lang("Searching..."));
 
                 // later catch more exceptions here and notify user
                 Optional<BibEntry> result = new CompositeIdFetcher(preferencesService.getImportFormatPreferences()).performSearchById(identifier);
diff --git a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
index 87f3ae37f0c..0d7ff1a4d1a 100644
--- a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
@@ -12,7 +12,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class CompositeIdFetcher implements IdBasedFetcher {
+public class CompositeIdFetcher {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CompositeIdFetcher.class);
 
@@ -80,8 +80,7 @@ public Optional<BibEntry> performSearchById(String identifier) {
 
     }
 
-    @Override
     public String getName() {
-        return null;
+        return "CompositeIdFetcher";
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/WebFetchersTest.java b/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
index 7b235f39671..6c1aa5aeb4d 100644
--- a/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
+++ b/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
@@ -59,9 +59,6 @@ void getIdBasedFetchersReturnsAllFetcherDerivingFromIdBasedFetcher() throws Exce
             expected.remove(JstorFetcher.class);
             expected.remove(GoogleScholar.class);
 
-            // Remove CompositeIdFetcher for now
-            expected.remove(CompositeIdFetcher.class);
-
             assertEquals(expected, getClasses(idFetchers));
         }
     }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java
index c938cad2bc0..99af0eb92b3 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java
@@ -1,6 +1,7 @@
 package org.jabref.logic.importer.fetcher;
 
 import java.util.Optional;
+import java.util.stream.Stream;
 
 import org.jabref.logic.bibtex.FieldContentFormatterPreferences;
 import org.jabref.logic.importer.CompositeIdFetcher;
@@ -10,9 +11,11 @@
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.StandardEntryType;
 
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
@@ -23,68 +26,70 @@
  * IdBasedFetcher interface are a prerequisite. Excluding TitleFetcher.
  */
 class CompositeIdFetcherTest {
-    private static BibEntry groundEntryArXiv;
-    private static BibEntry groundDOIEntry;
-    private static BibEntry groundIsbnEntry;
-    private static BibEntry groundIacrEprintEntry;
-    private static String groundInvalidArXivId;
-    private static String groundArXivId;
-    private static String groundDOIId;
-    private static String groundIsbnId;
-    private static String groundIacrEprintId;
 
     private CompositeIdFetcher compositeIdFetcher;
 
-    @BeforeAll
-    static void setUpGroundEntriesAndIds() {
-        groundInvalidArXivId = "arZiv:2110.02957";
-
-        groundArXivId = "arXiv:2110.02957";
-        groundEntryArXiv = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Emily C. Cunningham and Robyn E. Sanderson and Kathryn V. Johnston and Nondh Panithanpaisal and Melissa K. Ness and Andrew Wetzel and Sarah R. Loebman and Ivanna Escala and Danny Horta and Claude-André Faucher-Giguère")
-                .withField(StandardField.TITLE, "Reading the CARDs: the Imprint of Accretion History in the Chemical Abundances of the Milky Way's Stellar Halo")
-                .withField(StandardField.DATE, "2021-10-06")
-                .withField(StandardField.ABSTRACT, "In the era of large-scale spectroscopic surveys in the Local Group (LG), we can explore using chemical abundances of halo stars to study the star formation and chemical enrichment histories of the dwarf galaxy progenitors of the Milky Way (MW) and M31 stellar halos. In this paper, we investigate using the Chemical Abundance Ratio Distributions (CARDs) of seven stellar halos from the Latte suite of FIRE-2 simulations. We attempt to infer galaxies' assembly histories by modelling the CARDs of the stellar halos of the Latte galaxies as a linear combination of template CARDs from disrupted dwarfs, with different stellar masses $M_{\\star}$ and quenching times $t_{100}$. We present a method for constructing these templates using present-day dwarf galaxies. For four of the seven Latte halos studied in this work, we recover the mass spectrum of accreted dwarfs to a precision of $<10\\%$. For the fraction of mass accreted as a function of $t_{100}$, we find residuals of $20-30\\%$ for five of the seven simulations. We discuss the failure modes of this method, which arise from the diversity of star formation and chemical enrichment histories dwarf galaxies can take. These failure cases can be robustly identified by the high model residuals. Though the CARDs modeling method does not successfully infer the assembly histories in these cases, the CARDs of these disrupted dwarfs contain signatures of their unusual formation histories. Our results are promising for using CARDs to learn more about the histories of the progenitors of the MW and M31 stellar halos.")
-                .withField(StandardField.EPRINT, "2110.02957")
-                .withField(StandardField.FILE, ":http\\://arxiv.org/pdf/2110.02957v1:PDF")
-                .withField(StandardField.EPRINTTYPE, "arXiv")
-                .withField(StandardField.EPRINTCLASS, "astro-ph.GA")
-                .withField(StandardField.KEYWORDS, "astro-ph.GA");
-
-        groundDOIId = "10.1002/9781118257517";
-        groundDOIEntry = new BibEntry(StandardEntryType.Book)
-                .withField(StandardField.TITLE, "Java{\\textregistered} For Dummies{\\textregistered}")
-                .withField(StandardField.PUBLISHER, "Wiley Publishing, Inc.")
-                .withField(StandardField.YEAR, "2011")
-                .withField(StandardField.AUTHOR, "Barry Burd")
-                .withField(StandardField.MONTH, "jul")
-                .withField(StandardField.DOI, "10.1002/9781118257517");
-        groundDOIEntry.setCitationKey("Burd_2011");
-
-        groundIsbnId = "9780134685991";
-        groundIsbnEntry = new BibEntry(StandardEntryType.Book)
-                .withField(StandardField.TITLE, "Effective Java")
-                .withField(StandardField.PUBLISHER, "Addison Wesley")
-                .withField(StandardField.YEAR, "2018")
-                .withField(StandardField.AUTHOR, "Bloch, Joshua")
-                .withField(StandardField.DATE, "2018-01-01")
-                .withField(new UnknownField("ean"), "9780134685991")
-                .withField(StandardField.ISBN, "0134685997")
-                .withField(StandardField.URL, "https://www.ebook.de/de/product/28983211/joshua_bloch_effective_java.html");
-        groundIsbnEntry.setCitationKey("9780134685991");
-
-        groundIacrEprintId = "2017/1118";
-        groundIacrEprintEntry = new BibEntry(StandardEntryType.Misc)
-                .withField(StandardField.ABSTRACT, "The decentralized cryptocurrency Bitcoin has experienced great success but also encountered many challenges. One of the challenges has been the long confirmation time. Another challenge is the lack of incentives at certain steps of the protocol, raising concerns for transaction withholding, selfish mining, etc. To address these challenges, we propose Solida, a decentralized blockchain protocol based on reconfigurable Byzantine consensus augmented by proof-of-work. Solida improves on Bitcoin in confirmation time,  and provides safety  and liveness assuming the adversary control less than (roughly) one-third of the total mining power.\n")
-                .withField(StandardField.AUTHOR, "Ittai Abraham and Dahlia Malkhi and Kartik Nayak and Ling Ren and Alexander Spiegelman")
-                .withField(StandardField.DATE, "2017-11-18")
-                .withField(StandardField.HOWPUBLISHED, "Cryptology ePrint Archive, Report 2017/1118")
-                .withField(StandardField.NOTE, "\\url{https://ia.cr/2017/1118}")
-                .withField(StandardField.TITLE, "Solida: A Blockchain Protocol Based on Reconfigurable Byzantine Consensus")
-                .withField(StandardField.URL, "https://eprint.iacr.org/2017/1118/20171124:064527")
-                .withField(StandardField.VERSION, "20171124:064527")
-                .withField(StandardField.YEAR, "2017");
-        groundIacrEprintEntry.setCitationKey("cryptoeprint:2017:1118");
+    private static Stream<Arguments> performSearchByIdReturnsCorrectEntryForDoiId() {
+        return Stream.of(Arguments.arguments(
+                new BibEntry(StandardEntryType.Book)
+                        .withField(StandardField.TITLE, "Java{\\textregistered} For Dummies{\\textregistered}")
+                        .withField(StandardField.PUBLISHER, "Wiley Publishing, Inc.")
+                        .withField(StandardField.YEAR, "2011")
+                        .withField(StandardField.AUTHOR, "Barry Burd")
+                        .withField(StandardField.MONTH, "jul")
+                        .withField(StandardField.DOI, "10.1002/9781118257517")
+                        .withCitationKey("2011"),
+                "10.1002/9781118257517"
+        ));
+    }
+
+    private static Stream<Arguments> performSearchByIdReturnsCorrectEntryForIsbnId() {
+        return Stream.of(Arguments.arguments(
+                new BibEntry(StandardEntryType.Book)
+                        .withField(StandardField.TITLE, "Effective Java")
+                        .withField(StandardField.PUBLISHER, "Addison Wesley")
+                        .withField(StandardField.YEAR, "2018")
+                        .withField(StandardField.AUTHOR, "Bloch, Joshua")
+                        .withField(StandardField.DATE, "2018-01-01")
+                        .withField(new UnknownField("ean"), "9780134685991")
+                        .withField(StandardField.ISBN, "0134685997")
+                        .withField(StandardField.URL, "https://www.ebook.de/de/product/28983211/joshua_bloch_effective_java.html")
+                        .withCitationKey("9780134685991"),
+                "9780134685991"
+        ));
+    }
+
+    private static Stream<Arguments> performSearchByIdReturnsCorrectEntryForIacrEprintId() {
+        return Stream.of(Arguments.arguments(
+                new BibEntry(StandardEntryType.Misc)
+                        .withField(StandardField.ABSTRACT, "The decentralized cryptocurrency Bitcoin has experienced great success but also encountered many challenges. One of the challenges has been the long confirmation time. Another challenge is the lack of incentives at certain steps of the protocol, raising concerns for transaction withholding, selfish mining, etc. To address these challenges, we propose Solida, a decentralized blockchain protocol based on reconfigurable Byzantine consensus augmented by proof-of-work. Solida improves on Bitcoin in confirmation time,  and provides safety  and liveness assuming the adversary control less than (roughly) one-third of the total mining power.\n")
+                        .withField(StandardField.AUTHOR, "Ittai Abraham and Dahlia Malkhi and Kartik Nayak and Ling Ren and Alexander Spiegelman")
+                        .withField(StandardField.DATE, "2017-11-18")
+                        .withField(StandardField.HOWPUBLISHED, "Cryptology ePrint Archive, Report 2017/1118")
+                        .withField(StandardField.NOTE, "\\url{https://ia.cr/2017/1118}")
+                        .withField(StandardField.TITLE, "Solida: A Blockchain Protocol Based on Reconfigurable Byzantine Consensus")
+                        .withField(StandardField.URL, "https://eprint.iacr.org/2017/1118/20171124:064527")
+                        .withField(StandardField.VERSION, "20171124:064527")
+                        .withField(StandardField.YEAR, "2017")
+                        .withCitationKey("cryptoeprint:2017:1118"),
+                "2017/1118"
+        ));
+    }
+
+    private static Stream<Arguments> performSearchByIdReturnsCorrectEntryForArXivId() {
+        return Stream.of(Arguments.arguments(
+                new BibEntry(StandardEntryType.Article)
+                        .withField(StandardField.AUTHOR, "Emily C. Cunningham and Robyn E. Sanderson and Kathryn V. Johnston and Nondh Panithanpaisal and Melissa K. Ness and Andrew Wetzel and Sarah R. Loebman and Ivanna Escala and Danny Horta and Claude-André Faucher-Giguère")
+                        .withField(StandardField.TITLE, "Reading the CARDs: the Imprint of Accretion History in the Chemical Abundances of the Milky Way's Stellar Halo")
+                        .withField(StandardField.DATE, "2021-10-06")
+                        .withField(StandardField.ABSTRACT, "In the era of large-scale spectroscopic surveys in the Local Group (LG), we can explore using chemical abundances of halo stars to study the star formation and chemical enrichment histories of the dwarf galaxy progenitors of the Milky Way (MW) and M31 stellar halos. In this paper, we investigate using the Chemical Abundance Ratio Distributions (CARDs) of seven stellar halos from the Latte suite of FIRE-2 simulations. We attempt to infer galaxies' assembly histories by modelling the CARDs of the stellar halos of the Latte galaxies as a linear combination of template CARDs from disrupted dwarfs, with different stellar masses $M_{\\star}$ and quenching times $t_{100}$. We present a method for constructing these templates using present-day dwarf galaxies. For four of the seven Latte halos studied in this work, we recover the mass spectrum of accreted dwarfs to a precision of $<10\\%$. For the fraction of mass accreted as a function of $t_{100}$, we find residuals of $20-30\\%$ for five of the seven simulations. We discuss the failure modes of this method, which arise from the diversity of star formation and chemical enrichment histories dwarf galaxies can take. These failure cases can be robustly identified by the high model residuals. Though the CARDs modeling method does not successfully infer the assembly histories in these cases, the CARDs of these disrupted dwarfs contain signatures of their unusual formation histories. Our results are promising for using CARDs to learn more about the histories of the progenitors of the MW and M31 stellar halos.")
+                        .withField(StandardField.EPRINT, "2110.02957")
+                        .withField(StandardField.FILE, ":http\\://arxiv.org/pdf/2110.02957v1:PDF")
+                        .withField(StandardField.EPRINTTYPE, "arXiv")
+                        .withField(StandardField.EPRINTCLASS, "astro-ph.GA")
+                        .withField(StandardField.KEYWORDS, "astro-ph.GA"),
+                "arXiv:2110.02957"
+        ));
     }
 
     @BeforeEach
@@ -95,28 +100,33 @@ void setUp() throws Exception {
         compositeIdFetcher = new CompositeIdFetcher(importFormatPreferences);
     }
 
-    @Test
-    void performSearchByIdReturnsEmptyForInvalidId() {
+    @ParameterizedTest
+    @ValueSource(strings = "arZiv:2110.02957")
+    void performSearchByIdReturnsEmptyForInvalidId(String groundInvalidArXivId) {
         assertEquals(Optional.empty(), compositeIdFetcher.performSearchById(groundInvalidArXivId));
     }
 
-    @Test
-    void performSearchByIdReturnsCorrectEntryForDOIId() {
-        assertEquals(Optional.of(groundDOIEntry), compositeIdFetcher.performSearchById(groundDOIId));
+    @ParameterizedTest
+    @MethodSource
+    void performSearchByIdReturnsCorrectEntryForDoiId(BibEntry groundDoiEntry, String groundDoiId) {
+        assertEquals(Optional.of(groundDoiEntry), compositeIdFetcher.performSearchById(groundDoiId));
     }
 
-    @Test
-    void performSearchByIdReturnsCorrectEntryForIsbnId() {
+    @ParameterizedTest
+    @MethodSource
+    void performSearchByIdReturnsCorrectEntryForIsbnId(BibEntry groundIsbnEntry, String groundIsbnId) {
         assertEquals(Optional.of(groundIsbnEntry), compositeIdFetcher.performSearchById(groundIsbnId));
     }
 
-    @Test
-    void performSearchByIdReturnsCorrectEntryForIacrEprintId() {
+    @ParameterizedTest
+    @MethodSource
+    void performSearchByIdReturnsCorrectEntryForIacrEprintId(BibEntry groundIacrEprintEntry, String groundIacrEprintId) {
         assertEquals(Optional.of(groundIacrEprintEntry), compositeIdFetcher.performSearchById(groundIacrEprintId));
     }
 
-    @Test
-    void performSearchByIdReturnsCorrectEntryForArXivId() {
+    @ParameterizedTest
+    @MethodSource
+    void performSearchByIdReturnsCorrectEntryForArXivId(BibEntry groundEntryArXiv, String groundArXivId) {
         assertEquals(Optional.of(groundEntryArXiv), compositeIdFetcher.performSearchById(groundArXivId));
     }
 

From b00a749bdf4e66777b0e7181ba290c1c2ab45fd8 Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Sun, 17 Oct 2021 05:50:31 +0200
Subject: [PATCH 23/47] add IacrEprint identifier

---
 .../model/entry/identifier/IacrEprint.java    | 79 +++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 src/main/java/org/jabref/model/entry/identifier/IacrEprint.java

diff --git a/src/main/java/org/jabref/model/entry/identifier/IacrEprint.java b/src/main/java/org/jabref/model/entry/identifier/IacrEprint.java
new file mode 100644
index 00000000000..fc70c2c16b6
--- /dev/null
+++ b/src/main/java/org/jabref/model/entry/identifier/IacrEprint.java
@@ -0,0 +1,79 @@
+package org.jabref.model.entry.identifier;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.StandardField;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class IacrEprint implements Identifier {
+    public static final URI RESOLVER = URI.create("https://ia.cr");
+    private static final Logger LOGGER = LoggerFactory.getLogger(Eprint.class);
+
+    private static final String IACR_EPRINT_EXP = "d{4}\\/\\d{3,5}";
+    private static final String HTTP_EXP = "https:\\/\\/";
+    private static final String URL_SHORT_EXP = "ia\\.cr\\/";
+    private static final String URL_EXP = "eprint\\.iacr\\.org\\/";
+    private final String iacrEprint;
+
+    IacrEprint(String iacrEprint) {
+        Objects.requireNonNull(iacrEprint);
+
+        String trimmedId = iacrEprint.trim();
+
+        if (matchesExcepted(trimmedId)) {
+            Matcher matcher = Pattern.compile(IACR_EPRINT_EXP).matcher(trimmedId);
+            this.iacrEprint = matcher.group(1);
+        } else {
+            throw new IllegalArgumentException(trimmedId + " is not a valid IacrEprint identifier.");
+        }
+
+    }
+
+    private boolean matchesExcepted(String identifier) {
+        return iacrEprint.matches(IACR_EPRINT_EXP) ||
+            iacrEprint.matches(URL_EXP + IACR_EPRINT_EXP) ||
+            iacrEprint.matches(URL_SHORT_EXP + IACR_EPRINT_EXP) ||
+            iacrEprint.matches(HTTP_EXP + URL_EXP + IACR_EPRINT_EXP) ||
+            iacrEprint.matches(HTTP_EXP + URL_SHORT_EXP + IACR_EPRINT_EXP);
+    }
+
+    public static Optional<IacrEprint> parse(String identifier) {
+        String trimmed = identifier.strip();
+        try {
+            return Optional.of(new IacrEprint(trimmed));
+        } catch (IllegalArgumentException illegalArgumentException) {
+            return Optional.empty();
+        }
+    }
+
+    @Override
+    public String getNormalized() {
+        return iacrEprint;
+    }
+
+    @Override
+    public Field getDefaultField() {
+        return StandardField.EPRINT;
+    }
+
+    @Override
+    public Optional<URI> getExternalURI() {
+        try {
+            URI uri = new URI(RESOLVER.getScheme(), RESOLVER.getHost(), "/" + iacrEprint, null);
+            return Optional.of(uri);
+        } catch (URISyntaxException e) {
+            // should never happen
+            LOGGER.error(iacrEprint + " could not be encoded as URI.", e);
+            return Optional.empty();
+        }
+    }
+
+}

From b58fbdb83707f19aab9e2f1ea97d9f4e84457257 Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Sun, 17 Oct 2021 20:48:42 +0200
Subject: [PATCH 24/47] add IacrEprint identifier and tests

---
 .../model/entry/identifier/IacrEprint.java    | 22 ++++----
 .../entry/identifier/IacrEprintTest.java      | 51 +++++++++++++++++++
 2 files changed, 61 insertions(+), 12 deletions(-)
 create mode 100644 src/test/java/org/jabref/model/entry/identifier/IacrEprintTest.java

diff --git a/src/main/java/org/jabref/model/entry/identifier/IacrEprint.java b/src/main/java/org/jabref/model/entry/identifier/IacrEprint.java
index fc70c2c16b6..392bbe29687 100644
--- a/src/main/java/org/jabref/model/entry/identifier/IacrEprint.java
+++ b/src/main/java/org/jabref/model/entry/identifier/IacrEprint.java
@@ -17,10 +17,7 @@ public class IacrEprint implements Identifier {
     public static final URI RESOLVER = URI.create("https://ia.cr");
     private static final Logger LOGGER = LoggerFactory.getLogger(Eprint.class);
 
-    private static final String IACR_EPRINT_EXP = "d{4}\\/\\d{3,5}";
-    private static final String HTTP_EXP = "https:\\/\\/";
-    private static final String URL_SHORT_EXP = "ia\\.cr\\/";
-    private static final String URL_EXP = "eprint\\.iacr\\.org\\/";
+    private static final String IACR_EPRINT_EXP = "\\d{4}\\/\\d{3,5}";
     private final String iacrEprint;
 
     IacrEprint(String iacrEprint) {
@@ -30,19 +27,17 @@ public class IacrEprint implements Identifier {
 
         if (matchesExcepted(trimmedId)) {
             Matcher matcher = Pattern.compile(IACR_EPRINT_EXP).matcher(trimmedId);
-            this.iacrEprint = matcher.group(1);
+            matcher.find();
+            this.iacrEprint = matcher.group(0);
         } else {
             throw new IllegalArgumentException(trimmedId + " is not a valid IacrEprint identifier.");
         }
-
     }
 
-    private boolean matchesExcepted(String identifier) {
-        return iacrEprint.matches(IACR_EPRINT_EXP) ||
-            iacrEprint.matches(URL_EXP + IACR_EPRINT_EXP) ||
-            iacrEprint.matches(URL_SHORT_EXP + IACR_EPRINT_EXP) ||
-            iacrEprint.matches(HTTP_EXP + URL_EXP + IACR_EPRINT_EXP) ||
-            iacrEprint.matches(HTTP_EXP + URL_SHORT_EXP + IACR_EPRINT_EXP);
+    private static boolean matchesExcepted(String identifier) {
+        return identifier.matches(
+                "(https\\:\\/\\/)?(ia\\.cr\\/|eprint\\.iacr\\.org\\/)?" + IACR_EPRINT_EXP
+        );
     }
 
     public static Optional<IacrEprint> parse(String identifier) {
@@ -76,4 +71,7 @@ public Optional<URI> getExternalURI() {
         }
     }
 
+    public String getAsciiUrl() {
+        return getExternalURI().map(URI::toASCIIString).orElse("");
+    }
 }
diff --git a/src/test/java/org/jabref/model/entry/identifier/IacrEprintTest.java b/src/test/java/org/jabref/model/entry/identifier/IacrEprintTest.java
new file mode 100644
index 00000000000..89cc640320d
--- /dev/null
+++ b/src/test/java/org/jabref/model/entry/identifier/IacrEprintTest.java
@@ -0,0 +1,51 @@
+package org.jabref.model.entry.identifier;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class IacrEprintTest {
+
+
+    @Test
+    public void acceptPlainIacrEprint() {
+        assertEquals("2019/001", new IacrEprint("2019/001").getNormalized());
+    }
+
+    @Test
+    public void ignoreLeadingAndTrailingWhitespaces() {
+        assertEquals("2019/001", new IacrEprint(" 2019/001   ").getNormalized());
+    }
+
+    @Test
+    public void rejectInvalidIacrEprint() {
+        assertThrows(IllegalArgumentException.class,() -> new IacrEprint(" 2021/12"));
+    }
+
+    @Test
+    public void acceptFullUrlIacrEprint() {
+        assertEquals("2019/001", new IacrEprint("https://eprint.iacr.org/2019/001").getNormalized());
+    }
+
+    @Test
+    public void acceptShortenedUrlIacrEprint() {
+        assertEquals("2019/001", new IacrEprint("https://ia.cr/2019/001").getNormalized());
+    }
+
+    @Test
+    public void acceptDomainUrlIacrEprint() {
+        assertEquals("2019/001", new IacrEprint("eprint.iacr.org/2019/001").getNormalized());
+    }
+
+    @Test
+    public void acceptShortenedDomainUrlIacrEprint() {
+        assertEquals("2019/001", new IacrEprint("ia.cr/2019/001").getNormalized());
+    }
+
+
+    @Test
+    public void constructValidIacrEprintUrl() {
+        assertEquals("https://ia.cr/2019/001", new IacrEprint("2019/001").getAsciiUrl());
+    }
+
+}

From 1220f2ff40b8814d6c6b03ebd3ed2f8412282b02 Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Sun, 17 Oct 2021 20:58:13 +0200
Subject: [PATCH 25/47] adjust CompositeIdFetcher

---
 .../logic/importer/CompositeIdFetcher.java    | 67 ++++---------------
 .../model/entry/identifier/IacrEprint.java    |  2 +-
 2 files changed, 14 insertions(+), 55 deletions(-)

diff --git a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
index 0d7ff1a4d1a..981d1a33943 100644
--- a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
@@ -3,19 +3,17 @@
 import java.util.Optional;
 
 import org.jabref.logic.importer.fetcher.ArXiv;
-import org.jabref.logic.importer.fetcher.CrossRef;
 import org.jabref.logic.importer.fetcher.DoiFetcher;
 import org.jabref.logic.importer.fetcher.IacrEprintFetcher;
 import org.jabref.logic.importer.fetcher.IsbnFetcher;
 import org.jabref.model.entry.BibEntry;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.jabref.model.entry.identifier.ArXivIdentifier;
+import org.jabref.model.entry.identifier.DOI;
+import org.jabref.model.entry.identifier.ISBN;
+import org.jabref.model.entry.identifier.IacrEprint;
 
 public class CompositeIdFetcher {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(CompositeIdFetcher.class);
-
     private final ImportFormatPreferences importFormatPreferences;
 
     public CompositeIdFetcher(ImportFormatPreferences importFormatPreferences) {
@@ -23,57 +21,18 @@ public CompositeIdFetcher(ImportFormatPreferences importFormatPreferences) {
     }
 
     public Optional<BibEntry> performSearchById(String identifier) {
-
-        Optional<BibEntry> fetchedEntry;
-
-        try {
-            ArXiv arXiv = new ArXiv(importFormatPreferences);
-            fetchedEntry = arXiv.performSearchById(identifier);
-            if (fetchedEntry.isPresent()) {
-                return fetchedEntry;
-            }
-        } catch (FetcherException fetcherException) {
-            LOGGER.debug(fetcherException.getMessage());
-        }
-
-        try {
-            IsbnFetcher isbnFetcher = new IsbnFetcher(importFormatPreferences);
-            fetchedEntry = isbnFetcher.performSearchById(identifier);
-            if (fetchedEntry.isPresent()) {
-                return fetchedEntry;
-            }
-        } catch (FetcherException fetcherException) {
-            LOGGER.debug(fetcherException.getMessage());
-        }
-
-        try {
-            DoiFetcher doiFetcher = new DoiFetcher(importFormatPreferences);
-            fetchedEntry = doiFetcher.performSearchById(identifier);
-            if (fetchedEntry.isPresent()) {
-                return fetchedEntry;
-            }
-        } catch (FetcherException fetcherException) {
-            LOGGER.debug(fetcherException.getMessage());
-        }
-
-        try {
-            IacrEprintFetcher iacrEprintFetcher = new IacrEprintFetcher(importFormatPreferences);
-            fetchedEntry = iacrEprintFetcher.performSearchById(identifier);
-            if (fetchedEntry.isPresent()) {
-                return fetchedEntry;
-            }
-        } catch (FetcherException fetcherException) {
-            LOGGER.debug(fetcherException.getMessage());
-        }
-
         try {
-            CrossRef crossRef = new CrossRef();
-            fetchedEntry = crossRef.performSearchById(identifier);
-            if (fetchedEntry.isPresent()) {
-                return fetchedEntry;
+            if (ArXivIdentifier.parse(identifier).isPresent()) {
+                return new ArXiv(importFormatPreferences).performSearchById(identifier);
+            } else if (ISBN.parse(identifier).isPresent()) {
+                return new IsbnFetcher(importFormatPreferences).performSearchById(identifier);
+            } else if (DOI.parse(identifier).isPresent()) {
+                return new DoiFetcher(importFormatPreferences).performSearchById(identifier);
+            } else if (IacrEprint.parse(identifier).isPresent()) {
+                return new IacrEprintFetcher(importFormatPreferences).performSearchById(identifier);
             }
         } catch (FetcherException fetcherException) {
-            LOGGER.debug(fetcherException.getMessage());
+            fetcherException.printStackTrace();
         }
 
         return Optional.empty();
diff --git a/src/main/java/org/jabref/model/entry/identifier/IacrEprint.java b/src/main/java/org/jabref/model/entry/identifier/IacrEprint.java
index 392bbe29687..c385b9316ab 100644
--- a/src/main/java/org/jabref/model/entry/identifier/IacrEprint.java
+++ b/src/main/java/org/jabref/model/entry/identifier/IacrEprint.java
@@ -15,7 +15,7 @@
 
 public class IacrEprint implements Identifier {
     public static final URI RESOLVER = URI.create("https://ia.cr");
-    private static final Logger LOGGER = LoggerFactory.getLogger(Eprint.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(IacrEprint.class);
 
     private static final String IACR_EPRINT_EXP = "\\d{4}\\/\\d{3,5}";
     private final String iacrEprint;

From 450eb3f936b8d1ed3796e3005e7cbdd26145c268 Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Sun, 17 Oct 2021 21:17:15 +0200
Subject: [PATCH 26/47] optimize CompositeIdFetcher

---
 .../importer/GenerateEntryFromIdDialog.fxml   |  2 +-
 .../importer/GenerateEntryFromIdDialog.java   |  5 +++-
 .../logic/importer/CompositeIdFetcher.java    | 23 ++++++++++++-------
 src/main/resources/l10n/JabRef_en.properties  |  1 +
 4 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.fxml b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.fxml
index 5e052dc5c15..51413ac5108 100644
--- a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.fxml
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.fxml
@@ -11,7 +11,7 @@
        <Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="102.0" prefWidth="360.0">
            <TextField fx:id="idTextField" layoutX="14.0" layoutY="40.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="29.0" prefWidth="287.0" />
            <Button fx:id="generateButton" layoutX="314.0" layoutY="40.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" mnemonicParsing="false" onAction="#generateEntry" prefHeight="30.0" prefWidth="55.0" textAlignment="CENTER" />
-           <Label layoutX="14.0" layoutY="14.0" prefHeight="16.0" prefWidth="328.0" text="Import a BibEntry by its identifier..." />
+           <Label layoutX="14.0" layoutY="14.0" prefHeight="16.0" prefWidth="328.0" text="Import by ID..." />
        </Pane>
    </content>
 </DialogPane>
diff --git a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
index 4e111e26712..517b6a29ff0 100644
--- a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
@@ -3,6 +3,7 @@
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.DialogPane;
+import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
 
 import org.jabref.gui.DialogService;
@@ -21,6 +22,7 @@ public class GenerateEntryFromIdDialog {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(GenerateEntryFromIdDialog.class);
 
+    @FXML Label titleLabel;
     @FXML DialogPane dialogPane;
     @FXML TextField idTextField;
     @FXML Button generateButton;
@@ -39,9 +41,10 @@ public GenerateEntryFromIdDialog(LibraryTab libraryTab, DialogService dialogServ
         this.stateManager = stateManager;
         this.taskExecutor = taskExecutor;
 
+        this.titleLabel.setText(Localization.lang("Import new entry from ID..."));
         this.generateButton.setGraphic(IconTheme.JabRefIcons.IMPORT.getGraphicNode());
 
-        // a good idea would be to make to enter key correspond to the generateButton while the popup is in focus
+        this.generateButton.setDefaultButton(true);
 
     }
 
diff --git a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
index 981d1a33943..44253787f16 100644
--- a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
@@ -22,14 +22,21 @@ public CompositeIdFetcher(ImportFormatPreferences importFormatPreferences) {
 
     public Optional<BibEntry> performSearchById(String identifier) {
         try {
-            if (ArXivIdentifier.parse(identifier).isPresent()) {
-                return new ArXiv(importFormatPreferences).performSearchById(identifier);
-            } else if (ISBN.parse(identifier).isPresent()) {
-                return new IsbnFetcher(importFormatPreferences).performSearchById(identifier);
-            } else if (DOI.parse(identifier).isPresent()) {
-                return new DoiFetcher(importFormatPreferences).performSearchById(identifier);
-            } else if (IacrEprint.parse(identifier).isPresent()) {
-                return new IacrEprintFetcher(importFormatPreferences).performSearchById(identifier);
+            Optional<ArXivIdentifier> arXivIdentifier = ArXivIdentifier.parse(identifier);
+            if (arXivIdentifier.isPresent()) {
+                return new ArXiv(importFormatPreferences).performSearchById(arXivIdentifier.get().getNormalized());
+            }
+            Optional<ISBN> isbn = ISBN.parse(identifier);
+            if (isbn.isPresent()) {
+                return new IsbnFetcher(importFormatPreferences).performSearchById(isbn.get().getNormalized());
+            }
+            Optional<DOI> doi = DOI.parse(identifier);
+            if (doi.isPresent()) {
+                return new DoiFetcher(importFormatPreferences).performSearchById(doi.get().getNormalized());
+            }
+            Optional<IacrEprint> iacrEprint = IacrEprint.parse(identifier);
+            if (iacrEprint.isPresent()) {
+                return new IacrEprintFetcher(importFormatPreferences).performSearchById(iacrEprint.get().getNormalized());
             }
         } catch (FetcherException fetcherException) {
             fetcherException.printStackTrace();
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index cdc4ed2a294..059ec7bd416 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -1850,6 +1850,7 @@ JabRef\ resources=JabRef resources
 Manage\ journal\ abbreviations=Manage journal abbreviations
 Manage\ protected\ terms=Manage protected terms
 New\ entry\ from\ plain\ text=New entry from plain text
+Import\ new\ entry\ from\ ID...=Import new entry from ID...
 Import\ by\ ID=Import by ID
 Enter\ a\ valid\ ID=Enter a valid ID
 Entry\ could\ not\ be\ created=Entry could not be created

From c669ceba30fa5201889b412595992d6372f48744 Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Sun, 17 Oct 2021 21:19:24 +0200
Subject: [PATCH 27/47] delete unnecessary lines

---
 .../org/jabref/gui/importer/GenerateEntryFromIdAction.java | 5 -----
 .../org/jabref/gui/importer/GenerateEntryFromIdDialog.fxml | 2 +-
 .../org/jabref/gui/importer/GenerateEntryFromIdDialog.java | 7 -------
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
index b0c12a85a7a..58515b234b0 100644
--- a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
@@ -63,11 +63,8 @@ protected Optional<BibEntry> call() throws JabRefException {
                 }
 
                 updateMessage(Localization.lang("Searching..."));
-
-                // later catch more exceptions here and notify user
                 Optional<BibEntry> result = new CompositeIdFetcher(preferencesService.getImportFormatPreferences()).performSearchById(identifier);
                 LOGGER.debug("Resulted in " + result);
-
                 if (result.isPresent()) {
                     final BibEntry entry = result.get();
                     ImportCleanup cleanup = new ImportCleanup(libraryTab.getBibDatabaseContext().getMode());
@@ -91,8 +88,6 @@ protected Optional<BibEntry> call() throws JabRefException {
                     }
                 } else {
                     updateMessage(Localization.lang("Error"));
-                    // There could be more exact feedback if the CompositeIdFetcher.java / future IdFetcherManager
-                    // had a better structure or there would be individual exceptions for fetchers.
                     throw new JabRefException("Invalid identifier or connection failure.");
                 }
                 updateMessage(Localization.lang("Imported one entry"));
diff --git a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.fxml b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.fxml
index 51413ac5108..4ce541e53e3 100644
--- a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.fxml
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.fxml
@@ -11,7 +11,7 @@
        <Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="102.0" prefWidth="360.0">
            <TextField fx:id="idTextField" layoutX="14.0" layoutY="40.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="29.0" prefWidth="287.0" />
            <Button fx:id="generateButton" layoutX="314.0" layoutY="40.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" mnemonicParsing="false" onAction="#generateEntry" prefHeight="30.0" prefWidth="55.0" textAlignment="CENTER" />
-           <Label layoutX="14.0" layoutY="14.0" prefHeight="16.0" prefWidth="328.0" text="Import by ID..." />
+           <Label layoutX="14.0" layoutY="14.0" prefHeight="16.0" prefWidth="328.0"/>
        </Pane>
    </content>
 </DialogPane>
diff --git a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
index 517b6a29ff0..001bf335ada 100644
--- a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
@@ -15,13 +15,9 @@
 import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class GenerateEntryFromIdDialog {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(GenerateEntryFromIdDialog.class);
-
     @FXML Label titleLabel;
     @FXML DialogPane dialogPane;
     @FXML TextField idTextField;
@@ -43,9 +39,7 @@ public GenerateEntryFromIdDialog(LibraryTab libraryTab, DialogService dialogServ
 
         this.titleLabel.setText(Localization.lang("Import new entry from ID..."));
         this.generateButton.setGraphic(IconTheme.JabRefIcons.IMPORT.getGraphicNode());
-
         this.generateButton.setDefaultButton(true);
-
     }
 
     @FXML private void generateEntry() {
@@ -54,7 +48,6 @@ public GenerateEntryFromIdDialog(LibraryTab libraryTab, DialogService dialogServ
             return;
         }
 
-        // auto shift focus back to textfield for workflow
         this.idTextField.requestFocus();
 
         GenerateEntryFromIdAction generateEntryFromIdAction = new GenerateEntryFromIdAction(

From c1686953d22bff6d22958a5ad3662b64431e5ee9 Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Sun, 17 Oct 2021 21:26:50 +0200
Subject: [PATCH 28/47] separately handle fetcherexceptions in
 CompositeIdFetcher

---
 .../logic/importer/CompositeIdFetcher.java    | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
index 44253787f16..c464a90e426 100644
--- a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
@@ -12,8 +12,13 @@
 import org.jabref.model.entry.identifier.ISBN;
 import org.jabref.model.entry.identifier.IacrEprint;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class CompositeIdFetcher {
 
+    private final Logger LOGGER = LoggerFactory.getLogger(CompositeIdFetcher.class);
+
     private final ImportFormatPreferences importFormatPreferences;
 
     public CompositeIdFetcher(ImportFormatPreferences importFormatPreferences) {
@@ -26,20 +31,32 @@ public Optional<BibEntry> performSearchById(String identifier) {
             if (arXivIdentifier.isPresent()) {
                 return new ArXiv(importFormatPreferences).performSearchById(arXivIdentifier.get().getNormalized());
             }
+        } catch (FetcherException fetcherException) {
+            LOGGER.debug(fetcherException.getMessage());
+        }
+        try {
             Optional<ISBN> isbn = ISBN.parse(identifier);
             if (isbn.isPresent()) {
                 return new IsbnFetcher(importFormatPreferences).performSearchById(isbn.get().getNormalized());
             }
+        } catch (FetcherException fetcherException) {
+            LOGGER.debug(fetcherException.getMessage());
+        }
+        try {
             Optional<DOI> doi = DOI.parse(identifier);
             if (doi.isPresent()) {
                 return new DoiFetcher(importFormatPreferences).performSearchById(doi.get().getNormalized());
             }
+        } catch (FetcherException fetcherException) {
+            LOGGER.debug(fetcherException.getMessage());
+        }
+        try {
             Optional<IacrEprint> iacrEprint = IacrEprint.parse(identifier);
             if (iacrEprint.isPresent()) {
                 return new IacrEprintFetcher(importFormatPreferences).performSearchById(iacrEprint.get().getNormalized());
             }
         } catch (FetcherException fetcherException) {
-            fetcherException.printStackTrace();
+            LOGGER.debug(fetcherException.getMessage());
         }
 
         return Optional.empty();

From 3d6db7bdfdcdbfc9fdc7bbfcd2c5c6eee2c5bd79 Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Sun, 17 Oct 2021 21:30:21 +0200
Subject: [PATCH 29/47] Revert "separately handle fetcherexceptions in
 CompositeIdFetcher"

This reverts commit c1686953d22bff6d22958a5ad3662b64431e5ee9.
---
 .../logic/importer/CompositeIdFetcher.java    | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
index c464a90e426..44253787f16 100644
--- a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
@@ -12,13 +12,8 @@
 import org.jabref.model.entry.identifier.ISBN;
 import org.jabref.model.entry.identifier.IacrEprint;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class CompositeIdFetcher {
 
-    private final Logger LOGGER = LoggerFactory.getLogger(CompositeIdFetcher.class);
-
     private final ImportFormatPreferences importFormatPreferences;
 
     public CompositeIdFetcher(ImportFormatPreferences importFormatPreferences) {
@@ -31,32 +26,20 @@ public Optional<BibEntry> performSearchById(String identifier) {
             if (arXivIdentifier.isPresent()) {
                 return new ArXiv(importFormatPreferences).performSearchById(arXivIdentifier.get().getNormalized());
             }
-        } catch (FetcherException fetcherException) {
-            LOGGER.debug(fetcherException.getMessage());
-        }
-        try {
             Optional<ISBN> isbn = ISBN.parse(identifier);
             if (isbn.isPresent()) {
                 return new IsbnFetcher(importFormatPreferences).performSearchById(isbn.get().getNormalized());
             }
-        } catch (FetcherException fetcherException) {
-            LOGGER.debug(fetcherException.getMessage());
-        }
-        try {
             Optional<DOI> doi = DOI.parse(identifier);
             if (doi.isPresent()) {
                 return new DoiFetcher(importFormatPreferences).performSearchById(doi.get().getNormalized());
             }
-        } catch (FetcherException fetcherException) {
-            LOGGER.debug(fetcherException.getMessage());
-        }
-        try {
             Optional<IacrEprint> iacrEprint = IacrEprint.parse(identifier);
             if (iacrEprint.isPresent()) {
                 return new IacrEprintFetcher(importFormatPreferences).performSearchById(iacrEprint.get().getNormalized());
             }
         } catch (FetcherException fetcherException) {
-            LOGGER.debug(fetcherException.getMessage());
+            fetcherException.printStackTrace();
         }
 
         return Optional.empty();

From 832c185f69afe138da0f1ba0d956b7f1ceb635ca Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Sun, 17 Oct 2021 22:12:31 +0200
Subject: [PATCH 30/47] optimize imports

---
 .../java/org/jabref/model/entry/identifier/IacrEprintTest.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/java/org/jabref/model/entry/identifier/IacrEprintTest.java b/src/test/java/org/jabref/model/entry/identifier/IacrEprintTest.java
index 89cc640320d..7e3ca43f407 100644
--- a/src/test/java/org/jabref/model/entry/identifier/IacrEprintTest.java
+++ b/src/test/java/org/jabref/model/entry/identifier/IacrEprintTest.java
@@ -1,6 +1,7 @@
 package org.jabref.model.entry.identifier;
 
 import org.junit.jupiter.api.Test;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 

From 311aa639c652dcb11ce61efd918fc3f823eebfbf Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Sun, 17 Oct 2021 22:17:54 +0200
Subject: [PATCH 31/47] delete empty line

---
 .../java/org/jabref/model/entry/identifier/IacrEprintTest.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/test/java/org/jabref/model/entry/identifier/IacrEprintTest.java b/src/test/java/org/jabref/model/entry/identifier/IacrEprintTest.java
index 7e3ca43f407..a62b611a635 100644
--- a/src/test/java/org/jabref/model/entry/identifier/IacrEprintTest.java
+++ b/src/test/java/org/jabref/model/entry/identifier/IacrEprintTest.java
@@ -7,7 +7,6 @@
 
 public class IacrEprintTest {
 
-
     @Test
     public void acceptPlainIacrEprint() {
         assertEquals("2019/001", new IacrEprint("2019/001").getNormalized());

From 2b3070f1ff21e2329855f9d79db455e54c4f976b Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Sun, 17 Oct 2021 22:28:25 +0200
Subject: [PATCH 32/47] fix label not appearing

---
 .../java/org/jabref/gui/importer/GenerateEntryFromIdDialog.fxml | 2 +-
 .../java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java | 1 -
 src/main/resources/l10n/JabRef_en.properties                    | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.fxml b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.fxml
index 4ce541e53e3..8a2a6462f2e 100644
--- a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.fxml
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.fxml
@@ -11,7 +11,7 @@
        <Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="102.0" prefWidth="360.0">
            <TextField fx:id="idTextField" layoutX="14.0" layoutY="40.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="29.0" prefWidth="287.0" />
            <Button fx:id="generateButton" layoutX="314.0" layoutY="40.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" mnemonicParsing="false" onAction="#generateEntry" prefHeight="30.0" prefWidth="55.0" textAlignment="CENTER" />
-           <Label layoutX="14.0" layoutY="14.0" prefHeight="16.0" prefWidth="328.0"/>
+           <Label layoutX="14.0" layoutY="14.0" prefHeight="16.0" prefWidth="328.0" text="Import new Entry from ID..."/>
        </Pane>
    </content>
 </DialogPane>
diff --git a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
index 001bf335ada..bbbccc4ad9a 100644
--- a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
@@ -37,7 +37,6 @@ public GenerateEntryFromIdDialog(LibraryTab libraryTab, DialogService dialogServ
         this.stateManager = stateManager;
         this.taskExecutor = taskExecutor;
 
-        this.titleLabel.setText(Localization.lang("Import new entry from ID..."));
         this.generateButton.setGraphic(IconTheme.JabRefIcons.IMPORT.getGraphicNode());
         this.generateButton.setDefaultButton(true);
     }
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 059ec7bd416..cdc4ed2a294 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -1850,7 +1850,6 @@ JabRef\ resources=JabRef resources
 Manage\ journal\ abbreviations=Manage journal abbreviations
 Manage\ protected\ terms=Manage protected terms
 New\ entry\ from\ plain\ text=New entry from plain text
-Import\ new\ entry\ from\ ID...=Import new entry from ID...
 Import\ by\ ID=Import by ID
 Enter\ a\ valid\ ID=Enter a valid ID
 Entry\ could\ not\ be\ created=Entry could not be created

From 836e347b18e3fbc60f857a10cb08652afb33e0b5 Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Mon, 18 Oct 2021 00:08:05 +0200
Subject: [PATCH 33/47] clear checkstyle errors

---
 .../java/org/jabref/model/entry/identifier/IacrEprintTest.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/test/java/org/jabref/model/entry/identifier/IacrEprintTest.java b/src/test/java/org/jabref/model/entry/identifier/IacrEprintTest.java
index a62b611a635..b88abd329dc 100644
--- a/src/test/java/org/jabref/model/entry/identifier/IacrEprintTest.java
+++ b/src/test/java/org/jabref/model/entry/identifier/IacrEprintTest.java
@@ -19,7 +19,7 @@ public void ignoreLeadingAndTrailingWhitespaces() {
 
     @Test
     public void rejectInvalidIacrEprint() {
-        assertThrows(IllegalArgumentException.class,() -> new IacrEprint(" 2021/12"));
+        assertThrows(IllegalArgumentException.class, () -> new IacrEprint("2021/12"));
     }
 
     @Test
@@ -42,7 +42,6 @@ public void acceptShortenedDomainUrlIacrEprint() {
         assertEquals("2019/001", new IacrEprint("ia.cr/2019/001").getNormalized());
     }
 
-
     @Test
     public void constructValidIacrEprintUrl() {
         assertEquals("https://ia.cr/2019/001", new IacrEprint("2019/001").getAsciiUrl());

From c563ff072eb79cfe39ed5a9588fa44d647fe4f31 Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Mon, 25 Oct 2021 21:43:09 +0200
Subject: [PATCH 34/47] convert to parametrized test

---
 .../entry/identifier/IacrEprintTest.java      | 62 +++++++++++--------
 1 file changed, 36 insertions(+), 26 deletions(-)

diff --git a/src/test/java/org/jabref/model/entry/identifier/IacrEprintTest.java b/src/test/java/org/jabref/model/entry/identifier/IacrEprintTest.java
index b88abd329dc..4c7d6a2eeff 100644
--- a/src/test/java/org/jabref/model/entry/identifier/IacrEprintTest.java
+++ b/src/test/java/org/jabref/model/entry/identifier/IacrEprintTest.java
@@ -1,20 +1,44 @@
 package org.jabref.model.entry.identifier;
 
+import java.util.stream.Stream;
+
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class IacrEprintTest {
 
-    @Test
-    public void acceptPlainIacrEprint() {
-        assertEquals("2019/001", new IacrEprint("2019/001").getNormalized());
-    }
-
-    @Test
-    public void ignoreLeadingAndTrailingWhitespaces() {
-        assertEquals("2019/001", new IacrEprint(" 2019/001   ").getNormalized());
+    private static Stream<Arguments> provideTestData() {
+        return Stream.of(
+                Arguments.arguments(
+                        "acceptPlainIacrEprint",
+                        new IacrEprint("2019/001").getNormalized()
+                ),
+                Arguments.arguments(
+                        "ignoreLeadingAndTrailingWhitespaces",
+                        new IacrEprint(" 2019/001   ").getNormalized()
+                ),
+                Arguments.arguments(
+                        "acceptFullUrlIacrEprint",
+                        new IacrEprint("https://eprint.iacr.org/2019/001").getNormalized()
+                ),
+                Arguments.arguments(
+                        "acceptShortenedUrlIacrEprint",
+                        new IacrEprint("https://ia.cr/2019/001").getNormalized()
+                ),
+                Arguments.arguments(
+                        "acceptDomainUrlIacrEprint",
+                        new IacrEprint("eprint.iacr.org/2019/001").getNormalized()
+                ),
+                Arguments.arguments(
+                        "acceptShortenedDomainUrlIacrEprint",
+                        new IacrEprint("ia.cr/2019/001").getNormalized()
+                )
+        );
     }
 
     @Test
@@ -22,24 +46,10 @@ public void rejectInvalidIacrEprint() {
         assertThrows(IllegalArgumentException.class, () -> new IacrEprint("2021/12"));
     }
 
-    @Test
-    public void acceptFullUrlIacrEprint() {
-        assertEquals("2019/001", new IacrEprint("https://eprint.iacr.org/2019/001").getNormalized());
-    }
-
-    @Test
-    public void acceptShortenedUrlIacrEprint() {
-        assertEquals("2019/001", new IacrEprint("https://ia.cr/2019/001").getNormalized());
-    }
-
-    @Test
-    public void acceptDomainUrlIacrEprint() {
-        assertEquals("2019/001", new IacrEprint("eprint.iacr.org/2019/001").getNormalized());
-    }
-
-    @Test
-    public void acceptShortenedDomainUrlIacrEprint() {
-        assertEquals("2019/001", new IacrEprint("ia.cr/2019/001").getNormalized());
+    @ParameterizedTest(name = "{index} {0}")
+    @MethodSource("provideTestData")
+    public void acceptCorrectIacrEprintIdentifier(String name, String arg) {
+        assertEquals("2019/001", arg);
     }
 
     @Test

From 0a2a82821ec12d21b2cb4f2a24cfd0bdc4152012 Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Mon, 25 Oct 2021 21:54:56 +0200
Subject: [PATCH 35/47] optimize parametrized tests

---
 .../fetcher/CompositeIdFetcherTest.java       | 145 ++++++++----------
 .../entry/identifier/IacrEprintTest.java      |  16 +-
 2 files changed, 70 insertions(+), 91 deletions(-)

diff --git a/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java
index 99af0eb92b3..9d795704182 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java
@@ -29,67 +29,64 @@ class CompositeIdFetcherTest {
 
     private CompositeIdFetcher compositeIdFetcher;
 
-    private static Stream<Arguments> performSearchByIdReturnsCorrectEntryForDoiId() {
-        return Stream.of(Arguments.arguments(
-                new BibEntry(StandardEntryType.Book)
-                        .withField(StandardField.TITLE, "Java{\\textregistered} For Dummies{\\textregistered}")
-                        .withField(StandardField.PUBLISHER, "Wiley Publishing, Inc.")
-                        .withField(StandardField.YEAR, "2011")
-                        .withField(StandardField.AUTHOR, "Barry Burd")
-                        .withField(StandardField.MONTH, "jul")
-                        .withField(StandardField.DOI, "10.1002/9781118257517")
-                        .withCitationKey("2011"),
-                "10.1002/9781118257517"
-        ));
-    }
-
-    private static Stream<Arguments> performSearchByIdReturnsCorrectEntryForIsbnId() {
-        return Stream.of(Arguments.arguments(
-                new BibEntry(StandardEntryType.Book)
-                        .withField(StandardField.TITLE, "Effective Java")
-                        .withField(StandardField.PUBLISHER, "Addison Wesley")
-                        .withField(StandardField.YEAR, "2018")
-                        .withField(StandardField.AUTHOR, "Bloch, Joshua")
-                        .withField(StandardField.DATE, "2018-01-01")
-                        .withField(new UnknownField("ean"), "9780134685991")
-                        .withField(StandardField.ISBN, "0134685997")
-                        .withField(StandardField.URL, "https://www.ebook.de/de/product/28983211/joshua_bloch_effective_java.html")
-                        .withCitationKey("9780134685991"),
-                "9780134685991"
-        ));
-    }
-
-    private static Stream<Arguments> performSearchByIdReturnsCorrectEntryForIacrEprintId() {
-        return Stream.of(Arguments.arguments(
-                new BibEntry(StandardEntryType.Misc)
-                        .withField(StandardField.ABSTRACT, "The decentralized cryptocurrency Bitcoin has experienced great success but also encountered many challenges. One of the challenges has been the long confirmation time. Another challenge is the lack of incentives at certain steps of the protocol, raising concerns for transaction withholding, selfish mining, etc. To address these challenges, we propose Solida, a decentralized blockchain protocol based on reconfigurable Byzantine consensus augmented by proof-of-work. Solida improves on Bitcoin in confirmation time,  and provides safety  and liveness assuming the adversary control less than (roughly) one-third of the total mining power.\n")
-                        .withField(StandardField.AUTHOR, "Ittai Abraham and Dahlia Malkhi and Kartik Nayak and Ling Ren and Alexander Spiegelman")
-                        .withField(StandardField.DATE, "2017-11-18")
-                        .withField(StandardField.HOWPUBLISHED, "Cryptology ePrint Archive, Report 2017/1118")
-                        .withField(StandardField.NOTE, "\\url{https://ia.cr/2017/1118}")
-                        .withField(StandardField.TITLE, "Solida: A Blockchain Protocol Based on Reconfigurable Byzantine Consensus")
-                        .withField(StandardField.URL, "https://eprint.iacr.org/2017/1118/20171124:064527")
-                        .withField(StandardField.VERSION, "20171124:064527")
-                        .withField(StandardField.YEAR, "2017")
-                        .withCitationKey("cryptoeprint:2017:1118"),
-                "2017/1118"
-        ));
-    }
-
-    private static Stream<Arguments> performSearchByIdReturnsCorrectEntryForArXivId() {
-        return Stream.of(Arguments.arguments(
-                new BibEntry(StandardEntryType.Article)
-                        .withField(StandardField.AUTHOR, "Emily C. Cunningham and Robyn E. Sanderson and Kathryn V. Johnston and Nondh Panithanpaisal and Melissa K. Ness and Andrew Wetzel and Sarah R. Loebman and Ivanna Escala and Danny Horta and Claude-André Faucher-Giguère")
-                        .withField(StandardField.TITLE, "Reading the CARDs: the Imprint of Accretion History in the Chemical Abundances of the Milky Way's Stellar Halo")
-                        .withField(StandardField.DATE, "2021-10-06")
-                        .withField(StandardField.ABSTRACT, "In the era of large-scale spectroscopic surveys in the Local Group (LG), we can explore using chemical abundances of halo stars to study the star formation and chemical enrichment histories of the dwarf galaxy progenitors of the Milky Way (MW) and M31 stellar halos. In this paper, we investigate using the Chemical Abundance Ratio Distributions (CARDs) of seven stellar halos from the Latte suite of FIRE-2 simulations. We attempt to infer galaxies' assembly histories by modelling the CARDs of the stellar halos of the Latte galaxies as a linear combination of template CARDs from disrupted dwarfs, with different stellar masses $M_{\\star}$ and quenching times $t_{100}$. We present a method for constructing these templates using present-day dwarf galaxies. For four of the seven Latte halos studied in this work, we recover the mass spectrum of accreted dwarfs to a precision of $<10\\%$. For the fraction of mass accreted as a function of $t_{100}$, we find residuals of $20-30\\%$ for five of the seven simulations. We discuss the failure modes of this method, which arise from the diversity of star formation and chemical enrichment histories dwarf galaxies can take. These failure cases can be robustly identified by the high model residuals. Though the CARDs modeling method does not successfully infer the assembly histories in these cases, the CARDs of these disrupted dwarfs contain signatures of their unusual formation histories. Our results are promising for using CARDs to learn more about the histories of the progenitors of the MW and M31 stellar halos.")
-                        .withField(StandardField.EPRINT, "2110.02957")
-                        .withField(StandardField.FILE, ":http\\://arxiv.org/pdf/2110.02957v1:PDF")
-                        .withField(StandardField.EPRINTTYPE, "arXiv")
-                        .withField(StandardField.EPRINTCLASS, "astro-ph.GA")
-                        .withField(StandardField.KEYWORDS, "astro-ph.GA"),
-                "arXiv:2110.02957"
-        ));
+    public static Stream<Arguments> provideTestData() {
+        return Stream.of(
+                Arguments.arguments(
+                        "performSearchByIdReturnsCorrectEntryForArXivId",
+                        new BibEntry(StandardEntryType.Article)
+                                .withField(StandardField.AUTHOR, "Emily C. Cunningham and Robyn E. Sanderson and Kathryn V. Johnston and Nondh Panithanpaisal and Melissa K. Ness and Andrew Wetzel and Sarah R. Loebman and Ivanna Escala and Danny Horta and Claude-André Faucher-Giguère")
+                                .withField(StandardField.TITLE, "Reading the CARDs: the Imprint of Accretion History in the Chemical Abundances of the Milky Way's Stellar Halo")
+                                .withField(StandardField.DATE, "2021-10-06")
+                                .withField(StandardField.ABSTRACT, "In the era of large-scale spectroscopic surveys in the Local Group (LG), we can explore using chemical abundances of halo stars to study the star formation and chemical enrichment histories of the dwarf galaxy progenitors of the Milky Way (MW) and M31 stellar halos. In this paper, we investigate using the Chemical Abundance Ratio Distributions (CARDs) of seven stellar halos from the Latte suite of FIRE-2 simulations. We attempt to infer galaxies' assembly histories by modelling the CARDs of the stellar halos of the Latte galaxies as a linear combination of template CARDs from disrupted dwarfs, with different stellar masses $M_{\\star}$ and quenching times $t_{100}$. We present a method for constructing these templates using present-day dwarf galaxies. For four of the seven Latte halos studied in this work, we recover the mass spectrum of accreted dwarfs to a precision of $<10\\%$. For the fraction of mass accreted as a function of $t_{100}$, we find residuals of $20-30\\%$ for five of the seven simulations. We discuss the failure modes of this method, which arise from the diversity of star formation and chemical enrichment histories dwarf galaxies can take. These failure cases can be robustly identified by the high model residuals. Though the CARDs modeling method does not successfully infer the assembly histories in these cases, the CARDs of these disrupted dwarfs contain signatures of their unusual formation histories. Our results are promising for using CARDs to learn more about the histories of the progenitors of the MW and M31 stellar halos.")
+                                .withField(StandardField.EPRINT, "2110.02957")
+                                .withField(StandardField.FILE, ":http\\://arxiv.org/pdf/2110.02957v1:PDF")
+                                .withField(StandardField.EPRINTTYPE, "arXiv")
+                                .withField(StandardField.EPRINTCLASS, "astro-ph.GA")
+                                .withField(StandardField.KEYWORDS, "astro-ph.GA"),
+                        "arXiv:2110.02957"
+                ),
+                Arguments.arguments(
+                        "performSearchByIdReturnsCorrectEntryForIacrEprintId",
+                        new BibEntry(StandardEntryType.Misc)
+                                .withField(StandardField.ABSTRACT, "The decentralized cryptocurrency Bitcoin has experienced great success but also encountered many challenges. One of the challenges has been the long confirmation time. Another challenge is the lack of incentives at certain steps of the protocol, raising concerns for transaction withholding, selfish mining, etc. To address these challenges, we propose Solida, a decentralized blockchain protocol based on reconfigurable Byzantine consensus augmented by proof-of-work. Solida improves on Bitcoin in confirmation time,  and provides safety  and liveness assuming the adversary control less than (roughly) one-third of the total mining power.\n")
+                                .withField(StandardField.AUTHOR, "Ittai Abraham and Dahlia Malkhi and Kartik Nayak and Ling Ren and Alexander Spiegelman")
+                                .withField(StandardField.DATE, "2017-11-18")
+                                .withField(StandardField.HOWPUBLISHED, "Cryptology ePrint Archive, Report 2017/1118")
+                                .withField(StandardField.NOTE, "\\url{https://ia.cr/2017/1118}")
+                                .withField(StandardField.TITLE, "Solida: A Blockchain Protocol Based on Reconfigurable Byzantine Consensus")
+                                .withField(StandardField.URL, "https://eprint.iacr.org/2017/1118/20171124:064527")
+                                .withField(StandardField.VERSION, "20171124:064527")
+                                .withField(StandardField.YEAR, "2017")
+                                .withCitationKey("cryptoeprint:2017:1118"),
+                        "2017/1118"
+                ),
+                Arguments.arguments(
+                        "performSearchByIdReturnsCorrectEntryForIsbnId",
+                        new BibEntry(StandardEntryType.Book)
+                                .withField(StandardField.TITLE, "Effective Java")
+                                .withField(StandardField.PUBLISHER, "Addison Wesley")
+                                .withField(StandardField.YEAR, "2018")
+                                .withField(StandardField.AUTHOR, "Bloch, Joshua")
+                                .withField(StandardField.DATE, "2018-01-01")
+                                .withField(new UnknownField("ean"), "9780134685991")
+                                .withField(StandardField.ISBN, "0134685997")
+                                .withField(StandardField.URL, "https://www.ebook.de/de/product/28983211/joshua_bloch_effective_java.html")
+                                .withCitationKey("9780134685991"),
+                        "9780134685991"
+                ),
+                Arguments.arguments(
+                        "performSearchByIdReturnsCorrectEntryForDoiId",
+                        new BibEntry(StandardEntryType.Book)
+                                .withField(StandardField.TITLE, "Java{\\textregistered} For Dummies{\\textregistered}")
+                                .withField(StandardField.PUBLISHER, "Wiley Publishing, Inc.")
+                                .withField(StandardField.YEAR, "2011")
+                                .withField(StandardField.AUTHOR, "Barry Burd")
+                                .withField(StandardField.MONTH, "jul")
+                                .withField(StandardField.DOI, "10.1002/9781118257517")
+                                .withCitationKey("2011"),
+                        "10.1002/9781118257517"
+                )
+        );
     }
 
     @BeforeEach
@@ -106,28 +103,10 @@ void performSearchByIdReturnsEmptyForInvalidId(String groundInvalidArXivId) {
         assertEquals(Optional.empty(), compositeIdFetcher.performSearchById(groundInvalidArXivId));
     }
 
-    @ParameterizedTest
-    @MethodSource
-    void performSearchByIdReturnsCorrectEntryForDoiId(BibEntry groundDoiEntry, String groundDoiId) {
-        assertEquals(Optional.of(groundDoiEntry), compositeIdFetcher.performSearchById(groundDoiId));
-    }
-
-    @ParameterizedTest
-    @MethodSource
-    void performSearchByIdReturnsCorrectEntryForIsbnId(BibEntry groundIsbnEntry, String groundIsbnId) {
-        assertEquals(Optional.of(groundIsbnEntry), compositeIdFetcher.performSearchById(groundIsbnId));
-    }
-
-    @ParameterizedTest
-    @MethodSource
-    void performSearchByIdReturnsCorrectEntryForIacrEprintId(BibEntry groundIacrEprintEntry, String groundIacrEprintId) {
-        assertEquals(Optional.of(groundIacrEprintEntry), compositeIdFetcher.performSearchById(groundIacrEprintId));
-    }
-
-    @ParameterizedTest
-    @MethodSource
-    void performSearchByIdReturnsCorrectEntryForArXivId(BibEntry groundEntryArXiv, String groundArXivId) {
-        assertEquals(Optional.of(groundEntryArXiv), compositeIdFetcher.performSearchById(groundArXivId));
+    @ParameterizedTest(name = "{index} {0}")
+    @MethodSource("provideTestData")
+    void performSearchByIdReturnsCorrectEntryForIdentifier(String name, BibEntry bibEntry, String identifier) {
+        assertEquals(Optional.of(bibEntry), compositeIdFetcher.performSearchById(identifier));
     }
 
 }
diff --git a/src/test/java/org/jabref/model/entry/identifier/IacrEprintTest.java b/src/test/java/org/jabref/model/entry/identifier/IacrEprintTest.java
index 4c7d6a2eeff..ff0e55d67c2 100644
--- a/src/test/java/org/jabref/model/entry/identifier/IacrEprintTest.java
+++ b/src/test/java/org/jabref/model/entry/identifier/IacrEprintTest.java
@@ -16,27 +16,27 @@ private static Stream<Arguments> provideTestData() {
         return Stream.of(
                 Arguments.arguments(
                         "acceptPlainIacrEprint",
-                        new IacrEprint("2019/001").getNormalized()
+                        "2019/001"
                 ),
                 Arguments.arguments(
                         "ignoreLeadingAndTrailingWhitespaces",
-                        new IacrEprint(" 2019/001   ").getNormalized()
+                        " 2019/001   "
                 ),
                 Arguments.arguments(
                         "acceptFullUrlIacrEprint",
-                        new IacrEprint("https://eprint.iacr.org/2019/001").getNormalized()
+                        "https://eprint.iacr.org/2019/001"
                 ),
                 Arguments.arguments(
                         "acceptShortenedUrlIacrEprint",
-                        new IacrEprint("https://ia.cr/2019/001").getNormalized()
+                        "https://ia.cr/2019/001"
                 ),
                 Arguments.arguments(
                         "acceptDomainUrlIacrEprint",
-                        new IacrEprint("eprint.iacr.org/2019/001").getNormalized()
+                        "eprint.iacr.org/2019/001"
                 ),
                 Arguments.arguments(
                         "acceptShortenedDomainUrlIacrEprint",
-                        new IacrEprint("ia.cr/2019/001").getNormalized()
+                        "ia.cr/2019/001"
                 )
         );
     }
@@ -48,8 +48,8 @@ public void rejectInvalidIacrEprint() {
 
     @ParameterizedTest(name = "{index} {0}")
     @MethodSource("provideTestData")
-    public void acceptCorrectIacrEprintIdentifier(String name, String arg) {
-        assertEquals("2019/001", arg);
+    public void acceptCorrectIacrEprintIdentifier(String name, String identifier) {
+        assertEquals("2019/001", new IacrEprint(identifier).getNormalized());
     }
 
     @Test

From f8a0ec36ca4dbaacbfe904f1ead5a5e9e5bdf44f Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Mon, 25 Oct 2021 21:58:55 +0200
Subject: [PATCH 36/47] add logger to CompositeIdFetcher

---
 .../java/org/jabref/logic/importer/CompositeIdFetcher.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
index 44253787f16..29ccb294e92 100644
--- a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
@@ -12,7 +12,11 @@
 import org.jabref.model.entry.identifier.ISBN;
 import org.jabref.model.entry.identifier.IacrEprint;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class CompositeIdFetcher {
+    private static final Logger LOGGER = LoggerFactory.getLogger(CompositeIdFetcher.class);
 
     private final ImportFormatPreferences importFormatPreferences;
 
@@ -39,7 +43,7 @@ public Optional<BibEntry> performSearchById(String identifier) {
                 return new IacrEprintFetcher(importFormatPreferences).performSearchById(iacrEprint.get().getNormalized());
             }
         } catch (FetcherException fetcherException) {
-            fetcherException.printStackTrace();
+            LOGGER.error("Error during fetching.", fetcherException);
         }
 
         return Optional.empty();

From bcbb1430b941233e7e33c05a3ea0f3540763dda6 Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Mon, 25 Oct 2021 23:08:34 +0200
Subject: [PATCH 37/47] minor tweaks

---
 src/main/java/org/jabref/gui/EntryTypeViewModel.java          | 2 +-
 .../org/jabref/gui/importer/GenerateEntryFromIdAction.java    | 4 ++--
 .../java/org/jabref/logic/importer/CompositeIdFetcher.java    | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/jabref/gui/EntryTypeViewModel.java b/src/main/java/org/jabref/gui/EntryTypeViewModel.java
index d8221b328e6..9318c56d8d0 100644
--- a/src/main/java/org/jabref/gui/EntryTypeViewModel.java
+++ b/src/main/java/org/jabref/gui/EntryTypeViewModel.java
@@ -153,7 +153,7 @@ public void runFetcherWorker() {
                 ImportCleanup cleanup = new ImportCleanup(libraryTab.getBibDatabaseContext().getMode());
                 cleanup.doPostCleanup(entry);
                 Optional<BibEntry> duplicate = new DuplicateCheck(Globals.entryTypesManager).containsDuplicate(libraryTab.getDatabase(), entry, libraryTab.getBibDatabaseContext().getMode());
-                if ((duplicate.isPresent())) {
+                if (duplicate.isPresent()) {
                     DuplicateResolverDialog dialog = new DuplicateResolverDialog(entry, duplicate.get(), DuplicateResolverDialog.DuplicateResolverType.IMPORT_CHECK, libraryTab.getBibDatabaseContext(), stateManager);
                     switch (dialogService.showCustomDialogAndWait(dialog).orElse(DuplicateResolverDialog.DuplicateResolverResult.BREAK)) {
                         case KEEP_LEFT:
diff --git a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
index 58515b234b0..94877572b73 100644
--- a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
@@ -64,13 +64,13 @@ protected Optional<BibEntry> call() throws JabRefException {
 
                 updateMessage(Localization.lang("Searching..."));
                 Optional<BibEntry> result = new CompositeIdFetcher(preferencesService.getImportFormatPreferences()).performSearchById(identifier);
-                LOGGER.debug("Resulted in " + result);
+                LOGGER.debug("Resulted in {}", result);
                 if (result.isPresent()) {
                     final BibEntry entry = result.get();
                     ImportCleanup cleanup = new ImportCleanup(libraryTab.getBibDatabaseContext().getMode());
                     cleanup.doPostCleanup(entry);
                     Optional<BibEntry> duplicate = new DuplicateCheck(Globals.entryTypesManager).containsDuplicate(libraryTab.getDatabase(), entry, libraryTab.getBibDatabaseContext().getMode());
-                    if ((duplicate.isPresent())) {
+                    if (duplicate.isPresent()) {
                         DuplicateResolverDialog dialog = new DuplicateResolverDialog(entry, duplicate.get(), DuplicateResolverDialog.DuplicateResolverType.IMPORT_CHECK, libraryTab.getBibDatabaseContext(), stateManager);
                         switch (dialogService.showCustomDialogAndWait(dialog).orElse(DuplicateResolverDialog.DuplicateResolverResult.BREAK)) {
                             case KEEP_LEFT -> {
diff --git a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
index 29ccb294e92..4006c46d3d1 100644
--- a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
@@ -47,7 +47,6 @@ public Optional<BibEntry> performSearchById(String identifier) {
         }
 
         return Optional.empty();
-
     }
 
     public String getName() {

From 5a90ec7e5f67c3684dfbb5738a7f86ea2be9708e Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Mon, 25 Oct 2021 23:37:27 +0200
Subject: [PATCH 38/47] change status messages

---
 src/main/java/org/jabref/gui/JabRefFrame.java |  2 +-
 .../importer/GenerateEntryFromIdAction.java   | 25 ++++---------------
 .../importer/GenerateEntryFromIdDialog.java   |  8 +-----
 3 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index b6383321df7..f8f7d9a6388 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -921,7 +921,7 @@ private Button createNewEntryFromIdButton() {
         newEntryFromIdButton.setFocusTraversable(false);
         newEntryFromIdButton.disableProperty().bind(ActionHelper.needsDatabase(stateManager).not());
         newEntryFromIdButton.setOnMouseClicked(event -> {
-            GenerateEntryFromIdDialog entryFromId = new GenerateEntryFromIdDialog(getCurrentLibraryTab(), dialogService, prefs, stateManager, taskExecutor);
+            GenerateEntryFromIdDialog entryFromId = new GenerateEntryFromIdDialog(getCurrentLibraryTab(), dialogService, prefs, taskExecutor);
 
             if (entryFromIdPopOver == null) {
                 entryFromIdPopOver = new PopOver(entryFromId.getDialogPane());
diff --git a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
index 94877572b73..952202f6ad3 100644
--- a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
@@ -5,9 +5,7 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.Globals;
 import org.jabref.gui.LibraryTab;
-import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.SimpleCommand;
-import org.jabref.gui.duplicationFinder.DuplicateResolverDialog;
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.JabRefException;
@@ -29,15 +27,13 @@ public class GenerateEntryFromIdAction extends SimpleCommand {
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
     private final String identifier;
-    private final StateManager stateManager;
     private final TaskExecutor taskExecutor;
 
-    public GenerateEntryFromIdAction(LibraryTab libraryTab, DialogService dialogService, PreferencesService preferencesService, StateManager stateManager, TaskExecutor taskExecutor, String identifier) {
+    public GenerateEntryFromIdAction(LibraryTab libraryTab, DialogService dialogService, PreferencesService preferencesService, TaskExecutor taskExecutor, String identifier) {
         this.libraryTab = libraryTab;
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
         this.identifier = identifier;
-        this.stateManager = stateManager;
         this.taskExecutor = taskExecutor;
     }
 
@@ -69,25 +65,14 @@ protected Optional<BibEntry> call() throws JabRefException {
                     final BibEntry entry = result.get();
                     ImportCleanup cleanup = new ImportCleanup(libraryTab.getBibDatabaseContext().getMode());
                     cleanup.doPostCleanup(entry);
+                    // DuplicateCheck only covers DOI and ISBN at the moment.
                     Optional<BibEntry> duplicate = new DuplicateCheck(Globals.entryTypesManager).containsDuplicate(libraryTab.getDatabase(), entry, libraryTab.getBibDatabaseContext().getMode());
                     if (duplicate.isPresent()) {
-                        DuplicateResolverDialog dialog = new DuplicateResolverDialog(entry, duplicate.get(), DuplicateResolverDialog.DuplicateResolverType.IMPORT_CHECK, libraryTab.getBibDatabaseContext(), stateManager);
-                        switch (dialogService.showCustomDialogAndWait(dialog).orElse(DuplicateResolverDialog.DuplicateResolverResult.BREAK)) {
-                            case KEEP_LEFT -> {
-                                libraryTab.getDatabase().removeEntry(duplicate.get());
-                                libraryTab.getDatabase().insertEntry(entry);
-                            }
-                            case KEEP_BOTH -> libraryTab.getDatabase().insertEntry(entry);
-                            case KEEP_MERGE -> {
-                                libraryTab.getDatabase().removeEntry(duplicate.get());
-                                libraryTab.getDatabase().insertEntry(dialog.getMergedEntry());
-                            }
-                            default -> {
-                            }
-                        }
+                        updateMessage(Localization.lang("Duplicates found"));
+                        throw new JabRefException("Duplicate found, import halted.");
                     }
                 } else {
-                    updateMessage(Localization.lang("Error"));
+                    updateMessage(Localization.lang("Could not find any bibliographic information."));
                     throw new JabRefException("Invalid identifier or connection failure.");
                 }
                 updateMessage(Localization.lang("Imported one entry"));
diff --git a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
index bbbccc4ad9a..25739505973 100644
--- a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
@@ -3,12 +3,10 @@
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.DialogPane;
-import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTab;
-import org.jabref.gui.StateManager;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.l10n.Localization;
@@ -18,7 +16,6 @@
 
 public class GenerateEntryFromIdDialog {
 
-    @FXML Label titleLabel;
     @FXML DialogPane dialogPane;
     @FXML TextField idTextField;
     @FXML Button generateButton;
@@ -26,15 +23,13 @@ public class GenerateEntryFromIdDialog {
     private final PreferencesService preferencesService;
     private final DialogService dialogService;
     private final LibraryTab libraryTab;
-    private final StateManager stateManager;
     private final TaskExecutor taskExecutor;
 
-    public GenerateEntryFromIdDialog(LibraryTab libraryTab, DialogService dialogService, PreferencesService preferencesService, StateManager stateManager, TaskExecutor taskExecutor) {
+    public GenerateEntryFromIdDialog(LibraryTab libraryTab, DialogService dialogService, PreferencesService preferencesService, TaskExecutor taskExecutor) {
         ViewLoader.view(this).load();
         this.preferencesService = preferencesService;
         this.dialogService = dialogService;
         this.libraryTab = libraryTab;
-        this.stateManager = stateManager;
         this.taskExecutor = taskExecutor;
 
         this.generateButton.setGraphic(IconTheme.JabRefIcons.IMPORT.getGraphicNode());
@@ -53,7 +48,6 @@ public GenerateEntryFromIdDialog(LibraryTab libraryTab, DialogService dialogServ
                 libraryTab,
                 dialogService,
                 preferencesService,
-                stateManager,
                 taskExecutor,
                 idTextField.getText()
         );

From 2cd6332cd4ef6daf4602fd3356255a77334fb7ce Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Mon, 25 Oct 2021 23:44:49 +0200
Subject: [PATCH 39/47] add tooltip

---
 src/main/java/org/jabref/gui/JabRefFrame.java                   | 1 +
 .../java/org/jabref/gui/importer/GenerateEntryFromIdAction.java | 2 +-
 .../java/org/jabref/gui/importer/GenerateEntryFromIdDialog.fxml | 2 +-
 src/main/resources/l10n/JabRef_en.properties                    | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index f8f7d9a6388..30c63530f64 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -936,6 +936,7 @@ private Button createNewEntryFromIdButton() {
                 entryFromIdPopOver.show(newEntryFromIdButton);
             }
         });
+        newEntryFromIdButton.setTooltip(new Tooltip(Localization.lang("Import by ID")));
 
         return newEntryFromIdButton;
     }
diff --git a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
index 952202f6ad3..da80753b4c3 100644
--- a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
@@ -68,7 +68,7 @@ protected Optional<BibEntry> call() throws JabRefException {
                     // DuplicateCheck only covers DOI and ISBN at the moment.
                     Optional<BibEntry> duplicate = new DuplicateCheck(Globals.entryTypesManager).containsDuplicate(libraryTab.getDatabase(), entry, libraryTab.getBibDatabaseContext().getMode());
                     if (duplicate.isPresent()) {
-                        updateMessage(Localization.lang("Duplicates found"));
+                        updateMessage(Localization.lang("Entry already exists."));
                         throw new JabRefException("Duplicate found, import halted.");
                     }
                 } else {
diff --git a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.fxml b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.fxml
index 8a2a6462f2e..ed68c2425c7 100644
--- a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.fxml
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.fxml
@@ -11,7 +11,7 @@
        <Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="102.0" prefWidth="360.0">
            <TextField fx:id="idTextField" layoutX="14.0" layoutY="40.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="29.0" prefWidth="287.0" />
            <Button fx:id="generateButton" layoutX="314.0" layoutY="40.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" mnemonicParsing="false" onAction="#generateEntry" prefHeight="30.0" prefWidth="55.0" textAlignment="CENTER" />
-           <Label layoutX="14.0" layoutY="14.0" prefHeight="16.0" prefWidth="328.0" text="Import new Entry from ID..."/>
+           <Label layoutX="14.0" layoutY="14.0" prefHeight="16.0" prefWidth="328.0" text="Import new entry from ID"/>
        </Pane>
    </content>
 </DialogPane>
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index cdc4ed2a294..152ab1afac7 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -1854,6 +1854,7 @@ Import\ by\ ID=Import by ID
 Enter\ a\ valid\ ID=Enter a valid ID
 Entry\ could\ not\ be\ created=Entry could not be created
 Imported\ one\ entry=Imported one entry
+Entry\ already\ exists.=Entry already exists.
 New\ sublibrary\ based\ on\ AUX\ file=New sublibrary based on AUX file
 Push\ entries\ to\ external\ application\ (%0)=Push entries to external application (%0)
 Quit=Quit

From 950ad1f2da551d166e1e39d153806327cf06710f Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Tue, 26 Oct 2021 00:03:38 +0200
Subject: [PATCH 40/47] close PopOver in success case

---
 src/main/java/org/jabref/gui/JabRefFrame.java          |  2 ++
 .../jabref/gui/importer/GenerateEntryFromIdAction.java | 10 ++++++++--
 .../jabref/gui/importer/GenerateEntryFromIdDialog.java |  8 ++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 30c63530f64..7227e0de601 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -929,11 +929,13 @@ private Button createNewEntryFromIdButton() {
                 entryFromIdPopOver.setArrowLocation(PopOver.ArrowLocation.TOP_CENTER);
                 entryFromIdPopOver.setContentNode(entryFromId.getDialogPane());
                 entryFromIdPopOver.show(newEntryFromIdButton);
+                entryFromId.setEntryFromIdPopOver(entryFromIdPopOver);
             } else if (entryFromIdPopOver.isShowing()) {
                 entryFromIdPopOver.hide();
             } else {
                 entryFromIdPopOver.setContentNode(entryFromId.getDialogPane());
                 entryFromIdPopOver.show(newEntryFromIdButton);
+                entryFromId.setEntryFromIdPopOver(entryFromIdPopOver);
             }
         });
         newEntryFromIdButton.setTooltip(new Tooltip(Localization.lang("Import by ID")));
diff --git a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
index da80753b4c3..ce7cb24552b 100644
--- a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
@@ -16,6 +16,7 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.PreferencesService;
 
+import org.controlsfx.control.PopOver;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -28,13 +29,15 @@ public class GenerateEntryFromIdAction extends SimpleCommand {
     private final PreferencesService preferencesService;
     private final String identifier;
     private final TaskExecutor taskExecutor;
+    private final PopOver entryFromIdPopOver;
 
-    public GenerateEntryFromIdAction(LibraryTab libraryTab, DialogService dialogService, PreferencesService preferencesService, TaskExecutor taskExecutor, String identifier) {
+    public GenerateEntryFromIdAction(LibraryTab libraryTab, DialogService dialogService, PreferencesService preferencesService, TaskExecutor taskExecutor, PopOver entryFromIdPopOver, String identifier) {
         this.libraryTab = libraryTab;
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
         this.identifier = identifier;
         this.taskExecutor = taskExecutor;
+        this.entryFromIdPopOver = entryFromIdPopOver;
     }
 
     @Override
@@ -44,7 +47,10 @@ public void execute() {
         backgroundTask.showToUser(true);
         backgroundTask.onRunning(() -> dialogService.notify("%s".formatted(backgroundTask.messageProperty().get())));
         backgroundTask.onFailure((e) -> dialogService.notify(Localization.lang("Entry could not be created")));
-        backgroundTask.onSuccess((entry) -> entry.ifPresentOrElse(libraryTab::insertEntry,
+        backgroundTask.onSuccess((entry) -> entry.ifPresentOrElse((e) -> {
+                libraryTab.insertEntry(e);
+                entryFromIdPopOver.hide();
+                },
                 () -> dialogService.notify(Localization.lang("Import canceled"))
         ));
         backgroundTask.executeWith(taskExecutor);
diff --git a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
index 25739505973..02a402a6349 100644
--- a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
@@ -13,6 +13,7 @@
 import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
+import org.controlsfx.control.PopOver;
 
 public class GenerateEntryFromIdDialog {
 
@@ -25,6 +26,8 @@ public class GenerateEntryFromIdDialog {
     private final LibraryTab libraryTab;
     private final TaskExecutor taskExecutor;
 
+    private PopOver entryFromIdPopOver;
+
     public GenerateEntryFromIdDialog(LibraryTab libraryTab, DialogService dialogService, PreferencesService preferencesService, TaskExecutor taskExecutor) {
         ViewLoader.view(this).load();
         this.preferencesService = preferencesService;
@@ -49,11 +52,16 @@ public GenerateEntryFromIdDialog(LibraryTab libraryTab, DialogService dialogServ
                 dialogService,
                 preferencesService,
                 taskExecutor,
+                entryFromIdPopOver,
                 idTextField.getText()
         );
         generateEntryFromIdAction.execute();
     }
 
+    public void setEntryFromIdPopOver(PopOver entryFromIdPopOver) {
+        this.entryFromIdPopOver = entryFromIdPopOver;
+    }
+
     public DialogPane getDialogPane() {
         return dialogPane;
     }

From cbb702ce162e448d6e4fc737e05cc12eae36dd9a Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Tue, 26 Oct 2021 10:45:17 +0200
Subject: [PATCH 41/47] handle doi first

---
 .../org/jabref/logic/importer/CompositeIdFetcher.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
index 4006c46d3d1..e1a0da15666 100644
--- a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
@@ -26,6 +26,10 @@ public CompositeIdFetcher(ImportFormatPreferences importFormatPreferences) {
 
     public Optional<BibEntry> performSearchById(String identifier) {
         try {
+            Optional<DOI> doi = DOI.parse(identifier);
+            if (doi.isPresent()) {
+                return new DoiFetcher(importFormatPreferences).performSearchById(doi.get().getNormalized());
+            }
             Optional<ArXivIdentifier> arXivIdentifier = ArXivIdentifier.parse(identifier);
             if (arXivIdentifier.isPresent()) {
                 return new ArXiv(importFormatPreferences).performSearchById(arXivIdentifier.get().getNormalized());
@@ -34,10 +38,6 @@ public Optional<BibEntry> performSearchById(String identifier) {
             if (isbn.isPresent()) {
                 return new IsbnFetcher(importFormatPreferences).performSearchById(isbn.get().getNormalized());
             }
-            Optional<DOI> doi = DOI.parse(identifier);
-            if (doi.isPresent()) {
-                return new DoiFetcher(importFormatPreferences).performSearchById(doi.get().getNormalized());
-            }
             Optional<IacrEprint> iacrEprint = IacrEprint.parse(identifier);
             if (iacrEprint.isPresent()) {
                 return new IacrEprintFetcher(importFormatPreferences).performSearchById(iacrEprint.get().getNormalized());

From 87ddfacad04758c8cc28b9abfacb43edb6a3d6ab Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Tue, 26 Oct 2021 11:04:37 +0200
Subject: [PATCH 42/47] change status messages, include exceptions

---
 .../importer/GenerateEntryFromIdAction.java   | 41 ++++++++++---------
 .../logic/importer/CompositeIdFetcher.java    | 40 ++++++++----------
 src/main/resources/l10n/JabRef_en.properties  |  2 +-
 3 files changed, 39 insertions(+), 44 deletions(-)

diff --git a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
index ce7cb24552b..cf7e2f186d6 100644
--- a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
@@ -11,6 +11,7 @@
 import org.jabref.logic.JabRefException;
 import org.jabref.logic.database.DuplicateCheck;
 import org.jabref.logic.importer.CompositeIdFetcher;
+import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportCleanup;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
@@ -46,10 +47,11 @@ public void execute() {
         backgroundTask.titleProperty().set(Localization.lang("Import by ID"));
         backgroundTask.showToUser(true);
         backgroundTask.onRunning(() -> dialogService.notify("%s".formatted(backgroundTask.messageProperty().get())));
-        backgroundTask.onFailure((e) -> dialogService.notify(Localization.lang("Entry could not be created")));
-        backgroundTask.onSuccess((entry) -> entry.ifPresentOrElse((e) -> {
-                libraryTab.insertEntry(e);
+        backgroundTask.onFailure((e) -> dialogService.notify(e.getMessage()));
+        backgroundTask.onSuccess((bibEntry) -> bibEntry.ifPresentOrElse((entry) -> {
+                libraryTab.insertEntry(entry);
                 entryFromIdPopOver.hide();
+                dialogService.notify(Localization.lang("Imported one entry"));
                 },
                 () -> dialogService.notify(Localization.lang("Import canceled"))
         ));
@@ -65,24 +67,25 @@ protected Optional<BibEntry> call() throws JabRefException {
                 }
 
                 updateMessage(Localization.lang("Searching..."));
-                Optional<BibEntry> result = new CompositeIdFetcher(preferencesService.getImportFormatPreferences()).performSearchById(identifier);
-                LOGGER.debug("Resulted in {}", result);
-                if (result.isPresent()) {
-                    final BibEntry entry = result.get();
-                    ImportCleanup cleanup = new ImportCleanup(libraryTab.getBibDatabaseContext().getMode());
-                    cleanup.doPostCleanup(entry);
-                    // DuplicateCheck only covers DOI and ISBN at the moment.
-                    Optional<BibEntry> duplicate = new DuplicateCheck(Globals.entryTypesManager).containsDuplicate(libraryTab.getDatabase(), entry, libraryTab.getBibDatabaseContext().getMode());
-                    if (duplicate.isPresent()) {
-                        updateMessage(Localization.lang("Entry already exists."));
-                        throw new JabRefException("Duplicate found, import halted.");
+                try {
+                    Optional<BibEntry> result = new CompositeIdFetcher(preferencesService.getImportFormatPreferences()).performSearchById(identifier);
+                    if (result.isPresent()) {
+                        final BibEntry entry = result.get();
+                        ImportCleanup cleanup = new ImportCleanup(libraryTab.getBibDatabaseContext().getMode());
+                        cleanup.doPostCleanup(entry);
+                        // DuplicateCheck only covers DOI and ISBN at the moment.
+                        Optional<BibEntry> duplicate = new DuplicateCheck(Globals.entryTypesManager).containsDuplicate(libraryTab.getDatabase(), entry, libraryTab.getBibDatabaseContext().getMode());
+                        if (duplicate.isPresent()) {
+                            throw new JabRefException(Localization.lang("Entry already exists"));
+                        }
+                    } else {
+                        throw new JabRefException(Localization.lang("Could not find any bibliographic information."));
                     }
-                } else {
-                    updateMessage(Localization.lang("Could not find any bibliographic information."));
-                    throw new JabRefException("Invalid identifier or connection failure.");
+                    updateMessage(Localization.lang("Imported one entry"));
+                    return result;
+                } catch (FetcherException fetcherException) {
+                    throw new JabRefException("Fetcher error: %s".formatted(fetcherException.getMessage()));
                 }
-                updateMessage(Localization.lang("Imported one entry"));
-                return result;
             }
         };
     }
diff --git a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
index e1a0da15666..652cb52255d 100644
--- a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
@@ -12,11 +12,7 @@
 import org.jabref.model.entry.identifier.ISBN;
 import org.jabref.model.entry.identifier.IacrEprint;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class CompositeIdFetcher {
-    private static final Logger LOGGER = LoggerFactory.getLogger(CompositeIdFetcher.class);
 
     private final ImportFormatPreferences importFormatPreferences;
 
@@ -24,26 +20,22 @@ public CompositeIdFetcher(ImportFormatPreferences importFormatPreferences) {
         this.importFormatPreferences = importFormatPreferences;
     }
 
-    public Optional<BibEntry> performSearchById(String identifier) {
-        try {
-            Optional<DOI> doi = DOI.parse(identifier);
-            if (doi.isPresent()) {
-                return new DoiFetcher(importFormatPreferences).performSearchById(doi.get().getNormalized());
-            }
-            Optional<ArXivIdentifier> arXivIdentifier = ArXivIdentifier.parse(identifier);
-            if (arXivIdentifier.isPresent()) {
-                return new ArXiv(importFormatPreferences).performSearchById(arXivIdentifier.get().getNormalized());
-            }
-            Optional<ISBN> isbn = ISBN.parse(identifier);
-            if (isbn.isPresent()) {
-                return new IsbnFetcher(importFormatPreferences).performSearchById(isbn.get().getNormalized());
-            }
-            Optional<IacrEprint> iacrEprint = IacrEprint.parse(identifier);
-            if (iacrEprint.isPresent()) {
-                return new IacrEprintFetcher(importFormatPreferences).performSearchById(iacrEprint.get().getNormalized());
-            }
-        } catch (FetcherException fetcherException) {
-            LOGGER.error("Error during fetching.", fetcherException);
+    public Optional<BibEntry> performSearchById(String identifier) throws FetcherException {
+        Optional<DOI> doi = DOI.parse(identifier);
+        if (doi.isPresent()) {
+            return new DoiFetcher(importFormatPreferences).performSearchById(doi.get().getNormalized());
+        }
+        Optional<ArXivIdentifier> arXivIdentifier = ArXivIdentifier.parse(identifier);
+        if (arXivIdentifier.isPresent()) {
+            return new ArXiv(importFormatPreferences).performSearchById(arXivIdentifier.get().getNormalized());
+        }
+        Optional<ISBN> isbn = ISBN.parse(identifier);
+        if (isbn.isPresent()) {
+            return new IsbnFetcher(importFormatPreferences).performSearchById(isbn.get().getNormalized());
+        }
+        Optional<IacrEprint> iacrEprint = IacrEprint.parse(identifier);
+        if (iacrEprint.isPresent()) {
+            return new IacrEprintFetcher(importFormatPreferences).performSearchById(iacrEprint.get().getNormalized());
         }
 
         return Optional.empty();
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 152ab1afac7..1384095c7d4 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -1854,7 +1854,7 @@ Import\ by\ ID=Import by ID
 Enter\ a\ valid\ ID=Enter a valid ID
 Entry\ could\ not\ be\ created=Entry could not be created
 Imported\ one\ entry=Imported one entry
-Entry\ already\ exists.=Entry already exists.
+Entry\ already\ exists=Entry already exists
 New\ sublibrary\ based\ on\ AUX\ file=New sublibrary based on AUX file
 Push\ entries\ to\ external\ application\ (%0)=Push entries to external application (%0)
 Quit=Quit

From 8259ffc72b4cd7cfd81c1b51a63f1fe786162e31 Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Tue, 26 Oct 2021 11:11:31 +0200
Subject: [PATCH 43/47] delete unused logger

---
 .../org/jabref/gui/importer/GenerateEntryFromIdAction.java    | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
index cf7e2f186d6..f02fa00a327 100644
--- a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
@@ -18,13 +18,9 @@
 import org.jabref.preferences.PreferencesService;
 
 import org.controlsfx.control.PopOver;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class GenerateEntryFromIdAction extends SimpleCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(GenerateEntryFromIdDialog.class);
-
     private final LibraryTab libraryTab;
     private final DialogService dialogService;
     private final PreferencesService preferencesService;

From 4aa20bc484946a08bca0afe985330fa053f9c213 Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Tue, 26 Oct 2021 21:19:07 +0200
Subject: [PATCH 44/47] catch fetcher exception in test

---
 .../importer/fetcher/CompositeIdFetcherTest.java  | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java
index 9d795704182..04a136e0a13 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java
@@ -5,6 +5,7 @@
 
 import org.jabref.logic.bibtex.FieldContentFormatterPreferences;
 import org.jabref.logic.importer.CompositeIdFetcher;
+import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
@@ -16,8 +17,11 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.junit.jupiter.params.provider.ValueSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -26,6 +30,7 @@
  * IdBasedFetcher interface are a prerequisite. Excluding TitleFetcher.
  */
 class CompositeIdFetcherTest {
+    private final static Logger LOGGER = LoggerFactory.getLogger(CompositeIdFetcherTest.class);
 
     private CompositeIdFetcher compositeIdFetcher;
 
@@ -100,13 +105,21 @@ void setUp() throws Exception {
     @ParameterizedTest
     @ValueSource(strings = "arZiv:2110.02957")
     void performSearchByIdReturnsEmptyForInvalidId(String groundInvalidArXivId) {
-        assertEquals(Optional.empty(), compositeIdFetcher.performSearchById(groundInvalidArXivId));
+        try {
+            assertEquals(Optional.empty(), compositeIdFetcher.performSearchById(groundInvalidArXivId));
+        } catch (FetcherException fetcherException) {
+            fail("Fetcher Exception caught: %s".formatted(fetcherException.getMessage()));
+        }
     }
 
     @ParameterizedTest(name = "{index} {0}")
     @MethodSource("provideTestData")
     void performSearchByIdReturnsCorrectEntryForIdentifier(String name, BibEntry bibEntry, String identifier) {
+        try {
         assertEquals(Optional.of(bibEntry), compositeIdFetcher.performSearchById(identifier));
+        } catch (FetcherException fetcherException) {
+            fail("Fetcher Exception caught: %s".formatted(fetcherException.getMessage()));
+        }
     }
 
 }

From 0be09f087fbdcbee00a6a129522468f3159f0434 Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Tue, 26 Oct 2021 21:21:25 +0200
Subject: [PATCH 45/47] Revert "catch fetcher exception in test"

This reverts commit 4aa20bc484946a08bca0afe985330fa053f9c213.
---
 .../importer/fetcher/CompositeIdFetcherTest.java  | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java
index 04a136e0a13..9d795704182 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java
@@ -5,7 +5,6 @@
 
 import org.jabref.logic.bibtex.FieldContentFormatterPreferences;
 import org.jabref.logic.importer.CompositeIdFetcher;
-import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
@@ -17,11 +16,8 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.junit.jupiter.params.provider.ValueSource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -30,7 +26,6 @@
  * IdBasedFetcher interface are a prerequisite. Excluding TitleFetcher.
  */
 class CompositeIdFetcherTest {
-    private final static Logger LOGGER = LoggerFactory.getLogger(CompositeIdFetcherTest.class);
 
     private CompositeIdFetcher compositeIdFetcher;
 
@@ -105,21 +100,13 @@ void setUp() throws Exception {
     @ParameterizedTest
     @ValueSource(strings = "arZiv:2110.02957")
     void performSearchByIdReturnsEmptyForInvalidId(String groundInvalidArXivId) {
-        try {
-            assertEquals(Optional.empty(), compositeIdFetcher.performSearchById(groundInvalidArXivId));
-        } catch (FetcherException fetcherException) {
-            fail("Fetcher Exception caught: %s".formatted(fetcherException.getMessage()));
-        }
+        assertEquals(Optional.empty(), compositeIdFetcher.performSearchById(groundInvalidArXivId));
     }
 
     @ParameterizedTest(name = "{index} {0}")
     @MethodSource("provideTestData")
     void performSearchByIdReturnsCorrectEntryForIdentifier(String name, BibEntry bibEntry, String identifier) {
-        try {
         assertEquals(Optional.of(bibEntry), compositeIdFetcher.performSearchById(identifier));
-        } catch (FetcherException fetcherException) {
-            fail("Fetcher Exception caught: %s".formatted(fetcherException.getMessage()));
-        }
     }
 
 }

From 14d58855e117217c642ca9fd5f89bdff4cb3b3cc Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Tue, 26 Oct 2021 21:22:10 +0200
Subject: [PATCH 46/47] add throws to test methods

---
 .../logic/importer/fetcher/CompositeIdFetcherTest.java       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java
index 9d795704182..fb17d02c6e8 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java
@@ -5,6 +5,7 @@
 
 import org.jabref.logic.bibtex.FieldContentFormatterPreferences;
 import org.jabref.logic.importer.CompositeIdFetcher;
+import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
@@ -99,13 +100,13 @@ void setUp() throws Exception {
 
     @ParameterizedTest
     @ValueSource(strings = "arZiv:2110.02957")
-    void performSearchByIdReturnsEmptyForInvalidId(String groundInvalidArXivId) {
+    void performSearchByIdReturnsEmptyForInvalidId(String groundInvalidArXivId) throws FetcherException {
         assertEquals(Optional.empty(), compositeIdFetcher.performSearchById(groundInvalidArXivId));
     }
 
     @ParameterizedTest(name = "{index} {0}")
     @MethodSource("provideTestData")
-    void performSearchByIdReturnsCorrectEntryForIdentifier(String name, BibEntry bibEntry, String identifier) {
+    void performSearchByIdReturnsCorrectEntryForIdentifier(String name, BibEntry bibEntry, String identifier) throws FetcherException {
         assertEquals(Optional.of(bibEntry), compositeIdFetcher.performSearchById(identifier));
     }
 

From 3e705f6b6a0dfb013b4a296ced808e81082af91d Mon Sep 17 00:00:00 2001
From: colinhex <colin.fingerlin@gmail.com>
Date: Tue, 26 Oct 2021 21:35:17 +0200
Subject: [PATCH 47/47] remove obsolete localization key

---
 src/main/resources/l10n/JabRef_en.properties | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 1384095c7d4..8f6a049f3e8 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -1852,7 +1852,6 @@ Manage\ protected\ terms=Manage protected terms
 New\ entry\ from\ plain\ text=New entry from plain text
 Import\ by\ ID=Import by ID
 Enter\ a\ valid\ ID=Enter a valid ID
-Entry\ could\ not\ be\ created=Entry could not be created
 Imported\ one\ entry=Imported one entry
 Entry\ already\ exists=Entry already exists
 New\ sublibrary\ based\ on\ AUX\ file=New sublibrary based on AUX file