refactor: sonarqube

api/src/main/java/dev/xhyrom/lighteco/api/event/EventBus.java

@@ -1,11 +0,0 @@
-package dev.xhyrom.lighteco.api.event;
-
-import org.checkerframework.checker.nullness.qual.NonNull;
-
-import java.util.function.Consumer;
-
-public interface EventBus {
-    <T extends LightEcoEvent> @NonNull EventSubscription<T> subscribe(@NonNull Class<T> eventClass, @NonNull Consumer<? super T> subscriber);
-
-    <T extends LightEcoEvent> @NonNull EventSubscription<T> subscribe(Object plugin, @NonNull Class<T> eventClass, @NonNull Consumer<? super T> subscriber);
-}

api/src/main/java/dev/xhyrom/lighteco/api/event/EventSubscription.java

@@ -1,13 +0,0 @@
-package dev.xhyrom.lighteco.api.event;
-
-import org.checkerframework.checker.nullness.qual.NonNull;
-
-import java.util.function.Consumer;
-
-public interface EventSubscription<T extends LightEcoEvent> extends AutoCloseable {
-    @NonNull Class<T> getEventClass();
-
-    boolean isActive();
-
-    @NonNull Consumer<? super T> getHandler();
-}

api/src/main/java/dev/xhyrom/lighteco/api/event/LightEcoEvent.java

@@ -1,10 +0,0 @@
-package dev.xhyrom.lighteco.api.event;
-
-import dev.xhyrom.lighteco.api.LightEco;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
-public interface LightEcoEvent {
-    @NonNull LightEco getLightEco();
-
-    @NonNull Class<? extends LightEcoEvent> getEventClass();
-}

api/src/main/java/dev/xhyrom/lighteco/api/event/currency/CurrencyRegisterEvent.java

@@ -1,11 +0,0 @@
-package dev.xhyrom.lighteco.api.event.currency;
-
-import dev.xhyrom.lighteco.api.event.LightEcoEvent;
-import dev.xhyrom.lighteco.api.event.util.Position;
-import dev.xhyrom.lighteco.api.model.currency.Currency;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
-public interface CurrencyRegisterEvent extends LightEcoEvent {
-    @Position(0)
-    @NonNull Currency getCurrency();
-}

api/src/main/java/dev/xhyrom/lighteco/api/event/util/Position.java

@@ -1,21 +0,0 @@
-package dev.xhyrom.lighteco.api.event.util;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Represents the position (index) of a parameter within an event.
- * Used for information purposes only.
- */
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.SOURCE)
-public @interface Position {
-    /**
-     * Represents the position (index) of a parameter.
-     *
-     * @return the position (index)
-     */
-    int value();
-}

api/src/main/java/dev/xhyrom/lighteco/api/model/currency/Currency.java

@@ -4,24 +4,24 @@ import dev.xhyrom.lighteco.api.model.user.User;
 
 import java.math.BigDecimal;
 
