From 724d499845b21bfe9f86fa3d8daabc27bb038317 Mon Sep 17 00:00:00 2001
From: NikodemKch <nikodem.kch@gmail.com>
Date: Thu, 13 Feb 2020 02:25:56 +0100
Subject: [PATCH 1/7] GROBID integration using new fetcher

Add the possibility to extract references from plain text using the GROBID service. GROBID is called over a custom server. See also pull request #5614

Co-Authored-By: joeyzgraggen <joeyzgraggen@users.noreply.github.com>
Co-Authored-By: guenesaydin <guenesaydin@users.noreply.github.com>
Co-Authored-By: obsluk00 <obsluk00@users.noreply.github.com>
Co-Authored-By: nikodemkch <nikodemkch@users.noreply.github.com>
---
 src/main/java/org/jabref/gui/JabRefFrame.java |   3 +-
 .../jabref/gui/actions/StandardActions.java   |   3 +-
 .../BibtexExtractorViewModel.java             |  52 +++++---
 .../bibtexextractor/ExtractBibtexDialog.fxml  |  10 +-
 .../bibtexextractor/ExtractBibtexDialog.java  |  32 +++--
 .../java/org/jabref/gui/icon/IconTheme.java   |   3 +-
 .../org/jabref/gui/keyboard/KeyBinding.java   |   2 +-
 .../jabref/logic/importer/WebFetchers.java    |   2 +
 .../fetcher/GrobidCitationFetcher.java        |  77 ++++++++++++
 .../logic/importer/util/GrobidService.java    |  53 +++++++++
 src/main/resources/l10n/JabRef_en.properties  |  14 ++-
 .../fetcher/GrobidCitationFetcherTest.java    | 112 ++++++++++++++++++
 .../importer/util/GrobidServiceTest.java      |  54 +++++++++
 13 files changed, 376 insertions(+), 41 deletions(-)
 create mode 100644 src/main/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcher.java
 create mode 100644 src/main/java/org/jabref/logic/importer/util/GrobidService.java
 create mode 100644 src/test/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcherTest.java
 create mode 100644 src/test/java/org/jabref/logic/importer/util/GrobidServiceTest.java

diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 7fd1df234f9..935e36edbb2 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -480,6 +480,7 @@ private Node createToolbar() {
         HBox rightSide = new HBox(
                 factory.createIconButton(StandardActions.NEW_ARTICLE, new NewEntryAction(this, StandardEntryType.Article, dialogService, Globals.prefs, stateManager)),
                 factory.createIconButton(StandardActions.NEW_ENTRY, new NewEntryAction(this, dialogService, Globals.prefs, stateManager)),
+                factory.createIconButton(StandardActions.NEW_ENTRY_FROM_PLAIN_TEXT, new ExtractBibtexAction(stateManager)),
                 factory.createIconButton(StandardActions.DELETE_ENTRY, new OldDatabaseCommandWrapper(Actions.DELETE, this, stateManager)),
                 new Separator(Orientation.VERTICAL),
                 factory.createIconButton(StandardActions.UNDO, new OldDatabaseCommandWrapper(Actions.UNDO, this, stateManager)),
@@ -728,6 +729,7 @@ private MenuBar createMenu() {
         //@formatter:off
         library.getItems().addAll(
                 factory.createMenuItem(StandardActions.NEW_ENTRY, new NewEntryAction(this, dialogService, Globals.prefs, stateManager)),
+                factory.createMenuItem(StandardActions.NEW_ENTRY_FROM_PLAIN_TEXT, new ExtractBibtexAction(stateManager)),
                 factory.createMenuItem(StandardActions.DELETE_ENTRY, new OldDatabaseCommandWrapper(Actions.DELETE, this, stateManager)),
 
                 new SeparatorMenuItem(),
@@ -767,7 +769,6 @@ private MenuBar createMenu() {
                 factory.createMenuItem(StandardActions.FIND_UNLINKED_FILES, new FindUnlinkedFilesAction(this, stateManager)),
                 factory.createMenuItem(StandardActions.WRITE_XMP, new OldDatabaseCommandWrapper(Actions.WRITE_XMP, this, stateManager)),
                 factory.createMenuItem(StandardActions.COPY_LINKED_FILES, new CopyFilesAction(stateManager, this.getDialogService())),
-                factory.createMenuItem(StandardActions.EXTRACT_BIBTEX, new ExtractBibtexAction(stateManager)),
 
                 new SeparatorMenuItem(),
 
diff --git a/src/main/java/org/jabref/gui/actions/StandardActions.java b/src/main/java/org/jabref/gui/actions/StandardActions.java
index 87f48f1b4a5..245c20e30d5 100644
--- a/src/main/java/org/jabref/gui/actions/StandardActions.java
+++ b/src/main/java/org/jabref/gui/actions/StandardActions.java
@@ -120,7 +120,7 @@ public enum StandardActions implements Action {
 
     NEW_ENTRY(Localization.lang("New entry"), IconTheme.JabRefIcons.ADD_ENTRY, KeyBinding.NEW_ENTRY),
     NEW_ARTICLE(Localization.lang("New article"), IconTheme.JabRefIcons.ADD_ARTICLE),
-    NEW_ENTRY_FROM_PLAINTEX(Localization.lang("New entry from plain text"), KeyBinding.NEW_FROM_PLAIN_TEXT),
+    NEW_ENTRY_FROM_PLAIN_TEXT(Localization.lang("New entry from plain text"), IconTheme.JabRefIcons.NEW_ENTRY_FROM_PLAIN_TEXT, KeyBinding.NEW_ENTRY_FROM_PLAIN_TEXT),
     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),
@@ -138,7 +138,6 @@ public enum StandardActions implements Action {
     DOWNLOAD_FULL_TEXT(Localization.lang("Search full text documents online"), IconTheme.JabRefIcons.FILE_SEARCH, KeyBinding.DOWNLOAD_FULL_TEXT),
     CLEANUP_ENTRIES(Localization.lang("Cleanup entries"), IconTheme.JabRefIcons.CLEANUP_ENTRIES, KeyBinding.CLEANUP),
     SET_FILE_LINKS(Localization.lang("Automatically set file links"), KeyBinding.AUTOMATICALLY_LINK_FILES),
-    EXTRACT_BIBTEX(Localization.lang("Extract BibTeX from plain text")),
 
     HELP(Localization.lang("Online help"), IconTheme.JabRefIcons.HELP, KeyBinding.HELP),
     HELP_KEY_PATTERNS(Localization.lang("Help on key patterns"), IconTheme.JabRefIcons.HELP, KeyBinding.HELP),
diff --git a/src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractorViewModel.java b/src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractorViewModel.java
index 8eb694bd692..8f376810ca8 100644
--- a/src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractorViewModel.java
+++ b/src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractorViewModel.java
@@ -3,40 +3,60 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.swing.undo.UndoManager;
+
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 
 import org.jabref.Globals;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.StateManager;
+import org.jabref.gui.externalfiles.ImportHandler;
+import org.jabref.gui.externalfiletype.ExternalFileTypes;
+import org.jabref.gui.util.BackgroundTask;
+import org.jabref.gui.util.TaskExecutor;
+import org.jabref.logic.importer.fetcher.GrobidCitationFetcher;
+import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.types.EntryType;
-import org.jabref.model.entry.types.StandardEntryType;
+import org.jabref.model.util.FileUpdateMonitor;
+import org.jabref.preferences.JabRefPreferences;
 
 public class BibtexExtractorViewModel {
 
     private final StringProperty inputTextProperty = new SimpleStringProperty("");
-    private final BibDatabaseContext bibdatabaseContext;
-
-    public BibtexExtractorViewModel(BibDatabaseContext bibdatabaseContext) {
-        this.bibdatabaseContext = bibdatabaseContext;
+    private DialogService dialogService;
+    private GrobidCitationFetcher currentCitationfetcher;
+    private TaskExecutor taskExecutor;
+    private ImportHandler importHandler;
+
+    public BibtexExtractorViewModel(BibDatabaseContext bibdatabaseContext, DialogService dialogService,
+                                    JabRefPreferences jabRefPreferences, FileUpdateMonitor fileUpdateMonitor, TaskExecutor taskExecutor, UndoManager undoManager, StateManager stateManager) {
+        this.dialogService = dialogService;
+        currentCitationfetcher = new GrobidCitationFetcher(jabRefPreferences.getImportFormatPreferences());
+        this.taskExecutor = taskExecutor;
+        this.importHandler = new ImportHandler(dialogService, bibdatabaseContext, ExternalFileTypes.getInstance(), jabRefPreferences.getFilePreferences(), jabRefPreferences.getImportFormatPreferences(), jabRefPreferences.getUpdateFieldPreferences(), fileUpdateMonitor, undoManager, stateManager);
     }
 
     public StringProperty inputTextProperty() {
         return this.inputTextProperty;
     }
 
-    public void startExtraction() {
-
-        BibtexExtractor extractor = new BibtexExtractor();
-        BibEntry entity = extractor.extract(inputTextProperty.getValue());
-        this.bibdatabaseContext.getDatabase().insertEntry(entity);
-        trackNewEntry(StandardEntryType.Article);
+    public void startParsing() {
+        BackgroundTask.wrap(() -> currentCitationfetcher.performSearch(inputTextProperty.getValue()))
+                .onRunning(() -> dialogService.notify(Localization.lang("Your text is being parsed...")))
+                .onSuccess(parsedEntries -> {
+                    dialogService.notify(Localization.lang("GROBID could parse %0 Entries from your query.", String.valueOf(parsedEntries.size())));
+                    importHandler.importEntries(parsedEntries);
+                    for (BibEntry bibEntry : parsedEntries) {
+                        trackNewEntry(bibEntry);
+                    }
+                }).executeWith(taskExecutor);
     }
 
-    private void trackNewEntry(EntryType type) {
+    private void trackNewEntry(BibEntry bibEntry) {
         Map<String, String> properties = new HashMap<>();
-        properties.put("EntryType", type.getName());
-
-        Globals.getTelemetryClient().ifPresent(client -> client.trackEvent("NewEntry", properties, new HashMap<>()));
+        properties.put("EntryType", bibEntry.typeProperty().getValue().getName());
+        Globals.getTelemetryClient().ifPresent(client -> client.trackEvent("ParseWithGrobid", properties, new HashMap<>()));
     }
 }
diff --git a/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.fxml b/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.fxml
index 053024c2a6a..b024323565b 100644
--- a/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.fxml
+++ b/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.fxml
@@ -4,11 +4,17 @@
 <?import javafx.scene.control.DialogPane?>
 <?import javafx.scene.control.TextArea?>
 
+<?import javafx.scene.layout.VBox?>
+
 <DialogPane prefHeight="430.0" prefWidth="586.0" xmlns="http://javafx.com/javafx/8.0.171"
             xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.bibtexextractor.ExtractBibtexDialog">
     <content>
-        <TextArea fx:id="input" minHeight="-Infinity" prefHeight="350.0" prefWidth="586.0"/>
+        <VBox fx:id="contentVbox" minHeight="-Infinity" prefHeight="200.0" prefWidth="100.0">
+        <children>
+            <TextArea fx:id="input" minHeight="-Infinity" prefHeight="350.0" prefWidth="586.0"/>
+        </children>
+        </VBox>
     </content>
-    <ButtonType fx:id="extractButtonType" buttonData="OK_DONE" text="%Extract"/>
+    <ButtonType fx:id="parseButtonType" buttonData="OK_DONE" text = "%Add to current library"/>
     <ButtonType fx:constant="CANCEL"/>
 </DialogPane>
diff --git a/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.java b/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.java
index f4b7a1af81b..90bc98ef4b5 100644
--- a/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.java
+++ b/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.java
@@ -1,6 +1,7 @@
 package org.jabref.gui.bibtexextractor;
 
 import javax.inject.Inject;
+import javax.swing.undo.UndoManager;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -8,10 +9,14 @@
 import javafx.scene.control.TextArea;
 import javafx.scene.control.Tooltip;
 
+import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.util.BaseDialog;
+import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.util.FileUpdateMonitor;
+import org.jabref.preferences.JabRefPreferences;
 
 import com.airhacks.afterburner.views.ViewLoader;
 
@@ -20,31 +25,34 @@
  */
 public class ExtractBibtexDialog extends BaseDialog<Void> {
 
-    private final Button buttonExtract;
+    private final Button buttonParse;
     @FXML private TextArea input;
-    @FXML private ButtonType extractButtonType;
+    @FXML private ButtonType parseButtonType;
     private BibtexExtractorViewModel viewModel;
-
     @Inject private StateManager stateManager;
+    @Inject private DialogService dialogService;
+    @Inject private FileUpdateMonitor fileUpdateMonitor;
+    @Inject private TaskExecutor taskExecutor;
+    @Inject private UndoManager undoManager;
 
     public ExtractBibtexDialog() {
-
         ViewLoader.view(this)
                   .load()
                   .setAsDialogPane(this);
-
-        this.setTitle(Localization.lang("Input text to parse"));
-        buttonExtract = (Button) getDialogPane().lookupButton(extractButtonType);
-        buttonExtract.setTooltip(new Tooltip((Localization.lang("Starts the extraction of the BibTeX entry"))));
-        buttonExtract.setOnAction(e -> viewModel.startExtraction());
-        buttonExtract.disableProperty().bind(viewModel.inputTextProperty().isEmpty());
+        this.setTitle(Localization.lang("Plain References Parser"));
+        input.setPromptText(Localization.lang("Please enter the plain references to extract from."));
+        input.selectAll();
+
+        buttonParse = (Button) getDialogPane().lookupButton(parseButtonType);
+        buttonParse.setTooltip(new Tooltip((Localization.lang("Starts the extraction and adds the resulting entries to the currently opened database"))));
+        buttonParse.setOnAction(event -> viewModel.startParsing());
+        buttonParse.disableProperty().bind(viewModel.inputTextProperty().isEmpty());
     }
 
     @FXML
     private void initialize() {
         BibDatabaseContext database = stateManager.getActiveDatabase().orElseThrow(() -> new NullPointerException("Database null"));
-        this.viewModel = new BibtexExtractorViewModel(database);
-
+        this.viewModel = new BibtexExtractorViewModel(database, dialogService, JabRefPreferences.getInstance(), fileUpdateMonitor, taskExecutor,undoManager,stateManager);
         input.textProperty().bindBidirectional(viewModel.inputTextProperty());
     }
 }
diff --git a/src/main/java/org/jabref/gui/icon/IconTheme.java b/src/main/java/org/jabref/gui/icon/IconTheme.java
index 94e3ec56054..2df5017c21f 100644
--- a/src/main/java/org/jabref/gui/icon/IconTheme.java
+++ b/src/main/java/org/jabref/gui/icon/IconTheme.java
@@ -298,7 +298,8 @@ public enum JabRefIcons implements JabRefIcon {
         OPEN_ABBREVIATION_LIST(MaterialDesignIcon.FOLDER_OUTLINE),
         REMOVE_ABBREVIATION_LIST(MaterialDesignIcon.FOLDER_REMOVE),
         ADD_ABBREVIATION(MaterialDesignIcon.PLAYLIST_PLUS),
-        REMOVE_ABBREVIATION(MaterialDesignIcon.PLAYLIST_MINUS);
+        REMOVE_ABBREVIATION(MaterialDesignIcon.PLAYLIST_MINUS),
+        NEW_ENTRY_FROM_PLAIN_TEXT(MaterialDesignIcon.PLUS_BOX);
 
         private final JabRefIcon icon;
 
diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBinding.java b/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
index 17d5e6aef88..7c4f66a193d 100644
--- a/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
+++ b/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
@@ -48,7 +48,7 @@ public enum KeyBinding {
     NEW_ARTICLE("New article", Localization.lang("New article"), "ctrl+shift+A", KeyBindingCategory.BIBTEX),
     NEW_BOOK("New book", Localization.lang("New book"), "ctrl+shift+B", KeyBindingCategory.BIBTEX),
     NEW_ENTRY("New entry", Localization.lang("New entry"), "ctrl+N", KeyBindingCategory.BIBTEX),
-    NEW_FROM_PLAIN_TEXT("New from plain text", Localization.lang("New from plain text"), "ctrl+shift+N", KeyBindingCategory.BIBTEX),
+    NEW_ENTRY_FROM_PLAIN_TEXT("New entry from plain text", Localization.lang("New entry from plain text"), "ctrl+shift+N", KeyBindingCategory.BIBTEX),
     NEW_INBOOK("New inbook", Localization.lang("New inbook"), "ctrl+shift+I", KeyBindingCategory.BIBTEX),
     NEW_MASTERSTHESIS("New mastersthesis", Localization.lang("New mastersthesis"), "ctrl+shift+M", KeyBindingCategory.BIBTEX),
     NEW_PHDTHESIS("New phdthesis", Localization.lang("New phdthesis"), "ctrl+shift+T", KeyBindingCategory.BIBTEX),
diff --git a/src/main/java/org/jabref/logic/importer/WebFetchers.java b/src/main/java/org/jabref/logic/importer/WebFetchers.java
index 45f035914ca..f901ea0588a 100644
--- a/src/main/java/org/jabref/logic/importer/WebFetchers.java
+++ b/src/main/java/org/jabref/logic/importer/WebFetchers.java
@@ -18,6 +18,7 @@
 import org.jabref.logic.importer.fetcher.DoiFetcher;
 import org.jabref.logic.importer.fetcher.DoiResolution;
 import org.jabref.logic.importer.fetcher.GoogleScholar;
+import org.jabref.logic.importer.fetcher.GrobidCitationFetcher;
 import org.jabref.logic.importer.fetcher.GvkFetcher;
 import org.jabref.logic.importer.fetcher.IEEE;
 import org.jabref.logic.importer.fetcher.INSPIREFetcher;
@@ -98,6 +99,7 @@ public static SortedSet<SearchBasedFetcher> getSearchBasedFetchers(ImportFormatP
         set.add(new CiteSeer());
         set.add(new DOAJFetcher(importFormatPreferences));
         set.add(new IEEE(importFormatPreferences));
+        set.add(new GrobidCitationFetcher(importFormatPreferences));
         return set;
     }
 
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcher.java
new file mode 100644
index 00000000000..a976c8ed9c8
--- /dev/null
+++ b/src/main/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcher.java
@@ -0,0 +1,77 @@
+package org.jabref.logic.importer.fetcher;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.jabref.logic.importer.ImportFormatPreferences;
+import org.jabref.logic.importer.ParseException;
+import org.jabref.logic.importer.SearchBasedFetcher;
+import org.jabref.logic.importer.fileformat.BibtexParser;
+import org.jabref.logic.importer.util.GrobidService;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.util.DummyFileUpdateMonitor;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class GrobidCitationFetcher implements SearchBasedFetcher {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(GrobidCitationFetcher.class);
+    private static final String GROBID_URL = "http://grobid.cm.in.tum.de:8070";
+    private ImportFormatPreferences importFormatPreferences;
+    private GrobidService grobidService;
+
+    public GrobidCitationFetcher(ImportFormatPreferences importFormatPreferences) {
+      this.importFormatPreferences = importFormatPreferences;
+      this.grobidService = new GrobidService(GROBID_URL);
+    }
+
+    /**
+     * Passes request to grobid server, using consolidateCitations option to improve result.
+     * Takes a while, since the server has to look up the entry.
+     */
+    private String parseUsingGrobid(String plainText) {
+        try {
+            return grobidService.processCitation(plainText, GrobidService.ConsolidateCitations.WITH_METADATA);
+        } catch (IOException e) {
+            LOGGER.atDebug().setCause(e).log(e.getMessage());
+            return "";
+        }
+    }
+
+    private Optional<BibEntry> parseBibToBibEntry(String bibtexString) {
+        try {
+            return BibtexParser.singleFromString(bibtexString,
+                    importFormatPreferences, new DummyFileUpdateMonitor());
+        } catch (ParseException e) {
+            return Optional.empty();
+        }
+    }
+
+    @Override
+    public List<BibEntry> performSearch(String query) {
+        List<String> plainReferences = Arrays.stream( query.split( "[\\r\\n]+" ) )
+              .map(String::trim)
+              .filter(str -> !str.isBlank())
+              .collect(Collectors.toCollection(ArrayList::new));
+        if (plainReferences.size() == 0) {
+            return Collections.emptyList();
+        } else {
+          List<BibEntry> resultsList = new ArrayList<>();
+            for (String reference: plainReferences) {
+                parseBibToBibEntry(parseUsingGrobid(reference)).ifPresent(resultsList::add);
+            }
+            return resultsList;
+        }
+    }
+
+    @Override
+    public String getName() {
+        return "GROBID";
+    }
+}
diff --git a/src/main/java/org/jabref/logic/importer/util/GrobidService.java b/src/main/java/org/jabref/logic/importer/util/GrobidService.java
new file mode 100644
index 00000000000..8ad0204bafc
--- /dev/null
+++ b/src/main/java/org/jabref/logic/importer/util/GrobidService.java
@@ -0,0 +1,53 @@
+package org.jabref.logic.importer.util;
+
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+
+import org.jabref.logic.net.URLDownload;
+
+/**
+ * Implements an API to a GROBID server, as described at
+ * https://grobid.readthedocs.io/en/latest/Grobid-service/#grobid-web-services
+ * <p>
+ * Note: Currently a custom GROBID server is used...
+ * https://github.com/NikodemKch/grobid
+ * <p>
+ * The methods are structured to match the GROBID server api.
+ * Each method corresponds to a GROBID service request. Only the ones already used are already implemented.
+ */
+public class GrobidService {
+
+    public enum ConsolidateCitations {
+        NO(0), WITH_METADATA(1), WITH_DOI_ONLY(2);
+        private int code;
+
+        ConsolidateCitations(int code) {
+            this.code = code;
+        }
+
+        public int getCode() {
+            return this.code;
+        }
+    }
+
+    String grobidServerURL;
+
+    public GrobidService(String grobidServerURL) {
+        this.grobidServerURL = grobidServerURL;
+    }
+
+    public String processCitation(String rawCitation, ConsolidateCitations consolidateCitations) throws IOException {
+        rawCitation = URLEncoder.encode(rawCitation, StandardCharsets.UTF_8);
+        URLDownload urlDownload = new URLDownload(grobidServerURL
+                + "/api/processCitation");
+        urlDownload.setPostData("citations=" + rawCitation + "&consolidateCitations=" + consolidateCitations);
+        String httpResponse = urlDownload.asString();
+
+        if (httpResponse == null || httpResponse.equals("@misc{-1,\n\n}\n")) { //This filters empty BibTeX entries
+            throw new IOException("The GROBID server response does not contain anything.");
+        }
+
+        return httpResponse;
+    }
+}
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 7b0b9e6ec57..1aeb68e8301 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -1363,7 +1363,6 @@ Increase\ table\ font\ size=Increase table font size
 New\ article=New article
 New\ book=New book
 New\ entry=New entry
-New\ from\ plain\ text=New from plain text
 New\ inbook=New inbook
 New\ mastersthesis=New mastersthesis
 New\ phdthesis=New phdthesis
@@ -1976,11 +1975,6 @@ Accept\ changes=Accept changes
 Dismiss\ changes=Dismiss changes
 The\ library\ has\ been\ modified\ by\ another\ program.=The library has been modified by another program.
 
-Extract=Extract
-Extract\ BibTeX\ from\ plain\ text= Extract BibTeX from plain text
-Input\ text\ to\ parse=Input text to parse
-Starts\ the\ extraction\ of\ the\ BibTeX\ entry=Starts the extraction of the BibTeX entry
-
 Execute\ command=Execute command
 Open\ File\ Browser=Open File Browser
 Use\ default\ file\ browser=Use default file browser
@@ -2073,6 +2067,7 @@ Reset\ All=Reset All
 Column\ type\ %0\ is\ unknown.=Column type %0 is unknown.
 Linked\ identifiers=Linked identifiers
 Special\ field\ type\ %0\ is\ unknown.\ Using\ normal\ column\ type.=Special field type %0 is unknown. Using normal column type.
+
 insert\ entries=insert entries
 In\ JabRef=In JabRef
 On\ disk=On disk
@@ -2098,3 +2093,10 @@ Invalid\ regular\ expression.=Invalid regular expression.
 Keyword\ delimiter=Keyword delimiter
 Hierarchical\ keyword\ delimiter=Hierarchical keyword delimiter
 Escape\ ampersands=Escape ampersands
+
+Plain\ References\ Parser=Plain References Parser
+Please\ enter\ the\ plain\ references\ to\ extract\ from.=Please enter the plain references to extract from.
+Add\ to\ current\ library=Add to current library
+GROBID\ could\ parse\ %0\ Entries\ from\ your\ query.=GROBID could parse %0 Entries from your query.
+Starts\ the\ extraction\ and\ adds\ the\ resulting\ entries\ to\ the\ currently\ opened\ database=Starts the extraction and adds the resulting entries to the currently opened database
+Your\ text\ is\ being\ parsed...=Your text is being parsed...
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcherTest.java
new file mode 100644
index 00000000000..0230512bd15
--- /dev/null
+++ b/src/test/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcherTest.java
@@ -0,0 +1,112 @@
+package org.jabref.logic.importer.fetcher;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.jabref.logic.importer.ImportFormatPreferences;
+import org.jabref.logic.importer.ParseException;
+import org.jabref.logic.importer.fileformat.BibtexParser;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.util.DummyFileUpdateMonitor;
+import org.jabref.model.util.FileUpdateMonitor;
+import org.jabref.testutils.category.FetcherTest;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.mockito.Answers;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+
+@FetcherTest
+public class GrobidCitationFetcherTest {
+
+    static ImportFormatPreferences importFormatPreferences;
+    static FileUpdateMonitor fileUpdateMonitor;
+    static GrobidCitationFetcher grobidCitationFetcher;
+
+    static String example1 = "Derwing, T. M., Rossiter, M. J., & Munro, M. J. (2002). Teaching native speakers to listen to foreign-accented speech. Journal of Multilingual and Multicultural Development, 23(4), 245-259.";
+    static String example1AsBibtex = "@article{-1,\n" +
+            "author\t=\t\"T Derwing and M Rossiter and M Munro\",\n" +
+            "title\t=\t\"Teaching native speakers to listen to foreign-accented speech\",\n" +
+            "journal\t=\t\"Journal of Multilingual and Multicultural Development\",\n" +
+            "year\t=\t\"2002\",\n" +
+            "pages\t=\t\"245--259\",\n" +
+            "volume\t=\t\"23\",\n" +
+            "number\t=\t\"4\"\n" +
+            "}";
+    static String example2 = "Thomas, H. K. (2004). Training strategies for improving listeners' comprehension of foreign-accented speech (Doctoral dissertation). University of Colorado, Boulder.";
+    static String example2AsBibtex = "@misc{-1,\n" +
+            "author\t=\t\"H Thomas\",\n" +
+            "title\t=\t\"Training strategies for improving listeners' comprehension of foreign-accented speech (Doctoral dissertation)\",\n"
+            +
+            "year\t=\t\"2004\",\n" +
+            "address\t=\t\"Boulder\"\n" +
+            "}";
+    static String example3 = "Turk, J., Graham, P., & Verhulst, F. (2007). Child and adolescent psychiatry : A developmental approach. Oxford, England: Oxford University Press.";
+    static String example3AsBibtex = "@misc{-1,\n" +
+            "author\t=\t\"J Turk and P Graham and F Verhulst\",\n" +
+            "title\t=\t\"Child and adolescent psychiatry : A developmental approach\",\n" +
+            "publisher\t=\t\"Oxford University Press\",\n" +
+            "year\t=\t\"2007\",\n" +
+            "address\t=\t\"Oxford, England\"\n" +
+            "}";
+    static String example4 = "Carr, I., & Kidner, R. (2003). Statutes and conventions on international trade law (4th ed.). London, England: Cavendish.";
+    static String example4AsBibtex = "@article{-1,\n" +
+            "author\t=\t\"I Carr and R Kidner\",\n" +
+            "booktitle\t=\t\"Statutes and conventions on international trade law\",\n" +
+            "publisher\t=\t\"Cavendish\",\n" +
+            "year\t=\t\"2003\",\n" +
+            "address\t=\t\"London, England\"\n" +
+            "}";
+    static String invalidInput1 = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx________________________________";
+    static String invalidInput2 = "¦@#¦@#¦@#¦@#¦@#¦@#¦@°#¦@¦°¦@°";
+    static BibEntry example1AsBibEntry;
+    static BibEntry example2AsBibEntry;
+    static BibEntry example3AsBibEntry;
+    static BibEntry example4AsBibEntry;
+
+    @BeforeAll
+    public static void setup() throws ParseException {
+        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        fileUpdateMonitor = new DummyFileUpdateMonitor();
+        grobidCitationFetcher = new GrobidCitationFetcher(importFormatPreferences);
+        example1AsBibEntry = BibtexParser.singleFromString(example1AsBibtex, importFormatPreferences, fileUpdateMonitor).get();
+        example2AsBibEntry = BibtexParser.singleFromString(example2AsBibtex, importFormatPreferences, fileUpdateMonitor).get();
+        example3AsBibEntry = BibtexParser.singleFromString(example3AsBibtex, importFormatPreferences, fileUpdateMonitor).get();
+        example4AsBibEntry = BibtexParser.singleFromString(example4AsBibtex, importFormatPreferences, fileUpdateMonitor).get();
+    }
+
+    @Test
+    public void grobidPerformSearchCorrectResultTest() {
+        List<BibEntry> entries = grobidCitationFetcher.performSearch(example1);
+        assertEquals(List.of(example1AsBibEntry), entries);
+        entries = grobidCitationFetcher.performSearch(example2);
+        assertEquals(List.of(example2AsBibEntry), entries);
+        entries = grobidCitationFetcher.performSearch(example3);
+        assertEquals(List.of(example3AsBibEntry), entries);
+        entries = grobidCitationFetcher.performSearch(example4);
+        assertEquals(List.of(example4AsBibEntry), entries);
+    }
+
+    @Test
+    public void grobidPerformSearchCorrectlySplitsStringTest() {
+        List<BibEntry> entries = grobidCitationFetcher.performSearch(example1 + "\n" + example2 + "\r\n" + example3 + "\r" + example4);
+        assertEquals(List.of(example1AsBibEntry, example2AsBibEntry, example3AsBibEntry, example4AsBibEntry), entries);
+    }
+
+    @Test
+    public void grobidPerformSearchWithEmptyStringsTest() {
+        List<BibEntry> entries = grobidCitationFetcher.performSearch("   \n   ");
+        assertEquals(Collections.emptyList(), entries);
+    }
+
+    @Test
+    public void grobidPerformSearchWithInvalidDataTest() {
+        List<BibEntry> entries = grobidCitationFetcher.performSearch(invalidInput1);
+        assertEquals(Collections.emptyList(), entries);
+        entries = grobidCitationFetcher.performSearch(invalidInput2);
+        assertEquals(Collections.emptyList(), entries);
+    }
+
+}
diff --git a/src/test/java/org/jabref/logic/importer/util/GrobidServiceTest.java b/src/test/java/org/jabref/logic/importer/util/GrobidServiceTest.java
new file mode 100644
index 00000000000..7d7aceabb94
--- /dev/null
+++ b/src/test/java/org/jabref/logic/importer/util/GrobidServiceTest.java
@@ -0,0 +1,54 @@
+package org.jabref.logic.importer.util;
+
+import java.io.IOException;
+
+import org.jabref.testutils.category.FetcherTest;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@FetcherTest
+public class GrobidServiceTest {
+
+    private static GrobidService grobidService;
+
+    @BeforeAll
+    public static void setup() {
+        grobidService = new GrobidService("http://grobid.cm.in.tum.de:8070");
+    }
+
+    @Test
+    public void processValidCitationTest() throws IOException {
+        String response = grobidService.processCitation("Derwing, T. M., Rossiter, M. J., & Munro, " +
+                "M. J. (2002). Teaching native speakers to listen to foreign-accented speech. " +
+                "Journal of Multilingual and Multicultural Development, 23(4), 245-259.", GrobidService.ConsolidateCitations.WITH_METADATA);
+        String[] responseRows = response.split("\n");
+        assertNotNull(response);
+        assertEquals('@', response.charAt(0));
+        assertTrue(responseRows[1].contains("author") && responseRows[1].contains( "Derwing and M Rossiter"));
+        assertTrue(responseRows[2].contains("title") && responseRows[2].contains( "Teaching native speakers"));
+        assertTrue(responseRows[3].contains("journal") && responseRows[3].contains( "Journal of Multilingual and Multicultural"));
+        assertTrue(responseRows[4].contains("year") && responseRows[4].contains( "2002"));
+        assertTrue(responseRows[5].contains("pages") && responseRows[5].contains( "245--259"));
+        assertTrue(responseRows[6].contains("volume") && responseRows[6].contains( "23"));
+        assertTrue(responseRows[7].contains("number") && responseRows[7].contains( "4"));
+    }
+
+    @Test
+    public void processEmptyStringTest() throws IOException {
+        String response = grobidService.processCitation(" ", GrobidService.ConsolidateCitations.WITH_METADATA);
+        assertNotNull(response);
+        assertEquals("", response);
+    }
+
+    @Test
+    public void processInvalidCitationTest() {
+        assertThrows(IOException.class, () -> grobidService.processCitation("iiiiiiiiiiiiiiiiiiiiiiii", GrobidService.ConsolidateCitations.WITH_METADATA));
+    }
+
+}

From d9f938df66e465c2013f7a9c71ead3ef2addbe59 Mon Sep 17 00:00:00 2001
From: NikodemKch <nikodem.kch@gmail.com>
Date: Thu, 13 Feb 2020 03:02:55 +0100
Subject: [PATCH 2/7] Update Changelog.md for pull request #5614

---
 CHANGELOG.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9aa0ccb56a7..fbe10f1839e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,12 +12,13 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 ## [Unreleased]
 
 ### Changed
-- we changed the open office panel to show buttons in rows of three instead of going straight down to save space as the button expanded out to take up unnecessary horizontal space [#5479] (https://github.com/JabRef/jabref/issues/5479)
+
+- We changed the open office panel to show buttons in rows of three instead of going straight down to save space as the button expanded out to take up unnecessary horizontal space [#5479](https://github.com/JabRef/jabref/issues/5479)
 
 - We cleaned up the group add/edit dialog. [#5826](https://github.com/JabRef/jabref/pull/5826)
 - We reintroduced the index column. [#5844](https://github.com/JabRef/jabref/pull/5844)
 - Filenames of external files can no longer contain curly braces
-
+- We reintroduced the possibility to extract references from plain text (using GROBID) [#5614](https://github.com/JabRef/jabref/pull/5614) 
 
 ### Fixed
 

From 9af46abac88d8f45beb81150619736ca60f3a4c3 Mon Sep 17 00:00:00 2001
From: NikodemKch <nikodem.kch@gmail.com>
Date: Sun, 16 Feb 2020 22:19:24 +0100
Subject: [PATCH 3/7] Make GROBIDCitationFetcherTest more independent and
 clarified displayed message

---
 CHANGELOG.md                                  |  1 -
 .../BibtexExtractorViewModel.java             |  2 +-
 src/main/resources/l10n/JabRef_en.properties  |  2 +-
 .../fetcher/GrobidCitationFetcherTest.java    | 82 +++++++------------
 4 files changed, 31 insertions(+), 56 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fbe10f1839e..e0a0829d57b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,6 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 ### Changed
 
 - We changed the open office panel to show buttons in rows of three instead of going straight down to save space as the button expanded out to take up unnecessary horizontal space [#5479](https://github.com/JabRef/jabref/issues/5479)
-
 - We cleaned up the group add/edit dialog. [#5826](https://github.com/JabRef/jabref/pull/5826)
 - We reintroduced the index column. [#5844](https://github.com/JabRef/jabref/pull/5844)
 - Filenames of external files can no longer contain curly braces
diff --git a/src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractorViewModel.java b/src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractorViewModel.java
index 8f376810ca8..c68ae79c3a8 100644
--- a/src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractorViewModel.java
+++ b/src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractorViewModel.java
@@ -46,7 +46,7 @@ public void startParsing() {
         BackgroundTask.wrap(() -> currentCitationfetcher.performSearch(inputTextProperty.getValue()))
                 .onRunning(() -> dialogService.notify(Localization.lang("Your text is being parsed...")))
                 .onSuccess(parsedEntries -> {
-                    dialogService.notify(Localization.lang("GROBID could parse %0 Entries from your query.", String.valueOf(parsedEntries.size())));
+                    dialogService.notify(Localization.lang("%0 entries were parsed from your query.", String.valueOf(parsedEntries.size())));
                     importHandler.importEntries(parsedEntries);
                     for (BibEntry bibEntry : parsedEntries) {
                         trackNewEntry(bibEntry);
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 1aeb68e8301..f68215281f1 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2097,6 +2097,6 @@ Escape\ ampersands=Escape ampersands
 Plain\ References\ Parser=Plain References Parser
 Please\ enter\ the\ plain\ references\ to\ extract\ from.=Please enter the plain references to extract from.
 Add\ to\ current\ library=Add to current library
-GROBID\ could\ parse\ %0\ Entries\ from\ your\ query.=GROBID could parse %0 Entries from your query.
+%0\ entries\ were\ parsed\ from\ your\ query.=%0 entries were parsed from your query.
 Starts\ the\ extraction\ and\ adds\ the\ resulting\ entries\ to\ the\ currently\ opened\ database=Starts the extraction and adds the resulting entries to the currently opened database
 Your\ text\ is\ being\ parsed...=Your text is being parsed...
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcherTest.java
index 0230512bd15..f2b5a143aa4 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcherTest.java
@@ -4,14 +4,11 @@
 import java.util.List;
 
 import org.jabref.logic.importer.ImportFormatPreferences;
-import org.jabref.logic.importer.ParseException;
-import org.jabref.logic.importer.fileformat.BibtexParser;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.model.util.DummyFileUpdateMonitor;
-import org.jabref.model.util.FileUpdateMonitor;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.FetcherTest;
 
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
@@ -21,61 +18,40 @@
 @FetcherTest
 public class GrobidCitationFetcherTest {
 
-    static ImportFormatPreferences importFormatPreferences;
-    static FileUpdateMonitor fileUpdateMonitor;
-    static GrobidCitationFetcher grobidCitationFetcher;
+    static ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+    static GrobidCitationFetcher grobidCitationFetcher = new GrobidCitationFetcher(importFormatPreferences);
 
     static String example1 = "Derwing, T. M., Rossiter, M. J., & Munro, M. J. (2002). Teaching native speakers to listen to foreign-accented speech. Journal of Multilingual and Multicultural Development, 23(4), 245-259.";
-    static String example1AsBibtex = "@article{-1,\n" +
-            "author\t=\t\"T Derwing and M Rossiter and M Munro\",\n" +
-            "title\t=\t\"Teaching native speakers to listen to foreign-accented speech\",\n" +
-            "journal\t=\t\"Journal of Multilingual and Multicultural Development\",\n" +
-            "year\t=\t\"2002\",\n" +
-            "pages\t=\t\"245--259\",\n" +
-            "volume\t=\t\"23\",\n" +
-            "number\t=\t\"4\"\n" +
-            "}";
+    static BibEntry example1AsBibEntry = new BibEntry(StandardEntryType.Article).withCiteKey("-1")
+                .withField(StandardField.AUTHOR, "T Derwing and M Rossiter and M Munro")
+                .withField(StandardField.TITLE, "Teaching native speakers to listen to foreign-accented speech")
+                .withField(StandardField.JOURNAL, "Journal of Multilingual and Multicultural Development")
+                .withField(StandardField.YEAR, "2002")
+                .withField(StandardField.PAGES, "245--259")
+                .withField(StandardField.VOLUME, "23")
+                .withField(StandardField.NUMBER, "4");
     static String example2 = "Thomas, H. K. (2004). Training strategies for improving listeners' comprehension of foreign-accented speech (Doctoral dissertation). University of Colorado, Boulder.";
-    static String example2AsBibtex = "@misc{-1,\n" +
-            "author\t=\t\"H Thomas\",\n" +
-            "title\t=\t\"Training strategies for improving listeners' comprehension of foreign-accented speech (Doctoral dissertation)\",\n"
-            +
-            "year\t=\t\"2004\",\n" +
-            "address\t=\t\"Boulder\"\n" +
-            "}";
+    static BibEntry example2AsBibEntry = new BibEntry(BibEntry.DEFAULT_TYPE).withCiteKey("-1")
+            .withField(StandardField.AUTHOR, "H Thomas")
+            .withField(StandardField.TITLE, "Training strategies for improving listeners' comprehension of foreign-accented speech (Doctoral dissertation)")
+            .withField(StandardField.YEAR, "2004")
+            .withField(StandardField.ADDRESS, "Boulder");
     static String example3 = "Turk, J., Graham, P., & Verhulst, F. (2007). Child and adolescent psychiatry : A developmental approach. Oxford, England: Oxford University Press.";
-    static String example3AsBibtex = "@misc{-1,\n" +
-            "author\t=\t\"J Turk and P Graham and F Verhulst\",\n" +
-            "title\t=\t\"Child and adolescent psychiatry : A developmental approach\",\n" +
-            "publisher\t=\t\"Oxford University Press\",\n" +
-            "year\t=\t\"2007\",\n" +
-            "address\t=\t\"Oxford, England\"\n" +
-            "}";
+    static BibEntry example3AsBibEntry = new BibEntry(BibEntry.DEFAULT_TYPE).withCiteKey("-1")
+            .withField(StandardField.AUTHOR, "J Turk and P Graham and F Verhulst")
+            .withField(StandardField.TITLE, "Child and adolescent psychiatry : A developmental approach")
+            .withField(StandardField.PUBLISHER, "Oxford University Press")
+            .withField(StandardField.YEAR, "2007")
+            .withField(StandardField.ADDRESS, "Oxford, England");
     static String example4 = "Carr, I., & Kidner, R. (2003). Statutes and conventions on international trade law (4th ed.). London, England: Cavendish.";
-    static String example4AsBibtex = "@article{-1,\n" +
-            "author\t=\t\"I Carr and R Kidner\",\n" +
-            "booktitle\t=\t\"Statutes and conventions on international trade law\",\n" +
-            "publisher\t=\t\"Cavendish\",\n" +
-            "year\t=\t\"2003\",\n" +
-            "address\t=\t\"London, England\"\n" +
-            "}";
+    static BibEntry example4AsBibEntry = new BibEntry(StandardEntryType.Article).withCiteKey("-1")
+            .withField(StandardField.AUTHOR, "I Carr and R Kidner")
+            .withField(StandardField.BOOKTITLE, "Statutes and conventions on international trade law")
+            .withField(StandardField.PUBLISHER, "Cavendish")
+            .withField(StandardField.YEAR, "2003")
+            .withField(StandardField.ADDRESS, "London, England");
     static String invalidInput1 = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx________________________________";
     static String invalidInput2 = "¦@#¦@#¦@#¦@#¦@#¦@#¦@°#¦@¦°¦@°";
-    static BibEntry example1AsBibEntry;
-    static BibEntry example2AsBibEntry;
-    static BibEntry example3AsBibEntry;
-    static BibEntry example4AsBibEntry;
-
-    @BeforeAll
-    public static void setup() throws ParseException {
-        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        fileUpdateMonitor = new DummyFileUpdateMonitor();
-        grobidCitationFetcher = new GrobidCitationFetcher(importFormatPreferences);
-        example1AsBibEntry = BibtexParser.singleFromString(example1AsBibtex, importFormatPreferences, fileUpdateMonitor).get();
-        example2AsBibEntry = BibtexParser.singleFromString(example2AsBibtex, importFormatPreferences, fileUpdateMonitor).get();
-        example3AsBibEntry = BibtexParser.singleFromString(example3AsBibtex, importFormatPreferences, fileUpdateMonitor).get();
-        example4AsBibEntry = BibtexParser.singleFromString(example4AsBibtex, importFormatPreferences, fileUpdateMonitor).get();
-    }
 
     @Test
     public void grobidPerformSearchCorrectResultTest() {

From 7d8ea0afccf5e1767b6ddbc2846f537f9dc0c774 Mon Sep 17 00:00:00 2001
From: NikodemKch <nikodem.kch@gmail.com>
Date: Wed, 19 Feb 2020 21:34:38 +0100
Subject: [PATCH 4/7] minor improvements and switch to softwrap

Co-Authored-By: obsluk00 <obsluk00@users.noreply.github.com>
---
 .../gui/bibtexextractor/ExtractBibtexDialog.fxml   |  2 +-
 .../importer/fetcher/GrobidCitationFetcher.java    | 13 +++++++------
 .../logic/importer/util/GrobidServiceTest.java     | 14 +++++++-------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.fxml b/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.fxml
index b024323565b..d2182cbaf9c 100644
--- a/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.fxml
+++ b/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.fxml
@@ -11,7 +11,7 @@
     <content>
         <VBox fx:id="contentVbox" minHeight="-Infinity" prefHeight="200.0" prefWidth="100.0">
         <children>
-            <TextArea fx:id="input" minHeight="-Infinity" prefHeight="350.0" prefWidth="586.0"/>
+            <TextArea fx:id="input" minHeight="-Infinity" prefHeight="350.0" prefWidth="586.0" wrapText="true"/>
         </children>
         </VBox>
     </content>
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcher.java
index a976c8ed9c8..53a3438375c 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcher.java
@@ -22,7 +22,7 @@
 public class GrobidCitationFetcher implements SearchBasedFetcher {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(GrobidCitationFetcher.class);
-    private static final String GROBID_URL = "http://grobid.cm.in.tum.de:8070";
+    private static final String GROBID_URL = "http://grobid.jabref.org:8070";
     private ImportFormatPreferences importFormatPreferences;
     private GrobidService grobidService;
 
@@ -34,12 +34,13 @@ public GrobidCitationFetcher(ImportFormatPreferences importFormatPreferences) {
     /**
      * Passes request to grobid server, using consolidateCitations option to improve result.
      * Takes a while, since the server has to look up the entry.
+     * Returns a BibTeX string if it can extract it from the argument and an empty string otherwise.
      */
     private String parseUsingGrobid(String plainText) {
         try {
             return grobidService.processCitation(plainText, GrobidService.ConsolidateCitations.WITH_METADATA);
         } catch (IOException e) {
-            LOGGER.atDebug().setCause(e).log(e.getMessage());
+            LOGGER.debug("Could not process citation", e);
             return "";
         }
     }
@@ -59,13 +60,13 @@ public List<BibEntry> performSearch(String query) {
               .map(String::trim)
               .filter(str -> !str.isBlank())
               .collect(Collectors.toCollection(ArrayList::new));
-        if (plainReferences.size() == 0) {
+        if (plainReferences.isEmpty()) {
             return Collections.emptyList();
         } else {
           List<BibEntry> resultsList = new ArrayList<>();
-            for (String reference: plainReferences) {
-                parseBibToBibEntry(parseUsingGrobid(reference)).ifPresent(resultsList::add);
-            }
+          for (String reference: plainReferences) {
+            parseBibToBibEntry(parseUsingGrobid(reference)).ifPresent(resultsList::add);
+          }
             return resultsList;
         }
     }
diff --git a/src/test/java/org/jabref/logic/importer/util/GrobidServiceTest.java b/src/test/java/org/jabref/logic/importer/util/GrobidServiceTest.java
index 7d7aceabb94..75a0cf902be 100644
--- a/src/test/java/org/jabref/logic/importer/util/GrobidServiceTest.java
+++ b/src/test/java/org/jabref/logic/importer/util/GrobidServiceTest.java
@@ -30,13 +30,13 @@ public void processValidCitationTest() throws IOException {
         String[] responseRows = response.split("\n");
         assertNotNull(response);
         assertEquals('@', response.charAt(0));
-        assertTrue(responseRows[1].contains("author") && responseRows[1].contains( "Derwing and M Rossiter"));
-        assertTrue(responseRows[2].contains("title") && responseRows[2].contains( "Teaching native speakers"));
-        assertTrue(responseRows[3].contains("journal") && responseRows[3].contains( "Journal of Multilingual and Multicultural"));
-        assertTrue(responseRows[4].contains("year") && responseRows[4].contains( "2002"));
-        assertTrue(responseRows[5].contains("pages") && responseRows[5].contains( "245--259"));
-        assertTrue(responseRows[6].contains("volume") && responseRows[6].contains( "23"));
-        assertTrue(responseRows[7].contains("number") && responseRows[7].contains( "4"));
+        assertTrue(responseRows[1].contains("author") && responseRows[1].contains("Derwing and M Rossiter"));
+        assertTrue(responseRows[2].contains("title") && responseRows[2].contains("Teaching native speakers"));
+        assertTrue(responseRows[3].contains("journal") && responseRows[3].contains("Journal of Multilingual and Multicultural"));
+        assertTrue(responseRows[4].contains("year") && responseRows[4].contains("2002"));
+        assertTrue(responseRows[5].contains("pages") && responseRows[5].contains("245--259"));
+        assertTrue(responseRows[6].contains("volume") && responseRows[6].contains("23"));
+        assertTrue(responseRows[7].contains("number") && responseRows[7].contains("4"));
     }
 
     @Test

From 29d8c84ec81094287942ed912d6af33dfa88f906 Mon Sep 17 00:00:00 2001
From: NikodemKch <nikodem.kch@gmail.com>
Date: Wed, 19 Feb 2020 22:58:19 +0100
Subject: [PATCH 5/7] Resolved open issues

---
 .../fetcher/GrobidCitationFetcher.java        | 19 +++++++++----------
 .../logic/importer/util/GrobidService.java    |  4 ++++
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcher.java
index 53a3438375c..5f1fbe66aab 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcher.java
@@ -22,19 +22,19 @@
 public class GrobidCitationFetcher implements SearchBasedFetcher {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(GrobidCitationFetcher.class);
-    private static final String GROBID_URL = "http://grobid.jabref.org:8070";
+    private static final String GROBID_URL = "http://grobid.cm.in.tum.de:8070";
     private ImportFormatPreferences importFormatPreferences;
     private GrobidService grobidService;
 
     public GrobidCitationFetcher(ImportFormatPreferences importFormatPreferences) {
-      this.importFormatPreferences = importFormatPreferences;
-      this.grobidService = new GrobidService(GROBID_URL);
+        this.importFormatPreferences = importFormatPreferences;
+        this.grobidService = new GrobidService(GROBID_URL);
     }
 
     /**
      * Passes request to grobid server, using consolidateCitations option to improve result.
      * Takes a while, since the server has to look up the entry.
-     * Returns a BibTeX string if it can extract it from the argument and an empty string otherwise.
+     * @return A BibTeX-String if extraction is successful and an empty String otherwise.
      */
     private String parseUsingGrobid(String plainText) {
         try {
@@ -56,18 +56,17 @@ private Optional<BibEntry> parseBibToBibEntry(String bibtexString) {
 
     @Override
     public List<BibEntry> performSearch(String query) {
-        List<String> plainReferences = Arrays.stream( query.split( "[\\r\\n]+" ) )
+        List<String> plainReferences = Arrays.stream( query.split( "\\r\\r+|\\n\\n+|\\r\\n(\\r\\n)+" ) )
               .map(String::trim)
               .filter(str -> !str.isBlank())
               .collect(Collectors.toCollection(ArrayList::new));
         if (plainReferences.isEmpty()) {
             return Collections.emptyList();
         } else {
-          List<BibEntry> resultsList = new ArrayList<>();
-          for (String reference: plainReferences) {
-            parseBibToBibEntry(parseUsingGrobid(reference)).ifPresent(resultsList::add);
-          }
-            return resultsList;
+            return plainReferences.stream()
+                  .map(reference -> parseBibToBibEntry(parseUsingGrobid(reference)))
+                  .flatMap(Optional::stream)
+                  .collect(Collectors.toList());
         }
     }
 
diff --git a/src/main/java/org/jabref/logic/importer/util/GrobidService.java b/src/main/java/org/jabref/logic/importer/util/GrobidService.java
index 8ad0204bafc..146a31990ec 100644
--- a/src/main/java/org/jabref/logic/importer/util/GrobidService.java
+++ b/src/main/java/org/jabref/logic/importer/util/GrobidService.java
@@ -37,10 +37,14 @@ public GrobidService(String grobidServerURL) {
         this.grobidServerURL = grobidServerURL;
     }
 
+    /**
+     * @return A BibTeX-String if extraction is successful and an IOException otherwise.
+     */
     public String processCitation(String rawCitation, ConsolidateCitations consolidateCitations) throws IOException {
         rawCitation = URLEncoder.encode(rawCitation, StandardCharsets.UTF_8);
         URLDownload urlDownload = new URLDownload(grobidServerURL
                 + "/api/processCitation");
+        //urlDownload.addHeader("Accept", "application/x-bibtex"); //TODO: Uncomment as soon as the default GROBID server is used.
         urlDownload.setPostData("citations=" + rawCitation + "&consolidateCitations=" + consolidateCitations);
         String httpResponse = urlDownload.asString();
 

From f5743958af94bd35b09b86caaea6569d3452ab52 Mon Sep 17 00:00:00 2001
From: NikodemKch <nikodem.kch@gmail.com>
Date: Wed, 19 Feb 2020 23:05:58 +0100
Subject: [PATCH 6/7] feature is exposed to user

---
 .../org/jabref/gui/bibtexextractor/ExtractBibtexDialog.java     | 2 +-
 src/main/resources/l10n/JabRef_en.properties                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.java b/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.java
index 90bc98ef4b5..2354ef88cc5 100644
--- a/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.java
+++ b/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.java
@@ -40,7 +40,7 @@ public ExtractBibtexDialog() {
                   .load()
                   .setAsDialogPane(this);
         this.setTitle(Localization.lang("Plain References Parser"));
-        input.setPromptText(Localization.lang("Please enter the plain references to extract from."));
+        input.setPromptText(Localization.lang("Please enter the plain references to extract from separated by double empty lines."));
         input.selectAll();
 
         buttonParse = (Button) getDialogPane().lookupButton(parseButtonType);
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 626e1ead30b..3951fbe6015 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2093,7 +2093,7 @@ Hierarchical\ keyword\ delimiter=Hierarchical keyword delimiter
 Escape\ ampersands=Escape ampersands
 
 Plain\ References\ Parser=Plain References Parser
-Please\ enter\ the\ plain\ references\ to\ extract\ from.=Please enter the plain references to extract from.
+Please\ enter\ the\ plain\ references\ to\ extract\ from\ separated\ by\ double\ empty\ lines.=Please enter the plain references to extract from separated by double empty lines.
 Add\ to\ current\ library=Add to current library
 %0\ entries\ were\ parsed\ from\ your\ query.=%0 entries were parsed from your query.
 Starts\ the\ extraction\ and\ adds\ the\ resulting\ entries\ to\ the\ currently\ opened\ database=Starts the extraction and adds the resulting entries to the currently opened database

From 23bb8ef655c8dc5b83d0159cd84622d6be39328e Mon Sep 17 00:00:00 2001
From: NikodemKch <nikodem.kch@gmail.com>
Date: Wed, 19 Feb 2020 23:10:51 +0100
Subject: [PATCH 7/7] hotfix fetchertest

---
 .../logic/importer/fetcher/GrobidCitationFetcherTest.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcherTest.java
index f2b5a143aa4..c3075747a1e 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcherTest.java
@@ -67,7 +67,7 @@ public void grobidPerformSearchCorrectResultTest() {
 
     @Test
     public void grobidPerformSearchCorrectlySplitsStringTest() {
-        List<BibEntry> entries = grobidCitationFetcher.performSearch(example1 + "\n" + example2 + "\r\n" + example3 + "\r" + example4);
+        List<BibEntry> entries = grobidCitationFetcher.performSearch(example1 + "\n\n" + example2 + "\r\n\r\n" + example3 + "\r\r" + example4);
         assertEquals(List.of(example1AsBibEntry, example2AsBibEntry, example3AsBibEntry, example4AsBibEntry), entries);
     }