Mathias/sqltoolkit
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Removed the old log manager & integrated the new log manager

Browse Source
This commit is contained in:
mathias
2021-08-19 12:23:58 +02:00
parent 2f396093d1
commit ca3e4d180c
5 changed files with 46 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/de/gnmyt/SQLToolkit/manager/DataBaseSelection.java
View File

@ -1,6 +1,7 @@
package de.gnmyt.SQLToolkit.manager;
import de.gnmyt.SQLToolkit.drivers.MySQLConnection;
import org.slf4j.Logger;
import java.sql.ResultSet;
import java.util.ArrayList;
@ -10,6 +11,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
public class DataBaseSelection {
private final Logger LOG = MySQLConnection.LOG;
private final MySQLConnection connection;
private final HashMap<String, Object> whereList;
private final ArrayList<Object> databaseParameters;
@ -121,8 +124,7 @@ public class DataBaseSelection {
getTempParams().forEach(v -> { messageBuilder.append((added.get()) ? ", " : "").append(v);added.set(true); });
StackTraceElement[] st = Thread.currentThread().getStackTrace();
StackTraceElement stack = st[st.length-1];
connection.getLogManager()
.sendInfo("DEBUG <" + stack.getFileName()+":"+stack.getLineNumber() + "> Statement: " + messageBuilder.toString());
LOG.debug("DEBUG <" + stack.getFileName()+":"+stack.getLineNumber() + "> Statement: " + messageBuilder.toString());
return this;
}

30
src/main/java/de/gnmyt/SQLToolkit/manager/ResultManager.java
View File

@ -1,6 +1,7 @@
package de.gnmyt.SQLToolkit.manager;
import de.gnmyt.SQLToolkit.drivers.SqlLogManager;
import de.gnmyt.SQLToolkit.drivers.MySQLConnection;
import org.slf4j.Logger;
import java.sql.ResultSet;
import java.sql.Timestamp;
@ -9,17 +10,16 @@ import java.util.HashMap;
public class ResultManager {
private ResultSet resultSet;
private SqlLogManager logManager;
private final Logger LOG = MySQLConnection.LOG;
private final ResultSet resultSet;
/**
* Basic constructor for the ResultManager
* @param resultSet Existing ResultSet
* @param logManager Existing LogManager
*/
public ResultManager(ResultSet resultSet, SqlLogManager logManager) {
public ResultManager(ResultSet resultSet) {
this.resultSet = resultSet;
this.logManager = logManager;
}
/**
@ -37,7 +37,7 @@ public class ResultManager {
*/
public Object getObject(String column) {
try { while (resultSet.next()) { return resultSet.getObject(column); }
} catch (Exception err) { logManager.sendError(err.getMessage()); }
} catch (Exception err) { LOG.error(err.getMessage()); }
return null;
}
@ -48,7 +48,7 @@ public class ResultManager {
*/
public String getString(String column) {
try { while (resultSet.next()) { return resultSet.getString(column); }
} catch (Exception err) { logManager.sendError(err.getMessage()); }
} catch (Exception err) { LOG.error(err.getMessage()); }
return "";
}
@ -59,7 +59,7 @@ public class ResultManager {
*/
public Integer getInteger(String column) {
try { while (resultSet.next()) { return resultSet.getInt(column); }
} catch (Exception err) { logManager.sendError(err.getMessage()); }
} catch (Exception err) { LOG.error(err.getMessage()); }
return 0;
}
@ -70,13 +70,13 @@ public class ResultManager {
*/
public Boolean getBoolean(String column) {
try { while (resultSet.next()) { return resultSet.getBoolean(column); }
} catch (Exception err) { logManager.sendError(err.getMessage()); }
} catch (Exception err) { LOG.error(err.getMessage()); }
return false;
}
public Timestamp getTimestamp(String column) {
try { while (resultSet.next()) { return resultSet.getTimestamp(column); }
} catch (Exception err) { logManager.sendError(err.getMessage()); }
} catch (Exception err) { LOG.error(err.getMessage()); }
return null;
}
@ -86,7 +86,7 @@ public class ResultManager {
*/
public Integer getRowCount() {
int count=0;
try { while (resultSet.next()) { count++; } } catch (Exception err) { logManager.sendError(err.getMessage()); }
try { while (resultSet.next()) { count++; } } catch (Exception err) { LOG.error(err.getMessage()); }
return count;
}
@ -98,7 +98,7 @@ public class ResultManager {
public ArrayList<String> getList(String column) {
ArrayList<String> results = new ArrayList<>();
try { while (resultSet.next()) { results.add(resultSet.getString(column)); }
} catch (Exception err) { logManager.sendError(err.getMessage()); }
} catch (Exception err) { LOG.error(err.getMessage()); }
return results;
}
@ -112,7 +112,7 @@ public class ResultManager {
HashMap<String, String> results = new HashMap<>();
try { while (resultSet.next()) {
results.put(resultSet.getString(column), resultSet.getString(column2)); }
} catch (Exception err) { logManager.sendError(err.getMessage()); }
} catch (Exception err) { LOG.error(err.getMessage()); }
return results;
}
@ -131,7 +131,7 @@ public class ResultManager {
}
results.add(result);
}
} catch (Exception err) { logManager.sendError(err.getMessage()); }
} catch (Exception err) { LOG.error(err.getMessage()); }
return results;
}

9
src/main/java/de/gnmyt/SQLToolkit/manager/UpdateManager.java
View File

@ -2,6 +2,7 @@ package de.gnmyt.SQLToolkit.manager;
import de.gnmyt.SQLToolkit.drivers.MySQLConnection;
import de.gnmyt.SQLToolkit.generator.TableGenerator;
import org.slf4j.Logger;
import java.util.ArrayList;
import java.util.HashMap;
@ -9,6 +10,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
public class UpdateManager {
private final Logger LOG = MySQLConnection.LOG;
private MySQLConnection connection;
private String tableName;
private HashMap<String, Object> whereList;
@ -67,8 +70,7 @@ public class UpdateManager {
whereList.values().forEach(v -> { messageBuilder.append((added.get()) ? ", " : "").append(v);added.set(true); });
StackTraceElement[] st = Thread.currentThread().getStackTrace();
StackTraceElement stack = st[st.length-1];
connection.getLogManager()
.sendInfo("DEBUG <" + stack.getFileName()+":"+stack.getLineNumber() + "> Statement: " + messageBuilder.toString());
LOG.debug("DEBUG <" + stack.getFileName()+":"+stack.getLineNumber() + "> Statement: " + messageBuilder.toString());
return this;
}
@ -84,8 +86,7 @@ public class UpdateManager {
getTempParams().forEach(v -> { messageBuilder.append((added.get()) ? ", " : "").append(v);added.set(true); });
StackTraceElement[] st = Thread.currentThread().getStackTrace();
StackTraceElement stack = st[st.length-1];
connection.getLogManager()
.sendInfo("DEBUG <" + stack.getFileName()+":"+stack.getLineNumber() + "> Statement: " + messageBuilder.toString());
LOG.debug("DEBUG <" + stack.getFileName()+":"+stack.getLineNumber() + "> Statement: " + messageBuilder.toString());
return this;
}