Remove dependency on http://impossibl.github.io/pgjdbc-ng

JabRef · Dec 25, 2016 · 6ed686c · 6ed686c
1 parent b79f153
commit 6ed686c
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 92 deletions.
diff --git a/build.gradle b/build.gradle
@@ -102,7 +102,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.40'
 
-    compile 'com.impossibl.pgjdbc-ng:pgjdbc-ng:0.6'
+    compile 'org.postgresql:postgresql:9.4.1210'
 
     compile 'net.java.dev.glazedlists:glazedlists_java15:1.9.1'
     compile fileTree(dir: 'lib', includes: ['*.jar'])

diff --git a/external-libraries.txt b/external-libraries.txt
@@ -52,11 +52,6 @@ Project: java-diff-utils
 URL:     https://github.com/bkromhout/java-diff-utils
 License: Apache-2.0
 
-Id:      com.impossibl.pgjdbc-ng:pgjdbc-ng
-Project: pgjdbc-ng
-URL:     http://impossibl.github.io/pgjdbc-ng
-License: BSD
-
 Id:      com.jgoodies:jgoodies-common
 Project: JGoodies Common
 URL:     http://www.jgoodies.com/downloads/libraries/

diff --git a/src/main/java/net/sf/jabref/shared/DBMSType.java b/src/main/java/net/sf/jabref/shared/DBMSType.java
@@ -18,8 +18,8 @@ public enum DBMSType {
             "jdbc:oracle:thin:@%s:%d:%s", 1521),
     POSTGRESQL(
             "PostgreSQL",
-            "com.impossibl.postgres.jdbc.PGDriver",
-            "jdbc:pgsql://%s:%d/%s", 5432);
+            "org.postgresql.Driver",
+            "jdbc:postgresql://%s:%d/%s", 5432);
 
     private final String type;
     private final String driverPath;

diff --git a/src/main/java/net/sf/jabref/shared/PostgreSQLProcessor.java b/src/main/java/net/sf/jabref/shared/PostgreSQLProcessor.java
@@ -4,26 +4,14 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import net.sf.jabref.model.entry.BibEntry;
-import net.sf.jabref.shared.listener.PostgresSQLNotificationListener;
-
-import com.impossibl.postgres.api.jdbc.PGConnection;
-import com.impossibl.postgres.jdbc.PGDataSource;
-import com.impossibl.postgres.jdbc.ThreadedHousekeeper;
 
 /**
  * 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;
-
-
     public PostgreSQLProcessor(DBMSConnection connection) {
         super(connection);
     }
@@ -85,47 +73,4 @@ String escape(String expression) {
         return "\"" + 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);
-
-        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");
-            // 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);
-        } catch (SQLException e) {
-            LOGGER.error("SQL Error: ", e);
-        }
-    }
-
-    @Override
-    public void stopNotificationListener() {
-        try {
-            pgConnection.close();
-        } catch (SQLException e) {
-            LOGGER.error("SQL Error: ", e);
-        }
-    }
-
-    @Override
-    public void notifyClients() {
-        try {
-            pgConnection.createStatement().execute("NOTIFY jabrefLiveUpdate, '" + PROCESSOR_ID + "';");
-        } catch (SQLException e) {
-            LOGGER.error("SQL Error: ", e);
-        }
-    }
 }
diff --git a/src/main/java/net/sf/jabref/shared/listener/PostgresSQLNotificationListener.java b/src/main/java/net/sf/jabref/shared/listener/PostgresSQLNotificationListener.java
diff --git a/src/test/java/net/sf/jabref/shared/DBMSTypeTest.java b/src/test/java/net/sf/jabref/shared/DBMSTypeTest.java
@@ -20,7 +20,7 @@ public void testToString() {
     public void testGetDriverClassPath() {
         Assert.assertEquals("com.mysql.jdbc.Driver", DBMSType.MYSQL.getDriverClassPath());
         Assert.assertEquals("oracle.jdbc.driver.OracleDriver", DBMSType.ORACLE.getDriverClassPath());
-        Assert.assertEquals("com.impossibl.postgres.jdbc.PGDriver", DBMSType.POSTGRESQL.getDriverClassPath());
+        Assert.assertEquals("org.postgresql.Driver", DBMSType.POSTGRESQL.getDriverClassPath());
     }
 
     @Test
@@ -35,7 +35,7 @@ public void testFromString() {
     public void testGetUrl() {
         Assert.assertEquals("jdbc:mysql://localhost:3306/xe", DBMSType.MYSQL.getUrl("localhost", 3306, "xe"));
         Assert.assertEquals("jdbc:oracle:thin:@localhost:1521:xe", DBMSType.ORACLE.getUrl("localhost", 1521, "xe"));
-        Assert.assertEquals("jdbc:pgsql://localhost:5432/xe", DBMSType.POSTGRESQL.getUrl("localhost", 5432, "xe"));
+        Assert.assertEquals("jdbc:postgresql://localhost:5432/xe", DBMSType.POSTGRESQL.getUrl("localhost", 5432, "xe"));
     }
 
     @Test