Java upgrade

pom.xml

@@ -83,7 +83,7 @@
         <!-- Do not change unless you want different name for local builds. -->
         <build.number>-LOCAL</build.number>
         <!-- This allows to change between versions. -->
-        <build.version>1.17.2</build.version>
+        <build.version>1.17.3</build.version>
     </properties>
 
     <!-- Profiles will allow to automatically change build version. -->

src/main/java/world/bentobox/bentobox/api/addons/exceptions/AddonException.java

@@ -1,10 +1,13 @@
 package world.bentobox.bentobox.api.addons.exceptions;
 
+import java.io.Serial;
+
 public abstract class AddonException extends Exception {
 
     /**
      *
      */
+    @Serial
     private static final long serialVersionUID = 4203162022348693854L;
 
     protected AddonException(String errorMessage){

src/main/java/world/bentobox/bentobox/api/addons/exceptions/AddonRequestException.java

@@ -1,8 +1,11 @@
 package world.bentobox.bentobox.api.addons.exceptions;
 
+import java.io.Serial;
+
 public class AddonRequestException extends AddonException
 {
-	private static final long serialVersionUID = -5698456013070166174L;
+	@Serial
+    private static final long serialVersionUID = -5698456013070166174L;
 
 	public AddonRequestException(String errorMessage) {
 		super(errorMessage);

src/main/java/world/bentobox/bentobox/api/addons/exceptions/InvalidAddonDescriptionException.java

@@ -1,5 +1,7 @@
 package world.bentobox.bentobox.api.addons.exceptions;
 
+import java.io.Serial;
+
 /**
  * @since 1.11.0
  */
@@ -8,6 +10,7 @@ public class InvalidAddonDescriptionException extends AddonException {
     /**
      *
      */
+    @Serial
     private static final long serialVersionUID = 7741502900847049986L;
 
     public InvalidAddonDescriptionException(String errorMessage) {

src/main/java/world/bentobox/bentobox/api/addons/exceptions/InvalidAddonFormatException.java

@@ -1,5 +1,6 @@
 package world.bentobox.bentobox.api.addons.exceptions;
 
+import java.io.Serial;
 import java.util.logging.Level;
 
 import org.bukkit.Bukkit;
@@ -9,6 +10,7 @@ public class InvalidAddonFormatException extends AddonException {
     /**
      *
      */
+    @Serial
     private static final long serialVersionUID = 7741502900847049986L;
 
     public InvalidAddonFormatException(String errorMessage) {

src/main/java/world/bentobox/bentobox/api/addons/exceptions/InvalidAddonInheritException.java

@@ -1,10 +1,13 @@
 package world.bentobox.bentobox.api.addons.exceptions;
 
+import java.io.Serial;
+
 public class InvalidAddonInheritException extends AddonException {
 
     /**
      *
      */
+    @Serial
     private static final long serialVersionUID = -5847358994397613244L;
 
     public InvalidAddonInheritException(String errorMessage) {

src/main/java/world/bentobox/bentobox/api/commands/CompositeCommand.java

@@ -144,7 +144,7 @@ protected CompositeCommand(Addon addon, String label, String... aliases) {
 
         // Run setup
         setup();
-        if (!getSubCommand("help").isPresent() && !label.equals("help")) {
+        if (getSubCommand("help").isEmpty() && !label.equals("help")) {
             new DefaultHelpCommand(this);
         }
     }
@@ -204,11 +204,11 @@ protected CompositeCommand(Addon addon, CompositeCommand parent, String label, S
             p = p.getParent();
             index++;
         }
-        setDescription(COMMANDS + reference.toString() + ".description");
-        setParametersHelp(COMMANDS + reference.toString() + ".parameters");
+        setDescription(COMMANDS + reference + ".description");
+        setParametersHelp(COMMANDS + reference + ".parameters");
         setup();
         // If this command does not define its own help class, then use the default help command
-        if (!getSubCommand("help").isPresent() && !label.equals("help")) {
+        if (getSubCommand("help").isEmpty() && !label.equals("help")) {
             new DefaultHelpCommand(this);
         }
     }
@@ -278,7 +278,7 @@ private CompositeCommand getCommandFromArgs(String[] args) {
             // get the subcommand corresponding to the arg
             if (subCommand.hasSubCommands()) {
                 Optional<CompositeCommand> sub = subCommand.getSubCommand(arg);
-                if (!sub.isPresent()) {
+                if (sub.isEmpty()) {
                     return subCommand;
                 }
                 // Step down one
@@ -602,7 +602,7 @@ public List<String> tabComplete(final CommandSender sender, final String alias,
             return options;
         }
         // Add any tab completion from the subcommand
-        options.addAll(command.tabComplete(User.getInstance(sender), alias, new LinkedList<>(Arrays.asList(args))).orElseGet(() -> new ArrayList<>()));
+        options.addAll(command.tabComplete(User.getInstance(sender), alias, new LinkedList<>(Arrays.asList(args))).orElseGet(ArrayList::new));
         if (command.hasSubCommands()) {
             options.addAll(getSubCommandLabels(sender, command));
         }
@@ -701,7 +701,7 @@ public String getTopLabel() {
      * @since 1.5.0
      */
     public void setCooldown(String uniqueId, String targetUUID, int timeInSeconds) {
-        cooldowns.computeIfAbsent(uniqueId, k -> new HashMap<>()).put(targetUUID, System.currentTimeMillis() + timeInSeconds * 1000);
+        cooldowns.computeIfAbsent(uniqueId, k -> new HashMap<>()).put(targetUUID, System.currentTimeMillis() + timeInSeconds * 1000L);
     }
 
     /**
@@ -711,7 +711,7 @@ public void setCooldown(String uniqueId, String targetUUID, int timeInSeconds) {
      * @param timeInSeconds - time in seconds to cool down
      */
     public void setCooldown(UUID uniqueId, UUID targetUUID, int timeInSeconds) {
-        cooldowns.computeIfAbsent(uniqueId.toString(), k -> new HashMap<>()).put(targetUUID == null ? null : targetUUID.toString(), System.currentTimeMillis() + timeInSeconds * 1000);
+        cooldowns.computeIfAbsent(uniqueId.toString(), k -> new HashMap<>()).put(targetUUID == null ? null : targetUUID.toString(), System.currentTimeMillis() + timeInSeconds * 1000L);
     }
 
     /**

src/main/java/world/bentobox/bentobox/api/commands/admin/AdminSetProtectionCenterCommand.java

@@ -59,7 +59,7 @@ public boolean canExecute(User user, String label, List<String> args) {
             return false;
         }
         Optional<Island> optionalIsland = getIslands().getIslandAt(targetLoc);
-        if (!optionalIsland.isPresent()) {
+        if (optionalIsland.isEmpty()) {
             user.sendMessage("commands.admin.setspawnpoint.no-island-here");
             return false;
         }

src/main/java/world/bentobox/bentobox/api/commands/admin/AdminSettingsCommand.java

@@ -39,7 +39,7 @@ public class AdminSettingsCommand extends CompositeCommand {
     private Island island;
     private final List<String> SETTING_FLAG_NAMES;
     private List<String> WORLD_SETTING_FLAG_NAMES;
-    private @NonNull Optional<Flag> flag;
+    private @NonNull Optional<Flag> flag = Optional.empty();
     private boolean activeState;
     private int rank;
 
@@ -258,20 +258,14 @@ public Optional<List<String>> tabComplete(User user, String alias, List<String>
             }
         } else if (args.size() == 4) {
             // Get flag in previous argument
-            options = getPlugin().getFlagsManager().getFlag(args.get(2).toUpperCase(Locale.ENGLISH)).map(f -> {
-                switch (f.getType()) {
-                case PROTECTION:
-                    return getPlugin().getRanksManager()                     
-                            .getRanks().entrySet().stream()
-                            .filter(en -> en.getValue() > RanksManager.BANNED_RANK && en.getValue() <= RanksManager.OWNER_RANK)
-                            .map(Entry::getKey)
-                            .map(user::getTranslation).collect(Collectors.toList());
-                case SETTING:
-                    return Arrays.asList(active, disabled);
-                default:
-                    return Collections.<String>emptyList();
-
-                }
+            options = getPlugin().getFlagsManager().getFlag(args.get(2).toUpperCase(Locale.ENGLISH)).map(f -> switch (f.getType()) {
+                case PROTECTION -> getPlugin().getRanksManager()
+                        .getRanks().entrySet().stream()
+                        .filter(en -> en.getValue() > RanksManager.BANNED_RANK && en.getValue() <= RanksManager.OWNER_RANK)
+                        .map(Entry::getKey)
+                        .map(user::getTranslation).collect(Collectors.toList());
+                case SETTING -> Arrays.asList(active, disabled);
+                default -> Collections.<String>emptyList();
             }).orElse(Collections.emptyList());
         }
         return Optional.of(Util.tabLimit(options, lastArg));

src/main/java/world/bentobox/bentobox/api/commands/admin/AdminSwitchtoCommand.java

@@ -63,7 +63,7 @@ public boolean canExecute(User user, String label, List<String> args) {
     public boolean execute(User user, String label, List<String> args) {
         if (NumberUtils.isDigits(args.get(1))) {
             try {
-                Integer n = Integer.valueOf(args.get(1));
+                int n = Integer.parseInt(args.get(1));
                 if (n < 1 || n > islands.size()) {
                     user.sendMessage("commands.admin.switchto.out-of-range", TextVariables.NUMBER, String.valueOf(islands.size()), TextVariables.LABEL, getTopLabel());
                     return false;

src/main/java/world/bentobox/bentobox/api/commands/admin/purge/AdminPurgeCommand.java

@@ -70,7 +70,7 @@ public boolean execute(User user, String label, List<String> args) {
         islands.clear();
         this.user = user;
         try {
-            Integer days = Integer.parseInt(args.get(0));
+            int days = Integer.parseInt(args.get(0));
             if (days < 1) {
                 user.sendMessage("commands.admin.purge.days-one-or-more");
                 return false;

src/main/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeDisplayCommand.java

@@ -46,29 +46,15 @@ public boolean execute(User user, String label, List<String> args) {
 
         if (!displayRanges.containsKey(user)) {
             switch (label) {
-            case DISPLAY:
-            case SHOW:
-                showZones(user);
-                break;
-            case HIDE:
-                user.sendMessage("commands.admin.range.display.already-off");
-                break;
-            default:
-                showHelp(this, user);
-                break;
+                case DISPLAY, SHOW -> showZones(user);
+                case HIDE -> user.sendMessage("commands.admin.range.display.already-off");
+                default -> showHelp(this, user);
             }
         } else {
             switch (label) {
-            case DISPLAY:
-            case HIDE:
-                hideZones(user);
-                break;
-            case SHOW:
-                user.sendMessage("commands.admin.range.display.already-on");
-                break;
-            default:
-                showHelp(this, user);
-                break;
+                case DISPLAY, HIDE -> hideZones(user);
+                case SHOW -> user.sendMessage("commands.admin.range.display.already-on");
+                default -> showHelp(this, user);
             }
         }
 

src/main/java/world/bentobox/bentobox/api/commands/island/team/Invite.java

@@ -75,10 +75,9 @@ public boolean equals(Object obj) {
         if (obj == null) {
             return false;
         }
-        if (!(obj instanceof Invite)) {
+        if (!(obj instanceof Invite other)) {
             return false;
         }
-        Invite other = (Invite) obj;
         return Objects.equals(invitee, other.invitee) && Objects.equals(inviter, other.inviter) && type == other.type;
     }
 }

src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteAcceptCommand.java

@@ -82,14 +82,10 @@ public boolean execute(User user, String label, List<String> args) {
         // Get the invite
         Invite invite = itc.getInvite(playerUUID);
         switch (invite.getType()) {
-        case COOP:
-            askConfirmation(user, () -> acceptCoopInvite(user, invite));
-            break;
-        case TRUST:
-            askConfirmation(user, () -> acceptTrustInvite(user, invite));
-            break;
-        default:
-            askConfirmation(user, user.getTranslation("commands.island.team.invite.accept.confirmation"), () -> acceptTeamInvite(user, invite));
+            case COOP -> askConfirmation(user, () -> acceptCoopInvite(user, invite));
+            case TRUST -> askConfirmation(user, () -> acceptTrustInvite(user, invite));
+            default -> askConfirmation(user, user.getTranslation("commands.island.team.invite.accept.confirmation"),
+                    () -> acceptTeamInvite(user, invite));
         }
         return true;
     }

src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteCommand.java

@@ -51,15 +51,9 @@ public boolean canExecute(User user, String label, List<String> args) {
                 Invite invite = itc.getInvite(playerUUID);
                 String name = getPlayers().getName(playerUUID);
                 switch (invite.getType()) {
-                case COOP:
-                    user.sendMessage("commands.island.team.invite.name-has-invited-you.coop", TextVariables.NAME, name);
-                    break;
-                case TRUST:
-                    user.sendMessage("commands.island.team.invite.name-has-invited-you.trust", TextVariables.NAME, name);
-                    break;
-                default:
-                    user.sendMessage("commands.island.team.invite.name-has-invited-you", TextVariables.NAME, name);
-                    break;
+                    case COOP -> user.sendMessage("commands.island.team.invite.name-has-invited-you.coop", TextVariables.NAME, name);
+                    case TRUST -> user.sendMessage("commands.island.team.invite.name-has-invited-you.trust", TextVariables.NAME, name);
+                    default -> user.sendMessage("commands.island.team.invite.name-has-invited-you", TextVariables.NAME, name);
                 }
                 return true;
             }

src/main/java/world/bentobox/bentobox/api/events/addon/AddonEvent.java

@@ -100,29 +100,21 @@ public AddonEventBuilder reason(Reason reason) {
         }
 
         private AddonBaseEvent getDeprecatedEvent() {
-            switch (reason) {
-            case ENABLE:
-                return new AddonEnableEvent(addon, keyValues);
-            case DISABLE:
-                return new AddonDisableEvent(addon, keyValues);
-            case LOAD:
-                return new AddonLoadEvent(addon, keyValues);
-            default:
-                return new AddonGeneralEvent(addon, keyValues);
-            }
+            return switch (reason) {
+                case ENABLE -> new AddonEnableEvent(addon, keyValues);
+                case DISABLE -> new AddonDisableEvent(addon, keyValues);
+                case LOAD -> new AddonLoadEvent(addon, keyValues);
+                default -> new AddonGeneralEvent(addon, keyValues);
+            };
         }
 
         private AddonBaseEvent getEvent() {
-            switch (reason) {
-            case ENABLE:
-                return new world.bentobox.bentobox.api.events.addon.AddonEnableEvent(addon, keyValues);
-            case DISABLE:
-                return new world.bentobox.bentobox.api.events.addon.AddonDisableEvent(addon, keyValues);
-            case LOAD:
-                return new world.bentobox.bentobox.api.events.addon.AddonLoadEvent(addon, keyValues);
-            default:
-                return new world.bentobox.bentobox.api.events.addon.AddonGeneralEvent(addon, keyValues);
-            }
+            return switch (reason) {
+                case ENABLE -> new world.bentobox.bentobox.api.events.addon.AddonEnableEvent(addon, keyValues);
+                case DISABLE -> new world.bentobox.bentobox.api.events.addon.AddonDisableEvent(addon, keyValues);
+                case LOAD -> new world.bentobox.bentobox.api.events.addon.AddonLoadEvent(addon, keyValues);
+                default -> new world.bentobox.bentobox.api.events.addon.AddonGeneralEvent(addon, keyValues);
+            };
         }
 
         /**