From feb054e12a3ae7ce048ba593685dfe07648341b9 Mon Sep 17 00:00:00 2001
From: nikch <nikodem.kernbach@stud.unibas.ch>
Date: Thu, 14 Nov 2019 01:38:44 +0100
Subject: [PATCH 1/6] User can now decide which grobid server to use

---
 .../org/jabref/gui/preferences/AdvancedTab.fxml   |  6 ++++++
 .../jabref/gui/preferences/AdvancedTabView.java   | 15 +++++++++++++++
 .../gui/preferences/AdvancedTabViewModel.java     | 12 ++++++++++++
 .../org/jabref/preferences/JabRefPreferences.java |  5 +++++
 4 files changed, 38 insertions(+)

diff --git a/src/main/java/org/jabref/gui/preferences/AdvancedTab.fxml b/src/main/java/org/jabref/gui/preferences/AdvancedTab.fxml
index a98ac76d508..dfe0c90f5a6 100644
--- a/src/main/java/org/jabref/gui/preferences/AdvancedTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/AdvancedTab.fxml
@@ -45,6 +45,8 @@
             <RowConstraints minHeight="10.0" vgrow="SOMETIMES"/>
             <RowConstraints minHeight="10.0" vgrow="SOMETIMES"/>
             <RowConstraints minHeight="10.0" vgrow="SOMETIMES"/>
+            <RowConstraints minHeight="10.0" vgrow="SOMETIMES"/>
+            <RowConstraints minHeight="10.0" vgrow="SOMETIMES"/>
         </rowConstraints>
         <CheckBox fx:id="proxyUse" text="%Use custom proxy configuration" GridPane.columnSpan="3"
                   GridPane.rowIndex="0"/>
@@ -61,5 +63,9 @@
                              GridPane.rowIndex="5"/>
         <Label fx:id="proxyAttentionLabel" styleClass="warning-message"
                text="%Attention: Password is stored in plain text!" GridPane.columnIndex="2" GridPane.rowIndex="5"/>
+        <CheckBox fx:id="customGrobidServer" text="%Use custom GROBID server" GridPane.columnSpan="3"
+                  GridPane.rowIndex="6"/>
+        <Label fx:id="grobidServerAddressLabel" text="%Server Address" GridPane.rowIndex="7"/>
+        <TextField fx:id="grobidServerAddress" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="7"/>
     </GridPane>
 </fx:root>
diff --git a/src/main/java/org/jabref/gui/preferences/AdvancedTabView.java b/src/main/java/org/jabref/gui/preferences/AdvancedTabView.java
index 0da5d97b869..6a24d485a4c 100644
--- a/src/main/java/org/jabref/gui/preferences/AdvancedTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/AdvancedTabView.java
@@ -44,6 +44,9 @@ public class AdvancedTabView extends AbstractPreferenceTabView<AdvancedTabViewMo
     @FXML private Label proxyPasswordLabel;
     @FXML private CustomPasswordField proxyPassword;
     @FXML private Label proxyAttentionLabel;
+    @FXML private CheckBox customGrobidServer;
+    @FXML private Label grobidServerAddressLabel;
+    @FXML private TextField grobidServerAddress;
 
     private String proxyPasswordText = "";
     private int proxyPasswordCaretPosition = 0;
@@ -109,6 +112,12 @@ public void initialize() {
             validationVisualizer.initVisualization(viewModel.proxyUsernameValidationStatus(), proxyUsername);
             validationVisualizer.initVisualization(viewModel.proxyPasswordValidationStatus(), proxyPassword);
         });
+
+        customGrobidServer.selectedProperty().bindBidirectional(viewModel.useCustomGrobidServer());
+        customGrobidServer.selectedProperty().addListener(((observable, oldValue, newValue) -> grobidServerReset(newValue)));
+        grobidServerAddress.textProperty().bindBidirectional(viewModel.customGrobidServer());
+        grobidServerAddress.disableProperty().bind(viewModel.useCustomGrobidServer().not());
+        grobidServerAddressLabel.disableProperty().bind(viewModel.useCustomGrobidServer().not());
     }
 
     private void proxyPasswordReveal(MouseEvent event) {
@@ -127,4 +136,10 @@ private void proxyPasswordMask(MouseEvent event) {
             proxyPasswordCaretPosition = 0;
         }
     }
