From 8930e27291d7fc567b9ac7fafe02a41c2da78dea Mon Sep 17 00:00:00 2001 From: Jakub Date: Tue, 18 Nov 2025 17:47:46 +0100 Subject: [PATCH 1/5] Refactor and CI added, reorganize view classes/files --- .github/workflows/maven.yml | 21 +++++++++++++++++++ .../SystemLogAnalyzerApp.java | 5 +++-- .../controller/LoadingBarFXController.java | 2 +- ...ller.java => WelcomeViewFXController.java} | 4 ++-- .../resources/{ => view}/LoadingScreen.fxml | 0 src/main/resources/{ => view}/MainWindow.fxml | 0 .../resources/{ => view}/WelcomeView.fxml | 0 7 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/maven.yml rename src/main/java/com/project/authapi/system_log_analyzer/controller/{LogAnalyzerFXController.java => WelcomeViewFXController.java} (98%) rename src/main/resources/{ => view}/LoadingScreen.fxml (100%) rename src/main/resources/{ => view}/MainWindow.fxml (100%) rename src/main/resources/{ => view}/WelcomeView.fxml (100%) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml new file mode 100644 index 0000000..baf768a --- /dev/null +++ b/.github/workflows/maven.yml @@ -0,0 +1,21 @@ +name: Java CI + +on: + pull_request: + branches: [ "main" ] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout repo + uses: actions/checkout@v4 + + - name: Set up JDK + uses: actions/setup-java@v4 + with: + java-version: '21' + distribution: 'temurin' + + - name: Build with Maven + run: mvn clean test diff --git a/src/main/java/com/project/authapi/system_log_analyzer/SystemLogAnalyzerApp.java b/src/main/java/com/project/authapi/system_log_analyzer/SystemLogAnalyzerApp.java index 794efc6..d55028a 100644 --- a/src/main/java/com/project/authapi/system_log_analyzer/SystemLogAnalyzerApp.java +++ b/src/main/java/com/project/authapi/system_log_analyzer/SystemLogAnalyzerApp.java @@ -1,5 +1,6 @@ package com.project.authapi.system_log_analyzer; +import com.project.authapi.system_log_analyzer.controller.WelcomeViewFXController; import javafx.application.Application; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; @@ -21,9 +22,9 @@ public void init() { @Override public void start(Stage primaryStage) throws Exception { - FXMLLoader loader = new FXMLLoader(getClass().getResource("/WelcomeView.fxml")); + FXMLLoader loader = new FXMLLoader(getClass().getResource("/view/WelcomeView.fxml")); loader.setControllerFactory(springContext::getBean); - loader.setController(springContext.getBean(com.project.authapi.system_log_analyzer.controller.LogAnalyzerFXController.class)); + loader.setController(springContext.getBean(WelcomeViewFXController.class)); Parent root = loader.load(); Scene scene = new Scene(root); diff --git a/src/main/java/com/project/authapi/system_log_analyzer/controller/LoadingBarFXController.java b/src/main/java/com/project/authapi/system_log_analyzer/controller/LoadingBarFXController.java index 696eef6..5f772d2 100644 --- a/src/main/java/com/project/authapi/system_log_analyzer/controller/LoadingBarFXController.java +++ b/src/main/java/com/project/authapi/system_log_analyzer/controller/LoadingBarFXController.java @@ -70,7 +70,7 @@ protected List call() throws Exception { var springContext = com.project.authapi.system_log_analyzer.config.ApplicationContextProvider.getApplicationContext(); - FXMLLoader loader = new FXMLLoader(getClass().getResource("/MainWindow.fxml")); + FXMLLoader loader = new FXMLLoader(getClass().getResource("/view/MainWindow.fxml")); loader.setControllerFactory(springContext::getBean); Parent root = loader.load(); diff --git a/src/main/java/com/project/authapi/system_log_analyzer/controller/LogAnalyzerFXController.java b/src/main/java/com/project/authapi/system_log_analyzer/controller/WelcomeViewFXController.java similarity index 98% rename from src/main/java/com/project/authapi/system_log_analyzer/controller/LogAnalyzerFXController.java rename to src/main/java/com/project/authapi/system_log_analyzer/controller/WelcomeViewFXController.java index b17d473..4e409b0 100644 --- a/src/main/java/com/project/authapi/system_log_analyzer/controller/LogAnalyzerFXController.java +++ b/src/main/java/com/project/authapi/system_log_analyzer/controller/WelcomeViewFXController.java @@ -22,7 +22,7 @@ import java.io.IOException; @Component -public class LogAnalyzerFXController { +public class WelcomeViewFXController { @FXML private Button scanButton; @FXML private TextField logFilesDirField; @FXML private TextField reportDirField; @@ -55,7 +55,7 @@ private void scan(ActionEvent event) throws IOException { ApplicationContext springContext = ApplicationContextProvider.getApplicationContext(); - FXMLLoader loader = new FXMLLoader(getClass().getResource("/LoadingScreen.fxml")); + FXMLLoader loader = new FXMLLoader(getClass().getResource("/view/LoadingScreen.fxml")); loader.setControllerFactory(springContext::getBean); // <-- magiczna linia Parent root = loader.load(); diff --git a/src/main/resources/LoadingScreen.fxml b/src/main/resources/view/LoadingScreen.fxml similarity index 100% rename from src/main/resources/LoadingScreen.fxml rename to src/main/resources/view/LoadingScreen.fxml diff --git a/src/main/resources/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml similarity index 100% rename from src/main/resources/MainWindow.fxml rename to src/main/resources/view/MainWindow.fxml diff --git a/src/main/resources/WelcomeView.fxml b/src/main/resources/view/WelcomeView.fxml similarity index 100% rename from src/main/resources/WelcomeView.fxml rename to src/main/resources/view/WelcomeView.fxml From 1e5f43a532cbf637961755c08e2121b022668c05 Mon Sep 17 00:00:00 2001 From: Jakub Date: Tue, 18 Nov 2025 18:04:31 +0100 Subject: [PATCH 2/5] Fix CI: run workflow on master branch --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index baf768a..cd7376e 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -2,7 +2,7 @@ name: Java CI on: pull_request: - branches: [ "main" ] + branches: [ "master" ] jobs: build: From cbea5d82dc2cbb548673861f98401fc63ba072d3 Mon Sep 17 00:00:00 2001 From: Jakub Date: Tue, 18 Nov 2025 18:13:16 +0100 Subject: [PATCH 3/5] Fix CI: fixed error with java version --- .github/workflows/maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index cd7376e..0ca7d34 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -14,8 +14,8 @@ jobs: - name: Set up JDK uses: actions/setup-java@v4 with: - java-version: '21' + java-version: '25' distribution: 'temurin' - name: Build with Maven - run: mvn clean test + run: mvn clean javafx:run From fb5d53ccfcd7356c1b89ddb1c0e87d0b0de74ead Mon Sep 17 00:00:00 2001 From: Jakub Date: Tue, 18 Nov 2025 18:15:29 +0100 Subject: [PATCH 4/5] Fix CI: fixed error with running app in java CI --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 0ca7d34..7d6754d 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -18,4 +18,4 @@ jobs: distribution: 'temurin' - name: Build with Maven - run: mvn clean javafx:run + run: mvn clean test From 64c564eee659cf841612faf0a818c650c4abbaf2 Mon Sep 17 00:00:00 2001 From: Jakub Date: Tue, 18 Nov 2025 18:22:00 +0100 Subject: [PATCH 5/5] Fix in SpringBootApplication annotation --- .../authapi/system_log_analyzer/SystemLogAnalyzerApp.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/com/project/authapi/system_log_analyzer/SystemLogAnalyzerApp.java b/src/main/java/com/project/authapi/system_log_analyzer/SystemLogAnalyzerApp.java index d55028a..6b38c48 100644 --- a/src/main/java/com/project/authapi/system_log_analyzer/SystemLogAnalyzerApp.java +++ b/src/main/java/com/project/authapi/system_log_analyzer/SystemLogAnalyzerApp.java @@ -6,11 +6,9 @@ import javafx.scene.Parent; import javafx.scene.Scene; import javafx.stage.Stage; -import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.context.ConfigurableApplicationContext; -@SpringBootApplication public class SystemLogAnalyzerApp extends Application { private ConfigurableApplicationContext springContext;