From dda7199a1a5e93d5634008c864b394d10ce44ec9 Mon Sep 17 00:00:00 2001 From: Aurora Lahtela <24460436+AuroraLS3@users.noreply.github.com> Date: Fri, 20 Jan 2023 22:54:54 +0200 Subject: [PATCH] Fix more sonar smells --- .../plan/component/ComponentSvc.java | 3 +- .../domain/mutators/RetentionData.java | 4 +- .../json/graphs/stack/ActivityStackGraph.java | 2 +- .../web/WebAssetVersionCheckTask.java | 6 +-- .../webserver/PassBruteForceGuard.java | 6 +-- .../webserver/auth/ActiveCookieStore.java | 6 ++- .../webserver/cache/JSONFileStorage.java | 2 +- .../resolver/auth/LoginResolver.java | 2 +- .../plan/identification/ServerInfo.java | 3 +- .../config/paths/CustomizedFileSettings.java | 4 ++ .../settings/locale/TranslatedString.java | 1 + .../plan/storage/database/MySQLDB.java | 16 +++++--- .../RemoveIncorrectTebexPackageDataPatch.java | 21 ++++------ ...fterBadJoinAddressDataCorrectionPatch.java | 10 ----- .../plan/utilities/analysis/Percentage.java | 4 ++ .../plan/version/VersionNumber.java | 2 +- .../plan/component/ComponentServiceTest.java | 12 +++--- .../builder/ClassValuePairOrderTest.java | 2 +- .../builder/ExtensionDataBuilderTest.java | 2 +- .../settings/config/TimeZoneUtilityTest.java | 39 ++++++------------- .../component/ComponentConverterImpl.java | 2 +- .../FabricPlayerPositionTracker.java | 2 +- .../plan/version/FabricVersionChecker.java | 9 +++-- .../plugin/server/FabricListeners.java | 12 +++--- .../plan/gathering/SpongeSensor.java | 1 + .../com/djrapitops/plan/PlanVelocity.java | 4 -- 26 files changed, 78 insertions(+), 99 deletions(-) diff --git a/Plan/common/src/main/java/com/djrapitops/plan/component/ComponentSvc.java b/Plan/common/src/main/java/com/djrapitops/plan/component/ComponentSvc.java index 6a1765942..70ec1804c 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/component/ComponentSvc.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/component/ComponentSvc.java @@ -31,9 +31,8 @@ public class ComponentSvc implements ComponentService { private ComponentConverter converter; - // This is required to inject @Inject - public ComponentSvc() {} + public ComponentSvc() {/* Dagger constructor */} @Override public String translateLegacy(String input, char inputCharacter, char outputCharacter) { diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/mutators/RetentionData.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/mutators/RetentionData.java index 5f02d036b..5e9326afb 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/mutators/RetentionData.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/mutators/RetentionData.java @@ -46,8 +46,8 @@ public class RetentionData { totalPlayersOnline += retentionData.getOnlineOnJoin(); } - double averageIndex = totalIndex / (double) size; - double averagePlayersOnline = totalPlayersOnline / (double) size; + double averageIndex = totalIndex / size; + double averagePlayersOnline = totalPlayersOnline / size; return new RetentionData(averageIndex, averagePlayersOnline); } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/stack/ActivityStackGraph.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/stack/ActivityStackGraph.java index 99377c99e..1a23435cf 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/stack/ActivityStackGraph.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/stack/ActivityStackGraph.java @@ -59,7 +59,7 @@ class ActivityStackGraph extends StackGraph { for (Map data : activityData.values()) { for (int j = 0; j < groups.length; j++) { - dataSets[j].add((double) data.getOrDefault(defaultGroups[j], 0)); + dataSets[j].add(data.getOrDefault(defaultGroups[j], 0)); } } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/web/WebAssetVersionCheckTask.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/web/WebAssetVersionCheckTask.java index b59596b96..e05cf9a14 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/web/WebAssetVersionCheckTask.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/web/WebAssetVersionCheckTask.java @@ -127,9 +127,9 @@ public class WebAssetVersionCheckTask extends TaskSystem.Task { } private static class AssetInfo { - public String filename; - public long modifiedAt; - public long expectedModifiedAt; + private final String filename; + private final long modifiedAt; + private final long expectedModifiedAt; public AssetInfo(String filename, long modifiedAt, long expectedModifiedAt) { this.filename = filename; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/PassBruteForceGuard.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/PassBruteForceGuard.java index 19eac6a04..f1718995d 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/PassBruteForceGuard.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/PassBruteForceGuard.java @@ -73,12 +73,10 @@ public class PassBruteForceGuard { } @Override - public void increaseAttemptCountOnFailedLogin(String accessor) { - } + public void increaseAttemptCountOnFailedLogin(String accessor) { /* Disabled */ } @Override - public void resetAttemptCount(String accessor) { - } + public void resetAttemptCount(String accessor) { /* Disabled */ } } } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/auth/ActiveCookieStore.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/auth/ActiveCookieStore.java index 121f4e7a6..017630331 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/auth/ActiveCookieStore.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/auth/ActiveCookieStore.java @@ -41,7 +41,7 @@ import java.util.concurrent.TimeUnit; public class ActiveCookieStore implements SubSystem { private static final Map USERS_BY_COOKIE = new ConcurrentHashMap<>(); - public static long cookieExpiresAfterMs = TimeUnit.HOURS.toMillis(2L); + private static long cookieExpiresAfterMs = TimeUnit.HOURS.toMillis(2L); private final ActiveCookieExpiryCleanupTask activeCookieExpiryCleanupTask; @@ -67,6 +67,10 @@ public class ActiveCookieStore implements SubSystem { this.processing = processing; } + public static long getCookieExpiresAfterMs() { + return cookieExpiresAfterMs; + } + private static void removeCookieStatic(String cookie) { Holder.getActiveCookieStore().removeCookie(cookie); } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/cache/JSONFileStorage.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/cache/JSONFileStorage.java index 492c43d27..adddecd7c 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/cache/JSONFileStorage.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/cache/JSONFileStorage.java @@ -59,7 +59,7 @@ public class JSONFileStorage implements JSONStorage { private final Path jsonDirectory; private final ReentrantLockHelper readWriteProtectionLock = new ReentrantLockHelper(); - private final Pattern timestampRegex = Pattern.compile(".*-([0-9]*).json"); + private final Pattern timestampRegex = Pattern.compile(".*-(\\d*).json"); private static final String JSON_FILE_EXTENSION = ".json"; private final Formatter dateFormatter; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/auth/LoginResolver.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/auth/LoginResolver.java index 1b57a8f01..8910f332c 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/auth/LoginResolver.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/auth/LoginResolver.java @@ -88,7 +88,7 @@ public class LoginResolver implements NoAuthResolver { public Response getResponse(String cookie) { return Response.builder() .setStatus(200) - .setHeader("Set-Cookie", "auth=" + cookie + "; Path=/; Max-Age=" + ActiveCookieStore.cookieExpiresAfterMs + "; SameSite=Lax; Secure;") + .setHeader("Set-Cookie", "auth=" + cookie + "; Path=/; Max-Age=" + ActiveCookieStore.getCookieExpiresAfterMs() + "; SameSite=Lax; Secure;") .setJSONContent(Collections.singletonMap("success", true)) .build(); } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/identification/ServerInfo.java b/Plan/common/src/main/java/com/djrapitops/plan/identification/ServerInfo.java index f8ebc794b..963337163 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/identification/ServerInfo.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/identification/ServerInfo.java @@ -44,11 +44,10 @@ public abstract class ServerInfo implements SubSystem { } public ServerUUID getServerUUID() { - return getServer().getUuid(); + return server.getUuid(); } public ServerIdentifier getServerIdentifier() { - Server server = getServer(); return new ServerIdentifier(server.getUuid(), server.getIdentifiableName()); } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/settings/config/paths/CustomizedFileSettings.java b/Plan/common/src/main/java/com/djrapitops/plan/settings/config/paths/CustomizedFileSettings.java index 047a45e0e..ab32d5572 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/settings/config/paths/CustomizedFileSettings.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/settings/config/paths/CustomizedFileSettings.java @@ -23,4 +23,8 @@ import com.djrapitops.plan.settings.config.paths.key.StringSetting; public class CustomizedFileSettings { public static final Setting WEB_DEV_MODE = new BooleanSetting("Customized_files.Enable_web_dev_mode"); public static final Setting PATH = new StringSetting("Customized_files.Path"); + + private CustomizedFileSettings() { + /* static variable class*/ + } } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/settings/locale/TranslatedString.java b/Plan/common/src/main/java/com/djrapitops/plan/settings/locale/TranslatedString.java index da1dc2c89..3dc25243c 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/settings/locale/TranslatedString.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/settings/locale/TranslatedString.java @@ -117,6 +117,7 @@ class TranslatedString { @Override public void translate(String replace, String with) { + /* Some elements should not be translated, like URLs */ } @Override diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/MySQLDB.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/MySQLDB.java index dd452b265..1c8e1e73a 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/MySQLDB.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/MySQLDB.java @@ -125,12 +125,7 @@ public class MySQLDB extends SQLDB { increment(); hikariConfig.setAutoCommit(false); - try { - hikariConfig.setMaximumPoolSize(config.get(DatabaseSettings.MAX_CONNECTIONS)); - } catch (IllegalStateException e) { - logger.warn(e.getMessage() + ", using 1 as maximum for now."); - hikariConfig.setMaximumPoolSize(1); - } + setMaxConnections(hikariConfig); hikariConfig.setMaxLifetime(TimeUnit.MINUTES.toMillis(25L)); hikariConfig.setLeakDetectionThreshold(TimeUnit.SECONDS.toMillis(29L)); @@ -145,6 +140,15 @@ public class MySQLDB extends SQLDB { currentThread.setContextClassLoader(previousClassLoader); } + private void setMaxConnections(HikariConfig hikariConfig) { + try { + hikariConfig.setMaximumPoolSize(config.get(DatabaseSettings.MAX_CONNECTIONS)); + } catch (IllegalStateException e) { + logger.warn(e.getMessage() + ", using 1 as maximum for now."); + hikariConfig.setMaximumPoolSize(1); + } + } + private void unloadMySQLDriver() { // Avoid issues with other plugins by removing the mysql driver from driver manager Enumeration drivers = DriverManager.getDrivers(); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/init/RemoveIncorrectTebexPackageDataPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/init/RemoveIncorrectTebexPackageDataPatch.java index 231dfed8f..b04fa1881 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/init/RemoveIncorrectTebexPackageDataPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/init/RemoveIncorrectTebexPackageDataPatch.java @@ -16,13 +16,9 @@ */ package com.djrapitops.plan.storage.database.transactions.init; -import com.djrapitops.plan.storage.database.queries.HasMoreThanZeroQueryStatement; import com.djrapitops.plan.storage.database.queries.Query; import com.djrapitops.plan.storage.database.transactions.patches.Patch; -import java.sql.PreparedStatement; -import java.sql.SQLException; - import static com.djrapitops.plan.storage.database.sql.building.Sql.*; /** @@ -30,24 +26,21 @@ import static com.djrapitops.plan.storage.database.sql.building.Sql.*; */ public class RemoveIncorrectTebexPackageDataPatch extends Patch { + private static final String TABLE_NAME = "plan_tebex_payments"; + @Override public boolean hasBeenApplied() { - return !hasTable("plan_tebex_payments") || !query(hasWrongRows()); + return !hasTable(TABLE_NAME) || !query(hasWrongRows()); } private Query hasWrongRows() { - return new HasMoreThanZeroQueryStatement( - SELECT + "COUNT(*) as c" + FROM + "plan_tebex_payments" + - WHERE + "packages LIKE 'TebexPackage%'" - ) { - @Override - public void prepare(PreparedStatement statement) throws SQLException { - } - }; + String sql = SELECT + "COUNT(*) as c" + FROM + TABLE_NAME + + WHERE + "packages LIKE 'TebexPackage%'"; + return db -> db.queryOptional(sql, set -> set.getInt("c") > 0).orElse(false); } @Override protected void applyPatch() { - execute(DELETE_FROM + "plan_tebex_payments" + WHERE + "packages LIKE 'TebexPackage%'"); + execute(DELETE_FROM + TABLE_NAME + WHERE + "packages LIKE 'TebexPackage%'"); } } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/AfterBadJoinAddressDataCorrectionPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/AfterBadJoinAddressDataCorrectionPatch.java index 58de2ea8b..1f5994081 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/AfterBadJoinAddressDataCorrectionPatch.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/AfterBadJoinAddressDataCorrectionPatch.java @@ -26,7 +26,6 @@ import com.djrapitops.plan.storage.database.transactions.ExecBatchStatement; import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.List; -import java.util.Set; import static com.djrapitops.plan.storage.database.sql.building.Sql.*; @@ -110,13 +109,4 @@ public class AfterBadJoinAddressDataCorrectionPatch extends Patch { return query(db -> db.queryOptional(sql, results -> results.getInt("c") > 0)) .orElse(false); } - - private Set getBadAddressIds() { - String sql = SELECT + DISTINCT + SessionsTable.JOIN_ADDRESS_ID + - FROM + SessionsTable.TABLE_NAME + - WHERE + SessionsTable.JOIN_ADDRESS_ID + " NOT IN (" + - SELECT + JoinAddressTable.ID + FROM + JoinAddressTable.TABLE_NAME + - ")"; - return query(db -> db.querySet(sql, results -> results.getInt(SessionsTable.JOIN_ADDRESS_ID))); - } } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/analysis/Percentage.java b/Plan/common/src/main/java/com/djrapitops/plan/utilities/analysis/Percentage.java index 81aab18c8..566ea0fa3 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/analysis/Percentage.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/utilities/analysis/Percentage.java @@ -18,6 +18,10 @@ package com.djrapitops.plan.utilities.analysis; public class Percentage { + private Percentage() { + /* static utility method class */ + } + public static double calculate(double amount, long total) { return calculate(amount, total, 0); } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/version/VersionNumber.java b/Plan/common/src/main/java/com/djrapitops/plan/version/VersionNumber.java index 8a8620143..104d8f60c 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/version/VersionNumber.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/version/VersionNumber.java @@ -23,7 +23,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; public class VersionNumber implements Comparable { - private static final Pattern MATCH_NUMBERS = Pattern.compile("([0-9]+)"); + private static final Pattern MATCH_NUMBERS = Pattern.compile("(\\d+)"); private final String version; private final List versionNumbers; diff --git a/Plan/common/src/test/java/com/djrapitops/plan/component/ComponentServiceTest.java b/Plan/common/src/test/java/com/djrapitops/plan/component/ComponentServiceTest.java index 5998be0ff..d18eefdbd 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/component/ComponentServiceTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/component/ComponentServiceTest.java @@ -26,34 +26,34 @@ import org.junit.jupiter.api.extension.ExtendWith; import static org.junit.jupiter.api.Assertions.assertEquals; @ExtendWith(FullSystemExtension.class) -public class ComponentServiceTest { +class ComponentServiceTest { static ComponentSvc service; @BeforeAll - public static void enableSystem(PlanSystem system) { + static void enableSystem(PlanSystem system) { system.enable(); service = (ComponentSvc) ComponentService.getInstance(); } @AfterAll - public static void tearDown(PlanSystem system) { + static void tearDown(PlanSystem system) { service = null; system.disable(); } @Test - public void translateTest() { + void translateTest() { assertEquals("§cred", service.translateLegacy("&cred")); } @Test - public void invalidTranslateTest() { + void invalidTranslateTest() { assertEquals("&zinvalid color code", service.translateLegacy("&zinvalid color code")); } @Test - public void testAutoDetermine() { + void testAutoDetermine() { assertEquals("§cred", service.convert(service.fromAutoDetermine("red"), ComponentOperation.LEGACY, Component.SECTION)); assertEquals("§cred", service.convert(service.fromAutoDetermine("&cred"), ComponentOperation.LEGACY, Component.SECTION)); assertEquals("&cred", service.convert(service.fromAutoDetermine("§cred"), ComponentOperation.LEGACY, Component.AMPERSAND)); diff --git a/Plan/common/src/test/java/com/djrapitops/plan/extension/implementation/builder/ClassValuePairOrderTest.java b/Plan/common/src/test/java/com/djrapitops/plan/extension/implementation/builder/ClassValuePairOrderTest.java index d85e23810..5dd8ca7f3 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/extension/implementation/builder/ClassValuePairOrderTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/extension/implementation/builder/ClassValuePairOrderTest.java @@ -28,7 +28,7 @@ import java.util.List; import static org.junit.jupiter.api.Assertions.assertEquals; -public class ClassValuePairOrderTest { +class ClassValuePairOrderTest { @Test void providedConditionsComeBeforeConditions() throws NoSuchMethodException { diff --git a/Plan/common/src/test/java/com/djrapitops/plan/extension/implementation/builder/ExtensionDataBuilderTest.java b/Plan/common/src/test/java/com/djrapitops/plan/extension/implementation/builder/ExtensionDataBuilderTest.java index 53a6b1bca..a23ad4108 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/extension/implementation/builder/ExtensionDataBuilderTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/extension/implementation/builder/ExtensionDataBuilderTest.java @@ -25,7 +25,7 @@ import java.util.Collections; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -public class ExtensionDataBuilderTest { +class ExtensionDataBuilderTest { @Test void nullTextWhenCreatingValueBuilderThrowsException() { ExtDataBuilder builder = new ExtDataBuilder(new Extension()); diff --git a/Plan/common/src/test/java/com/djrapitops/plan/settings/config/TimeZoneUtilityTest.java b/Plan/common/src/test/java/com/djrapitops/plan/settings/config/TimeZoneUtilityTest.java index 3faeddae4..48665b1e5 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/settings/config/TimeZoneUtilityTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/settings/config/TimeZoneUtilityTest.java @@ -17,6 +17,8 @@ package com.djrapitops.plan.settings.config; import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; import java.time.ZoneId; import java.util.Optional; @@ -31,33 +33,16 @@ import static org.junit.jupiter.api.Assertions.*; */ class TimeZoneUtilityTest { - @Test - void utcIsValidZoneID() { - ZoneId zone = ZoneId.of("UTC"); - assertNotNull(zone); - } - - @Test - void gmtPlusIsValidZoneID() { - ZoneId zone = ZoneId.of("GMT+3"); - assertNotNull(zone); - } - - @Test - void gmtMinusIsValidZoneID() { - ZoneId zone = ZoneId.of("GMT-3"); - assertNotNull(zone); - } - - @Test - void gmtPlusMinutesIsValidZoneID() { - ZoneId zone = ZoneId.of("GMT+03:30"); - assertNotNull(zone); - } - - @Test - void gmtMinusMinutesIsValidZoneID() { - ZoneId zone = ZoneId.of("GMT-03:30"); + @ParameterizedTest + @CsvSource({ + "UTC", + "GMT+3", + "GMT-3", + "GMT+03:30", + "GMT-03:30" + }) + void isValidZoneId(String zoneId) { + ZoneId zone = ZoneId.of(zoneId); assertNotNull(zone); } diff --git a/Plan/extensions/adventure/src/main/java/com/djrapitops/plan/component/ComponentConverterImpl.java b/Plan/extensions/adventure/src/main/java/com/djrapitops/plan/component/ComponentConverterImpl.java index ed96a0472..6b8e08eef 100644 --- a/Plan/extensions/adventure/src/main/java/com/djrapitops/plan/component/ComponentConverterImpl.java +++ b/Plan/extensions/adventure/src/main/java/com/djrapitops/plan/component/ComponentConverterImpl.java @@ -68,7 +68,7 @@ public class ComponentConverterImpl implements ComponentConverter { boolean isMM = false; try { isMM = MiniMessage.miniMessage().stripTags(input).length() != input.length(); - } catch (Throwable ignored) { + } catch (Exception ignored) { // MiniMessage may in some cases throw an exception, for example when it is given a legacy section. } diff --git a/Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/FabricPlayerPositionTracker.java b/Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/FabricPlayerPositionTracker.java index 724b5d1c5..87a2701f8 100644 --- a/Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/FabricPlayerPositionTracker.java +++ b/Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/FabricPlayerPositionTracker.java @@ -27,7 +27,7 @@ public class FabricPlayerPositionTracker { private static final double[] EMPTY_POSITION = new double[5]; - public FabricPlayerPositionTracker() { + private FabricPlayerPositionTracker() { // Static method class } diff --git a/Plan/fabric/src/main/java/net/playeranalytics/plan/version/FabricVersionChecker.java b/Plan/fabric/src/main/java/net/playeranalytics/plan/version/FabricVersionChecker.java index a19ed3619..5268d344a 100644 --- a/Plan/fabric/src/main/java/net/playeranalytics/plan/version/FabricVersionChecker.java +++ b/Plan/fabric/src/main/java/net/playeranalytics/plan/version/FabricVersionChecker.java @@ -46,15 +46,16 @@ public class FabricVersionChecker extends VersionChecker { super(currentVersion, locale, config, logger, runnableFactory, errorLogger); } + @Override public Optional getNewVersionAvailable() { if (newVersionAvailable == null) { return Optional.empty(); } else { return Optional.of(new VersionInfo( - newVersionAvailable.isRelease(), - newVersionAvailable.getVersion(), - newVersionAvailable.getDownloadUrl().replace("Plan-", "PlanFabric-"), - newVersionAvailable.getChangeLogUrl() + newVersionAvailable.isRelease(), + newVersionAvailable.getVersion(), + newVersionAvailable.getDownloadUrl().replace("Plan-", "PlanFabric-"), + newVersionAvailable.getChangeLogUrl() )); } } diff --git a/Plan/fabric/src/main/java/net/playeranalytics/plugin/server/FabricListeners.java b/Plan/fabric/src/main/java/net/playeranalytics/plugin/server/FabricListeners.java index 910dc8750..66bf08a42 100644 --- a/Plan/fabric/src/main/java/net/playeranalytics/plugin/server/FabricListeners.java +++ b/Plan/fabric/src/main/java/net/playeranalytics/plugin/server/FabricListeners.java @@ -34,13 +34,13 @@ public class FabricListeners implements Listeners { public void registerListener(Object listener) { if (listener == null) { throw new IllegalArgumentException("Listener can not be null!"); - } else if (!(listener instanceof FabricListener)) { - throw new IllegalArgumentException("Listener needs to be of type " + listener.getClass().getName() + ", but was " + listener.getClass()); - } else { - if (!((FabricListener) listener).isEnabled()) { - ((FabricListener) listener).register(); - listeners.add((FabricListener) listener); + } else if (listener instanceof FabricListener fabricListener) { + if (!fabricListener.isEnabled()) { + fabricListener.register(); + listeners.add(fabricListener); } + } else { + throw new IllegalArgumentException("Listener needs to be of type " + listener.getClass().getName() + ", but was " + listener.getClass()); } } diff --git a/Plan/sponge/src/main/java/com/djrapitops/plan/gathering/SpongeSensor.java b/Plan/sponge/src/main/java/com/djrapitops/plan/gathering/SpongeSensor.java index 6b33c3f6c..26f3d6445 100644 --- a/Plan/sponge/src/main/java/com/djrapitops/plan/gathering/SpongeSensor.java +++ b/Plan/sponge/src/main/java/com/djrapitops/plan/gathering/SpongeSensor.java @@ -62,6 +62,7 @@ public class SpongeSensor implements ServerSensor { return -1; } + @SuppressWarnings("unused") // This remains here so that it is not enabled, it causes lag. private int getLaggyChunkCount(ServerWorld world) { Iterator chunks = world.loadedChunks().iterator(); int count = 0; diff --git a/Plan/velocity/src/main/java/com/djrapitops/plan/PlanVelocity.java b/Plan/velocity/src/main/java/com/djrapitops/plan/PlanVelocity.java index 715e54a60..d38601bdd 100644 --- a/Plan/velocity/src/main/java/com/djrapitops/plan/PlanVelocity.java +++ b/Plan/velocity/src/main/java/com/djrapitops/plan/PlanVelocity.java @@ -185,8 +185,4 @@ public class PlanVelocity implements PlanPlugin { public File getDataFolder() { return dataFolderPath.toFile(); } - - private String fixMsgParams(String message) { - return message.replaceAll("\\{\\d+}", "{}"); - } }