Upgrade java to 16 and use record type for models

build.gradle

@@ -37,8 +37,8 @@ sourceSets {
 }
 
 java {
-    sourceCompatibility = JavaVersion.toVersion('15')
-    targetCompatibility = JavaVersion.toVersion('15')
+    sourceCompatibility = JavaVersion.toVersion('16')
+    targetCompatibility = JavaVersion.toVersion('16')
 }
 
 jar {

src/main/java/fr/lukam/jambot/Main.java

@@ -36,9 +36,9 @@ private static boolean buildJDA() {
 
         try {
 
-            jda = JDABuilder.createDefault(ConfigurationUtils.getToken().token)
+            jda = JDABuilder.createDefault(ConfigurationUtils.getToken().token())
                     .setStatus(OnlineStatus.ONLINE)
-                    .setActivity(Activity.of(Activity.ActivityType.DEFAULT, "préfixe : " + prefix.prefix))
+                    .setActivity(Activity.of(Activity.ActivityType.DEFAULT, "préfixe : " + prefix.prefix()))
                     .addEventListeners(new CommandListener(new CommandsRepository(), prefix))
                     .build();
 

src/main/java/fr/lukam/jambot/commands/StaffCommand.java

@@ -19,7 +19,7 @@ public StaffCommand() {
 
     @Override
     public boolean canExecute(GuildMessageReceivedEvent event) {
-        Role role = event.getGuild().getRoleById(roleID.id);
+        Role role = event.getGuild().getRoleById(roleID.id());
 
         if (role == null) {
             return false;

src/main/java/fr/lukam/jambot/commands/impl/CommandPropose.java

@@ -53,7 +53,7 @@ public void execute(GuildMessageReceivedEvent event) {
             return;
         }
 
-        if (theme.length() > limit.limit) {
+        if (theme.length() > limit.limit()) {
             event.getChannel().sendMessage("Ce thème est trop long.").queue();
             return;
         }

src/main/java/fr/lukam/jambot/listeners/CommandListener.java

@@ -16,7 +16,7 @@ public class CommandListener extends ListenerAdapter {
     public CommandListener(CommandsRepository commandsRepository, Prefix prefix) {
         this.commandsRepository = commandsRepository;
         this.prefix = prefix;
-        this.guildId = ConfigurationUtils.getGuildId().id;
+        this.guildId = ConfigurationUtils.getGuildId().id();
     }
 
     @Override
@@ -32,7 +32,7 @@ public void onGuildMessageReceived(GuildMessageReceivedEvent event) {
             return;
         }
 
-        if (content.charAt(0) != prefix.prefix) {
+        if (content.charAt(0) != prefix.prefix()) {
             return;
         }
 

src/main/java/fr/lukam/jambot/model/Authorized.java

@@ -2,14 +2,7 @@
 
 import java.util.List;
 
-public class Authorized {
-
-    private final List<String> authorized;
-
-    public Authorized(List<String> authorized) {
-        this.authorized = authorized;
-    }
-
+public record Authorized(List<String> authorized) {
     public boolean isAuthorized(String id) {
         return authorized.contains(id);
     }

src/main/java/fr/lukam/jambot/model/Channels.java

@@ -2,14 +2,7 @@
 
 import java.util.List;
 
-public class Channels {
-
-    private final List<String> channels;
-
-    public Channels(List<String> authorized) {
-        this.channels = authorized;
-    }
-
+public record Channels(List<String> channels) {
     public boolean isAuthorized(String id) {
         return channels.contains(id);
     }

src/main/java/fr/lukam/jambot/model/GuildId.java

@@ -1,15 +1,8 @@
 package fr.lukam.jambot.model;
 
-public class GuildId {
-
-    public final long id;
-
-    public GuildId(long id) {
-        this.id = id;
-    }
-
+public record GuildId(long id) {
     public GuildId(String id) {
-        this.id = Long.parseLong(id);
+        this(Long.parseLong(id));
     }
 
 }

src/main/java/fr/lukam/jambot/model/Limit.java

@@ -1,11 +1,4 @@
 package fr.lukam.jambot.model;
 
-public class Limit {
-
-    public final int limit;
-
-    public Limit(int limit) {
-        this.limit = limit;
-    }
-
+public record Limit(int limit) {
 }

src/main/java/fr/lukam/jambot/model/Prefix.java

@@ -1,11 +1,4 @@
 package fr.lukam.jambot.model;
 
-public class Prefix {
-
-    public final char prefix;
-
-    public Prefix(char prefix) {
-        this.prefix = prefix;
-    }
-
+public record Prefix(char prefix) {
 }

src/main/java/fr/lukam/jambot/model/RoleId.java

@@ -1,15 +1,8 @@
 package fr.lukam.jambot.model;
 
-public class RoleId {
-
-    public final long id;
-
-    public RoleId(long id) {
-        this.id = id;
-    }
-
+public record RoleId(long id) {
     public RoleId(String id) {
-        this.id = Long.parseLong(id);
+        this(Long.parseLong(id));
     }
 
 }

src/main/java/fr/lukam/jambot/model/Theme.java

@@ -2,9 +2,8 @@
 
 import java.util.Objects;
 
-public class Theme {
-
-    public final String theme;
+public final class Theme {
+    public String theme;
 
     public Theme(String theme) {
         this.theme = theme;
@@ -22,5 +21,4 @@ public boolean equals(Object o) {
     public int hashCode() {
         return Objects.hash(theme);
     }
-
 }

src/main/java/fr/lukam/jambot/model/Token.java

@@ -1,11 +1,4 @@
 package fr.lukam.jambot.model;
 
-public class Token {
-
-    public final String token;
-
-    public Token(String token) {
-        this.token = token;
-    }
-
+public record Token(String token) {
 }