+added log4j2, +changed Databaseconnection to Singleton pattern, +moved default.properties to src\main\resources\default.properties

Author: sjaghori

Diff for: .idea/modules/PIC-DB.main.iml

@@ -6,7 +6,7 @@ plugins {
 }
 
 group 'at.technikum'
-version '0.0.1-alpha'
+version '0.0.2-alpha'
 
 sourceCompatibility = 14
 
@@ -18,6 +18,8 @@ dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.13'
     // https://mvnrepository.com/artifact/mysql/mysql-connector-java
     implementation group: 'mysql', name: 'mysql-connector-java', version: '5.1.13'
+    compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.1'
+    compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.1'
 }
 
 javafx {
@@ -38,18 +40,6 @@ sourceSets.main {
     }
 }
 
-/*
-jar {
-    manifest {
-        attributes(
-                'Class-Path': configurations.compile.collect { it.getName() }.join(' '),
-                'Main-Class': mainClassName
-        )
-    }
-}
-
- */
-
 // resolved Fat Jar Issue !!
 // https://stackoverflow.com/questions/52569724/javafx-11-create-a-jar-file-with-gradle/52571719#52571719
 mainClassName='at.technikum.Main'

Diff for: .idea/modules/PIC-DB.test.iml

@@ -1,28 +1,32 @@
 package at.technikum;
 
 import at.technikum.Business.BusinessLayerImpl;
-import at.technikum.DataAccessLayer.Database;
-import at.technikum.Model.PictureModelImpl;
 import at.technikum.interfaces.BusinessLayer;
 import at.technikum.interfaces.models.PictureModel;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.io.IOException;
 
 public class ApplicationFX extends Application {
 
+    private static final Logger logger = LogManager.getLogger(ApplicationFX.class);
+
     public static void main(String[] args) throws Exception {
-        Database db = new Database();
-        db.connect();
-        /*BusinessLayer businessLayer = new BusinessLayerImpl();
+
+        logger.debug("Hello from Log4j 2");
+
+        BusinessLayer businessLayer = new BusinessLayerImpl();
         PictureModel pictureModel = businessLayer.getPicture(2);
 
         System.out.println("ID: " + pictureModel.getID() + " , name: "
-                + pictureModel.getFileName());*/
+                + pictureModel.getFileName());
+
         launch(args);
     }
 

Diff for: build.gradle

@@ -16,8 +16,7 @@ public static DataAccessLayer getDAL() {
         if(useMock) {
             return new DALMockImpl();
         } else {
-            Database db = new Database();
-            Connection connection = db.connect();
+            Connection connection = Database.getConnection();
             return new DALImpl(connection);
         }
     }

Diff for: src/main/java/at/technikum/ApplicationFX.java

@@ -8,21 +8,23 @@
 import java.util.Properties;
 
 public class Database {
+
+    static Connection connection = null;
+
     /**
      * Connect to the MySQL database
      *
      * @return a Connection object
      */
-    public Connection connect() {
-        
+    public static Connection getConnection() {
+        if (connection != null) return connection;
+
         Properties properties = Configurations.readProperties();
 
         String url = properties.getProperty("db.url");
         String user = properties.getProperty("db.user");
         String passwd = properties.getProperty("db.passwd");
 
-        Connection connection = null;
-
         try {
             Class.forName("com.mysql.jdbc.Driver");
             connection = DriverManager.getConnection(url, user, passwd);

Diff for: src/main/java/at/technikum/DataAccessLayer/DALFactory.java

@@ -16,7 +16,8 @@ public class Configurations {
     public static Properties readProperties() {
         // create and load default properties Properties
         java.util.Properties defaultProps = new java.util.Properties();
-        Path defaultPropsPath = Paths.get("default.properties");
+        Path defaultPropsPath = Paths.get(System.getProperty("user.dir") +
+                "\\src\\main\\resources\\default.properties");
 
         try {
             BufferedReader bf = Files.newBufferedReader(defaultPropsPath, StandardCharsets.UTF_8);

Diff for: src/main/java/at/technikum/DataAccessLayer/Database.java

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="WARN">
+    <Appenders>
+        <Console name="LogToConsole" target="SYSTEM_OUT">
+            <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
+        </Console>
+    </Appenders>
+    <Loggers>
+        <Logger name="at.technikum" level="debug" additivity="false">
+            <AppenderRef ref="LogToConsole"/>
+        </Logger>
+        <Root level="error">
+            <AppenderRef ref="LogToConsole"/>
+        </Root>
+    </Loggers>
+</Configuration>