Skip to content

Commit 6ebafca

Browse files
MrSnouMrSnou
committed
16th commit - (BIG) Application refactor, building desktop app with Spring Boot was a bad idea, what commit contains :
- Spring boot swaped to clear Spring Core. - Rebuilded main class integrating Spring and JavaFX in one starting class. - Fixed dependency injection for FX controllers. - Maven configurated to generate clear .jar with dependencies.
1 parent 1a3e072 commit 6ebafca

25 files changed

Lines changed: 123 additions & 141 deletions

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
TO-DO.md
2+
dist
23
target/
34
.mvn/wrapper/maven-wrapper.jar
45
!**/src/main/**/target/

‎pom.xml‎

Lines changed: 36 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,109 +1,86 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
34
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
46
<modelVersion>4.0.0</modelVersion>
5-
<parent>
6-
<groupId>org.springframework.boot</groupId>
7-
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>3.5.7</version>
9-
<relativePath/> <!-- lookup parent from repository -->
10-
</parent>
11-
<groupId>com.project.authAPI</groupId>
7+
8+
<groupId>com.project</groupId>
129
<artifactId>System_Log_Analyzer</artifactId>
1310
<version>0.0.1-SNAPSHOT</version>
1411
<name>System Log Analyzer</name>
15-
<description>System Log Analyzer</description>
16-
<url/>
17-
<licenses>
18-
<license/>
19-
</licenses>
20-
<developers>
21-
<developer/>
22-
</developers>
23-
<scm>
24-
<connection/>
25-
<developerConnection/>
26-
<tag/>
27-
<url/>
28-
</scm>
12+
2913
<properties>
3014
<java.version>25</java.version>
15+
<spring.version>6.2.12</spring.version>
16+
<maven.compiler.release>${java.version}</maven.compiler.release>
3117
</properties>
18+
3219
<dependencies>
20+
21+
<!-- CZYSTY SPRING (bez Boot) -->
3322
<dependency>
34-
<groupId>org.springframework.boot</groupId>
35-
<artifactId>spring-boot-starter</artifactId>
23+
<groupId>org.springframework</groupId>
24+
<artifactId>spring-context</artifactId>
25+
<version>${spring.version}</version>
3626
</dependency>
3727

28+
<!-- Optionalny Lombok -->
3829
<dependency>
3930
<groupId>org.projectlombok</groupId>
4031
<artifactId>lombok</artifactId>
32+
<version>1.18.32</version>
4133
<optional>true</optional>
4234
</dependency>
43-
<dependency>
44-
<groupId>org.springframework.boot</groupId>
45-
<artifactId>spring-boot-starter-test</artifactId>
46-
<scope>test</scope>
47-
</dependency>
35+
36+
<!-- JavaFX 25 -->
4837
<dependency>
4938
<groupId>org.openjfx</groupId>
5039
<artifactId>javafx-controls</artifactId>
51-
<version>22.0.2</version>
40+
<version>25-ea+1</version>
5241
</dependency>
42+
5343
<dependency>
5444
<groupId>org.openjfx</groupId>
5545
<artifactId>javafx-fxml</artifactId>
56-
<version>22.0.2</version>
46+
<version>25-ea+1</version>
5747
</dependency>
5848

59-
60-
<dependency>
61-
<groupId>org.springframework</groupId>
62-
<artifactId>spring-context</artifactId>
63-
</dependency>
6449
</dependencies>
6550

6651
<build>
6752
<plugins>
53+
54+
<!-- Kompilator Javy -->
6855
<plugin>
6956
<groupId>org.apache.maven.plugins</groupId>
7057
<artifactId>maven-compiler-plugin</artifactId>
58+
<version>3.11.0</version>
7159
<configuration>
72-
<annotationProcessorPaths>
73-
<path>
74-
<groupId>org.projectlombok</groupId>
75-
<artifactId>lombok</artifactId>
76-
</path>
77-
</annotationProcessorPaths>
60+
<release>${java.version}</release>
7861
</configuration>
7962
</plugin>
8063

