Switch to org.postgresql

build.gradle

@@ -113,7 +113,7 @@ dependencies {
  // VersionEye states that 6.0.5 is the most recent version, but http://dev.mysql.com/downloads/connector/j/ shows that as "Development Release"
  compile 'mysql:mysql-connector-java:5.1.46'
 
- compile 'com.impossibl.pgjdbc-ng:pgjdbc-ng:0.7.1'
+ compile 'org.postgresql:postgresql:42.2.2'
 
  compile 'net.java.dev.glazedlists:glazedlists_java15:1.9.1'
 
@@ -314,7 +314,7 @@ test {
  useJUnitPlatform {
  excludeTags 'DatabaseTest', 'FetcherTest', 'GUITest', 'org.jabref.testutils.category.FetcherTest', 'org.jabref.testutils.category.GUITest'
  }
- 
+
  testLogging {
  // set options for log level LIFECYCLE
  events "failed"
@@ -375,7 +375,7 @@ checkstyle {
  // do not use other packages for checkstyle, excluding gen(erated) sources
  checkstyleMain.source = "src/main/java"
  toolVersion = '8.5'
- 
+
  // do not perform checkstyle checks by default
  sourceSets = []
 }

src/main/java/org/jabref/logic/shared/PostgreSQLProcessor.java

@@ -4,24 +4,18 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import org.jabref.logic.shared.listener.PostgresSQLNotificationListener;
 import org.jabref.model.database.shared.DatabaseConnection;
 import org.jabref.model.entry.BibEntry;
 
-import com.impossibl.postgres.api.jdbc.PGConnection;
-import com.impossibl.postgres.jdbc.PGDataSource;
-import com.impossibl.postgres.jdbc.ThreadedHousekeeper;
+import org.postgresql.PGConnection;
 
 /**
  * Processes all incoming or outgoing bib data to PostgreSQL database and manages its structure.
  */
 public class PostgreSQLProcessor extends DBMSProcessor {
 
- private PGConnection pgConnection;
-
  private PostgresSQLNotificationListener listener;
 
 
@@ -89,23 +83,16 @@ String escape(String expression) {
  @Override
  public void startNotificationListener(DBMSSynchronizer dbmsSynchronizer) {
  // Disable cleanup output of ThreadedHousekeeper
- Logger.getLogger(ThreadedHousekeeper.class.getName()).setLevel(Level.SEVERE);
-
- this.listener = new PostgresSQLNotificationListener(dbmsSynchronizer);
+ //Logger.getLogger(ThreadedHousekeeper.class.getName()).setLevel(Level.SEVERE);
 
- PGDataSource dataSource = new PGDataSource();
- dataSource.setHost(connectionProperties.getHost());
- dataSource.setPort(connectionProperties.getPort());
- dataSource.setDatabase(connectionProperties.getDatabase());
- dataSource.setUser(connectionProperties.getUser());
- dataSource.setPassword(connectionProperties.getPassword());
 
  try {
- pgConnection = (PGConnection) dataSource.getConnection();
- pgConnection.createStatement().execute("LISTEN jabrefLiveUpdate");
+ connection.createStatement().execute("LISTEN jabrefLiveUpdate");
  // Do not use `new PostgresSQLNotificationListener(...)` as the object has to exist continuously!
  // Otherwise the listener is going to be deleted by GC.
- pgConnection.addNotificationListener(listener);
+ PGConnection pgConnection = connection.unwrap(PGConnection.class);
+ listener = new PostgresSQLNotificationListener(dbmsSynchronizer, pgConnection);
+ listener.start();
  } catch (SQLException e) {
  LOGGER.error("SQL Error: ", e);
  }
@@ -114,7 +101,7 @@ public void startNotificationListener(DBMSSynchronizer dbmsSynchronizer) {
  @Override
  public void stopNotificationListener() {
  try {
- pgConnection.close();
+ connection.close();
  } catch (SQLException e) {
  LOGGER.error("SQL Error: ", e);
  }
@@ -123,7 +110,7 @@ public void stopNotificationListener() {
  @Override
  public void notifyClients() {
  try {
- pgConnection.createStatement().execute("NOTIFY jabrefLiveUpdate, '" + PROCESSOR_ID + "';");
+ connection.createStatement().execute("NOTIFY jabrefLiveUpdate, '" + PROCESSOR_ID + "';");
  } catch (SQLException e) {
  LOGGER.error("SQL Error: ", e);
  }

src/main/java/org/jabref/logic/shared/listener/PostgresSQLNotificationListener.java

@@ -1,27 +1,50 @@
 package org.jabref.logic.shared.listener;
 
+import java.sql.SQLException;
+
 import org.jabref.logic.shared.DBMSProcessor;
 import org.jabref.logic.shared.DBMSSynchronizer;
 
-import com.impossibl.postgres.api.jdbc.PGNotificationListener;
+import org.postgresql.PGConnection;
+import org.postgresql.PGNotification;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A listener for PostgreSQL database notifications.
  */
-public class PostgresSQLNotificationListener implements PGNotificationListener {
+public class PostgresSQLNotificationListener extends Thread {
 
- private final DBMSSynchronizer dbmsSynchronizer;
+ private static final Logger LOGGER = LoggerFactory.getLogger(PostgresSQLNotificationListener.class);
 
+ private final DBMSSynchronizer dbmsSynchronizer;
+ private final PGConnection pgConnection;
 
- public PostgresSQLNotificationListener(DBMSSynchronizer dbmsSynchronizer) {
+ public PostgresSQLNotificationListener(DBMSSynchronizer dbmsSynchronizer, PGConnection pgConnection) {
  this.dbmsSynchronizer = dbmsSynchronizer;
+ this.pgConnection = pgConnection;
  }
 
  @Override
- public void notification(int processId, String channel, String payload) {
- if (!payload.equals(DBMSProcessor.PROCESSOR_ID)) {
- dbmsSynchronizer.pullChanges();
+ public void run() {
+ try {
+ //noinspection InfiniteLoopStatement
+ while (true) {
+ PGNotification notifications[] = pgConnection.getNotifications();
+
+ if (notifications != null) {
+ for (PGNotification notification : notifications) {
+ if (!notification.getName().equals(DBMSProcessor.PROCESSOR_ID)) {
+ dbmsSynchronizer.pullChanges();
+ }
+ }
+ }
+
+ // Wait a while before checking again for new notifications
+ Thread.sleep(500);
+ }
+ } catch (SQLException | InterruptedException exception) {
+ LOGGER.error("Error while listening for updates to PostgresSQL", exception);
  }
  }
-
 }