Starting SQL bump.

Author: DxsSucuk

Backend/pom.xml

@@ -61,7 +61,7 @@
         <dependency>
             <groupId>de.ree6</groupId>
             <artifactId>Ree6-SQL</artifactId>
-            <version>982f71d8ad</version>
+            <version>2.2.0-RC.3</version>
         </dependency>
 
         <!-- Discord -->

Backend/src/main/java/de/presti/ree6/backend/Server.java

@@ -16,6 +16,7 @@
 import de.presti.ree6.sql.entities.Recording;
 import de.presti.ree6.sql.entities.TwitchIntegration;
 import de.presti.ree6.backend.utils.ThreadUtil;
+import de.presti.ree6.sql.util.SQLConfig;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -129,12 +130,20 @@ public void load(String[] args) {
             default -> databaseTyp = DatabaseTyp.SQLite;
         }
 
-        new SQLSession(getConfig().getConfiguration().getString("hikari.sql.user"),
-                getConfig().getConfiguration().getString("hikari.sql.db"), getConfig().getConfiguration().getString("hikari.sql.pw"),
-                getConfig().getConfiguration().getString("hikari.sql.host"), getConfig().getConfiguration().getInt("hikari.sql.port"),
-                getConfig().getConfiguration().getString("hikari.misc.storageFile"), databaseTyp,
-                getConfig().getConfiguration().getInt("hikari.misc.poolSize"),
-                getConfig().getConfiguration().getBoolean("hikari.misc.createEmbeddedServer"), false);
+        SQLConfig sqlConfig = SQLConfig.builder()
+                .username(getConfig().getConfiguration().getString("hikari.sql.user"))
+                .database(getConfig().getConfiguration().getString("hikari.sql.db"))
+                .password(getConfig().getConfiguration().getString("hikari.sql.pw"))
+                .host(getConfig().getConfiguration().getString("hikari.sql.host"))
+                .port(getConfig().getConfiguration().getInt("hikari.sql.port"))
+                .path(getConfig().getConfiguration().getString("hikari.misc.storageFile"))
+                .typ(databaseTyp)
+                .poolSize(getConfig().getConfiguration().getInt("hikari.misc.poolSize"))
+                .createEmbeddedServer(getConfig().getConfiguration().getBoolean("hikari.misc.createEmbeddedServer"))
+                .debug(false)
+                .build();
+
+        new SQLSession(sqlConfig);
 
         credentialManager = CredentialManagerBuilder.builder()
                 .withStorageBackend(new DatabaseStorageBackend())

Backend/src/main/java/de/presti/ree6/backend/controller/GuildController.java

@@ -46,7 +46,7 @@ public SettingsController(SessionService sessionService) {
      */
     @GetMapping(value = "/", produces = MediaType.APPLICATION_JSON_VALUE)
     public GenericObjectResponse<List<Setting>> retrieveSettings(@RequestHeader(name = "X-Session-Authenticator") String sessionIdentifier,
-                                                  @PathVariable(name = "guildId") String guildId) {
+                                                  @PathVariable(name = "guildId") long guildId) {
         try {
             GuildContainer guildContainer = sessionService.retrieveGuild(sessionIdentifier, guildId);
             return new GenericObjectResponse<>(true, SQLSession.getSqlConnector().getSqlWorker().getAllSettings(guildId), "Setting retrieved!");
@@ -64,7 +64,7 @@ public GenericObjectResponse<List<Setting>> retrieveSettings(@RequestHeader(name
      */
     @GetMapping(value = "/{settingName}", produces = MediaType.APPLICATION_JSON_VALUE)
     public GenericObjectResponse<Setting> retrieveSetting(@RequestHeader(name = "X-Session-Authenticator") String sessionIdentifier,
-                                           @PathVariable(name = "guildId") String guildId,
+                                           @PathVariable(name = "guildId") long guildId,
                                            @PathVariable(name = "settingName") String settingName) {
         try {
             GuildContainer guildContainer = sessionService.retrieveGuild(sessionIdentifier, guildId);
@@ -88,7 +88,7 @@ public GenericObjectResponse<Setting> retrieveSetting(@RequestHeader(name = "X-S
      */
     @PostMapping(value = "/{settingName}/update", produces = MediaType.APPLICATION_JSON_VALUE)
     public GenericObjectResponse<Setting> updateSetting(@RequestHeader(name = "X-Session-Authenticator") String sessionIdentifier,
-                                         @PathVariable(name = "guildId") String guildId,
+                                         @PathVariable(name = "guildId") long guildId,
                                          @PathVariable(name = "settingName") String settingName,
                                          @RequestBody GenericValueRequest request) {
         try {
@@ -114,7 +114,7 @@ public GenericObjectResponse<Setting> updateSetting(@RequestHeader(name = "X-Ses
      */
     @GetMapping(value = "/{settingName}/delete", produces = MediaType.APPLICATION_JSON_VALUE)
     public GenericResponse deleteSetting(@RequestHeader(name = "X-Session-Authenticator") String sessionIdentifier,
-                                         @PathVariable(name = "guildId") String guildId,
+                                         @PathVariable(name = "guildId") long guildId,
                                          @PathVariable(name = "settingName") String settingName) {
         try {
             GuildContainer guildContainer = sessionService.retrieveGuild(sessionIdentifier, guildId);