2

OddsStrategyWeb/pom.xml

@@ -27,11 +27,7 @@
             <artifactId>OddsFx</artifactId>
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>Odds</groupId>
-            <artifactId>Odds</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-        </dependency>
+
         <!--  WICKET DEPENDENCIES -->
         <dependency>
             <groupId>org.apache.wicket</groupId>

OddsStrategyWeb/src/main/java/MainPage.html

@@ -6,6 +6,7 @@
 
     <h2 wicket:id="tomorrowsLabel">[Toaday Label]</h2>
     <div wicket:id="tomorrowsMatches"> </div>
+
 </body>
 
 </html>

OddsStrategyWeb/src/main/java/MainPage.java

@@ -1,5 +1,5 @@
 import components.matchtable.MatchTable;
-import database.Database;
+import data.GuiMysql;
 import objects.SoccerMatch;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.markup.html.basic.Label;
@@ -12,10 +12,10 @@ public class MainPage extends WebPage {
     public MainPage(final PageParameters parameters) {
         super(parameters);
 
-        List<SoccerMatch> todaysMatches = Database.getInstance()
+        List<SoccerMatch> todaysMatches = GuiMysql.getInstance()
                 .getPrioMatchesOfDate(LocalDateTime.now().toLocalDate().toString());
 
-        List<SoccerMatch> tomorrowsMatches = Database.getInstance()
+        List<SoccerMatch> tomorrowsMatches = GuiMysql.getInstance()
                 .getPrioMatchesOfDate(LocalDateTime.now().toLocalDate().plusDays(1).toString());
 
         // Tables of

OddsStrategyWeb/src/main/java/database/Database.java

@@ -2,19 +2,8 @@ package database;
 
 import data.GuiMysql;
 
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-
 public class Database extends GuiMysql {
 
-    private static final String USERNAME = "OddsNy";
-    private static final String PASSWORD = "Odds1_Ny_Password";
-    private static final String DATABASE = "new_odds";
-    private static final String URL = "jdbc:mysql://nordh.xyz:3306/";
-    private static final String TIMEZONE_FIX = "?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC";
-    private Connection conn;
-
     public static final Database instance = new Database();
 
     private Database() {
@@ -25,15 +14,4 @@ public class Database extends GuiMysql {
         return instance;
     }
 
-    @Override
-    protected Connection getConnection() {
-        if (conn == null) {
-            try {
-                conn = DriverManager.getConnection(URL + DATABASE + TIMEZONE_FIX, USERNAME, PASSWORD);
-            } catch (final SQLException e) {
-                throw new RuntimeException(e.getMessage(), e);
-            }
-        }
-        return conn;
-    }
 }