refactor: remove duplicated code in admin economy commands

SonarCloud flagged 40-55% duplication across the admin eco command classes.
Extract the shared <player> <amount> scaffolding into AbstractAdminAmountCommand
(template method: subclasses supply the money op and success key), and add
requireEconomy() and sendBalanceMessage() helpers to the command bases. Give/
take/set/balance and pay now delegate to these instead of repeating the
validation and balance-reporting blocks. No behaviour change; 120 tests pass.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

Author: tastybento

src/main/java/com/wasteofplastic/invswitcher/commands/AbstractMoneyCommand.java

@@ -40,6 +40,19 @@ protected InvEconomy economy() {
         return addon.getEconomy();
     }
 
+    /**
+     * Get the economy or send the "no economy" error to the user.
+     * @param user - command sender
+     * @return the economy, or null if unavailable (an error has been sent)
+     */
+    protected InvEconomy requireEconomy(User user) {
+        InvEconomy eco = economy();
+        if (eco == null) {
+            user.sendMessage("invswitcher.errors.no-economy");
+        }
+        return eco;
+    }
+
     /**
      * Parse a strictly-positive money amount, sending an error message on failure.
      * @param user - command sender

src/main/java/com/wasteofplastic/invswitcher/commands/admin/AbstractAdminAmountCommand.java

@@ -0,0 +1,68 @@
+package com.wasteofplastic.invswitcher.commands.admin;
+
+import java.util.List;
+
+import org.bukkit.OfflinePlayer;
+
+import com.wasteofplastic.invswitcher.economy.InvEconomy;
+
+import net.milkbowl.vault.economy.EconomyResponse;
+import world.bentobox.bentobox.api.commands.CompositeCommand;
+import world.bentobox.bentobox.api.user.User;
+
+/**
+ * Base for admin economy commands of the form {@code <command> <player> <amount>} (give, take,
+ * set). Handles the shared validation, applies the subclass's money operation against the
+ * command's game mode world, and reports the resulting balance. Subclasses only define the
+ * operation and the success message.
+ * @author tastybento
+ */
+public abstract class AbstractAdminAmountCommand extends AbstractAdminMoneyCommand {
+
+    protected AbstractAdminAmountCommand(CompositeCommand parent, String label, String... aliases) {
+        super(parent, label, aliases);
+    }
+
+    /**
+     * Perform the money operation on the target for the given world.
+     * @param eco - the economy
+     * @param target - the target player
+     * @param world - the command's game mode world name
+     * @param amount - the parsed, positive amount
+     * @return the economy response (a non-success response reports insufficient funds)
+     */
+    protected abstract EconomyResponse apply(InvEconomy eco, OfflinePlayer target, String world, double amount);
+
+    /**
+     * @return the locale key of the success message, which receives [name] and [number]
+     */
+    protected abstract String successKey();
+
+    @Override
+    public boolean execute(User user, String label, List<String> args) {
+        if (args.size() != 2) {
+            this.showHelp(this, user);
+            return false;
+        }
+        InvEconomy eco = requireEconomy(user);
+        if (eco == null) {
+            return false;
+        }
+        User target = resolveTarget(user, args.get(0));
+        if (target == null) {
+            return false;
+        }
+        Double amount = parseAmount(user, args.get(1));
+        if (amount == null) {
+            return false;
+        }
+        String world = getWorld().getName();
+        EconomyResponse response = apply(eco, target.getOfflinePlayer(), world, amount);
+        if (!response.transactionSuccess()) {
+            user.sendMessage("invswitcher.errors.insufficient-funds");
+            return false;
+        }
+        sendBalanceMessage(user, successKey(), target, world);
+        return true;
+    }
+}

src/main/java/com/wasteofplastic/invswitcher/commands/admin/AbstractAdminMoneyCommand.java

@@ -36,6 +36,18 @@ protected User resolveTarget(User user, String name) {
         return target;
     }
 