64+
<!-- JavaFX Maven Plugin -->
8165
<plugin>
82-
<groupId>org.springframework.boot</groupId>
83-
<artifactId>spring-boot-maven-plugin</artifactId>
66+
<groupId>org.openjfx</groupId>
67+
<artifactId>javafx-maven-plugin</artifactId>
68+
<version>0.0.8</version>
8469
<configuration>
85-
<excludes>
86-
<exclude>
87-
<groupId>org.projectlombok</groupId>
88-
<artifactId>lombok</artifactId>
89-
</exclude>
90-
</excludes>
70+
<mainClass>com.project.system_log_analyzer.SystemLogAnalyzerApp</mainClass>
9171
</configuration>
9272
</plugin>
9373

74+
<!-- Wyłącz testy przy build -->
9475
<plugin>
95-
<groupId>org.springframework.boot</groupId>
96-
<artifactId>spring-boot-maven-plugin</artifactId>
97-
</plugin>
98-
99-
<plugin>
100-
<groupId>org.openjfx</groupId>
101-
<artifactId>javafx-maven-plugin</artifactId>
102-
<version>0.0.8</version>
76+
<groupId>org.apache.maven.plugins</groupId>
77+
<artifactId>maven-surefire-plugin</artifactId>
78+
<version>3.5.4</version>
10379
<configuration>
104-
<mainClass>com.project.authapi.system_log_analyzer.SystemLogAnalyzerApp</mainClass>
80+
<skipTests>true</skipTests>
10581
</configuration>
10682
</plugin>
83+
10784
</plugins>
10885
</build>
10986

‎src/main/java/com/project/authapi/system_log_analyzer/SystemLogAnalyzerSpringBoot.java‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/main/java/com/project/authapi/system_log_analyzer/SystemLogAnalyzerApp.java renamed to src/main/java/com/project/system_log_analyzer/SystemLogAnalyzerApp.java

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,44 @@
1-
package com.project.authapi.system_log_analyzer;
1+
package com.project.system_log_analyzer;
22

3-
import com.project.authapi.system_log_analyzer.controller.WelcomeViewFXController;
3+
import com.project.system_log_analyzer.config.SpringConfig;
44
import javafx.application.Application;
55
import javafx.fxml.FXMLLoader;
66
import javafx.scene.Parent;
77
import javafx.scene.Scene;
88
import javafx.stage.Stage;
9-
import org.springframework.boot.builder.SpringApplicationBuilder;
10-
import org.springframework.context.ConfigurableApplicationContext;
9+
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
1110

1211
public class SystemLogAnalyzerApp extends Application {
1312

14-
private ConfigurableApplicationContext springContext;
13+
private AnnotationConfigApplicationContext springContext;
1514

1615
@Override
1716
public void init() {
18-
springContext = new SpringApplicationBuilder(SystemLogAnalyzerSpringBoot.class).run();
17+
springContext = new AnnotationConfigApplicationContext(SpringConfig.class);
1918
}
2019

2120
@Override
2221
public void start(Stage primaryStage) throws Exception {
23-
FXMLLoader loader = new FXMLLoader(getClass().getResource("/view/WelcomeView.fxml"));
22+
FXMLLoader loader = new FXMLLoader(getClass().getResource("/view/WelcomeView.fxml"));
2423
loader.setControllerFactory(springContext::getBean);
25-
loader.setController(springContext.getBean(WelcomeViewFXController.class));
24+
2625
Parent root = loader.load();
2726

27+
SpringConfig.APP_READY = true;
28+
2829
Scene scene = new Scene(root);
2930
primaryStage.setScene(scene);
3031
primaryStage.setTitle("System Log Analyzer");
3132
primaryStage.show();
32-
3333
}
3434

3535
@Override
3636
public void stop() {
3737
springContext.close();
3838
}
3939

40-
4140
public static void main(String[] args) {
4241
launch(args);
4342
}
44-
4543
}
44+

src/main/java/com/project/authapi/system_log_analyzer/config/ApplicationContextProvider.java renamed to src/main/java/com/project/system_log_analyzer/config/ApplicationContextProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.project.authapi.system_log_analyzer.config;
1+
package com.project.system_log_analyzer.config;
22

33
import org.springframework.context.ApplicationContext;
44
import org.springframework.context.ApplicationContextAware;

