Merge 6bd25e8240 into 57b4583fd7

.github/workflows/build.yml

@@ -44,7 +44,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Download artifact
-        uses: actions/download-artifact@v4.1.0
+        uses: actions/download-artifact@v4.0.0
         with:
           # Artifact name
           name: claptrap_jar

.github/workflows/release.yml

@@ -42,7 +42,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Download artifact
-        uses: actions/download-artifact@v4.1.0
+        uses: actions/download-artifact@v4.0.0
         with:
           # Artifact name
           name: claptrap_jar

.vscode/settings.json

@@ -2,6 +2,6 @@
   "java.configuration.updateBuildConfiguration": "automatic",
   "java.compile.nullAnalysis.mode": "disabled",
   "editor.codeActionsOnSave": {
-    "source.organizeImports": "explicit"
+    "source.organizeImports": true
   }
 }

Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:21
+FROM openjdk:18.0.1
 WORKDIR /bot_src
 ARG BUILD_NBR
 ARG BRANCH_NAME

src/main/java/net/Broken/Api/Security/MethodSecurityConfig.java

@@ -0,0 +1,16 @@
+package net.Broken.Api.Security;
+
+import net.Broken.Api.Security.Expression.CustomMethodSecurityExpressionHandler;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.access.expression.method.MethodSecurityExpressionHandler;
+import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.security.config.annotation.method.configuration.GlobalMethodSecurityConfiguration;
+
+@Configuration
+@EnableGlobalMethodSecurity(prePostEnabled = true)
+public class MethodSecurityConfig extends GlobalMethodSecurityConfiguration {
+    @Override
+    protected MethodSecurityExpressionHandler createExpressionHandler() {
+        return new CustomMethodSecurityExpressionHandler();
+    }
+}

src/main/java/net/Broken/MainBot.java

@@ -1,7 +1,6 @@
 package net.Broken;
 
-import java.util.HashMap;
+import net.dv8tion.jda.api.JDA;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.boot.SpringApplication;
@@ -11,8 +10,9 @@ import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
-import net.dv8tion.jda.api.JDA;
+import java.util.HashMap;
 
 /**
  * Main Class