+
+    private void grobidServerReset(boolean newObservedValue) {
+      if (!newObservedValue) {
+        grobidServerAddress.setText((String) preferences.defaults.get(JabRefPreferences.CUSTOM_GROBID_SERVER));
+      }
+    }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/AdvancedTabViewModel.java b/src/main/java/org/jabref/gui/preferences/AdvancedTabViewModel.java
index 663df383ee6..0c641cef7b7 100644
--- a/src/main/java/org/jabref/gui/preferences/AdvancedTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/AdvancedTabViewModel.java
@@ -38,6 +38,8 @@ public class AdvancedTabViewModel implements PreferenceTabViewModel {
     private final BooleanProperty proxyUseAuthenticationProperty = new SimpleBooleanProperty();
     private final StringProperty proxyUsernameProperty = new SimpleStringProperty("");
     private final StringProperty proxyPasswordProperty = new SimpleStringProperty("");
+    private final BooleanProperty customGrobidServerProperty = new SimpleBooleanProperty();
+    private final StringProperty grobidServerProperty = new SimpleStringProperty("");
 
     private FunctionBasedValidator remotePortValidator;
     private FunctionBasedValidator proxyHostnameValidator;
@@ -121,6 +123,9 @@ public void setValues() {
         proxyUseAuthenticationProperty.setValue(proxyPreferences.isUseAuthentication());
         proxyUsernameProperty.setValue(proxyPreferences.getUsername());
         proxyPasswordProperty.setValue(proxyPreferences.getPassword());
+
+        customGrobidServerProperty.setValue(preferences.getBoolean(JabRefPreferences.USE_CUSTOM_GROBID_SERVER));
+        grobidServerProperty.setValue(preferences.get(JabRefPreferences.CUSTOM_GROBID_SERVER));
     }
 
     public void storeSettings() {
@@ -137,6 +142,9 @@ public void storeSettings() {
         preferences.putBoolean(JabRefPreferences.USE_UNIT_FORMATTER_ON_SEARCH, useUnitFormatterProperty.getValue());
 
         storeProxySettings();
+
+        preferences.putBoolean(JabRefPreferences.USE_CUSTOM_GROBID_SERVER, customGrobidServerProperty.getValue());
+        preferences.put(JabRefPreferences.CUSTOM_GROBID_SERVER, grobidServerProperty.getValue());
     }
 
     private void storeRemoteSettings() {
@@ -248,4 +256,8 @@ public boolean validateSettings() {
     public StringProperty proxyUsernameProperty() { return proxyUsernameProperty; }
 
     public StringProperty proxyPasswordProperty() { return proxyPasswordProperty; }
+
+    public BooleanProperty useCustomGrobidServer() { return customGrobidServerProperty; }
+
+    public StringProperty customGrobidServer() { return grobidServerProperty; }
 }
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index 76e0c962e8b..62a5ff2b1f7 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -146,6 +146,8 @@ public class JabRefPreferences implements PreferencesService {
     public static final String PROXY_USERNAME = "proxyUsername";
     public static final String PROXY_PASSWORD = "proxyPassword";
     public static final String PROXY_USE_AUTHENTICATION = "useProxyAuthentication";
+    public static final String USE_CUSTOM_GROBID_SERVER = "useCustomGrobidServer";
+    public static final String CUSTOM_GROBID_SERVER = "customGrobidServer";
 
     public static final String REFORMAT_FILE_ON_SAVE_AND_EXPORT = "reformatFileOnSaveAndExport";
     public static final String EXPORT_IN_ORIGINAL_ORDER = "exportInOriginalOrder";
@@ -487,6 +489,9 @@ private JabRefPreferences() {
         defaults.put(PROXY_USERNAME, "");
         defaults.put(PROXY_PASSWORD, "");
 
+        defaults.put(USE_CUSTOM_GROBID_SERVER, Boolean.FALSE);
+        defaults.put(CUSTOM_GROBID_SERVER, "http://localhost:8070");
+
         defaults.put(USE_DEFAULT_LOOK_AND_FEEL, Boolean.TRUE);
         defaults.put(LYXPIPE, USER_HOME + File.separator + ".lyx/lyxpipe");
         defaults.put(VIM, "vim");

From 37277704aa20b8b783e95dc9c73b9d9a1aa59214 Mon Sep 17 00:00:00 2001
From: nikch <nikodem.kernbach@stud.unibas.ch>
Date: Thu, 14 Nov 2019 03:07:45 +0100
Subject: [PATCH 2/6] Experimental callback work, end for today

---
 .../org/jabref/logic/net/GrobidClient.java    | 27 ++++++++
 .../org/jabref/logic/net/HttpPostService.java | 62 ++++++++++++-------
 .../logic/net/HttpPostServiceException.java   | 15 +++++
 .../logic/plaintextparser/ParserPipeline.java | 19 +++++-
 4 files changed, 97 insertions(+), 26 deletions(-)
 create mode 100644 src/main/java/org/jabref/logic/net/GrobidClient.java
 create mode 100644 src/main/java/org/jabref/logic/net/HttpPostServiceException.java

diff --git a/src/main/java/org/jabref/logic/net/GrobidClient.java b/src/main/java/org/jabref/logic/net/GrobidClient.java
new file mode 100644
index 00000000000..dd242886ef1
--- /dev/null
+++ b/src/main/java/org/jabref/logic/net/GrobidClient.java
@@ -0,0 +1,27 @@
+package org.jabref.logic.net;
+
+import java.net.URISyntaxException;
+
+import org.jabref.Globals;
+import org.jabref.JabRefException;
+import org.jabref.preferences.JabRefPreferences;
+
+/**
+ * Implements an API to a GROBID server, as described at
+ * https://grobid.readthedocs.io/en/latest/Grobid-service/#grobid-web-services
+ */
+public class GrobidClient {
+
+  private HttpPostService httpPostService;
+
+  public GrobidClient() throws JabRefException {
+    try {
+      httpPostService = new HttpPostService(Globals.prefs.get(JabRefPreferences.CUSTOM_GROBID_SERVER));
+    } catch (URISyntaxException e) {
+      throw new JabRefException("Something seems wrong with your custom GROBID server address.");
+    }
+  }
+
+
+
+}
diff --git a/src/main/java/org/jabref/logic/net/HttpPostService.java b/src/main/java/org/jabref/logic/net/HttpPostService.java
index 85a56eb94b2..b8b57a7749e 100644
--- a/src/main/java/org/jabref/logic/net/HttpPostService.java
+++ b/src/main/java/org/jabref/logic/net/HttpPostService.java
@@ -4,20 +4,19 @@
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
 import org.apache.http.client.methods.HttpPost;
-//import org.apache.http.concurrent.FutureCallback;
+import org.apache.http.concurrent.FutureCallback;
 import org.apache.http.impl.client.HttpClients;
-//import org.apache.http.impl.nio.client.HttpAsyncClients;
 import org.apache.http.message.BasicNameValuePair;
-//import org.apache.http.nio.client.HttpAsyncClient;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-//import java.util.concurrent.Future;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Future;
+
+import org.jabref.JabRefExecutorService;
 
 /**
  * Makes it easy to send http post requests
@@ -25,34 +24,43 @@
  */
 public class HttpPostService {
 
-    private static final HttpClient httpClient = HttpClients.createDefault();
-    //private static final HttpAsyncClient httpAsyncClient = HttpAsyncClients.createDefault();
-    private URI url;
-
-    public HttpPostService(String url) throws URISyntaxException {
-        this(new URI(url));
-    }
+    private static final HttpClient HTTP_CLIENT = HttpClients.createDefault();
+    private String url; //The root URL
 
-    public HttpPostService(URI url) {
+    public HttpPostService(String url) {
         this.url = url;
     }
 
-    public HttpResponse sendPostAndWait(Map<String, String> params) throws IOException {
-        return httpClient.execute(prepareHttpPost(params));
+    public HttpResponse sendPostAndWait(Map<String, String> params) throws HttpPostServiceException {
+        try {
+            return HTTP_CLIENT.execute(prepareHttpPost(params));
+        } catch (IOException e) {
+            throw new HttpPostServiceException();
+        }
     }
 
-    /* sadly this does not work due to gradle compile errors
-    public Future<HttpResponse> sendPost(Map<String, String> params,
+    public Future<HttpResponse> sendPost(String subUrl,
+                                         Map<String, String> params,
                                          FutureCallback<HttpResponse> httpResponseHandler) throws IOException {
-        return httpAsyncClient.execute(prepareHttpPost(params), httpResponseHandler);
+        return JabRefExecutorService.INSTANCE.execute(() -> HTTP_CLIENT.execute(prepareHttpPost(params, subUrl)));
+        return httpAsyncClient.execute(prepareHttpPost(params, subUrl), httpResponseHandler);
     }
 
-    public Future<HttpResponse> sendPost(Map<String, String> params) throws IOException {
-        return httpAsyncClient.execute(prepareHttpPost(params), null);
-    }*/
+    public Future<HttpResponse> sendPost(Map<String, String> params) throws HttpPostServiceException {
+        return JabRefExecutorService.INSTANCE.execute(new Callable<HttpResponse>() {
+          @Override
+          public HttpResponse call() throws HttpPostServiceException {
+            try {
+              return HTTP_CLIENT.execute(prepareHttpPost(params));
+            } catch (IOException e) {
+              throw new HttpPostServiceException();
+            }
+          }
+        });
+    }
 
-    private HttpPost prepareHttpPost(Map<String, String> params) throws UnsupportedEncodingException {
-        HttpPost httpPost = new HttpPost(url);
+    private HttpPost prepareHttpPost(Map<String, String> params, String urlSubPath) throws UnsupportedEncodingException {
+        HttpPost httpPost = new HttpPost(url + urlSubPath);
         List<BasicNameValuePair> parameterList = new ArrayList<>();
         for (Map.Entry<String, String> e: params.entrySet()) {
             parameterList.add(new BasicNameValuePair(e.getKey(), e.getValue()));
@@ -61,4 +69,10 @@ private HttpPost prepareHttpPost(Map<String, String> params) throws UnsupportedE
         return httpPost;
     }
 
+    private HttpPost prepareHttpPost(Map<String, String> params) throws UnsupportedEncodingException {
+      return prepareHttpPost(params, "");
+    }
+
+
+
 }
diff --git a/src/main/java/org/jabref/logic/net/HttpPostServiceException.java b/src/main/java/org/jabref/logic/net/HttpPostServiceException.java
new file mode 100644
index 00000000000..dcc935a1aec
--- /dev/null
+++ b/src/main/java/org/jabref/logic/net/HttpPostServiceException.java
@@ -0,0 +1,15 @@
+package org.jabref.logic.net;
+
+import org.jabref.JabRefException;
+
+public class HttpPostServiceException extends JabRefException {
+
+  public HttpPostServiceException() {
+    super("An error occurred connecting to the external http server.");
+  }
+
+  public HttpPostServiceException(String message) {
+    super(message);
+  }
+
+}
diff --git a/src/main/java/org/jabref/logic/plaintextparser/ParserPipeline.java b/src/main/java/org/jabref/logic/plaintextparser/ParserPipeline.java
index f6a29a3f0b2..0a355e32d8d 100644
--- a/src/main/java/org/jabref/logic/plaintextparser/ParserPipeline.java
+++ b/src/main/java/org/jabref/logic/plaintextparser/ParserPipeline.java
@@ -17,8 +17,11 @@
 import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.TreeSet;
+import java.util.concurrent.Future;
 
 /**
  * This class is used to help making new entries faster by parsing a String.
@@ -37,12 +40,24 @@ public class ParserPipeline {
      * @param plainText Plain reference citation to be parsed.
      * @return The BibEntry, if creation was possible.
      */
-    public static Optional<BibEntry> parsePlainRefCit(String plainText) {
+    public static List<Future<BibEntry>> parsePlainRefCit(String plainText) {
         try {
+          TreeSet<String> plainReferences = new TreeSet<>();
+          String[] plainReferencesArray = plainText.split(";;;");
+          for (int i = 0; i < plainReferencesArray.length; i++) {
+            plainReferences.add(plainReferencesArray[i].trim());
+          }
+          plainReferences.remove("");
+          if (plainReferences.size() == 0) {
+            throw new ParserPipelineException("Your entered References are empty.");
+          } else if (plainReferences.size() == 1) {
             return parseBibToBibEntry(parseTeiToBib(parseUsingGrobid(plainText)));
+          } else {
+
+          }
         } catch (ParserPipelineException e) {
         LOGGER.error("ParserPipeline Failed. Reason: "+e.getMessage());
-        return Optional.empty();
+        return null;
         }
     }
 

From 24e781710c7007ea437dcc6b119accd00c60448b Mon Sep 17 00:00:00 2001
From: nikch <nikodem.kernbach@stud.unibas.ch>
Date: Thu, 14 Nov 2019 14:50:26 +0100
Subject: [PATCH 3/6] Rewrite HttpPostService to handle async requests using
 apache and callback functions

---
 build.gradle                                  |  3 +-
 src/main/java/module-info.java                |  1 +
 .../org/jabref/logic/net/HttpPostService.java | 37 ++++++++++---------
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/build.gradle b/build.gradle
index 31ab111735e..6378b78524c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -115,7 +115,8 @@ dependencies {
 
     compile group: 'org.apache.tika', name: 'tika-core', version: '1.22'
 
-    compile 'org.apache.httpcomponents:httpclient:4.5.10'
+    compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.10'
+    compile group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '4.1.4'
     compile group: 'commons-io', name: 'commons-io', version: '2.6'
 
     // required for reading write-protected PDFs - see https://github.com/JabRef/jabref/pull/942#issuecomment-209252635
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index b3aed14bfb0..9f9f2c4adad 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -66,6 +66,7 @@
     requires unirest.java;
     requires org.apache.httpcomponents.httpcore;
     requires org.apache.httpcomponents.httpclient;
+    requires org.apache.httpcomponents.httpasyncclient;
     requires org.apache.commons.io;
     requires org.jsoup;
     requires commons.csv;
diff --git a/src/main/java/org/jabref/logic/net/HttpPostService.java b/src/main/java/org/jabref/logic/net/HttpPostService.java
index b8b57a7749e..7755c3c95a0 100644
--- a/src/main/java/org/jabref/logic/net/HttpPostService.java
+++ b/src/main/java/org/jabref/logic/net/HttpPostService.java
@@ -6,6 +6,7 @@
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.concurrent.FutureCallback;
 import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.nio.client.HttpAsyncClients;
 import org.apache.http.message.BasicNameValuePair;
 
 import java.io.IOException;
@@ -13,10 +14,9 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
 
-import org.jabref.JabRefExecutorService;
+import org.apache.http.nio.client.HttpAsyncClient;
 
 /**
  * Makes it easy to send http post requests
@@ -25,38 +25,39 @@
 public class HttpPostService {
 
     private static final HttpClient HTTP_CLIENT = HttpClients.createDefault();
+    private static final HttpAsyncClient ASYNC_HTTP_CLIENT = HttpAsyncClients.createDefault();
     private String url; //The root URL
 
     public HttpPostService(String url) {
         this.url = url;
     }
 
-    public HttpResponse sendPostAndWait(Map<String, String> params) throws HttpPostServiceException {
+    public HttpResponse sendPostAndWait(String subUrl, Map<String, String> params) throws HttpPostServiceException {
         try {
-            return HTTP_CLIENT.execute(prepareHttpPost(params));
+            return HTTP_CLIENT.execute(prepareHttpPost(params, subUrl));
         } catch (IOException e) {
             throw new HttpPostServiceException();
         }
     }
 
+    public HttpResponse sendPostAndWait(Map<String, String> params) throws HttpPostServiceException {
+        return sendPostAndWait("", params);
+    }
+
     public Future<HttpResponse> sendPost(String subUrl,
                                          Map<String, String> params,
-                                         FutureCallback<HttpResponse> httpResponseHandler) throws IOException {
-        return JabRefExecutorService.INSTANCE.execute(() -> HTTP_CLIENT.execute(prepareHttpPost(params, subUrl)));
-        return httpAsyncClient.execute(prepareHttpPost(params, subUrl), httpResponseHandler);
+                                         FutureCallback<HttpResponse> httpResponseHandler) throws HttpPostServiceException {
+        try {
+            return ASYNC_HTTP_CLIENT.execute(prepareHttpPost(params, subUrl), httpResponseHandler);
+        } catch (IOException e) {
+            throw new HttpPostServiceException();
+        }
     }
 
-    public Future<HttpResponse> sendPost(Map<String, String> params) throws HttpPostServiceException {
-        return JabRefExecutorService.INSTANCE.execute(new Callable<HttpResponse>() {
-          @Override
-          public HttpResponse call() throws HttpPostServiceException {
-            try {
-              return HTTP_CLIENT.execute(prepareHttpPost(params));
-            } catch (IOException e) {
-              throw new HttpPostServiceException();
-            }
-          }
-        });
+    public Future<HttpResponse> sendPost(String subUrl,
+                                         Map<String, String> params) throws HttpPostServiceException {
+        return sendPost(subUrl, params, null);
+
     }
 
     private HttpPost prepareHttpPost(Map<String, String> params, String urlSubPath) throws UnsupportedEncodingException {

From f0117bcd83f45c0d764d6fb22622fe0365f16434 Mon Sep 17 00:00:00 2001
From: nikch <nikodem.kernbach@stud.unibas.ch>
Date: Thu, 14 Nov 2019 15:38:18 +0100
Subject: [PATCH 4/6] Finished HttpPostService

---
 .../org/jabref/logic/net/GrobidClient.java    | 22 ++++----------
 .../org/jabref/logic/net/HttpPostService.java | 30 ++++++++-----------
 2 files changed, 19 insertions(+), 33 deletions(-)

diff --git a/src/main/java/org/jabref/logic/net/GrobidClient.java b/src/main/java/org/jabref/logic/net/GrobidClient.java
index dd242886ef1..6913e8ddc57 100644
--- a/src/main/java/org/jabref/logic/net/GrobidClient.java
+++ b/src/main/java/org/jabref/logic/net/GrobidClient.java
@@ -1,27 +1,17 @@
 package org.jabref.logic.net;
 
-import java.net.URISyntaxException;
-
-import org.jabref.Globals;
-import org.jabref.JabRefException;
-import org.jabref.preferences.JabRefPreferences;
-
 /**
  * Implements an API to a GROBID server, as described at
  * https://grobid.readthedocs.io/en/latest/Grobid-service/#grobid-web-services
+ *
+ * The methods are structured to match the GROBID server api.
+ * The interfaces using PDFs as parameters are not implemented yet, but feel free to add them if you want to
+ * expand the functionality of JabRef.
  */
 public class GrobidClient {
 
-  private HttpPostService httpPostService;
-
-  public GrobidClient() throws JabRefException {
-    try {
-      httpPostService = new HttpPostService(Globals.prefs.get(JabRefPreferences.CUSTOM_GROBID_SERVER));
-    } catch (URISyntaxException e) {
-      throw new JabRefException("Something seems wrong with your custom GROBID server address.");
+    public static String processDate(String rawDate) {
+        HttpPostService.sendPost();
     }
-  }
-
-
 
 }
diff --git a/src/main/java/org/jabref/logic/net/HttpPostService.java b/src/main/java/org/jabref/logic/net/HttpPostService.java
index 7755c3c95a0..4bddc63911e 100644
--- a/src/main/java/org/jabref/logic/net/HttpPostService.java
+++ b/src/main/java/org/jabref/logic/net/HttpPostService.java
@@ -26,41 +26,38 @@ public class HttpPostService {
 
     private static final HttpClient HTTP_CLIENT = HttpClients.createDefault();
     private static final HttpAsyncClient ASYNC_HTTP_CLIENT = HttpAsyncClients.createDefault();
-    private String url; //The root URL
 
-    public HttpPostService(String url) {
-        this.url = url;
-    }
-
-    public HttpResponse sendPostAndWait(String subUrl, Map<String, String> params) throws HttpPostServiceException {
+    public static HttpResponse sendPostAndWait(String url, String subUrl, Map<String, String> params) throws HttpPostServiceException {
         try {
-            return HTTP_CLIENT.execute(prepareHttpPost(params, subUrl));
+            return HTTP_CLIENT.execute(prepareHttpPost(url, subUrl, params));
         } catch (IOException e) {
             throw new HttpPostServiceException();
         }
     }
 
-    public HttpResponse sendPostAndWait(Map<String, String> params) throws HttpPostServiceException {
-        return sendPostAndWait("", params);
+    public static HttpResponse sendPostAndWait(String url, Map<String, String> params) throws HttpPostServiceException {
+        return sendPostAndWait(url, "", params);
     }
 
-    public Future<HttpResponse> sendPost(String subUrl,
+    public static Future<HttpResponse> sendPost(String url,
+                                                String subUrl,
                                          Map<String, String> params,
                                          FutureCallback<HttpResponse> httpResponseHandler) throws HttpPostServiceException {
         try {
-            return ASYNC_HTTP_CLIENT.execute(prepareHttpPost(params, subUrl), httpResponseHandler);
+            return ASYNC_HTTP_CLIENT.execute(prepareHttpPost(url, subUrl, params), httpResponseHandler);
         } catch (IOException e) {
             throw new HttpPostServiceException();
         }
     }
 
-    public Future<HttpResponse> sendPost(String subUrl,
+    public static Future<HttpResponse> sendPost(String url,
+                                                String subUrl,
                                          Map<String, String> params) throws HttpPostServiceException {
-        return sendPost(subUrl, params, null);
+        return sendPost(url, subUrl, params, null);
 
     }
 
-    private HttpPost prepareHttpPost(Map<String, String> params, String urlSubPath) throws UnsupportedEncodingException {
+    private static HttpPost prepareHttpPost(String url, String urlSubPath, Map<String, String> params) throws UnsupportedEncodingException {
         HttpPost httpPost = new HttpPost(url + urlSubPath);
         List<BasicNameValuePair> parameterList = new ArrayList<>();
         for (Map.Entry<String, String> e: params.entrySet()) {
@@ -70,10 +67,9 @@ private HttpPost prepareHttpPost(Map<String, String> params, String urlSubPath)
         return httpPost;
     }
 
-    private HttpPost prepareHttpPost(Map<String, String> params) throws UnsupportedEncodingException {
-      return prepareHttpPost(params, "");
+    private static HttpPost prepareHttpPost(String url, Map<String, String> params) throws UnsupportedEncodingException {
+      return prepareHttpPost(url, "", params);
     }
 
 
-
 }

From b0447fe262434df0b877b0a2580a4c3b532f6d44 Mon Sep 17 00:00:00 2001
From: nikch <nikodem.kernbach@stud.unibas.ch>
Date: Fri, 15 Nov 2019 00:43:49 +0100
Subject: [PATCH 5/6] Assumed that Pipeline is already working on another
 thread

---
 build.gradle                                  |  1 -
 src/main/java/module-info.java                |  1 -
 .../org/jabref/logic/net/GrobidClient.java    | 33 +++++++--
 .../logic/net/GrobidClientException.java      | 30 +++++++++
 .../org/jabref/logic/net/HttpPostService.java | 23 +------
 .../logic/plaintextparser/ParserPipeline.java | 67 ++++++-------------
 6 files changed, 82 insertions(+), 73 deletions(-)
 create mode 100644 src/main/java/org/jabref/logic/net/GrobidClientException.java

diff --git a/build.gradle b/build.gradle
index 6378b78524c..d5bd54fbc74 100644
--- a/build.gradle
+++ b/build.gradle
@@ -116,7 +116,6 @@ dependencies {
     compile group: 'org.apache.tika', name: 'tika-core', version: '1.22'
 
     compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.10'
-    compile group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '4.1.4'
     compile group: 'commons-io', name: 'commons-io', version: '2.6'
 
     // required for reading write-protected PDFs - see https://github.com/JabRef/jabref/pull/942#issuecomment-209252635
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 9f9f2c4adad..b3aed14bfb0 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -66,7 +66,6 @@
     requires unirest.java;
     requires org.apache.httpcomponents.httpcore;
     requires org.apache.httpcomponents.httpclient;
-    requires org.apache.httpcomponents.httpasyncclient;
     requires org.apache.commons.io;
     requires org.jsoup;
     requires commons.csv;
diff --git a/src/main/java/org/jabref/logic/net/GrobidClient.java b/src/main/java/org/jabref/logic/net/GrobidClient.java
index 6913e8ddc57..922db4fe7ed 100644
--- a/src/main/java/org/jabref/logic/net/GrobidClient.java
+++ b/src/main/java/org/jabref/logic/net/GrobidClient.java
@@ -1,17 +1,42 @@
 package org.jabref.logic.net;
 
+import org.apache.commons.io.IOUtils;
+import org.apache.http.HttpEntity;
+import org.jabref.Globals;
+import org.jabref.preferences.JabRefPreferences;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+
 /**
  * Implements an API to a GROBID server, as described at
  * https://grobid.readthedocs.io/en/latest/Grobid-service/#grobid-web-services
  *
  * The methods are structured to match the GROBID server api.
- * The interfaces using PDFs as parameters are not implemented yet, but feel free to add them if you want to
- * expand the functionality of JabRef.
+ * Each method corresponds to a GROBID service request. Only the ones already used are already implemented.
  */
 public class GrobidClient {
 
-    public static String processDate(String rawDate) {
-        HttpPostService.sendPost();
+    public static String processCitation(String rawCitation, int consolidateCitations) throws GrobidClientException {
+        try {
+            if (consolidateCitations < 0 || consolidateCitations > 2) {
+                throw new GrobidClientException("");
+            }
+            HttpEntity httpResponse = HttpPostService.sendPostAndWait(
+                    Globals.prefs.get(JabRefPreferences.CUSTOM_GROBID_SERVER),
+                    "api/processCitation",
+                    Map.of("citations", rawCitation, "consolidateCitations", String.valueOf(consolidateCitations))
+                    ).getEntity();
+            if (httpResponse == null) {
+                throw new GrobidClientException("The GROBID server response does not contain anything.");
+            }
+            InputStream serverResponseAsStream = httpResponse.getContent();
+            return IOUtils.toString(serverResponseAsStream, StandardCharsets.UTF_8);
+        } catch (HttpPostServiceException | IOException e) {
+            throw new GrobidClientException();
+        }
     }
 
 }
diff --git a/src/main/java/org/jabref/logic/net/GrobidClientException.java b/src/main/java/org/jabref/logic/net/GrobidClientException.java
new file mode 100644
index 00000000000..282cc6fc812
--- /dev/null
+++ b/src/main/java/org/jabref/logic/net/GrobidClientException.java
@@ -0,0 +1,30 @@
+package org.jabref.logic.net;
+
+import org.jabref.JabRefException;
+
+public class GrobidClientException extends JabRefException {
+
+    public GrobidClientException() {
+        super("An error occurred while processing your query.");
+    }
+
+    public GrobidClientException(String message) {
+        super(message);
+    }
+
+    public static GrobidClientException getNewGrobidClientExceptionByCode(int httpCode) {
+        switch(httpCode) {
+            case 204:
+                return new GrobidClientException("The GROBID service could not extract any Information from this String.");
+            case 400:
+                return new GrobidClientException("The generated Request was wrong.");
+            case 500:
+                return new GrobidClientException("An internal GROBID service error occured.");
+            case 503:
+                return new GrobidClientException("There are too many requests at a time, please try again later.");
+            default:
+                return new GrobidClientException("An error occured processing your GROBID request.");
+        }
+    }
+
+}
diff --git a/src/main/java/org/jabref/logic/net/HttpPostService.java b/src/main/java/org/jabref/logic/net/HttpPostService.java
index 4bddc63911e..155a2ac0f33 100644
--- a/src/main/java/org/jabref/logic/net/HttpPostService.java
+++ b/src/main/java/org/jabref/logic/net/HttpPostService.java
@@ -6,7 +6,6 @@
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.concurrent.FutureCallback;
 import org.apache.http.impl.client.HttpClients;
-import org.apache.http.impl.nio.client.HttpAsyncClients;
 import org.apache.http.message.BasicNameValuePair;
 
 import java.io.IOException;
@@ -16,7 +15,6 @@
 import java.util.Map;
 import java.util.concurrent.Future;
 
-import org.apache.http.nio.client.HttpAsyncClient;
 
 /**
  * Makes it easy to send http post requests
@@ -24,8 +22,7 @@
  */
 public class HttpPostService {
 
-    private static final HttpClient HTTP_CLIENT = HttpClients.createDefault();
-    private static final HttpAsyncClient ASYNC_HTTP_CLIENT = HttpAsyncClients.createDefault();
+    private static final HttpClient HTTP_CLIENT = HttpClients.createSystem();
 
     public static HttpResponse sendPostAndWait(String url, String subUrl, Map<String, String> params) throws HttpPostServiceException {
         try {
@@ -39,24 +36,6 @@ public static HttpResponse sendPostAndWait(String url, Map<String, String> param
         return sendPostAndWait(url, "", params);
     }
 
-    public static Future<HttpResponse> sendPost(String url,
-                                                String subUrl,
-                                         Map<String, String> params,
-                                         FutureCallback<HttpResponse> httpResponseHandler) throws HttpPostServiceException {
-        try {
-            return ASYNC_HTTP_CLIENT.execute(prepareHttpPost(url, subUrl, params), httpResponseHandler);
-        } catch (IOException e) {
-            throw new HttpPostServiceException();
-        }
-    }
-
-    public static Future<HttpResponse> sendPost(String url,
-                                                String subUrl,
-                                         Map<String, String> params) throws HttpPostServiceException {
-        return sendPost(url, subUrl, params, null);
-
-    }
-
     private static HttpPost prepareHttpPost(String url, String urlSubPath, Map<String, String> params) throws UnsupportedEncodingException {
         HttpPost httpPost = new HttpPost(url + urlSubPath);
         List<BasicNameValuePair> parameterList = new ArrayList<>();
diff --git a/src/main/java/org/jabref/logic/plaintextparser/ParserPipeline.java b/src/main/java/org/jabref/logic/plaintextparser/ParserPipeline.java
index 0a355e32d8d..fb815cf7e52 100644
--- a/src/main/java/org/jabref/logic/plaintextparser/ParserPipeline.java
+++ b/src/main/java/org/jabref/logic/plaintextparser/ParserPipeline.java
@@ -1,27 +1,19 @@
 package org.jabref.logic.plaintextparser;
 
-import org.apache.commons.io.IOUtils;
-import org.apache.http.HttpEntity;
 import org.jabref.Globals;
 import org.jabref.logic.importer.ParseException;
 import org.jabref.logic.importer.fileformat.BibtexParser;
-import org.jabref.logic.net.HttpPostService;
+import org.jabref.logic.net.GrobidClient;
+import org.jabref.logic.net.GrobidClientException;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.field.StandardField;
 import org.jabref.preferences.JabRefPreferences;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URISyntaxException;
-import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import java.util.TreeSet;
-import java.util.concurrent.Future;
 
 /**
  * This class is used to help making new entries faster by parsing a String.
@@ -30,9 +22,6 @@
 public class ParserPipeline {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ParserPipeline.class);
-    private static final String GROBID_PROCESS_CITATIONS_URL = "http://localhost:8070/api/processCitation";
-    private static HttpPostService grobidPostService;
-    private static BibEntry bibEntry;
 
     /**
      * Takes a whole String and filters the specific fields for the entry which is done
@@ -40,21 +29,23 @@ public class ParserPipeline {
      * @param plainText Plain reference citation to be parsed.
      * @return The BibEntry, if creation was possible.
      */
-    public static List<Future<BibEntry>> parsePlainRefCit(String plainText) {
+    public static List<Optional<BibEntry>> parsePlainRefCit(String plainText) {
         try {
-          TreeSet<String> plainReferences = new TreeSet<>();
-          String[] plainReferencesArray = plainText.split(";;;");
-          for (int i = 0; i < plainReferencesArray.length; i++) {
-            plainReferences.add(plainReferencesArray[i].trim());
-          }
-          plainReferences.remove("");
-          if (plainReferences.size() == 0) {
-            throw new ParserPipelineException("Your entered References are empty.");
-          } else if (plainReferences.size() == 1) {
-            return parseBibToBibEntry(parseTeiToBib(parseUsingGrobid(plainText)));
-          } else {
-
-          }
+            TreeSet<String> plainReferences = new TreeSet<>();
+            String[] plainReferencesArray = plainText.split(";;");
+            for (int i = 0; i < plainReferencesArray.length; i++) {
+                plainReferences.add(plainReferencesArray[i].trim());
+            }
+            plainReferences.remove("");
+            if (plainReferences.size() == 0) {
+                throw new ParserPipelineException("Your entered References are empty.");
+            } else {
+                ArrayList<Optional<BibEntry>> resultsList = new ArrayList<>();
+                for (String reference: plainReferences) {
+                    resultsList.add(parseBibToBibEntry(parseTeiToBib(parseUsingGrobid(reference))));
+                }
+                return resultsList;
+            }
         } catch (ParserPipelineException e) {
         LOGGER.error("ParserPipeline Failed. Reason: "+e.getMessage());
         return null;
@@ -66,24 +57,10 @@ public static List<Future<BibEntry>> parsePlainRefCit(String plainText) {
      * Takes a while, since the server has to look up the entry.
      */
     private static String parseUsingGrobid(String plainText) throws ParserPipelineException {
-        if (grobidPostService == null) {
-            try {
-                grobidPostService = new HttpPostService(GROBID_PROCESS_CITATIONS_URL);
-            } catch (URISyntaxException e) {
-                throw new ParserPipelineException("HttpPostService could not be created");
-            }
-        }
         try {
-            HttpEntity serverResponse = grobidPostService.sendPostAndWait(
-                    Map.of("citations", plainText, "consolidateCitations", "1")).getEntity();
-            if (serverResponse == null) {
-                throw new ParserPipelineException("The server response does not contain anything.");
-            }
-            InputStream serverResponseAsStream = serverResponse.getContent();
-            LOGGER.info(IOUtils.toString(serverResponseAsStream, StandardCharsets.UTF_8));
-            return IOUtils.toString(serverResponseAsStream, StandardCharsets.UTF_8);
-        } catch (IOException e) {
-            throw new ParserPipelineException("Something went wrong requesting parsing results from grobid server.");
+            return GrobidClient.processCitation(plainText, 1);
+        } catch (GrobidClientException e) {
+            throw new ParserPipelineException("The Pipeline failed to get the results from the GROBID client");
         }
     }
 

From 5d24dedc676186dbfae108a6730a39cd4f02b290 Mon Sep 17 00:00:00 2001
From: nikch <nikodem.kernbach@stud.unibas.ch>
Date: Fri, 15 Nov 2019 01:21:20 +0100
Subject: [PATCH 6/6] Running version of multi entry on separate thread

---
 .../EntryByPlainTextViewModel.java            | 20 ++++++++++++++-----
 .../org/jabref/logic/net/GrobidClient.java    |  2 +-
 .../logic/plaintextparser/ParserPipeline.java |  9 +++++----
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/jabref/gui/entrybyplaintext/EntryByPlainTextViewModel.java b/src/main/java/org/jabref/gui/entrybyplaintext/EntryByPlainTextViewModel.java
index ccab86b7024..cf20a826684 100644
--- a/src/main/java/org/jabref/gui/entrybyplaintext/EntryByPlainTextViewModel.java
+++ b/src/main/java/org/jabref/gui/entrybyplaintext/EntryByPlainTextViewModel.java
@@ -1,12 +1,17 @@
 package org.jabref.gui.entrybyplaintext;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.Optional;
+
+import javafx.application.Platform;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 
 
 import org.jabref.Globals;
+import org.jabref.JabRefExecutorService;
 import org.jabref.JabRefGUI;
 import org.jabref.logic.plaintextparser.ParserPipeline;
 import org.jabref.model.Defaults;
@@ -22,7 +27,7 @@ public class EntryByPlainTextViewModel {
   private final BibDatabaseContext bibDatabaseContext;
   private boolean directAdd;
   private final BibDatabaseContext newDatabaseContext;
-
+  private List<BibEntry> extractedEntries;
 
 
   public EntryByPlainTextViewModel(BibDatabaseContext bibDatabaseContext){
@@ -40,13 +45,18 @@ public StringProperty inputTextProperty(){
 
   public void startParsing(boolean directAdd){
     this.directAdd = directAdd;
-    executeParse();
+    this.extractedEntries = null;
+    JabRefExecutorService.INSTANCE.execute(() -> {
+        this.extractedEntries = ParserPipeline.parsePlainRefCit(inputText.getValue());
+        Platform.runLater(this::executeParse);
+    });
   }
 
   public void executeParse(){
-      if(ParserPipeline.parsePlainRefCit(inputText.getValue()).isPresent()){
-          BibEntry bibEntry = ParserPipeline.parsePlainRefCit(inputText.getValue()).get();
-          parsingSuccess(bibEntry);
+      if(extractedEntries.size() > 0){
+          for (BibEntry bibEntry: extractedEntries) {
+              parsingSuccess(bibEntry);
+          }
       } else{
           parsingFail(inputText.getValue());
       }
diff --git a/src/main/java/org/jabref/logic/net/GrobidClient.java b/src/main/java/org/jabref/logic/net/GrobidClient.java
index 922db4fe7ed..188ecf304d0 100644
--- a/src/main/java/org/jabref/logic/net/GrobidClient.java
+++ b/src/main/java/org/jabref/logic/net/GrobidClient.java
@@ -26,7 +26,7 @@ public static String processCitation(String rawCitation, int consolidateCitation
             }
             HttpEntity httpResponse = HttpPostService.sendPostAndWait(
                     Globals.prefs.get(JabRefPreferences.CUSTOM_GROBID_SERVER),
-                    "api/processCitation",
+                    "/api/processCitation",
                     Map.of("citations", rawCitation, "consolidateCitations", String.valueOf(consolidateCitations))
                     ).getEntity();
             if (httpResponse == null) {
diff --git a/src/main/java/org/jabref/logic/plaintextparser/ParserPipeline.java b/src/main/java/org/jabref/logic/plaintextparser/ParserPipeline.java
index fb815cf7e52..ef84551ab2d 100644
--- a/src/main/java/org/jabref/logic/plaintextparser/ParserPipeline.java
+++ b/src/main/java/org/jabref/logic/plaintextparser/ParserPipeline.java
@@ -29,7 +29,7 @@ public class ParserPipeline {
      * @param plainText Plain reference citation to be parsed.
      * @return The BibEntry, if creation was possible.
      */
-    public static List<Optional<BibEntry>> parsePlainRefCit(String plainText) {
+    public static List<BibEntry> parsePlainRefCit(String plainText) {
         try {
             TreeSet<String> plainReferences = new TreeSet<>();
             String[] plainReferencesArray = plainText.split(";;");
@@ -40,15 +40,15 @@ public static List<Optional<BibEntry>> parsePlainRefCit(String plainText) {
             if (plainReferences.size() == 0) {
                 throw new ParserPipelineException("Your entered References are empty.");
             } else {
-                ArrayList<Optional<BibEntry>> resultsList = new ArrayList<>();
+                ArrayList<BibEntry> resultsList = new ArrayList<>();
                 for (String reference: plainReferences) {
-                    resultsList.add(parseBibToBibEntry(parseTeiToBib(parseUsingGrobid(reference))));
+                    parseBibToBibEntry(parseTeiToBib(parseUsingGrobid(reference))).ifPresent(resultsList::add);
                 }
                 return resultsList;
             }
         } catch (ParserPipelineException e) {
         LOGGER.error("ParserPipeline Failed. Reason: "+e.getMessage());
-        return null;
+        return new ArrayList<>();
         }
     }
 
@@ -65,6 +65,7 @@ private static String parseUsingGrobid(String plainText) throws ParserPipelineEx
     }
 
     private static String parseTeiToBib(String tei) {
+        System.out.println(tei);
         //TODO: THIS IS A DUMMY METHOD RIGHT NOW, SHOULD BE IMPLEMENTED
         return "@BOOK{DUMMY:1,\n" +
                 "AUTHOR=\"John Doe\",\n" +