Serializable classes

.gitignore

@@ -3,4 +3,5 @@
 */.settings/*
 *.iml*
 dependency-reduced-pom.xml
-target/
+target/
+*/target/

Odds/pom.xml

@@ -4,6 +4,13 @@
   <groupId>Odds</groupId>
   <artifactId>Odds</artifactId>
   <version>0.0.1-SNAPSHOT</version>
+
+  <properties>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
+    <maven.compiler.release>17</maven.compiler.release>
+  </properties>
+
   <!-- <packaging>pom</packaging> -->
   <build>
     <sourceDirectory>src</sourceDirectory>
@@ -15,6 +22,7 @@
         <configuration>
           <source>17</source>
           <target>17</target>
+          <release>17</release>
         </configuration>
       </plugin>
 

Odds/src/mysql/Mysql.java

@@ -4,6 +4,7 @@ import com.google.common.base.Strings;
 import object.CurrentParsing;
 import object.ResultDTO;
 
+import java.io.Serializable;
 import java.sql.*;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -12,7 +13,7 @@ import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-public class Mysql {
+public class Mysql implements Serializable {
 
     private static final Mysql instance = new Mysql();
 
@@ -22,10 +23,10 @@ public class Mysql {
     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;
+    protected transient Connection conn;
 
     protected Mysql() {
-        getConnection();
+        conn = getConnection();
     }
 
     public static Mysql getInstance() {

OddsJavaFx/.classpath

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry combineaccessrules="false" kind="src" path="/Odds"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-18">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

OddsJavaFx/.settings/org.eclipse.jdt.core.prefs

@@ -42,9 +42,9 @@ org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.lambda.genericSignature=do not generate
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.shareCommonFinallyBlocks=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=18
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=18
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -169,7 +169,7 @@ org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.processAnnotations=disabled
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=18
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.compiler.storeAnnotations=disabled
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

OddsJavaFx/pom.xml

@@ -5,8 +5,9 @@
     <artifactId>OddsFx</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <properties>
-        <maven.compiler.source>18</maven.compiler.source>
-        <maven.compiler.target>18</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.release>17</maven.compiler.release>
     </properties>
     <repositories>
         <repository>

OddsJavaFx/src/data/GuiMysql.java

@@ -10,12 +10,14 @@ import org.eclipse.jetty.util.log.Log;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.sql.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.*;
-import java.util.Date;
 import java.util.AbstractMap.SimpleEntry;
 
 public class GuiMysql extends Mysql {
@@ -35,12 +37,10 @@ public class GuiMysql extends Mysql {
     private static final BigDecimal INCREMENT = BigDecimal.valueOf(0.2);
     private static final GuiMysql instance = new GuiMysql();
     public static final String GAME_DATE = "gameDate";
-    private final Connection conn;
 
 
     protected GuiMysql() {
         super();
-        conn = this.getConnection();
     }
 
     public static GuiMysql getInstance() {

OddsJavaFx/src/objects/Percentages.java

@@ -1,6 +1,8 @@
 package objects;
 
-public class Percentages {
+import java.io.Serializable;
+
+public class Percentages implements Serializable {
 
     private int scoringDiffHomeWin = 0;
     private int scoringDiffDraw = 0;

OddsJavaFx/src/objects/SoccerMatch.java

@@ -2,12 +2,13 @@ package objects;
 
 import objects.bets.Bet;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.time.LocalDateTime;
 
-public class SoccerMatch {
+public class SoccerMatch implements Serializable {
 
     private LocalDateTime gameDate;
     private Team homeTeam;

OddsJavaFx/src/objects/SoccerMatchAnalysis.java

@@ -2,7 +2,6 @@ package objects;
 
 import data.GuiMysql;
 
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.sql.PreparedStatement;
@@ -14,7 +13,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.Optional;
 
-public class SoccerMatchAnalysis extends SoccerMatch implements Serializable {
+public class SoccerMatchAnalysis extends SoccerMatch  {
 
     GuiMysql database;
     private List<TeamStanding> leagueTable;

OddsJavaFx/src/objects/Team.java

@@ -1,6 +1,8 @@
 package objects;
 
-public class Team {
+import java.io.Serializable;
+
+public class Team implements Serializable {
 
 	private int teamId;
 	private String teamName;

OddsStrategyWeb/pom.xml

@@ -16,6 +16,9 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- allowed values: R7, 1.0, 1.5, 2.0 or none -->
         <wtp.version>none</wtp.version>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.release>17</maven.compiler.release>
     </properties>
 
     <dependencies>
@@ -102,11 +105,13 @@
             <scope>test</scope>
         </dependency>
         -->
+        <!--
         <dependency>
             <groupId>io.github.bonigarcia</groupId>
             <artifactId>webdrivermanager</artifactId>
             <version>5.8.0</version>
         </dependency>
+        -->
         <!-- https://mvnrepository.com/artifact/org.apache.wicket/wicket-extensions -->
         <dependency>
             <groupId>org.apache.wicket</groupId>
@@ -179,7 +184,7 @@
                 <artifactId>jetty-maven-plugin</artifactId>
                 <version>${jetty.version}</version>
                 <configuration>
-                    <!--<scan>2</scan> -->
+                    <scan>2</scan>
                     <systemProperties>
                         <systemProperty>
                             <name>maven.project.build.directory.test-classes</name>

OddsStrategyWeb/src/main/java/MainApplication.java

@@ -1,5 +1,3 @@
-import org.apache.wicket.csp.CSPDirective;
-import org.apache.wicket.csp.CSPDirectiveSrcValue;
 import org.apache.wicket.protocol.http.WebApplication;
 
 public class MainApplication extends WebApplication {
@@ -12,10 +10,6 @@ public class MainApplication extends WebApplication {
         super.init();
 
         // needed for the styling used by the quickstart
-        getCspSettings().blocking()
-                .add(CSPDirective.STYLE_SRC, CSPDirectiveSrcValue.SELF)
-                .add(CSPDirective.STYLE_SRC, "https://fonts.googleapis.com/css")
-                .add(CSPDirective.FONT_SRC, "https://fonts.gstatic.com");
 
         // add your configuration here
     }

OddsStrategyWeb/src/main/java/MainPage.html

@@ -1,4 +1,4 @@
-<html>
+<html xmlns:wicket="http://www.w3.org/1999/xhtml">
 
 <body>
     <h2 wicket:id="todaysLabel">[Toaday Label]</h2>

OddsStrategyWeb/src/main/java/MainPage.java

@@ -1,13 +1,12 @@
-import java.time.LocalDateTime;
-import java.util.List;
-
+import components.matchtable.MatchTable;
+import database.Database;
+import objects.SoccerMatch;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 
-import components.MatchTable.MatchTable;
-import database.Database;
-import objects.SoccerMatch;
+import java.time.LocalDateTime;
+import java.util.List;
 
 public class MainPage extends WebPage {
     public MainPage(final PageParameters parameters) {

OddsStrategyWeb/src/main/java/components/MatchTable/MatchTable.html

@@ -1,30 +0,0 @@
-<wicket:panel>
-    <!-- <table id="jqGrid1" style="width:100%;height:200px">
-        </table> -->
-    <div wicket:id="matchesCount"></div>
-    <p></p>
-    <table wicket:id="matchesTable" class="matchTable">
-        <thead>
-            <tr>
-                <th>Match</th>
-                <th>Odds 1</th>
-                <th>Odds X</th>
-                <th>Odds 2</th>
-                <th>Calculated Percent 1</th>
-                <th>Calculated Percent X</th>
-                <th>Calculated Percent 2</th>
-            </tr>
-        </thead>
-        <!-- <tbody>
-            <tr>
-                <td wicket:id="matchTeams">Team names</td>
-                <td wicket:id="odds1">Team names</td>
-                <td wicket:id="oddsX">Team names</td>
-                <td wicket:id="odds2">Team names</td>
-                <td wicket:id="calculatedPercent1">Team names</td>
-                <td wicket:id="calculatedPercentX">Team names</td>
-                <td wicket:id="calculatedPercent2">Team names</td>
-            </tr>
-        </tbody> -->
-    </table>
-</wicket:panel>

OddsStrategyWeb/src/main/java/components/matchtable/MatchTable.html

@@ -0,0 +1,8 @@
+<wicket:panel xmlns:wicket="http://www.w3.org/1999/xhtml">
+    <!-- <table id="jqGrid1" style="width:100%;height:200px">
+        </table> -->
+    <div wicket:id="matchesCount"></div>
+    <p></p>
+    <table wicket:id="matchesTable" class="matchTable">
+    </table>
+</wicket:panel>

OddsStrategyWeb/src/main/java/components/MatchTable/MatchTable.java → OddsStrategyWeb/src/main/java/components/matchtable/MatchTable.java

@@ -1,17 +1,9 @@
-package components.MatchTable;
-
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
+package components.matchtable;
 
+import objects.SoccerMatch;
+import objects.SoccerMatchAnalysis;
 import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.LambdaColumn;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.*;
 import org.apache.wicket.markup.head.CssHeaderItem;
 import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.markup.html.basic.Label;
@@ -21,8 +13,9 @@ import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.request.resource.PackageResourceReference;
 
-import objects.SoccerMatch;
-import objects.SoccerMatchAnalysis;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
 
 public class MatchTable extends Panel {
 
@@ -52,6 +45,9 @@ public class MatchTable extends Panel {
 
     private void populateMatchesTable(List<SoccerMatchAnalysis> todaysMatchAnalysis) {
 
+        todaysMatchAnalysis.sort((m1, m2) ->
+                Float.compare(m2.getCalculatedPercentages().getDrawPercentage(),
+                        m1.getCalculatedPercentages().getDrawPercentage()));
         SortableSoccerMatchAnalysisDataProvider dataProvider = new SortableSoccerMatchAnalysisDataProvider(todaysMatchAnalysis);
 
         DataTable<SoccerMatchAnalysis, String> dataTable = new DataTable<>("matchesTable", tableColumns, dataProvider, 10);
@@ -68,29 +64,29 @@ public class MatchTable extends Panel {
         tableColumns.add(new PropertyColumn<>(Model.of("Odds X"), "oddsX", "oddsX"));
         tableColumns.add(new PropertyColumn<>(Model.of("Odds 2"), "odds2", "odds2"));
 
-        tableColumns.add(new AbstractColumn<SoccerMatchAnalysis, String>(Model.of("Calculated Percent 1")) {
+        tableColumns.add(new AbstractColumn<>(Model.of("Calculated Percent 1")) {
 
             @Override
             public void populateItem(Item<ICellPopulator<SoccerMatchAnalysis>> cellItem, String componentId,
                     IModel<SoccerMatchAnalysis> model) {
                 cellItem.add(new Label(componentId, model.getObject().getCalculatedPercentages().getHomeWinPercentage()));
-            };
+            }
         });
-        tableColumns.add(new AbstractColumn<SoccerMatchAnalysis, String>(Model.of("Calculated Percent X")) {
+        tableColumns.add(new AbstractColumn<>(Model.of("Calculated Percent X")) {
 
             @Override
             public void populateItem(Item<ICellPopulator<SoccerMatchAnalysis>> cellItem, String componentId,
                     IModel<SoccerMatchAnalysis> model) {
                 cellItem.add(new Label(componentId, model.getObject().getCalculatedPercentages().getDrawPercentage()));
-            };
+            }
         });
-        tableColumns.add(new AbstractColumn<SoccerMatchAnalysis, String>(Model.of("Calculated Percent 2")) {
+        tableColumns.add(new AbstractColumn<>(Model.of("Calculated Percent 2")) {
 
             @Override
             public void populateItem(Item<ICellPopulator<SoccerMatchAnalysis>> cellItem, String componentId,
                     IModel<SoccerMatchAnalysis> model) {
                 cellItem.add(new Label(componentId, model.getObject().getCalculatedPercentages().getAwayWinPercentage()));
-            };
+            }
         });
     }
 

OddsStrategyWeb/src/main/java/components/MatchTable/SortableSoccerMatchAnalysisDataProvider.java → OddsStrategyWeb/src/main/java/components/matchtable/SortableSoccerMatchAnalysisDataProvider.java

@@ -1,13 +1,12 @@
-package components.MatchTable;
-
-import java.util.Iterator;
-import java.util.List;
+package components.matchtable;
 
+import objects.SoccerMatchAnalysis;
 import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 
-import objects.SoccerMatchAnalysis;
+import java.util.Iterator;
+import java.util.List;
 
 public class SortableSoccerMatchAnalysisDataProvider extends SortableDataProvider<SoccerMatchAnalysis, String> {
 

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

@@ -1,11 +1,11 @@
 package database;
 
+import data.GuiMysql;
+
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 
-import data.GuiMysql;
-
 public class Database extends GuiMysql {
 
     private static final String USERNAME = "OddsNy";
@@ -15,7 +15,7 @@ public class Database extends GuiMysql {
     private static final String TIMEZONE_FIX = "?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC";
     private Connection conn;
 
-    public static Database instance = new Database();
+    public static final Database instance = new Database();
 
     private Database() {
         getConnection();
@@ -25,6 +25,7 @@ public class Database extends GuiMysql {
         return instance;
     }
 
+    @Override
     protected Connection getConnection() {
         if (conn == null) {
             try {
@@ -35,5 +36,4 @@ public class Database extends GuiMysql {
         }
         return conn;
     }
-
 }

OddsStrategyWeb/src/test/jetty/jetty.xml

@@ -21,3 +21,4 @@
 		<!-- </Call> -->
 	</New>
 </Configure>
+

OddsStrategyWeb/target/OddsStrategyWeb-1.0-SNAPSHOT/WEB-INF/classes/MainPage.html

@@ -1,11 +0,0 @@
-<html>
-
-<body>
-    <h2 wicket:id="todaysLabel">[Toaday Label]</h2>
-    <div wicket:id="todaysMatches"> </div>
-
-    <h2 wicket:id="tomorrowsLabel">[Toaday Label]</h2>
-    <div wicket:id="tomorrowsMatches"> </div>
-</body>
-
-</html>

OddsStrategyWeb/target/OddsStrategyWeb-1.0-SNAPSHOT/WEB-INF/classes/components/MatchTable/MatchTable.css

@@ -1,15 +0,0 @@
-table th {
-    font-weight: bold;
-}
-
-th td {
-    border-bottom: 1px solid #ddd;
-}
-
-table.alternate tr:nth-child(odd) {
-    background-color: #888888;
-}
-
-table.alternate tr:nth-child(even) {
-    background-color: #BBBBBB;
-}

OddsStrategyWeb/target/OddsStrategyWeb-1.0-SNAPSHOT/WEB-INF/classes/components/MatchTable/MatchTable.html

@@ -1,30 +0,0 @@
-<wicket:panel>
-    <!-- <table id="jqGrid1" style="width:100%;height:200px">
-        </table> -->
-    <div wicket:id="matchesCount"></div>
-    <p></p>
-    <table wicket:id="matchesTable" class="matchTable">
-        <thead>
-            <tr>
-                <th>Match</th>
-                <th>Odds 1</th>
-                <th>Odds X</th>
-                <th>Odds 2</th>
-                <th>Calculated Percent 1</th>
-                <th>Calculated Percent X</th>
-                <th>Calculated Percent 2</th>
-            </tr>
-        </thead>
-        <!-- <tbody>
-            <tr>
-                <td wicket:id="matchTeams">Team names</td>
-                <td wicket:id="odds1">Team names</td>
-                <td wicket:id="oddsX">Team names</td>
-                <td wicket:id="odds2">Team names</td>
-                <td wicket:id="calculatedPercent1">Team names</td>
-                <td wicket:id="calculatedPercentX">Team names</td>
-                <td wicket:id="calculatedPercent2">Team names</td>
-            </tr>
-        </tbody> -->
-    </table>
-</wicket:panel>