+    /**
+     * Send a message reporting the target's balance for the given world, with [name] and [number].
+     * @param user - command sender
+     * @param messageKey - locale key of the message
+     * @param target - the target player
+     * @param world - the world to report the balance for
+     */
+    protected void sendBalanceMessage(User user, String messageKey, User target, String world) {
+        user.sendMessage(messageKey, TextVariables.NAME, target.getName(),
+                TextVariables.NUMBER, economy().format(economy().getBalance(target.getOfflinePlayer(), world)));
+    }
+
     /**
      * Tab-complete the player parameter (the first argument of these commands) with the names of
      * online players. The command tree is {@code <admin> eco <sub> <player> [amount]}, so the

src/main/java/com/wasteofplastic/invswitcher/commands/admin/AdminBalanceCommand.java

@@ -2,14 +2,11 @@
 
 import java.util.List;
 
-import com.wasteofplastic.invswitcher.economy.InvEconomy;
-
 import world.bentobox.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.user.User;
 
 /**
- * Shows an admin another player's balance for the world that player is currently in (or was last in).
+ * Shows an admin another player's balance for this command's game mode world.
  * @author tastybento
  */
 public class AdminBalanceCommand extends AbstractAdminMoneyCommand {
@@ -31,18 +28,14 @@ public boolean execute(User user, String label, List<String> args) {
             this.showHelp(this, user);
             return false;
         }
-        InvEconomy eco = economy();
-        if (eco == null) {
-            user.sendMessage("invswitcher.errors.no-economy");
+        if (requireEconomy(user) == null) {
             return false;
         }
         User target = resolveTarget(user, args.get(0));
         if (target == null) {
             return false;
         }
-        user.sendMessage("invswitcher.commands.admin.balance.balance",
-                TextVariables.NAME, target.getName(),
-                TextVariables.NUMBER, eco.format(eco.getBalance(target.getOfflinePlayer(), getWorld().getName())));
+        sendBalanceMessage(user, "invswitcher.commands.admin.balance.balance", target, getWorld().getName());
         return true;
     }
 }

src/main/java/com/wasteofplastic/invswitcher/commands/admin/AdminGiveCommand.java

@@ -1,18 +1,17 @@
 package com.wasteofplastic.invswitcher.commands.admin;
 
-import java.util.List;
+import org.bukkit.OfflinePlayer;
 
 import com.wasteofplastic.invswitcher.economy.InvEconomy;
 
+import net.milkbowl.vault.economy.EconomyResponse;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bentobox.api.localization.TextVariables;
-import world.bentobox.bentobox.api.user.User;
 
 /**
- * Gives money to a player in the world they are currently in (or were last in).
+ * Gives money to a player in this command's game mode world.
  * @author tastybento
  */
