From a696ddfc3104fd18654689847e30d32de3dcd89e Mon Sep 17 00:00:00 2001
From: Peter Hormanns <peter.hormanns@jalin.de>
Date: Tue, 19 Sep 2017 20:50:14 +0200
Subject: [PATCH] load config on queue-server

---
 hsarback/src/de/hsadmin/core/qserv/JDBCProcessor.java              |   35 ++++++++++++-----------------------
 hsarback/src/de/hsadmin/mods/db/MySqlDatabaseProcessorFactory.java |   11 ++++++-----
 hsarback/src/de/hsadmin/mods/db/PgSqlDatabaseProcessorFactory.java |    6 +++---
 3 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/hsarback/src/de/hsadmin/core/qserv/JDBCProcessor.java b/hsarback/src/de/hsadmin/core/qserv/JDBCProcessor.java
index 3a7da87..8ec1b94 100644
--- a/hsarback/src/de/hsadmin/core/qserv/JDBCProcessor.java
+++ b/hsarback/src/de/hsadmin/core/qserv/JDBCProcessor.java
@@ -18,25 +18,24 @@
 
 	final private String driver;
 	final private String url;
-	final private String user;
-	final private String password;
 	final private List<String> sql;
 	
 	private String errorMsg;
 
-	public JDBCProcessor(final String driver, final String url, final String user, final String password) {
-		this.driver = driver;
-		this.url = url;
-		this.user = user;
-		this.password = password;
-		this.errorMsg = "";
-		this.sql = new ArrayList<String>();
-		LOG.info("Constructor 1 - DB-User: " + user + "  Password: " + password);
-	}
-
 	public JDBCProcessor(final String driver, final String url) throws ProcessorException {
 		this.driver = driver;
 		this.url = url;
+		this.errorMsg = "";
+		this.sql = new ArrayList<String>();
+	}
+
+	public void addSQL(String sqlStatement) {
+		sql.add(sqlStatement);
+	}
+
+	public Object process() throws ProcessorException {
+		Connection c = null;
+		String user, password;
 		final Config config = Config.getInstance();
 		if ("com.mysql.jdbc.Driver".equals(driver)) {
 			user = config.getProperty("mysqladmin.user", "root");
@@ -49,17 +48,7 @@
 				throw new ProcessorException("database admin-user configuration failed");
 			}
 		}
-		LOG.info("Constructor 2 - DB-User: " + user + "  Password: " + password);
-		this.errorMsg = "";
-		this.sql = new ArrayList<String>();
-	}
-
-	public void addSQL(String sqlStatement) {
-		sql.add(sqlStatement);
-	}
-
-	public Object process() throws ProcessorException {
-		Connection c = null;
+		LOG.info("process() - DB-User: " + user + "  Password: " + password);
 		try {
 			Class.forName(driver);
 			c = DriverManager.getConnection(url, user, password);
diff --git a/hsarback/src/de/hsadmin/mods/db/MySqlDatabaseProcessorFactory.java b/hsarback/src/de/hsadmin/mods/db/MySqlDatabaseProcessorFactory.java
index 4e267cb..1162139 100644
--- a/hsarback/src/de/hsadmin/mods/db/MySqlDatabaseProcessorFactory.java
+++ b/hsarback/src/de/hsadmin/mods/db/MySqlDatabaseProcessorFactory.java
@@ -15,11 +15,12 @@
  * @author mi
  */
 public class MySqlDatabaseProcessorFactory implements EntityProcessorFactory {
-	public static JDBCProcessor createMySqlProcessor(String database,
-			String user, String password) {
-		return new JDBCProcessor("com.mysql.jdbc.Driver",
-				"jdbc:mysql://localhost/" + database, user, password);
-	}
+	
+//	public static JDBCProcessor createMySqlProcessor(String database,
+//			String user, String password) {
+//		return new JDBCProcessor("com.mysql.jdbc.Driver",
+//				"jdbc:mysql://localhost/" + database, user, password);
+//	}
 
 	public static JDBCProcessor createMySqlAdminProcessor() throws ProcessorException {
 		return new JDBCProcessor("com.mysql.jdbc.Driver", "jdbc:mysql://localhost/");
diff --git a/hsarback/src/de/hsadmin/mods/db/PgSqlDatabaseProcessorFactory.java b/hsarback/src/de/hsadmin/mods/db/PgSqlDatabaseProcessorFactory.java
index 4460c8b..609dfe4 100644
--- a/hsarback/src/de/hsadmin/mods/db/PgSqlDatabaseProcessorFactory.java
+++ b/hsarback/src/de/hsadmin/mods/db/PgSqlDatabaseProcessorFactory.java
@@ -10,9 +10,9 @@
 
 public class PgSqlDatabaseProcessorFactory implements EntityProcessorFactory {
 	
-	public static JDBCProcessor createPostgreSqlProcessor(String user, String password) {
-		return new JDBCProcessor("org.postgresql.Driver", "jdbc:postgresql://localhost/template1", user, password);
-	}
+//	public static JDBCProcessor createPostgreSqlProcessor(String user, String password) {
+//		return new JDBCProcessor("org.postgresql.Driver", "jdbc:postgresql://localhost/template1", user, password);
+//	}
 
 	public static JDBCProcessor createPostgreSqlAdminProcessor() throws ProcessorException {
 		return new JDBCProcessor("org.postgresql.Driver", "jdbc:postgresql://localhost/template1");

--
Gitblit v1.9.0-SNAPSHOT