Update to 17 and SpringBoot 3

Author: sesturm

.github/workflows/mavenCi.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      version: 1.3.${{ github.run_number }}
+      version: 2.0.${{ github.run_number }}
 
     steps:
       - uses: actions/checkout@v3
@@ -37,7 +37,7 @@ jobs:
           languages: 'java'
 
       - name: Build
-        run:  mvn -V -B -DskipTests=true clean package org.jacoco:jacoco-maven-plugin:0.8.7:prepare-agent org.jacoco:jacoco-maven-plugin:0.8.7:report -Pcoverage -Dproject.version=${{ env.version }}-SNAPSHOT
+        run:  mvn -V -B clean package org.jacoco:jacoco-maven-plugin:0.8.7:prepare-agent org.jacoco:jacoco-maven-plugin:0.8.7:report -Pcoverage -Dproject.version=${{ env.version }}-SNAPSHOT
 
       - name: Upload Build Artifact
         uses: actions/upload-artifact@v3
@@ -49,12 +49,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: mvn -V -B sonar:sonar
-          -Dsonar.host.url=${{ secrets.HOST_URL }}
-          -Dsonar.organization=${{ secrets.ORGANIZATION_NAME }}
-          -Dsonar.projectKey=${{ secrets.PROJECT_KEY }}
-          -Dsonar.java.binaries=.
-          -Dsonar.qualitygate.wait=false
+        run: mvn -V -B sonar:sonar -Dsonar.host.url=${{ secrets.HOST_URL }} -Dsonar.organization=${{ secrets.ORGANIZATION_NAME }} -Dsonar.projectKey=${{ secrets.PROJECT_KEY }} -Dsonar.java.binaries=. -Dsonar.qualitygate.wait=false
 
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v2
@@ -66,10 +61,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'corretto'
           cache: maven
 

pom.xml

@@ -5,7 +5,7 @@
 
   <groupId>de.doubleslash</groupId>
   <artifactId>keeptime</artifactId>
-  <version>${project.version}</version>
+  <version>2.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>KeepTime</name>
@@ -27,16 +27,15 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.7.5</version>
+    <version>3.0.6</version>
     <relativePath /> <!-- lookup parent from repository -->
   </parent>
 
   <properties>
-    <project.version>1.3.0-SNAPSHOT</project.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <maven.compiler.source>17</maven.compiler.source>
-    <maven.compiler.target>17</maven.compiler.target>
+    <java.version>17</java.version>
+    <javafx.version>20.0.1</javafx.version>
 
     <maven-dependency-check.version>8.0.2</maven-dependency-check.version>
     <!-- USING HTML,XML (comma-separated list) did not work with plugin version 5.1.0 -->
@@ -50,40 +49,45 @@
     <dependency>
       <groupId>org.openjfx</groupId>
       <artifactId>javafx-controls</artifactId>
-      <version>17.0.2</version>
+      <version>${javafx.version}</version>
     </dependency>
     <dependency>
       <groupId>org.openjfx</groupId>
       <artifactId>javafx-fxml</artifactId>
-      <version>17.0.2</version>
+      <version>${javafx.version}</version>
     </dependency>
     <dependency>
       <groupId>org.openjfx</groupId>
       <artifactId>javafx-swing</artifactId>
-      <version>17.0.2</version>
+      <version>${javafx.version}</version>
     </dependency>
     <dependency>
       <groupId>org.openjfx</groupId>
       <artifactId>javafx-graphics</artifactId>
-      <version>17.0.2</version>
+      <version>${javafx.version}</version>
       <classifier>win</classifier>
     </dependency>
     <dependency>
       <groupId>org.openjfx</groupId>
       <artifactId>javafx-graphics</artifactId>
-      <version>17.0.2</version>
+      <version>${javafx.version}</version>
       <classifier>linux</classifier>
     </dependency>
     <dependency>
       <groupId>org.openjfx</groupId>
       <artifactId>javafx-graphics</artifactId>
-      <version>17.0.2</version>
+      <version>${javafx.version}</version>
       <classifier>mac-aarch64</classifier>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-data-jpa</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-runtime</artifactId>
+      <scope>provided</scope>
+    </dependency>
 
     <dependency>
       <groupId>com.h2database</groupId>
@@ -122,7 +126,12 @@
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-library</artifactId>
-      <version>2.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.testfx</groupId>
+      <artifactId>testfx-junit5</artifactId>
+      <version>4.0.16-alpha</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

src/main/java/de/doubleslash/keeptime/App.java

