A dual world: Derby 10.4 and 10.14+

Author: egonw

org.bridgedb.rdb.construct/src/org/bridgedb/rdb/construct/DBConnectorDerbyServer.java

@@ -65,11 +65,12 @@ public Connection createConnection(String dbName) throws IDMapperException
 		try
 		{
 			sysprop.setProperty("derby.stream.error.file", File.createTempFile("derby",".log").toString());
-			Class.forName("org.apache.derby.jdbc.ClientDriver");
-		}
-		catch (ClassNotFoundException e)
-		{
-			throw new IDMapperException (e);
+            try {
+				Class.forName("org.apache.derby.jdbc.ClientDriver"); // Derby 10.4
+				System.out.println("Derby ClientDriver loaded");
+            } catch (ClassNotFoundException e) {
+            	// ignore, probably we're running this with Derby 10.14 or higher
+            }
 		}
 		catch (IOException f)
 		{

org.bridgedb.rdb.construct/src/org/bridgedb/rdb/construct/DataDerby.java

@@ -123,11 +123,12 @@ public Connection createConnection(String dbName, int props) throws IDMapperExce
 		{
 			sysprop.setProperty("derby.storage.tempDirectory", System.getProperty("java.io.tmpdir"));
 			sysprop.setProperty("derby.stream.error.file", File.createTempFile("derby",".log").toString());
-			Class.forName("org.apache.derby.jdbc.ClientDriver");
-		}
-		catch (ClassNotFoundException e)
-		{
-			throw new IDMapperException (e);
+            try {
+				Class.forName("org.apache.derby.jdbc.ClientDriver"); // Derby 10.4
+				System.out.println("Derby ClientDriver loaded");
+            } catch (ClassNotFoundException e) {
+            	// ignore, probably we're running this with Derby 10.14 or higher
+            }
 		}
 		catch (IOException f)
 		{

org.bridgedb.rdb/src/org/bridgedb/rdb/IDMapperRdb.java

@@ -89,8 +89,13 @@ public IDMapper connect(String location) throws IDMapperException
 
 	            String host = args.containsKey("host") ? args.get("host") : "wikipathways.org";
 	            String port = args.containsKey("port") ? args.get("port") : "1527";
-	            
-				Class.forName("org.apache.derby.jdbc.ClientDriver");
+
+	            try {
+					Class.forName("org.apache.derby.jdbc.ClientDriver"); // Derby 10.4
+					System.out.println("Derby ClientDriver loaded");
+	            } catch (ClassNotFoundException e) {
+	            	// ignore, probably we're running this with Derby 10.14 or higher
+	            }
 				Properties sysprop = System.getProperties();
 				sysprop.setProperty("derby.storage.tempDirectory", System.getProperty("java.io.tmpdir"));
 				sysprop.setProperty("derby.stream.error.file", File.createTempFile("derby",".log").toString());
@@ -102,10 +107,6 @@ public IDMapper connect(String location) throws IDMapperException
 			{
 				throw new IDMapperException (e);
 			}
-			catch (ClassNotFoundException e)
-			{
-				throw new IDMapperException (e);
-			}
 		}
 	}
 

org.bridgedb.rdb/test/org/bridgedb/rdb/Test.java

@@ -151,7 +151,6 @@ public void testSimpleGdb() throws ClassNotFoundException, IDMapperException, IO
 		Class.forName("org.bridgedb.file.IDMapperText");
 		Class.forName("org.bridgedb.rdb.IDMapperRdb");
 		Class.forName("com.mysql.jdbc.Driver");
-		// no longer needed?? Class.forName("org.apache.derby.jdbc.ClientDriver");
 
 		String fileName = "yeast_id_mapping";
 		String fullName = fileName + ".txt";
@@ -181,8 +180,13 @@ public void testDerbyClient() throws IDMapperException, ClassNotFoundException {
 		long start, end, delta;
 		start = System.currentTimeMillis();
 		Class.forName ("org.bridgedb.rdb.IDMapperRdb");
-		Class.forName ("org.apache.derby.jdbc.ClientDriver");
-		
+        try {
+			Class.forName("org.apache.derby.jdbc.ClientDriver"); // Derby 10.4
+			System.out.println("Derby ClientDriver loaded");
+        } catch (ClassNotFoundException e) {
+        	// ignore, probably we're running this with Derby 10.14 or higher
+        }
+
 		IDMapper mapper = BridgeDb.connect ("idmapper-derbyclient:Homo sapiens?host=www.wikipathways.org");
 		end = System.currentTimeMillis();
 		delta = end - start;