-public abstract class Currency {
+public interface Currency {
-    public abstract String getIdentifier();
+    String getIdentifier();
     /**
      * Get the type of the currency, either {@link Type#LOCAL} or {@link Type#GLOBAL}
      *
      * @see Type
      * @return The type of the currency
      */
-    public abstract Type getType();
+    Type getType();
 
-    public abstract boolean isPayable();
+    boolean isPayable();
 
     /**
      * Get the number of fractional digits this currency has
      *
      * @return The number of fractional digits
      */
-    public int fractionalDigits() {
+    default int fractionalDigits() {
         return 0;
     };
 
@@ -30,7 +30,7 @@ public abstract class Currency {
      *
      * @return The users
      */
-    public abstract BigDecimal getDefaultBalance();
+    BigDecimal getDefaultBalance();
 
     /**
      * Calculate the tax for the given amount
@@ -39,7 +39,7 @@ public abstract class Currency {
      * @param amount The amount to calculate the tax for
      * @return Amount that should be taxed
      */
-    public BigDecimal calculateTax(User user, BigDecimal amount) {
+    default BigDecimal calculateTax(User user, BigDecimal amount) {
         return BigDecimal.ZERO;
     };
 

build.gradle.kts

@@ -2,6 +2,7 @@ import java.io.ByteArrayOutputStream
 
 plugins {
     id("java")
+    id("org.sonarqube") version "4.2.1.3168"
 }
 
 val majorVersion = 0

bukkit/src/main/java/dev/xhyrom/lighteco/bukkit/chat/BukkitCommandSender.java

@@ -25,8 +25,8 @@ public class BukkitCommandSender extends AbstractCommandSender<CommandSender> {
 
     @Override
     public UUID getUniqueId() {
-        if (super.delegate instanceof Player) {
+        if (super.delegate instanceof Player player) {
-            return ((Player) super.delegate).getUniqueId();
+            return player.getUniqueId();
         }
 
         return null;

bukkit/src/main/java/dev/xhyrom/lighteco/bukkit/commands/BalanceCommand.java

@@ -46,8 +46,12 @@ public class BalanceCommand implements Command {
 
         this.manager.plugin.getUserManager().loadUser(target.getUniqueId())
                 .thenAcceptAsync(result -> {
-                    String name = target.getName() != null ? target.getName() : args.getRaw("target");
+                    String username = result.getUsername() == null ?
-                    result.setUsername(name);
+                            target.getName() != null
+                                    ? target.getName()
+                                    : args.getRaw("target")
+                            : result.getUsername();
+                    result.setUsername(username);
 
                     this.manager.onBalance(sender, currency, result);
                 });

bukkit/src/main/java/dev/xhyrom/lighteco/bukkit/commands/Command.java

@@ -2,13 +2,12 @@ package dev.xhyrom.lighteco.bukkit.commands;
 
 import dev.jorel.commandapi.CommandAPICommand;
 
-import java.util.List;
-
 public interface Command {
     default CommandAPICommand build() {
         return null;
-    };
+    }
-    default CommandAPICommand[] multipleBuild() {
+
-        return null;
+    default CommandAPICommand[] multipleBuild() {
-    };
+        return new CommandAPICommand[0];
+    }
 }

bukkit/src/main/java/dev/xhyrom/lighteco/bukkit/commands/PayCommand.java

@@ -44,12 +44,12 @@ public class PayCommand implements Command {
 
         this.manager.plugin.getUserManager().loadUser(target.getUniqueId())
                 .thenAcceptAsync(result -> {
-                    String name = result.getUsername() == null ?
+                    String username = result.getUsername() == null ?
                             target.getName() != null
                                     ? target.getName()
                                     : args.getRaw("target")
                             : result.getUsername();
-                    result.setUsername(name);
+                    result.setUsername(username);
 
                     this.manager.onPay(sender, currency, result, amount);
                 });

bukkittest/src/main/java/dev/xhyrom/lighteco/bukkittest/TestCurrency.java

@@ -4,7 +4,7 @@ import dev.xhyrom.lighteco.api.model.currency.Currency;
 
 import java.math.BigDecimal;
 
-public class TestCurrency extends Currency {
+public class TestCurrency implements Currency {
     @Override
     public String getIdentifier() {
         return "test";

bukkittest/src/main/java/dev/xhyrom/lighteco/bukkittest/TestCurrency2.java

@@ -5,7 +5,7 @@ import dev.xhyrom.lighteco.api.model.user.User;
 
 import java.math.BigDecimal;
 
-public class TestCurrency2 extends Currency {
+public class TestCurrency2 implements Currency {
     @Override
     public String getIdentifier() {
         return "test2";

bukkittest/src/main/java/dev/xhyrom/lighteco/bukkittest/TestPlugin.java

@@ -18,9 +18,7 @@ public class TestPlugin extends JavaPlugin {
 
         getLogger().info("TestCurrency registered!");
 
-        currencyManager.getRegisteredCurrencies().forEach(currency -> {
+        currencyManager.getRegisteredCurrencies().forEach(currency -> getLogger().info("Currency: " + currency.getIdentifier() + " (" + currency.getType() + ", " + currency.fractionalDigits() + ", " + currency.isPayable() + ")"));
-            getLogger().info("Currency: " + currency.getIdentifier() + " (" + currency.getType() + ", " + currency.fractionalDigits() + ", " + currency.isPayable() + ")");
-        });
 
         provider.getCommandManager().registerCurrencyCommand(currencyManager.getCurrency("test"));
         provider.getCommandManager().registerCurrencyCommand(currencyManager.getCurrency("test2"));

common/src/main/java/dev/xhyrom/lighteco/common/api/impl/ApiCurrencyManager.java

@@ -23,7 +23,7 @@ public class ApiCurrencyManager extends ApiAbstractManager<dev.xhyrom.lighteco.c
     public @NonNull Collection<Currency> getRegisteredCurrencies() {
         return this.handler.values()
                 .stream().map(this::wrap)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     @Override

common/src/main/java/dev/xhyrom/lighteco/common/manager/command/AbstractCommandManager.java

@@ -21,7 +21,7 @@ public abstract class AbstractCommandManager implements CommandManager {
     private final Map<String, CurrencyMessageConfig> config;
     private final ArrayList<UUID> mustWait = new ArrayList<>();
 
-    public AbstractCommandManager(LightEcoPlugin plugin) {
+    protected AbstractCommandManager(LightEcoPlugin plugin) {
         this.plugin = plugin;
         this.config = this.plugin.getConfig().messages.currency;
     }
@@ -59,13 +59,13 @@ public abstract class AbstractCommandManager implements CommandManager {
     }
 
     private CurrencyMessageConfig getConfig(Currency currency) {
-        CurrencyMessageConfig config = this.config.get(currency.getIdentifier());
+        CurrencyMessageConfig currencyMessageConfig = this.config.get(currency.getIdentifier());
 
-        if (config == null) {
+        if (currencyMessageConfig == null) {
            return this.config.get("default");
         }
 
-        return config;
+        return currencyMessageConfig;
     }
 
     @Override

common/src/main/java/dev/xhyrom/lighteco/common/manager/currency/StandardCurrencyManager.java

@@ -6,13 +6,9 @@ import dev.xhyrom.lighteco.common.model.user.User;
 import dev.xhyrom.lighteco.common.plugin.LightEcoPlugin;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
-import java.math.BigDecimal;
-import java.math.BigInteger;
 import java.util.Collection;
 import java.util.List;
 
-import static dev.xhyrom.lighteco.api.model.currency.Currency.Type;
-
 public class StandardCurrencyManager extends AbstractManager<String, Currency> implements CurrencyManager {
     private final LightEcoPlugin plugin;
 

common/src/main/java/dev/xhyrom/lighteco/common/model/chat/AbstractCommandSender.java

@@ -3,7 +3,7 @@ package dev.xhyrom.lighteco.common.model.chat;
 public abstract class AbstractCommandSender<T> implements CommandSender {
   protected final T delegate;
 
-  public AbstractCommandSender(T delegate) {
+  protected AbstractCommandSender(T delegate) {
       this.delegate = delegate;
   }
 }

common/src/main/java/dev/xhyrom/lighteco/common/plugin/AbstractLightEcoPlugin.java

@@ -12,10 +12,8 @@ import eu.okaeri.configs.ConfigManager;
 import eu.okaeri.configs.yaml.snakeyaml.YamlSnakeYamlConfigurer;
 import lombok.Getter;
 
-import java.io.File;
-
-public abstract class AbstractLightEcoPlugin implements LightEcoPlugin {
 @Getter
+public abstract class AbstractLightEcoPlugin implements LightEcoPlugin {
     private DependencyManager dependencyManager;
     @Getter
     private Config config;
@@ -27,7 +25,7 @@ public abstract class AbstractLightEcoPlugin implements LightEcoPlugin {
     public final void load() {
         this.dependencyManager = new DependencyManagerImpl(this);
 
-        this.config = ConfigManager.create(Config.class, (it) -> {
+        this.config = ConfigManager.create(Config.class, it -> {
             it.withConfigurer(new YamlSnakeYamlConfigurer());
             it.withBindFile(this.getBootstrap().getDataDirectory().resolve("config.yml"));
             it.withRemoveOrphans(true);

common/src/main/java/dev/xhyrom/lighteco/common/storage/Storage.java

@@ -24,8 +24,8 @@ public class Storage {
             try {
                 return callable.call();
             } catch (Exception e) {
-                if (e instanceof RuntimeException) {
+                if (e instanceof RuntimeException r) {
-                    throw (RuntimeException) e;
+                    throw r;
                 }
 
                 throw new CompletionException(e);
@@ -38,8 +38,8 @@ public class Storage {
             try {
                 runnable.run();
             } catch (Exception e) {
-                if (e instanceof RuntimeException) {
+                if (e instanceof RuntimeException r) {
-                    throw (RuntimeException) e;
+                    throw r;
                 }
 
                 throw new CompletionException(e);

common/src/main/java/dev/xhyrom/lighteco/common/storage/provider/memory/MemoryStorageProvider.java

@@ -10,7 +10,7 @@ import java.util.HashMap;
 import java.util.UUID;
 
 public class MemoryStorageProvider implements StorageProvider {
-    private final HashMap<UUID, User> userDatabase = new HashMap<>();
+    private HashMap<UUID, User> userDatabase;
 
     private final LightEcoPlugin plugin;
     public MemoryStorageProvider(LightEcoPlugin plugin) {
@@ -18,10 +18,14 @@ public class MemoryStorageProvider implements StorageProvider {
     }
 
     @Override
-    public void init() {}
+    public void init() {
+        userDatabase = new HashMap<>();
+    }
 
     @Override
-    public void shutdown() {}
+    public void shutdown() {
+        userDatabase = null;
+    }
 
     @Override
     public @NonNull User loadUser(@NonNull UUID uniqueId, @Nullable String username) {

common/src/main/java/dev/xhyrom/lighteco/common/storage/provider/sql/SqlStatements.java

@@ -48,9 +48,8 @@ public enum SqlStatements {
             case POSTGRESQL -> {
                 return this.postgresql;
             }
+            default -> throw new IllegalArgumentException("Unknown implementation: " + implementationName);
         }
-
-        throw new IllegalArgumentException("Unknown implementation: " + implementationName);
     }
 
     public static boolean mustDuplicateParameters(StorageType implementationName) {

common/src/main/java/dev/xhyrom/lighteco/common/storage/provider/sql/SqlStorageProvider.java

@@ -14,7 +14,6 @@ import java.io.InputStream;
 import java.math.BigDecimal;
 import java.sql.*;
 import java.util.List;
-import java.util.Map;
 import java.util.UUID;
 import java.util.function.Function;
 

common/src/main/java/dev/xhyrom/lighteco/common/storage/provider/sql/connection/file/FileConnectionFactory.java

@@ -2,7 +2,6 @@ package dev.xhyrom.lighteco.common.storage.provider.sql.connection.file;
 
 import dev.xhyrom.lighteco.common.storage.provider.sql.connection.ConnectionFactory;
 
-import java.io.File;
 import java.nio.file.Path;
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -12,7 +11,7 @@ abstract class FileConnectionFactory implements ConnectionFactory {
     private Connection connection;
     private final Path file;
 
-    public FileConnectionFactory(Path file) {
+    protected FileConnectionFactory(Path file) {
         this.file = file;
     }
 

common/src/main/java/dev/xhyrom/lighteco/common/storage/provider/sql/connection/hikari/HikariConnectionFactory.java

@@ -17,7 +17,7 @@ public abstract class HikariConnectionFactory implements ConnectionFactory {
     private final StorageDataConfig configuration;
     private HikariDataSource hikari;
 
-    public HikariConnectionFactory(StorageDataConfig configuration) {
+    protected HikariConnectionFactory(StorageDataConfig configuration) {
         this.configuration = configuration;
     }
 

common/src/main/java/dev/xhyrom/lighteco/common/storage/provider/sql/connection/hikari/MariaDBConnectionFactory.java

@@ -3,8 +3,6 @@ package dev.xhyrom.lighteco.common.storage.provider.sql.connection.hikari;
 import dev.xhyrom.lighteco.common.config.storage.StorageDataConfig;
 import dev.xhyrom.lighteco.common.storage.StorageType;
 
-import java.util.Map;
-
 public class MariaDBConnectionFactory extends DriverBasedHikariConnectionFactory {
     public MariaDBConnectionFactory(StorageDataConfig configuration) {
         super(configuration);

currency-money/src/main/java/dev/xhyrom/lighteco/currency/money/bukkit/hooks/vault/Vault.java

@@ -227,7 +227,7 @@ public class Vault extends AbstractEconomy {
     private double bigDecimalToDouble(final BigDecimal value) {
         double amount = value.doubleValue();
 
-        if (new BigDecimal(amount).compareTo(value) > 0) {
+        if (BigDecimal.valueOf(amount).compareTo(value) > 0) {
             amount = Math.nextAfter(amount, Double.NEGATIVE_INFINITY);
         }
 

currency-money/src/main/java/dev/xhyrom/lighteco/currency/money/bukkit/listener/BukkitServiceListener.java

@@ -1,15 +0,0 @@
-package dev.xhyrom.lighteco.currency.money.bukkit.listener;
-
-import net.milkbowl.vault.economy.Economy;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.server.ServiceRegisterEvent;
-
-public class BukkitServiceListener implements Listener {
-    @EventHandler
-    public void onServiceRegister(ServiceRegisterEvent event) {
-        if (!(event.getProvider().getProvider() instanceof Economy)) return;
-
-
-    }
-}

currency-money/src/main/java/dev/xhyrom/lighteco/currency/money/common/MoneyCurrency.java

@@ -4,7 +4,7 @@ import dev.xhyrom.lighteco.api.model.currency.Currency;
 
 import java.math.BigDecimal;
 
-public class MoneyCurrency extends Currency {
+public class MoneyCurrency implements Currency {
     @Override
     public String getIdentifier() {
         return "money";