-public class AdminGiveCommand extends AbstractAdminMoneyCommand {
+public class AdminGiveCommand extends AbstractAdminAmountCommand {
 
     public AdminGiveCommand(CompositeCommand parent) {
         super(parent, "give");
@@ -26,29 +25,12 @@ public void setup() {
     }
 
     @Override
-    public boolean execute(User user, String label, List<String> args) {
-        if (args.size() != 2) {
-            this.showHelp(this, user);
-            return false;
-        }
-        InvEconomy eco = economy();
-        if (eco == null) {
-            user.sendMessage("invswitcher.errors.no-economy");
-            return false;
-        }
-        User target = resolveTarget(user, args.get(0));
-        if (target == null) {
-            return false;
-        }
-        Double amount = parseAmount(user, args.get(1));
-        if (amount == null) {
-            return false;
-        }
-        String world = getWorld().getName();
-        eco.depositPlayer(target.getOfflinePlayer(), world, amount);
-        user.sendMessage("invswitcher.commands.admin.give.success",
-                TextVariables.NAME, target.getName(),
-                TextVariables.NUMBER, eco.format(eco.getBalance(target.getOfflinePlayer(), world)));
-        return true;
+    protected EconomyResponse apply(InvEconomy eco, OfflinePlayer target, String world, double amount) {
+        return eco.depositPlayer(target, world, amount);
+    }
+
+    @Override
+    protected String successKey() {
+        return "invswitcher.commands.admin.give.success";
     }
 }

src/main/java/com/wasteofplastic/invswitcher/commands/admin/AdminSetCommand.java

@@ -1,18 +1,17 @@
 package com.wasteofplastic.invswitcher.commands.admin;
 
-import java.util.List;
+import org.bukkit.OfflinePlayer;
 
 import com.wasteofplastic.invswitcher.economy.InvEconomy;
 
+import net.milkbowl.vault.economy.EconomyResponse;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bentobox.api.localization.TextVariables;
-import world.bentobox.bentobox.api.user.User;
 
 /**
- * Sets a player's balance in the world they are currently in (or were last in).
+ * Sets a player's balance in this command's game mode world.
  * @author tastybento
  */
-public class AdminSetCommand extends AbstractAdminMoneyCommand {
+public class AdminSetCommand extends AbstractAdminAmountCommand {
 
     public AdminSetCommand(CompositeCommand parent) {
         super(parent, "set");
@@ -26,29 +25,12 @@ public void setup() {
     }
 
     @Override
-    public boolean execute(User user, String label, List<String> args) {
-        if (args.size() != 2) {
-            this.showHelp(this, user);
-            return false;
-        }
-        InvEconomy eco = economy();
-        if (eco == null) {
-            user.sendMessage("invswitcher.errors.no-economy");
-            return false;
-        }
-        User target = resolveTarget(user, args.get(0));
-        if (target == null) {
-            return false;
-        }
-        Double amount = parseAmount(user, args.get(1));
-        if (amount == null) {
-            return false;
-        }
-        String world = getWorld().getName();
-        eco.setBalance(target.getOfflinePlayer(), world, amount);
-        user.sendMessage("invswitcher.commands.admin.set.success",
-                TextVariables.NAME, target.getName(),
-                TextVariables.NUMBER, eco.format(eco.getBalance(target.getOfflinePlayer(), world)));
-        return true;
+    protected EconomyResponse apply(InvEconomy eco, OfflinePlayer target, String world, double amount) {
+        return eco.setBalance(target, world, amount);
+    }
+
+    @Override
+    protected String successKey() {
+        return "invswitcher.commands.admin.set.success";
     }
 }

src/main/java/com/wasteofplastic/invswitcher/commands/admin/AdminTakeCommand.java

@@ -1,19 +1,17 @@
 package com.wasteofplastic.invswitcher.commands.admin;
 
-import java.util.List;
+import org.bukkit.OfflinePlayer;
 
 import com.wasteofplastic.invswitcher.economy.InvEconomy;
 
 import net.milkbowl.vault.economy.EconomyResponse;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bentobox.api.localization.TextVariables;
-import world.bentobox.bentobox.api.user.User;
 
 /**
- * Takes money from a player in the world they are currently in (or were last in).
+ * Takes money from a player in this command's game mode world.
  * @author tastybento
  */
-public class AdminTakeCommand extends AbstractAdminMoneyCommand {
+public class AdminTakeCommand extends AbstractAdminAmountCommand {
 
     public AdminTakeCommand(CompositeCommand parent) {
         super(parent, "take");
@@ -27,33 +25,12 @@ public void setup() {
     }
 
     @Override
-    public boolean execute(User user, String label, List<String> args) {
-        if (args.size() != 2) {
-            this.showHelp(this, user);
-            return false;
-        }
-        InvEconomy eco = economy();
-        if (eco == null) {
-            user.sendMessage("invswitcher.errors.no-economy");
-            return false;
-        }
-        User target = resolveTarget(user, args.get(0));
-        if (target == null) {
-            return false;
-        }
-        Double amount = parseAmount(user, args.get(1));
-        if (amount == null) {
-            return false;
-        }
-        String world = getWorld().getName();
-        EconomyResponse response = eco.withdrawPlayer(target.getOfflinePlayer(), world, amount);
-        if (!response.transactionSuccess()) {
-            user.sendMessage("invswitcher.errors.insufficient-funds");
-            return false;
-        }
-        user.sendMessage("invswitcher.commands.admin.take.success",
-                TextVariables.NAME, target.getName(),
-                TextVariables.NUMBER, eco.format(eco.getBalance(target.getOfflinePlayer(), world)));
-        return true;
+    protected EconomyResponse apply(InvEconomy eco, OfflinePlayer target, String world, double amount) {
+        return eco.withdrawPlayer(target, world, amount);
+    }
+
+    @Override
+    protected String successKey() {
+        return "invswitcher.commands.admin.take.success";
     }
 }

src/main/java/com/wasteofplastic/invswitcher/commands/user/PayCommand.java

@@ -37,9 +37,8 @@ public boolean execute(User user, String label, List<String> args) {
             this.showHelp(this, user);
             return false;
         }
-        InvEconomy eco = economy();
+        InvEconomy eco = requireEconomy(user);
         if (eco == null) {
-            user.sendMessage("invswitcher.errors.no-economy");
             return false;
         }
         User target = getPlayers().getUser(args.get(0));