@@ -143,7 +143,8 @@ private void initialiseApplication(final Stage primaryStage) throws Exception {
       FontProvider.loadFonts();
       readSettings();
 
-      final List<Work> todaysWorkItems = model.getWorkRepository().findByStartDateOrderByStartTimeAsc(LocalDate.now());
+      final List<Work> todaysWorkItems = model.findWorkByStartDateOrderByStartTimeAsc(LocalDate.now());
+
       LOG.info("Found {} past work items", todaysWorkItems.size());
       model.getPastWorkItems().addAll(todaysWorkItems);
 
@@ -184,6 +185,7 @@ private void readSettings() {
       final List<Settings> settingsList = model.getSettingsRepository().findAll();
       final Settings settings;
       if (settingsList.isEmpty()) {
+         LOG.info("Empty settings. Set default");
          settings = new Settings();
          settings.setTaskBarColor(model.taskBarColor.get());
 
@@ -197,6 +199,7 @@ private void readSettings() {
          settings.setHideProjectsOnMouseExit(false);
          model.getSettingsRepository().save(settings);
       } else {
+         LOG.info("Got settings from database");
          settings = settingsList.get(0);
       }
 

src/main/java/de/doubleslash/keeptime/controller/Controller.java

@@ -22,11 +22,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.PreDestroy;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import de.doubleslash.keeptime.common.DateFormatter;
@@ -36,6 +33,7 @@
 import de.doubleslash.keeptime.model.Project;
 import de.doubleslash.keeptime.model.Settings;
 import de.doubleslash.keeptime.model.Work;
+import jakarta.annotation.PreDestroy;
 import javafx.collections.ObservableList;
 
 @Service
@@ -48,7 +46,6 @@ public class Controller {
 
    private final DateProvider dateProvider;
 
-   @Autowired
    public Controller(final Model model, final DateProvider dateProvider) {
       this.model = model;
       this.dateProvider = dateProvider;

src/main/java/de/doubleslash/keeptime/model/Model.java

@@ -16,9 +16,14 @@
 
 package de.doubleslash.keeptime.model;
 
+import java.time.LocalDate;
 import java.util.Comparator;
+import java.util.List;
 
-import org.springframework.beans.factory.annotation.Autowired;
+import de.doubleslash.keeptime.App;
+import jakarta.transaction.Transactional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.stereotype.Component;
 
@@ -34,11 +39,11 @@
 
 @Component
 public class Model {
+   private static final Logger LOG = LoggerFactory.getLogger(Model.class);
    private ProjectRepository projectRepository;
    private WorkRepository workRepository;
    private SettingsRepository settingsRepository;
 
-   @Autowired
    public Model(final ProjectRepository projectRepository, final WorkRepository workRepository,
          final SettingsRepository settingsRepository) {
       super();
@@ -154,4 +159,14 @@ public SortedList<Work> getSortedPastWorkItems() {
       return sortedPastWorkItems;
    }
 
+   public List<Work> findWorkByStartDateOrderByStartTimeAsc(LocalDate date) {
+      List<Work> workList = workRepository.findByStartDateOrderByStartTimeAsc(date);
+
+      for (final Work work : workList) {
+         Project project = work.getProject();
+         LOG.debug("color {} ", project.getColor());
+      }
+      return workList;
+   }
+
 }

src/main/java/de/doubleslash/keeptime/model/Project.java

@@ -16,14 +16,7 @@
 
 package de.doubleslash.keeptime.model;
 
-import javax.persistence.Column;
-import javax.persistence.Convert;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Lob;
-import javax.persistence.Table;
+import jakarta.persistence.*;
 
 import de.doubleslash.keeptime.model.persistenceconverter.ColorConverter;
 import javafx.scene.paint.Color;
@@ -42,7 +35,7 @@ public class Project {
    @Lob
    private String description;
 
-   @Convert(converter = ColorConverter.class, disableConversion = false)
+   @Convert(converter = ColorConverter.class)
    private Color color;
 
    private boolean isWork;

src/main/java/de/doubleslash/keeptime/model/Settings.java

@@ -16,13 +16,13 @@
 
 package de.doubleslash.keeptime.model;
 
-import javax.persistence.Column;
-import javax.persistence.Convert;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 import de.doubleslash.keeptime.model.persistenceconverter.ColorConverter;
 import javafx.scene.paint.Color;

src/main/java/de/doubleslash/keeptime/model/Work.java

@@ -18,14 +18,7 @@
 
 import java.time.LocalDateTime;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Lob;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.*;
 
 @Entity
 @Table(name = "Work")

src/main/java/de/doubleslash/keeptime/model/persistenceconverter/ColorConverter.java

@@ -16,8 +16,9 @@
 
 package de.doubleslash.keeptime.model.persistenceconverter;
 
-import javax.persistence.AttributeConverter;
+import jakarta.persistence.AttributeConverter;
 
+import jakarta.persistence.Converter;
 import javafx.scene.paint.Color;
 
 public class ColorConverter implements AttributeConverter<Color, String> {

src/main/java/de/doubleslash/keeptime/model/repos/WorkRepository.java

@@ -28,6 +28,6 @@
 @Repository
 public interface WorkRepository extends JpaRepository<Work, Long> {
 
-   @Query(value = "SELECT * FROM work WHERE CAST(start_time AS DATE) = ?1 ORDER BY start_time ASC", nativeQuery = true)
+   @Query(value = "SELECT w FROM Work w WHERE CAST(startTime AS DATE) = ?1 ORDER BY startTime ASC")
    List<Work> findByStartDateOrderByStartTimeAsc(LocalDate creationDate);
 }