Rel 1.7: ReadJDBC converted to use reflection - 1st stage (hard-wired…

… jar file name)
jpaulm · Oct 19, 2020 · d96599d · d96599d
1 parent 404afa5
commit d96599d
Show file tree

Hide file tree

Showing 11 changed files with 110 additions and 49 deletions.
diff --git a/build.gradle b/build.gradle
@@ -33,7 +33,7 @@ apply plugin: 'java-library'
 
 }
 
-version = '4.1.6'
+version = '4.1.7'
 
 group = 'com.jpaulmorrison'
 
@@ -63,7 +63,7 @@ repositories {
 
 dependencies { 	
 	implementation ('com.google.code.gson:gson:2.8.6')
-	implementation ('mysql:mysql-connector-java:8.0.21')
+	//implementation ('mysql:mysql-connector-java:8.0.21')
 
  }  
 
@@ -137,7 +137,7 @@ description = "Create default maven directory structure"
 
             groupId = 'com.jpaulmorrison'
             artifactId = 'javafbp'       
-            version = '4.1.6'
+            version = '4.1.7'
 
             from components.java
 

diff --git a/build/distributions/javafbp-4.1.7.tar b/build/distributions/javafbp-4.1.7.tar
diff --git a/build/distributions/javafbp-4.1.7.zip b/build/distributions/javafbp-4.1.7.zip
diff --git a/build/libs/javafbp-4.1.7-javadoc.jar b/build/libs/javafbp-4.1.7-javadoc.jar
diff --git a/build/libs/javafbp-4.1.7-sources.jar b/build/libs/javafbp-4.1.7-sources.jar
diff --git a/build/libs/javafbp-4.1.7.jar b/build/libs/javafbp-4.1.7.jar
diff --git a/build/scripts/javafbp b/build/scripts/javafbp
@@ -80,7 +80,7 @@ case "`uname`" in
     ;;
 esac
 
-CLASSPATH=$APP_HOME/lib/javafbp-4.1.6.jar:$APP_HOME/lib/gson-2.8.6.jar:$APP_HOME/lib/mysql-connector-java-8.0.21.jar:$APP_HOME/lib/protobuf-java-3.11.4.jar
+CLASSPATH=$APP_HOME/lib/javafbp-4.1.7.jar:$APP_HOME/lib/gson-2.8.6.jar
 
 
 # Determine the Java command to use to start the JVM.

diff --git a/build/scripts/javafbp.bat b/build/scripts/javafbp.bat
@@ -82,7 +82,7 @@ set CMD_LINE_ARGS=%*
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\lib\javafbp-4.1.6.jar;%APP_HOME%\lib\gson-2.8.6.jar;%APP_HOME%\lib\mysql-connector-java-8.0.21.jar;%APP_HOME%\lib\protobuf-java-3.11.4.jar
+set CLASSPATH=%APP_HOME%\lib\javafbp-4.1.7.jar;%APP_HOME%\lib\gson-2.8.6.jar
 
 
 @rem Execute javafbp

diff --git a/src/main/java/com/jpaulmorrison/fbp/core/components/jdbc/ReadJDBC.java b/src/main/java/com/jpaulmorrison/fbp/core/components/jdbc/ReadJDBC.java
@@ -1,14 +1,32 @@
 package com.jpaulmorrison.fbp.core.components.jdbc;
 
 
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.InputStreamReader;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+
+/*
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.sql.Statement;
+*/
 
-import java.sql.*;
 import java.util.HashMap;
-
+ 
 import com.google.gson.Gson;
 import com.jpaulmorrison.fbp.core.engine.Component; // Using 'Connection', 'Statement' and 'ResultSet' classes in java.sql package
 import com.jpaulmorrison.fbp.core.engine.ComponentDescription;
@@ -72,7 +90,7 @@ protected void execute() throws Exception {
 
 
 		//Class<?> curClass = cls;
-		Class<?> curClass = Class.forName(objClass);
+		Class<?> dataClass = Class.forName(objClass);
 
 		String[] iipContents = dbTable.split("!", 2);
 
@@ -100,64 +118,107 @@ protected void execute() throws Exception {
 			}
 
 
-		try (
+		String userName = System.getProperty("user.name");
+		File f = new File("C:\\Users\\" + userName + "\\.m2\\repository\\mysql\\mysql-connector-java\\8.0.21\\mysql-connector-java-8.0.21.jar");
+
+		URL[] urls = {f.toURI().toURL()};
+		URLClassLoader ucl = new URLClassLoader(urls);
+		Class<?> conn_cls = ucl.loadClass("java.sql.Connection");
+		Class<?> dm_cls = ucl.loadClass("java.sql.DriverManager");
+		Class<?> stmt_cls = ucl.loadClass("java.sql.Statement");
+		Class<?> rs_cls = ucl.loadClass("java.sql.ResultSet");
+		Class<?> rsmd_cls = ucl.loadClass("java.sql.ResultSetMetaData");
+		//Class<?> se_cls = ucl.loadClass("java.sql.SQLException");
+
+		Class<?>[] carr = {String.class, String.class, String.class};
+		//Object conn = conn_cls.newInstance();
+
+
+
+		try  
+		{
+				Method gc = dm_cls.getMethod("getConnection", carr);
+				Object conn = gc.invoke(null, iipContents[0] + 
+						"?allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=UTC", 
+						user, pswd);                         // o1 is a Connection
+
+				Method cs = conn_cls.getMethod("createStatement");
+				Object stmt = cs.invoke(conn);                   //o2 is a Statement 
+				//@SuppressWarnings("resource")
+				//Statement stmt = (Statement) o2;
 
 				// Step 1: Allocate a database 'Connection' object
-				Connection conn = DriverManager.getConnection(
+				//Connection conn = DriverManager.getConnection(
 						// "jdbc:mysql://localhost:3306/ebookshop?allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=UTC",
 						// "root", pswd); // For MySQL only
 
-						iipContents[0] + "?allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=UTC", user, pswd);
+				//		iipContents[0] + "?allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=UTC", user, pswd);
 
-				Statement stmt = conn.createStatement();
+				//Statement stmt = conn.createStatement();
 
-		) {
+				//		) 
+
 
 			String strSelect = "select * from " + iipContents[1];
-			System.out.println("The SQL statement is: \"" + strSelect + "\"\n"); // Echo
-																					// For
-																					// debugging
+			System.out.println("The SQL statement is: \"" + strSelect + "\"\n");  
+
+			Class<?>[] carr2 = {String.class};
 
-			ResultSet rset = stmt.executeQuery(strSelect);
+			Method eq = stmt_cls.getMethod("executeQuery", carr2);	
+
+			Object rset2 = eq.invoke(stmt, strSelect);  // o3 is ResultSet
+
+			//ResultSet rset = stmt.executeQuery(strSelect);
 
-			ResultSetMetaData rsmd;
+			Object rsmd2;
 			int numberOfColumns = 0;
 			HashMap<String, String> hmColumns = new HashMap<String, String>();
 			try {
-				rsmd = rset.getMetaData();
-				numberOfColumns = rsmd.getColumnCount();
+				Method gmd = rs_cls.getMethod("getMetaData");
+		    	rsmd2 = gmd.invoke(rset2);
+		    	//rsmd = rset.getMetaData();
+		    	Method gcc = rsmd_cls.getMethod("getColumnCount");
+		    	numberOfColumns  = (int) gcc.invoke(rsmd2);
+				//numberOfColumns = rsmd.getColumnCount();
+		    	Method gcn = rsmd_cls.getMethod("getColumnName", int.class);
+		    	Method gct = rsmd_cls.getMethod("getColumnTypeName", int.class);
+
 				for (int i = 1; i <= numberOfColumns; i++) {
-					hmColumns.put(rsmd.getColumnName(i), rsmd.getColumnTypeName(i));
+					String colName  = (String) gcn.invoke(rsmd2, i);
+					String colTypeName  = (String) gct.invoke(rsmd2, i);
+					hmColumns.put(colName, colTypeName);
 				}
-			} catch (SQLException e) {
+			} catch (Exception e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
 
 			// number of columns should match number of fields in curClass - so
 			// let's test...
 
-			int n = curClass.getFields().length;
-			if (n != numberOfColumns) {
+			int n2= dataClass.getFields().length;
+			if (n2 != numberOfColumns) {
 				System.out.println(
-						"Number of class fields - " + n + " does not match number of columns - " + numberOfColumns);
+						"Number of class fields - " + n2 + " does not match number of columns - " + numberOfColumns);
 				return;
 			}
 
 			HashMap<String, Class<?>> hmFields = new HashMap<String, Class<?>>();
 
-			for (Field fd: curClass.getFields()) {
+			for (Field fd: dataClass.getFields()) {
 				hmFields.put(fd.getName(), fd.getType());
 			}
 
 			// iterate through rows
 
 			int rowCount = 0;
-			while (rset.next()) { // Move the cursor to the next row, return
+			Method next = rs_cls.getMethod("next");
+	    	boolean nxt = (boolean) next.invoke(rset2);
+			while (nxt) { // Move the cursor to the next row, return
 									// false if no more row
 				Object obj = null;
 				try {
-					obj = curClass.newInstance();
+					obj = dataClass.newInstance();
 				} catch (InstantiationException e) {
 					// handle 1
 				} catch (IllegalAccessException e) {
@@ -188,12 +249,12 @@ protected void execute() throws Exception {
 
 					if (objFType.startsWith("class ")) {
 						int k = objFType.lastIndexOf(".");
-						String s = objFType.substring(k + 1);
-						if (s.equals("BigDecimal")) 
-								s = "Decimal";
-						getMethodName = "get" + s;
+						String s2 = objFType.substring(k + 1);
+						if (s2.equals("BigDecimal")) 
+								s2 = "Decimal";
+						getMethodName = "get" + s2;
 						try {
-							ResultSet.class.getMethod(getMethodName, cArg);
+							rs_cls.getMethod(getMethodName, cArg);
 						} catch (NoSuchMethodException e)
 						{
 							getMethodName = "getString";
@@ -212,29 +273,29 @@ protected void execute() throws Exception {
 					Object o = null;
 
 					try {
-						meth = ResultSet.class.getMethod(getMethodName, cArg);
+						meth = rs_cls.getMethod(getMethodName, cArg);
 					} catch (NoSuchMethodException e) {
 						System.out.println("Missing method - trying method: '" + getMethodName + "()' on '" + colName
 								+ "' " + hmColumns.get(colName) + " (target: '" + objField + "' "
 								+ hmFields.get(objField) + ")");
 					}
 
 					try {
-					o = meth.invoke(rset, colName);
+					o = meth.invoke(rset2, colName);
 					} catch (InvocationTargetException e) {
 						e.printStackTrace();
 					}
 
-					Field fd = curClass.getField(objField);
+					Field fd = dataClass.getField(objField);
 
 					try {
 						fd.set(obj, o);
 					} catch (Exception e) {						
-						String s = hmFields.get(objField).toString();
+						String s2 = hmFields.get(objField).toString();
 						//System.out.println("class is " + s); 
-						s = s.substring(6);
+						s2 = s2.substring(6);
 						//Object oo = Class.forName(s).newInstance();
-						Constructor<?> cons = Class.forName(s).getConstructor(cArg);
+						Constructor<?> cons = Class.forName(s2).getConstructor(cArg);
 						Object oo = cons.newInstance((String) o);
 						try {
 						fd.set(obj, oo);
@@ -246,22 +307,22 @@ protected void execute() throws Exception {
 				}
 				outPort.send(create(obj));
 				++rowCount;
+				nxt = (boolean) next.invoke(rset2);
 			}
 
 			System.out.println("Total number of records = " + rowCount);
 			// outPort.send(create("Total number of records = " + rowCount));
 
-		} catch (SQLException ex) {
-			//System.out.println("SQL Exception");
-			ex.printStackTrace();
 		} catch (ClassNotFoundException ex) {
 			//System.out.println("Class Not Found Exception");
 			ex.printStackTrace();
-		}
-		catch (InvocationTargetException ex) {
+		} catch (InvocationTargetException ex) {
 			//System.out.println("Class Not Found Exception");
 			ex.printStackTrace();
-		}
+		} catch (Exception ex) {
+			//System.out.println("SQL Exception");
+			ex.printStackTrace();
+		} 
 
 		// Step 5: Close conn and stmt - Done automatically by
 		// try-with-resources (JDK 7)

diff --git a/src/main/java/com/jpaulmorrison/fbp/core/engine/VersionAndTimestamp.java b/src/main/java/com/jpaulmorrison/fbp/core/engine/VersionAndTimestamp.java
@@ -25,9 +25,9 @@ public final class VersionAndTimestamp {
 	 *   
 	 */
 
-  private static String version = "JavaFBP - version 4.1.6";
+  private static String version = "JavaFBP - version 4.1.7";
 
-  private static String date = "Sept. 7, 2020";
+  private static String date = "Oct. 19, 2020";
 
   static String getVersion() {
     return version;

diff --git a/src/main/java/com/jpaulmorrison/fbp/resourcekit/examples/networks/MergeandSort.java b/src/main/java/com/jpaulmorrison/fbp/resourcekit/examples/networks/MergeandSort.java
@@ -42,13 +42,13 @@ protected void define() {
     component("_Sort", Sort.class);
     component("_Generate_1st_group", GenerateTestData.class);
     component("_Generate_2nd_group", GenerateTestData.class);
-    initialize("100 ", component("_Generate_1st_group"), port("COUNT"));
+    initialize("10", component("_Generate_1st_group"), port("COUNT"));
     connect(component("_Generate_2nd_group"), port("OUT"), component("_Sort"), port("IN"));
     connect(component("_Generate_1st_group"), port("OUT"), component("_Sort"), port("IN"));
     //connect(component("_Write_text_to_pane"), port("OUT"), component("_Discard"), port("IN"));
     initialize("Sorted Data", component("_Write_text_to_pane"), port("TITLE"));
     connect(component("_Sort"), port("OUT"), component("_Write_text_to_pane"), port("IN"));
-    initialize("50", component("_Generate_2nd_group"), port("COUNT"));
+    initialize("5", component("_Generate_2nd_group"), port("COUNT"));
 
   }