‎src/main/java/com/project/system_log_analyzer/config/SpringConfig.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package com.project.system_log_analyzer.config;
2+
3+
4+
import org.springframework.context.annotation.ComponentScan;
5+
import org.springframework.context.annotation.Configuration;
6+
7+
@Configuration
8+
@ComponentScan("com.project.system_log_analyzer")
9+
public class SpringConfig {
10+
11+
public static boolean APP_READY = false;
12+
13+
}

src/main/java/com/project/authapi/system_log_analyzer/config/appConfig.java renamed to src/main/java/com/project/system_log_analyzer/config/appConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.project.authapi.system_log_analyzer.config;
1+
package com.project.system_log_analyzer.config;
22

33
import org.springframework.stereotype.Component;
44

src/main/java/com/project/authapi/system_log_analyzer/controller/LoadingBarFXController.java renamed to src/main/java/com/project/system_log_analyzer/controller/LoadingBarFXController.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
package com.project.authapi.system_log_analyzer.controller;
1+
package com.project.system_log_analyzer.controller;
22

3-
import com.project.authapi.system_log_analyzer.config.appConfig;
4-
import com.project.authapi.system_log_analyzer.core.LogEvent;
5-
import com.project.authapi.system_log_analyzer.io.WindowsEventExporter;
6-
import com.project.authapi.system_log_analyzer.io.WindowsEventParser;
3+
import com.project.system_log_analyzer.config.appConfig;
4+
import com.project.system_log_analyzer.core.LogEvent;
5+
import com.project.system_log_analyzer.io.WindowsEventExporter;
6+
import com.project.system_log_analyzer.io.WindowsEventParser;
7+
import com.project.system_log_analyzer.config.ApplicationContextProvider;
78
import javafx.application.Platform;
89
import javafx.concurrent.Task;
910
import javafx.fxml.FXML;
@@ -68,7 +69,7 @@ protected List<LogEvent> call() throws Exception {
6869
try {
6970
List<LogEvent> logs = loadingTask.getValue();
7071

71-
var springContext = com.project.authapi.system_log_analyzer.config.ApplicationContextProvider.getApplicationContext();
72+
var springContext = ApplicationContextProvider.getApplicationContext();
7273

7374
FXMLLoader loader = new FXMLLoader(getClass().getResource("/view/MainWindow.fxml"));
7475
loader.setControllerFactory(springContext::getBean);

src/main/java/com/project/authapi/system_log_analyzer/controller/MainWindowFXController.java renamed to src/main/java/com/project/system_log_analyzer/controller/MainWindowFXController.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package com.project.authapi.system_log_analyzer.controller;
2-
3-
import com.project.authapi.system_log_analyzer.config.appConfig;
4-
import com.project.authapi.system_log_analyzer.core.FileLoggerService;
5-
import com.project.authapi.system_log_analyzer.core.LogEvent;
6-
import com.project.authapi.system_log_analyzer.core.LogLevel;
7-
import com.project.authapi.system_log_analyzer.io.WindowsEventExporter;
8-
import com.project.authapi.system_log_analyzer.io.WindowsEventParser;
1+
package com.project.system_log_analyzer.controller;
2+
3+
import com.project.system_log_analyzer.config.appConfig;
4+
import com.project.system_log_analyzer.core.FileLoggerService;
5+
import com.project.system_log_analyzer.core.LogEvent;
6+
import com.project.system_log_analyzer.core.LogLevel;
7+
import com.project.system_log_analyzer.io.WindowsEventExporter;
8+
import com.project.system_log_analyzer.io.WindowsEventParser;
99
import javafx.concurrent.Task;
1010
import javafx.fxml.FXML;
1111
import javafx.scene.control.*;

src/main/java/com/project/authapi/system_log_analyzer/controller/WelcomeViewFXController.java renamed to src/main/java/com/project/system_log_analyzer/controller/WelcomeViewFXController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.project.authapi.system_log_analyzer.controller;
1+
package com.project.system_log_analyzer.controller;
22

3-
import com.project.authapi.system_log_analyzer.config.ApplicationContextProvider;
4-
import com.project.authapi.system_log_analyzer.config.appConfig;
3+
import com.project.system_log_analyzer.config.ApplicationContextProvider;
4+
import com.project.system_log_analyzer.config.appConfig;
55
import javafx.event.ActionEvent;
66
import javafx.fxml.FXML;
77
import javafx.fxml.FXMLLoader;

0 commit comments

Comments
 (0)