Reworked application for Java 25 and JDA 4

.github/workflows/pr-validation.yml

@@ -0,0 +1,25 @@
+name: PR Validation
+
+on:
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 25
+        uses: actions/setup-java@v4
+        with:
+          java-version: '25'
+          distribution: 'temurin'
+          cache: 'maven'
+
+      - name: Run Maven Tests
+        run: mvn clean test

.github/workflows/release-publish.yml

@@ -0,0 +1,54 @@
+name: Release & Publish
+
+on:
+  pull_request:
+    types:
+      - closed
+    branches:
+      - master
+
+jobs:
+  release:
+    if: github.event.pull_request.merged == true && github.head_ref == 'develop'
+    runs-on: ubuntu-latest
+
+    steps:
+
+      - name: Checkout master branch
+        uses: actions/checkout@v4
+        with:
+          ref: master
+          token: ${{ secrets.PAT_TOKEN }}
+
+      - name: Set up JDK 25
+        uses: actions/setup-java@v4
+        with:
+          java-version: '25'
+          distribution: 'temurin'
+          cache: 'maven'
+
+      - name: Remove SNAPSHOT from POM
+        id: bump_version
+        run: |
+          mvn versions:set -DremoveSnapshot=true -DgenerateBackupPoms=false
+          NEW_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+          echo "VERSION=$NEW_VERSION" >> $GITHUB_ENV
+
+      - name: Commit and Push to Master
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git commit -am "chore: release version ${{ env.VERSION }}"
+          git push origin master
+
+      - name: Package Application
+        # Tests are skipped because they already passed in the PR Validation workflow
+        run: mvn clean package -DskipTests
+
+      - name: Publish GitHub Release
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: v${{ env.VERSION }}
+          name: Release v${{ env.VERSION }}
+          files: target/*.jar
+          generate_release_notes: true

pom.xml

@@ -7,24 +7,27 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.5.2</version>
+		<version>4.0.4</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>ovh.excale</groupId>
 	<artifactId>vgreeter</artifactId>
-	<version>2.3.0</version>
+	<version>26.4.0-SNAPSHOT</version>
 
 	<name>VGreeter</name>
 	<description>Let the bot greet your friends when they join vocal chat on Discord!</description>
 	<url>https://github.com/devExcale/VGreeter</url>
 	<packaging>jar</packaging>
 
+	<scm>
+		<connection>scm:git:${project.url}</connection>
+	</scm>
+
 	<properties>
-		<java.version>1.8</java.version>
-		<maven.compiler.source>8</maven.compiler.source>
-		<maven.compiler.target>8</maven.compiler.target>
+		<java.version>25</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<jdave.version>0.1.8</jdave.version>
 	</properties>
 
 	<dependencies>
@@ -43,7 +46,27 @@
 		<dependency>
 			<groupId>net.dv8tion</groupId>
 			<artifactId>JDA</artifactId>
-			<version>4.3.0_277</version>
+			<version>6.4.1</version>
+		</dependency>
+		<dependency>
+			<groupId>club.minnced</groupId>
+			<artifactId>jdave-api</artifactId>
+			<version>${jdave.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>club.minnced</groupId>
+			<artifactId>jdave-native-win-x86-64</artifactId>
+			<version>${jdave.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>club.minnced</groupId>
+			<artifactId>jdave-native-linux-x86-64</artifactId>
+			<version>${jdave.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>club.minnced</groupId>
+			<artifactId>jdave-native-linux-aarch64</artifactId>
+			<version>${jdave.version}</version>
 		</dependency>
 
 		<!-- Opus processing -->
@@ -62,7 +85,12 @@
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
-			<version>1.2.5</version>
+		</dependency>
+
+		<!-- JSON parsing -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
 		</dependency>
 
 		<!-- Environment -->
@@ -76,18 +104,18 @@
 		<dependency>
 			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
-			<version>42.2.22</version>
+			<version>42.7.7</version>
 		</dependency>
 
-	</dependencies>
+		<!-- Better code -->
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<version>1.18.44</version>
+			<scope>provided</scope>
+		</dependency>
 
-	<repositories>
-		<repository>
-			<id>dv8tion</id>
-			<name>m2-dv8tion</name>
-			<url>https://m2.dv8tion.net/releases</url>
-		</repository>
-	</repositories>
+	</dependencies>
 
 	<build>
 		<finalName>${project.name}-${project.version}</finalName>
@@ -105,10 +133,31 @@
 
 		<plugins>
 
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.14.1</version>
+				<configuration>
+					<release>${java.version}</release>
+					<proc>full</proc>
+					<annotationProcessorPaths>
+						<path>
+							<groupId>org.projectlombok</groupId>
+							<artifactId>lombok</artifactId>
+							<version>1.18.44</version>
+						</path>
+						<path>
+							<groupId>org.springframework.boot</groupId>
+							<artifactId>spring-boot-configuration-processor</artifactId>
+							<version>${project.parent.version}</version>
+						</path>
+					</annotationProcessorPaths>
+				</configuration>
+			</plugin>
+
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-				<version>2.5.2</version>
 			</plugin>
 
 		</plugins>

src/main/java/ovh/excale/vgreeter/VGreeterApplication.java

@@ -1,8 +1,8 @@
 package ovh.excale.vgreeter;
 
+import lombok.extern.log4j.Log4j2;
 import org.jetbrains.annotations.NotNull;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.jetbrains.annotations.Nullable;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.Banner;
@@ -11,11 +11,14 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
+import org.springframework.context.ConfigurableApplicationContext;
 
+@Log4j2
 @SpringBootApplication
 public class VGreeterApplication implements CommandLineRunner, ApplicationContextAware {
 
-	private static ApplicationContext ctx;
+	private static Boolean maintenance;
+	private static ConfigurableApplicationContext ctx;
 
 	public static void main(String[] args) {
 
@@ -25,26 +28,64 @@ public static void main(String[] args) {
 
 	}
 
+	// TODO: DON'T CONNECT TO DB DURING MAINTENANCE
+
+	// keep previous maintenance state
+	public static void restart(@Nullable final Runnable then, @Nullable final Boolean maintenance) {
+
+		log.info("Restarting app");
+
+		Thread thread = new Thread(() -> {
+			ctx.close();
+
+			VGreeterApplication.maintenance = maintenance != null ? maintenance : VGreeterApplication.maintenance;
+
+			SpringApplication app = new SpringApplication(VGreeterApplication.class);
+			app.setBannerMode(Banner.Mode.OFF);
+			app.run();
+
+			if(then != null)
+				then.run();
+
+		});
+
+		thread.setDaemon(false);
+		thread.start();
+
+	}
+
+	public static void restart(@NotNull Runnable then) {
+		restart(then, null);
+	}
+
+	public static void restart(boolean maintenance) {
+		restart(null, maintenance);
+	}
+
+	public static boolean isInMaintenance() {
+		return maintenance;
+	}
+
 	public static ApplicationContext getApplicationContext() {
 		return ctx;
 	}
 
-	public final Logger logger;
 	public final String version;
 
-	public VGreeterApplication(@Value("${application.version}") String version) {
+	public VGreeterApplication(@Value("${application.version}") String version,
+			@Value("${env.MAINTENANCE:false}") boolean maintenance) {
 		this.version = version;
-		logger = LoggerFactory.getLogger(VGreeterApplication.class);
+		VGreeterApplication.maintenance = maintenance;
 	}
 
 	@Override
 	public void run(String[] args) {
-		logger.info("Running on version {}", version);
+		log.info("Running on version {}", version);
 	}
 
 	@Override
 	public void setApplicationContext(@NotNull ApplicationContext context) throws BeansException {
-		ctx = context;
+		ctx = (ConfigurableApplicationContext) context;
 	}
 
 }