Merge branch 'develop' into feature/#165_Rest-API-New

# Conflicts:
#	pom.xml

Author: Death111

.github/workflows/mavenCi.yml

@@ -22,25 +22,25 @@ jobs:
       version: 2.0.${{ github.run_number }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '17'
           distribution: 'corretto'
           cache: maven
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: 'java'
 
       - name: Build
-        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 -Djava.awt.headless=true -Dtestfx.robot=glass -Dtestfx.headless=true
+        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
+        uses: actions/upload-artifact@v4
         with:
           name: KeepTime-${{ env.version }}
           path: /home/runner/work/KeepTime/KeepTime/target/*-bin.zip
@@ -52,17 +52,17 @@ jobs:
         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
+        uses: github/codeql-action/analyze@v3
 
   dependency-check:
 
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '17'
           distribution: 'corretto'

README.md

@@ -64,7 +64,8 @@ You should put the .jar in an extra folder as a *logs* and a *db* folder will be
 7. To see the changes just start the new KeepTime again
 
 ## Requirements
-
-* Windows 7, 10
-* Linux (tested on Ubuntu 18.04)
-* Java 11
+* Operating System
+  * Windows 7, 10, 11
+  * Linux (tested on Ubuntu 18.04)
+  * Mac (tested on MacBook M2 Pro (ARM based CPU))
+* Java 17

pom.xml

@@ -6,13 +6,13 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.1.3</version>
+    <version>3.1.10</version>
     <relativePath />
     <!-- lookup parent from repository -->
   </parent>
   <groupId>de.doubleslash</groupId>
   <artifactId>keeptime</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
+  <version>${project.version}</version>
 
   <packaging>jar</packaging>
   <name>KeepTime</name>
@@ -33,12 +33,13 @@
   </licenses>
 
   <properties>
+    <project.version>2.0.0-SNAPSHOT</project.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <java.version>17</java.version>
-    <javafx.version>20.0.1</javafx.version>
+    <javafx.version>22</javafx.version>
 
-    <maven-dependency-check.version>8.0.2</maven-dependency-check.version>
+    <maven-dependency-check.version>9.1.0</maven-dependency-check.version>
     <!-- USING HTML,XML (comma-separated list) did not work with plugin version 5.1.0 -->
     <maven-dependency-check.format>ALL</maven-dependency-check.format>
     <maven-dependency-check.failOnError>true</maven-dependency-check.failOnError>
@@ -108,7 +109,12 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-validation</artifactId>
     </dependency>
-
+    <!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-security -->
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-security</artifactId>
+      <version>3.1.3</version>
+    </dependency>
 
 
     <dependency>
@@ -143,50 +149,32 @@
     <dependency>
       <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-assembly-plugin</artifactId>
-      <version>3.4.2</version>
+      <version>3.7.1</version>
       <type>maven-plugin</type>
     </dependency>
     <dependency>
       <groupId>org.sonarsource.scanner.maven</groupId>
       <artifactId>sonar-maven-plugin</artifactId>
-      <version>3.9.1.2184</version>
+      <version>3.11.0.3922</version>
     </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-library</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.testfx</groupId>
-      <artifactId>testfx-junit5</artifactId>
-      <version>4.0.16-alpha</version>
-      <scope>test</scope>
-    </dependency>
-    <!-- https://mvnrepository.com/artifact/org.testfx/openjfx-monocle -->
-    <dependency>
-      <groupId>org.testfx</groupId>
-      <artifactId>openjfx-monocle</artifactId>
-      <version>jdk-12.0.1+2</version>
-      <scope>test</scope>
-    </dependency>
-    <!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-security -->
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-security</artifactId>
-      <version>3.1.3</version>
-    </dependency>
-
   </dependencies>
   <build>
+    <finalName>keeptime-${project.version}</finalName>
+
     <plugins>
       <plugin>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
       </plugin>
 
       <plugin>
-        <groupId>pl.project13.maven</groupId>
-        <artifactId>git-commit-id-plugin</artifactId>
+        <groupId>io.github.git-commit-id</groupId>
+        <artifactId>git-commit-id-maven-plugin</artifactId>
         <configuration>
           <generateGitPropertiesFile>false</generateGitPropertiesFile>
         </configuration>
@@ -205,7 +193,6 @@
               <descriptors>
                 <descriptor>./assembly.xml</descriptor>
               </descriptors>
-              <finalName>keeptime-${project.version}</finalName>
             </configuration>
           </execution>
         </executions>

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

@@ -95,6 +95,7 @@ public void init() throws Exception {
 
       model = springContext.getBean(Model.class);
       controller = springContext.getBean(Controller.class);
+      controller.enableAutoSave();
       model.setSpringContext(springContext);
    }
 

src/main/java/de/doubleslash/keeptime/common/BrowserHelper.java

@@ -34,30 +34,43 @@ public static void openURL(final String url) {
          openUrlWindows(rt, url);
       } else if (OS.isLinux()) {
          openUrlLinux(rt, url);
+      } else if (OS.isMacOS()) {
+         openUrlMac(rt, url);
       } else {
-         LOG.warn("OS is not supported");
+         LOG.warn("OS '{}' is not supported", OS.getOSName());
       }
    }
 
    private static void openUrlWindows(final Runtime rt, final String url) {
       final String command = "rundll32 url.dll,FileProtocolHandler " + url;
+      executeCommand(rt, command, url);
+   }
+
+   private static void openUrlLinux(final Runtime rt, final String url) {
+      final String[] command = {"xdg-open", url};
+      executeCommand(rt, command, url); 
+   }
+
+   private static void openUrlMac(final Runtime rt, final String url) {
+      final String[] command = {"open", url};
+      executeCommand(rt, command, url);
+   }
+
+   private static void executeCommand(final Runtime rt, final String command, final String url) {
       try {
          LOG.debug("Executing command: {}", command);
          rt.exec(command);
       } catch (final Exception e) {
-         LOG.error("Could not open url '" + url + "' with command '" + command + "'.", e);
+         LOG.error("Could not open url '{}' with command '{}'.", url, command, e);
       }
    }
 
-   private static void openUrlLinux(final Runtime rt, final String url) {
-      final String[] command = {
-            "xdg-open", url
-      };
+   private static void executeCommand(final Runtime rt, final String[] command, final String url) {
       try {
          LOG.debug("Executing command: {}", Arrays.toString(command));
-         rt.exec(command);
+         rt.exec(command); 
       } catch (final Exception e) {
-         LOG.error("Could not open url '" + url + "' with command '" + Arrays.toString(command) + "'.", e);
+         LOG.error("Could not open url '{}' with command '{}'.", url, Arrays.toString(command), e);
       }
    }
 }

src/main/java/de/doubleslash/keeptime/common/FileOpenHelper.java

@@ -32,18 +32,19 @@ public static boolean openFile(final String filePath) {
       final File file = new File(filePath);
       final Runtime rt = Runtime.getRuntime();
 
-      if (file.exists() && file.isFile()) {
-         if (OS.isWindows()) {
-            openFileWindows(rt, file);
-         } else if (OS.isLinux()) {
-            openFileLinux(rt, filePath);
-         } else {
-            LOG.warn("OS is not supported");
-         }
-         return true;
-      } else {
+      if (!file.exists() || file.isFile()) {
+         LOG.warn("Filepath does not seem to exist or does not point to a file: '{}'.", filePath);
          return false;
       }
+
+      if (OS.isWindows()) {
+         openFileWindows(rt, file);
+      } else if (OS.isLinux()) {
+         openFileLinux(rt, filePath);
+      } else {
+         LOG.warn("OS '{}' is not supported", OS.getOSName());
+      }
+      return true;
    }
 
    private static void openFileWindows(final Runtime rt, final File file) {
@@ -52,7 +53,7 @@ private static void openFileWindows(final Runtime rt, final File file) {
          LOG.debug("executing command: {}", command);
          rt.exec(command);
       } catch (final Exception e) {
-         LOG.error("Could not open file '" + file + "' with command '" + command + "'.", e);
+         LOG.error("Could not open file '{}' with command '{}'.", file, command, e);
       }
    }
 
@@ -64,7 +65,8 @@ private static void openFileLinux(final Runtime rt, final String filePath) {
          LOG.debug("executing command: {}", Arrays.toString(command));
          rt.exec(command);
       } catch (final Exception e) {
-         LOG.error("Could not open file '" + filePath + "' with command '" + Arrays.toString(command) + "'.", e);
+         LOG.error("Could not open file '{}' with command '{}'.", filePath, Arrays.toString(command),
+            e);
       }
    }
 }

src/main/java/de/doubleslash/keeptime/common/OS.java

@@ -19,29 +19,26 @@
 public class OS {
 
    private static final String OS_PROPERTY = "os.name";
+   private static final String OS_NAME = System.getProperty(OS_PROPERTY).toLowerCase();
 
    private OS() {
       // prevent instance creation
    }
 
    public static boolean isWindows() {
-      if (System.getProperty(OS_PROPERTY).toLowerCase().contains("windows")) {
-         return true;
-      }
-
-      return false;
+     return OS_NAME.contains("windows");
    }
 
    public static boolean isLinux() {
-      if (System.getProperty(OS_PROPERTY).toLowerCase().contains("linux")) {
-         return true;
-      }
+     return OS_NAME.contains("linux");
+   }
 
-      return false;
+   public static String getOSName() {
+      return OS_NAME;
    }
 
-   public static String getOSname() {
-      return System.getProperty(OS_PROPERTY);
+   public static boolean isMacOS() {
+       return OS_NAME.contains("mac os x");
    }
 
 }

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

@@ -38,20 +38,28 @@
 
 @Service
 public class Controller {
-   private final long QUICK_SAVE_INTERVAL = 60;
 
    private static final Logger LOG = LoggerFactory.getLogger(Controller.class);
 
+   private final long AUTO_SAVE_INTERVAL_SECONDS = 60;
+   private Interval autoSaveInterval;
+
    private final Model model;
 
    private final DateProvider dateProvider;
 
    public Controller(final Model model, final DateProvider dateProvider) {
       this.model = model;
       this.dateProvider = dateProvider;
+   }
 
-      // initiate quicksaving
-      new Interval(QUICK_SAVE_INTERVAL).registerCallBack(() -> saveCurrentWork(dateProvider.dateTimeNow()));
+   public void enableAutoSave() {
+      LOG.info("Enabling auto save with interval '{}' seconds.", AUTO_SAVE_INTERVAL_SECONDS);
+      autoSaveInterval = new Interval(AUTO_SAVE_INTERVAL_SECONDS);
+      autoSaveInterval.registerCallBack(() -> {
+         LOG.debug("Auto saving current work.");
+         saveCurrentWork(dateProvider.dateTimeNow());
+      });
    }
 
    public void changeProject(final Project newProject) {
@@ -178,7 +186,7 @@ public void deleteProject(final Project p) {
          changeProject(model.getIdleProject());
       }
 
-      LOG.info("Disabeling project '{}'.", p);
+      LOG.info("Disabling project '{}'.", p);
 
       final int indexToRemove = p.getIndex();
       p.setEnabled(false); // we don't delete it because of the referenced work
@@ -311,7 +319,7 @@ public void setComment(final String notes) {
    }
 
    /**
-    * Calculate todays seconds counted as work
+    * Calculate today's seconds counted as work
     */
    public long calcTodaysWorkSeconds() {
       final List<Work> workItems = new ArrayList<>();
@@ -332,16 +340,12 @@ public long calcTodaysWorkSeconds() {
    }
 
    /**
-    * Calculate todays present seconds (work+nonWork)
+    * Calculate today's present seconds (work+nonWork)
     */
    public long calcTodaysSeconds() {
       return calcSeconds(model.getPastWorkItems());
    }
 
-   public ObservableList<Project> getAvailableProjects() {
-      return model.getAvailableProjects();
-   }
-
    public long calcSeconds(final List<Work> workItems) {
       long seconds = 0;