diff --git a/mongo-connector/src/main/java/net/codingarea/commons/common/config/document/BsonDocument.java b/mongo-connector/src/main/java/net/codingarea/commons/common/config/document/BsonDocument.java index f801ab556..e44ad0bd5 100644 --- a/mongo-connector/src/main/java/net/codingarea/commons/common/config/document/BsonDocument.java +++ b/mongo-connector/src/main/java/net/codingarea/commons/common/config/document/BsonDocument.java @@ -80,7 +80,7 @@ public String getString(@Nonnull String path) { @Override public long getLong(@Nonnull String path, long def) { try { - return Long.parseLong(getString(path)); + return Long.parseLong(Objects.requireNonNull(getString(path))); } catch (Exception ex) { return def; } @@ -89,7 +89,7 @@ public long getLong(@Nonnull String path, long def) { @Override public int getInt(@Nonnull String path, int def) { try { - return Integer.parseInt(getString(path)); + return Integer.parseInt(Objects.requireNonNull(getString(path))); } catch (Exception ex) { return def; } @@ -98,7 +98,7 @@ public int getInt(@Nonnull String path, int def) { @Override public short getShort(@Nonnull String path, short def) { try { - return Short.parseShort(getString(path)); + return Short.parseShort(Objects.requireNonNull(getString(path))); } catch (Exception ex) { return def; } @@ -107,7 +107,7 @@ public short getShort(@Nonnull String path, short def) { @Override public byte getByte(@Nonnull String path, byte def) { try { - return Byte.parseByte(getString(path)); + return Byte.parseByte(Objects.requireNonNull(getString(path))); } catch (Exception ex) { return def; } @@ -116,7 +116,7 @@ public byte getByte(@Nonnull String path, byte def) { @Override public double getDouble(@Nonnull String path, double def) { try { - return Double.parseDouble(getString(path)); + return Double.parseDouble(Objects.requireNonNull(getString(path))); } catch (Exception ex) { return def; } @@ -125,7 +125,7 @@ public double getDouble(@Nonnull String path, double def) { @Override public float getFloat(@Nonnull String path, float def) { try { - return Float.parseFloat(getString(path)); + return Float.parseFloat(Objects.requireNonNull(getString(path))); } catch (Exception ex) { return def; } @@ -137,7 +137,7 @@ public boolean getBoolean(@Nonnull String path, boolean def) { Object value = bsonDocument.get(path); if (value instanceof Boolean) return (Boolean) value; if (value instanceof String) return Boolean.parseBoolean((String) value); - } catch (Exception ex) { + } catch (Exception ignored) { } return def; } @@ -161,7 +161,7 @@ public UUID getUUID(@Nonnull String path) { Object value = bsonDocument.get(path); if (value instanceof UUID) return (UUID) value; if (value instanceof String) return UUID.fromString((String) value); - } catch (Exception ex) { + } catch (Exception ignored) { } return null; } diff --git a/mongo-connector/src/main/java/net/codingarea/commons/common/misc/BsonUtils.java b/mongo-connector/src/main/java/net/codingarea/commons/common/misc/BsonUtils.java index 05611a0b0..6df6ce127 100644 --- a/mongo-connector/src/main/java/net/codingarea/commons/common/misc/BsonUtils.java +++ b/mongo-connector/src/main/java/net/codingarea/commons/common/misc/BsonUtils.java @@ -16,7 +16,7 @@ public final class BsonUtils { - protected static final ILogger logger = ILogger.forThisClass(); + private static final ILogger logger = ILogger.forThisClass(); private BsonUtils() { } diff --git a/mongo-connector/src/main/java/net/codingarea/commons/common/misc/MongoUtils.java b/mongo-connector/src/main/java/net/codingarea/commons/common/misc/MongoUtils.java index d0c2c4a37..32e03109f 100644 --- a/mongo-connector/src/main/java/net/codingarea/commons/common/misc/MongoUtils.java +++ b/mongo-connector/src/main/java/net/codingarea/commons/common/misc/MongoUtils.java @@ -57,7 +57,7 @@ public static Object packObject(@Nullable Object value) { BsonUtils.setDocumentProperties(bson, values); return bson; } else if (value instanceof UUID) { - return ((UUID) value).toString(); + return value.toString(); } else { return value; } diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/effect/RandomPotionEffectChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/effect/RandomPotionEffectChallenge.java index 5b15d051e..2cd31b223 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/effect/RandomPotionEffectChallenge.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/effect/RandomPotionEffectChallenge.java @@ -65,7 +65,7 @@ public RandomPotionEffectChallenge() { @Nullable public static PotionEffectType getNewRandomEffect(@Nonnull LivingEntity entity) { - List activeEffects = entity.getActivePotionEffects().stream().map(PotionEffect::getType).collect(Collectors.toList()); + List activeEffects = entity.getActivePotionEffects().stream().map(PotionEffect::getType).toList(); ArrayList possibleEffects = new ArrayList<>(Arrays.asList(PotionEffectType.values())); possibleEffects.removeAll(activeEffects); diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/inventory/PermanentItemChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/inventory/PermanentItemChallenge.java index 6b86b70af..99d8ccdb6 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/inventory/PermanentItemChallenge.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/inventory/PermanentItemChallenge.java @@ -17,6 +17,7 @@ import org.bukkit.inventory.Inventory; import javax.annotation.Nonnull; +import java.util.Objects; @Since("2.0") public class PermanentItemChallenge extends Setting { @@ -40,7 +41,7 @@ public void onInventoryClick(@Nonnull PlayerInventoryClickEvent event) { Inventory clickedInventory = event.getClickedInventory(); if (event.getCursor() == null) return; if (clickedInventory == null) return; - InventoryType type = CompatibilityUtils.getTopInventory(player).getType(); + InventoryType type = Objects.requireNonNull(CompatibilityUtils.getTopInventory(player)).getType(); if (type == InventoryType.WORKBENCH || type == InventoryType.CRAFTING) return; if (clickedInventory.getType() == InventoryType.CRAFTING) return; if (clickedInventory.getType() == InventoryType.PLAYER) { diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/EnderGamesChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/EnderGamesChallenge.java index 899c446cc..8a11d2c29 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/EnderGamesChallenge.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/EnderGamesChallenge.java @@ -64,7 +64,7 @@ private void teleportRandom(@Nonnull Player player) { List list = player.getWorld().getNearbyEntities(player.getLocation(), 200, 200, 200).stream() .filter(entity -> !(entity instanceof Player)) .filter(entity -> entity instanceof LivingEntity) - .collect(Collectors.toList()); + .toList(); Entity targetEntity = list.get(globalRandom.nextInt(list.size())); diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/quiz/QuizChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/quiz/QuizChallenge.java index 90b44a7e9..aa48d502b 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/quiz/QuizChallenge.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/quiz/QuizChallenge.java @@ -423,7 +423,7 @@ class DocumentCountStatistic extends DocumentStatistic { } } - List newAnswers = answers.stream().map(StringUtils::getEnumName).collect(Collectors.toList()); + List newAnswers = answers.stream().map(StringUtils::getEnumName).toList(); answers.clear(); answers.addAll(newAnswers); diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/HotBarRandomizerChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/HotBarRandomizerChallenge.java index 32c31c8f6..2b621dc6f 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/HotBarRandomizerChallenge.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/HotBarRandomizerChallenge.java @@ -29,6 +29,7 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; +import java.util.Objects; @Since("2.1.2") public class HotBarRandomizerChallenge extends TimedChallenge { @@ -117,7 +118,7 @@ public void onInventoryClick(@Nonnull PlayerInventoryClickEvent event) { Inventory clickedInventory = event.getClickedInventory(); if (event.getCursor() == null) return; if (clickedInventory == null) return; - InventoryType type = CompatibilityUtils.getTopInventory(player).getType(); + InventoryType type = Objects.requireNonNull(CompatibilityUtils.getTopInventory(player)).getType(); if (type == InventoryType.WORKBENCH || type == InventoryType.CRAFTING) return; if (clickedInventory.getType() == InventoryType.CRAFTING) return; if (clickedInventory.getType() == InventoryType.PLAYER) { diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/SnakeChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/SnakeChallenge.java index 28ae22550..26f25a80c 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/SnakeChallenge.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/SnakeChallenge.java @@ -56,7 +56,7 @@ public void writeGameState(@Nonnull Document document) { public void loadGameState(@Nonnull Document document) { super.loadGameState(document); - blocks.addAll(document.getSerializableList("blocks", Location.class).stream().map(Location::getBlock).collect(Collectors.toList())); + blocks.addAll(document.getSerializableList("blocks", Location.class).stream().map(Location::getBlock).toList()); } @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/CollectionGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/CollectionGoal.java index 2ad3bacf4..c9f19f248 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/CollectionGoal.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/CollectionGoal.java @@ -70,7 +70,7 @@ protected void collect(@Nonnull Player player, @Nonnull Object item, @Nonnull Ru } protected List getCollectionFiltered(@Nonnull UUID uuid) { - List targetStringList = Arrays.stream(target).map(Object::toString).collect(Collectors.toList()); + List targetStringList = Arrays.stream(target).map(Object::toString).toList(); return collections.computeIfAbsent(uuid, key -> new ArrayList<>()).stream().filter(targetStringList::contains).collect(Collectors.toList()); } diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/MenuGenerator.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/MenuGenerator.java index 5fadbe3f4..bf7090a65 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/MenuGenerator.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/MenuGenerator.java @@ -14,6 +14,7 @@ import javax.annotation.Nonnegative; import javax.annotation.Nonnull; import java.util.List; +import java.util.Objects; @Getter @Setter @@ -31,7 +32,7 @@ public abstract class MenuGenerator { public boolean hasInventoryOpen(Player player) { MenuPosition menuPosition = MenuPosition.get(player); return menuPosition instanceof GeneratorMenuPosition - && CompatibilityUtils.getTopInventory(player).getType() != InventoryType.CRAFTING + && Objects.requireNonNull(CompatibilityUtils.getTopInventory(player)).getType() != InventoryType.CRAFTING && ((GeneratorMenuPosition) menuPosition).getGenerator() == this; } diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/info/ChallengeMenuClickInfo.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/info/ChallengeMenuClickInfo.java index 53b285c9d..9df0dc49b 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/info/ChallengeMenuClickInfo.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/info/ChallengeMenuClickInfo.java @@ -30,14 +30,4 @@ public boolean isLowerItemClick() { return !upperItem; } - @Nonnull - public Player getPlayer() { - return player; - } - - @Nonnull - public Inventory getInventory() { - return inventory; - } - } diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/team/TeamProvider.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/team/TeamProvider.java index a633ec0d7..f3f6db16f 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/team/TeamProvider.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/team/TeamProvider.java @@ -2,7 +2,6 @@ import net.codingarea.commons.bukkit.utils.logging.Logger; import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; import java.util.LinkedList; import java.util.List; diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/CheatListener.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/CheatListener.java index 00de88ed9..2251cdd1b 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/CheatListener.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/CheatListener.java @@ -33,8 +33,7 @@ public void onGameModeChange(@Nonnull PlayerGameModeChangeEvent event) { @EventHandler(priority = EventPriority.MONITOR) public void onSneak(PlayerToggleSneakEvent event) { - if (!event.isSneaking()) { - } + event.isSneaking(); //// Structure structure = entry.getValue(); } diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/misc/BukkitStringUtils.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/misc/BukkitStringUtils.java index c5f73691e..37e6f5fbc 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/misc/BukkitStringUtils.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/misc/BukkitStringUtils.java @@ -149,7 +149,7 @@ public static List format(@Nonnull String sequence, @Nonnull Obje if (!currentText.getText().isEmpty()) { results.add(currentText); } - if (argument.length() > 0) { + if (!argument.isEmpty()) { results.add(new TextComponent(String.valueOf(start))); results.add(new TextComponent(String.valueOf(argument))); } diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/NMSProvider.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/NMSProvider.java index 4b941e688..32bb95dfa 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/NMSProvider.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/NMSProvider.java @@ -19,7 +19,6 @@ public class NMSProvider { /** * -- GETTER -- * - * @return A border packet factory */ @Getter private static final BorderPacketFactory borderPacketFactory; diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/item/ItemBuilder.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/item/ItemBuilder.java index b457a897e..42523ce79 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/item/ItemBuilder.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/item/ItemBuilder.java @@ -214,7 +214,8 @@ public ItemDescription getBuiltByItemDescription() { @Override public ItemBuilder clone() { - ItemBuilder builder = new ItemBuilder(item.clone(), getMeta().clone()); + ItemBuilder itemBuilder = (ItemBuilder) super.clone(); + ItemBuilder builder = new ItemBuilder(item.clone(), getMeta().clone()); builder.builtByItemDescription = builtByItemDescription; return builder; } diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/ImageUtils.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/ImageUtils.java index f81f27ba2..e94c8cf0d 100644 --- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/ImageUtils.java +++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/ImageUtils.java @@ -1,5 +1,6 @@ package net.codingarea.challenges.plugin.utils.misc; +import net.codingarea.commons.common.collection.IOUtils; import org.bukkit.entity.Player; import javax.annotation.Nonnull; @@ -20,8 +21,7 @@ private ImageUtils() { @Nullable public static BufferedImage getImage(@Nonnull String url) throws IOException { - HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection(); - connection.setRequestProperty("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36"); + HttpURLConnection connection = IOUtils.createConnection(url); return ImageIO.read(connection.getInputStream()); } diff --git a/plugin/src/main/java/net/codingarea/commons/bukkit/core/BukkitModule.java b/plugin/src/main/java/net/codingarea/commons/bukkit/core/BukkitModule.java index c90eea42b..31f3e41cb 100644 --- a/plugin/src/main/java/net/codingarea/commons/bukkit/core/BukkitModule.java +++ b/plugin/src/main/java/net/codingarea/commons/bukkit/core/BukkitModule.java @@ -1,6 +1,7 @@ package net.codingarea.commons.bukkit.core; import com.google.common.base.Charsets; +import lombok.Getter; import net.codingarea.commons.bukkit.utils.menu.MenuPosition; import net.codingarea.commons.bukkit.utils.menu.MenuPositionListener; import net.codingarea.commons.bukkit.utils.misc.MinecraftVersion; @@ -54,7 +55,8 @@ public abstract class BukkitModule extends JavaPlugin { private ExecutorService executorService; private Document config, pluginConfig; private Version version; - private boolean devMode; + @Getter + private boolean devMode; private boolean firstInstall; private boolean isReloaded; private boolean isLoaded; @@ -75,10 +77,10 @@ public final void onLoad() { ILogger.setConstantFactory(this.getILogger()); trySaveDefaultConfig(); if (wasShutdown) isReloaded = true; - if (firstInstall = !getDataFolder().exists()) { + if (firstInstall == !getDataFolder().exists()) { getILogger().info("Detected first install!"); } - if (devMode = getConfigDocument().getBoolean("dev-mode") || getConfigDocument().getBoolean("dev-mode.enabled")) { + if (devMode == getConfigDocument().getBoolean("dev-mode") || getConfigDocument().getBoolean("dev-mode.enabled")) { getILogger().setLevel(Level.ALL); getILogger().debug("Devmode is enabled: Showing debug messages. This can be disabled in the plugin.yml ('dev-mode')"); } else { @@ -142,11 +144,7 @@ protected void handleLoad() throws Exception {} protected void handleEnable() throws Exception {} protected void handleDisable() throws Exception {} - public boolean isDevMode() { - return devMode; - } - - public final boolean isFirstInstall() { + public final boolean isFirstInstall() { return firstInstall; } @@ -185,7 +183,7 @@ public void reloadConfig() { @Nonnull public Document getPluginDocument() { return pluginConfig != null ? pluginConfig : - (pluginConfig = new YamlDocument(YamlConfiguration.loadConfiguration(new InputStreamReader(getResource("plugin.yml"), Charsets.UTF_8)))); + (pluginConfig = new YamlDocument(YamlConfiguration.loadConfiguration(new InputStreamReader(Objects.requireNonNull(getResource("plugin.yml")), Charsets.UTF_8)))); } @Nonnull @@ -344,7 +342,7 @@ private void injectInstance() { Field instanceField = this.getClass().getDeclaredField("instance"); instanceField.setAccessible(true); instanceField.set(null, this); - } catch (Throwable ex) { + } catch (Throwable ignored) { } } diff --git a/plugin/src/main/java/net/codingarea/commons/bukkit/core/RequirementsChecker.java b/plugin/src/main/java/net/codingarea/commons/bukkit/core/RequirementsChecker.java index 87cae1721..8b380040c 100644 --- a/plugin/src/main/java/net/codingarea/commons/bukkit/core/RequirementsChecker.java +++ b/plugin/src/main/java/net/codingarea/commons/bukkit/core/RequirementsChecker.java @@ -6,6 +6,7 @@ import org.bukkit.Bukkit; import javax.annotation.Nonnull; +import java.util.Objects; public final class RequirementsChecker { @@ -18,7 +19,7 @@ public RequirementsChecker(@Nonnull BukkitModule module) { public void checkExceptionally(@Nonnull Document requirements) throws IllegalStateException { if (requirements.getBoolean("spigot")) requireSpigot(); if (requirements.getBoolean("paper")) requirePaper(); - if (requirements.contains("version")) requireVersion(requirements.getVersion("version")); + if (requirements.contains("version")) requireVersion(Objects.requireNonNull(requirements.getVersion("version"))); } public boolean checkBoolean(@Nonnull Document requirements) { diff --git a/plugin/src/main/java/net/codingarea/commons/bukkit/utils/animation/AnimationFrame.java b/plugin/src/main/java/net/codingarea/commons/bukkit/utils/animation/AnimationFrame.java index 130785522..b91add45e 100644 --- a/plugin/src/main/java/net/codingarea/commons/bukkit/utils/animation/AnimationFrame.java +++ b/plugin/src/main/java/net/codingarea/commons/bukkit/utils/animation/AnimationFrame.java @@ -7,6 +7,7 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.Arrays; +import java.util.Objects; public class AnimationFrame implements Cloneable { @@ -59,7 +60,7 @@ public ItemStack getItem(int slot) { @Nullable public Material getItemType(int slot) { - return getItem(slot) == null ? Material.AIR : getItem(slot).getType(); + return getItem(slot) == null ? Material.AIR : Objects.requireNonNull(getItem(slot)).getType(); } @Nonnull @@ -78,7 +79,8 @@ public int getSize() { @Nonnull @Override public AnimationFrame clone() { - return new AnimationFrame(content); + AnimationFrame animationFrame = (AnimationFrame) super.clone(); + return new AnimationFrame(content); } } diff --git a/plugin/src/main/java/net/codingarea/commons/bukkit/utils/animation/SoundSample.java b/plugin/src/main/java/net/codingarea/commons/bukkit/utils/animation/SoundSample.java index 8991960e0..47441780a 100644 --- a/plugin/src/main/java/net/codingarea/commons/bukkit/utils/animation/SoundSample.java +++ b/plugin/src/main/java/net/codingarea/commons/bukkit/utils/animation/SoundSample.java @@ -1,5 +1,6 @@ package net.codingarea.commons.bukkit.utils.animation; +import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Sound; @@ -35,7 +36,9 @@ public static void playStatusSound(@Nonnull Player player, boolean enabled) { private static final class SoundFrame { - private final float pitch, volume; + @Getter + @Getter + private final float pitch, volume; private final Sound sound; public SoundFrame(@Nonnull Sound sound, float volume, float pitch) { @@ -52,15 +55,7 @@ public void play(@Nonnull Player player, @Nonnull Location location) { player.playSound(location, sound, volume, pitch); } - public float getPitch() { - return pitch; - } - - public float getVolume() { - return volume; - } - - @Nonnull + @Nonnull public Sound getSound() { return sound; } diff --git a/plugin/src/main/java/net/codingarea/commons/bukkit/utils/bstats/JsonObjectBuilder.java b/plugin/src/main/java/net/codingarea/commons/bukkit/utils/bstats/JsonObjectBuilder.java index 172e2e4ff..01431c4e6 100644 --- a/plugin/src/main/java/net/codingarea/commons/bukkit/utils/bstats/JsonObjectBuilder.java +++ b/plugin/src/main/java/net/codingarea/commons/bukkit/utils/bstats/JsonObjectBuilder.java @@ -160,14 +160,15 @@ public JsonObject build() { } /** - * Escapes the given string like stated in https://www.ietf.org/rfc/rfc4627.txt. - * - *

This method escapes only the necessary characters '"', '\'. and '\u0000' - '\u001F'. - * Compact escapes are not used (e.g., '\n' is escaped as "\u000a" and not as "\n"). - * - * @param value The value to escape. - * @return The escaped value. - */ + * Escapes the given string like stated in .... + * + *

This method escapes only the necessary characters '"', '\'. and '\u0000' - '\u001F'. + * Compact escapes are not used (e.g., '\n' is escaped as " +" and not as "\n"). + * + * @param value The value to escape. + * @return The escaped value. + */ private static String escape(String value) { final StringBuilder builder = new StringBuilder(); for (int i = 0; i < value.length(); i++) { diff --git a/plugin/src/main/java/net/codingarea/commons/bukkit/utils/item/ItemBuilder.java b/plugin/src/main/java/net/codingarea/commons/bukkit/utils/item/ItemBuilder.java index 339bbaba2..868ad8110 100644 --- a/plugin/src/main/java/net/codingarea/commons/bukkit/utils/item/ItemBuilder.java +++ b/plugin/src/main/java/net/codingarea/commons/bukkit/utils/item/ItemBuilder.java @@ -14,10 +14,7 @@ import javax.annotation.CheckReturnValue; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; +import java.util.*; public class ItemBuilder { @@ -67,7 +64,7 @@ public ItemMeta getMeta() { @Nonnull @SuppressWarnings("unchecked") public final M getCastedMeta() { - return (M) (meta == null ? meta = item.getItemMeta() : meta); + return (M) (meta == null ? Objects.requireNonNull(meta = item.getItemMeta()) : meta); } @Nonnull @@ -254,7 +251,8 @@ public ItemStack toItem() { @Override public ItemBuilder clone() { - return new ItemBuilder(item.clone(), getMeta().clone()); + ItemBuilder itemBuilder = (ItemBuilder) super.clone(); + return new ItemBuilder(item.clone(), getMeta().clone()); } public static class BannerBuilder extends ItemBuilder { diff --git a/plugin/src/main/java/net/codingarea/commons/bukkit/utils/menu/MenuClickInfo.java b/plugin/src/main/java/net/codingarea/commons/bukkit/utils/menu/MenuClickInfo.java index 5753ad174..0d2e9236d 100644 --- a/plugin/src/main/java/net/codingarea/commons/bukkit/utils/menu/MenuClickInfo.java +++ b/plugin/src/main/java/net/codingarea/commons/bukkit/utils/menu/MenuClickInfo.java @@ -1,5 +1,6 @@ package net.codingarea.commons.bukkit.utils.menu; +import lombok.Getter; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; @@ -13,9 +14,12 @@ public class MenuClickInfo { protected final Player player; protected final Inventory inventory; - protected final boolean shiftClick; - protected final boolean rightClick; - protected final int slot; + @Getter + protected final boolean shiftClick; + @Getter + protected final boolean rightClick; + @Getter + protected final int slot; public MenuClickInfo(@Nonnull Player player, @Nonnull Inventory inventory, boolean shiftClick, boolean rightClick, @Nonnegative int slot) { this.player = player; @@ -35,23 +39,11 @@ public Inventory getInventory() { return inventory; } - public boolean isRightClick() { - return rightClick; - } - - public boolean isLeftClick() { + public boolean isLeftClick() { return !rightClick; } - public boolean isShiftClick() { - return shiftClick; - } - - public int getSlot() { - return slot; - } - - @Nullable + @Nullable public ItemStack getClickedItem() { return inventory.getItem(slot); } diff --git a/plugin/src/main/java/net/codingarea/commons/bukkit/utils/misc/BukkitReflectionUtils.java b/plugin/src/main/java/net/codingarea/commons/bukkit/utils/misc/BukkitReflectionUtils.java index 36284f5e3..46b72210b 100644 --- a/plugin/src/main/java/net/codingarea/commons/bukkit/utils/misc/BukkitReflectionUtils.java +++ b/plugin/src/main/java/net/codingarea/commons/bukkit/utils/misc/BukkitReflectionUtils.java @@ -136,7 +136,7 @@ public static NamespacedKey fromString(@Nonnull String key) { */ @Nullable public static NamespacedKey fromString(@Nonnull String string, @Nullable Plugin defaultNamespace) { - Preconditions.checkArgument(string != null && !string.isEmpty(), "Input string must not be empty or null"); + Preconditions.checkArgument(!string.isEmpty(), "Input string must not be empty or null"); String[] components = string.split(":", 3); if (components.length > 2) { diff --git a/plugin/src/main/java/net/codingarea/commons/bukkit/utils/wrapper/ActionListener.java b/plugin/src/main/java/net/codingarea/commons/bukkit/utils/wrapper/ActionListener.java index 8faa0993b..c53353706 100644 --- a/plugin/src/main/java/net/codingarea/commons/bukkit/utils/wrapper/ActionListener.java +++ b/plugin/src/main/java/net/codingarea/commons/bukkit/utils/wrapper/ActionListener.java @@ -1,5 +1,6 @@ package net.codingarea.commons.bukkit.utils.wrapper; +import lombok.Getter; import org.bukkit.event.Event; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; @@ -13,7 +14,8 @@ public final class ActionListener implements Listener { private final Class classOfEvent; private final Consumer listener; private final EventPriority priority; - private final boolean ignoreCancelled; + @Getter + private final boolean ignoreCancelled; public ActionListener(@Nonnull Class classOfEvent, @Nonnull Consumer listener, @Nonnull EventPriority priority, boolean ignoreCancelled) { this.classOfEvent = classOfEvent; @@ -50,8 +52,4 @@ public Class getClassOfEvent() { return classOfEvent; } - public boolean isIgnoreCancelled() { - return ignoreCancelled; - } - } diff --git a/plugin/src/main/java/net/codingarea/commons/common/collection/ClassWalker.java b/plugin/src/main/java/net/codingarea/commons/common/collection/ClassWalker.java index d71f0df71..49018ec35 100644 --- a/plugin/src/main/java/net/codingarea/commons/common/collection/ClassWalker.java +++ b/plugin/src/main/java/net/codingarea/commons/common/collection/ClassWalker.java @@ -4,7 +4,7 @@ import java.util.*; /** - * @author JDA | https://github.com/DV8FromTheWorld/JDA/blob/development/src/main/java/net/dv8tion/jda/internal/utils/ClassWalker.java + * @author JDA | ... */ public class ClassWalker implements Iterable> { diff --git a/plugin/src/main/java/net/codingarea/commons/common/collection/NumberFormatter.java b/plugin/src/main/java/net/codingarea/commons/common/collection/NumberFormatter.java index 4a734b55b..013c092c1 100644 --- a/plugin/src/main/java/net/codingarea/commons/common/collection/NumberFormatter.java +++ b/plugin/src/main/java/net/codingarea/commons/common/collection/NumberFormatter.java @@ -48,7 +48,7 @@ default String format(@Nonnull Number number) { return format(number.doubleValue()); } - public static final NumberFormatter + NumberFormatter DEFAULT = fromPattern("0.##", null, false), INTEGER = value -> (int) value + "", SPACE_SPLIT = fromPattern("###,##0.###############", null, false, diff --git a/plugin/src/main/java/net/codingarea/commons/common/collection/SeededRandomWrapper.java b/plugin/src/main/java/net/codingarea/commons/common/collection/SeededRandomWrapper.java index a9fcb48f2..0c0f90e5e 100644 --- a/plugin/src/main/java/net/codingarea/commons/common/collection/SeededRandomWrapper.java +++ b/plugin/src/main/java/net/codingarea/commons/common/collection/SeededRandomWrapper.java @@ -1,11 +1,14 @@ package net.codingarea.commons.common.collection; +import lombok.Getter; + import java.util.Random; /** * Since there is no way of getting the seed of a {@link Random} we create a wrapper * which will save seed. This allows us to save randomization and reload it. */ +@Getter public class SeededRandomWrapper extends Random implements IRandom { protected long seed; @@ -24,11 +27,7 @@ public void setSeed(long seed) { this.seed = seed; } - public long getSeed() { - return seed; - } - - @Override + @Override public String toString() { return "Random[seed=" + seed + "]"; } diff --git a/plugin/src/main/java/net/codingarea/commons/common/collection/pair/Quadro.java b/plugin/src/main/java/net/codingarea/commons/common/collection/pair/Quadro.java index df07b890d..734f5cf16 100644 --- a/plugin/src/main/java/net/codingarea/commons/common/collection/pair/Quadro.java +++ b/plugin/src/main/java/net/codingarea/commons/common/collection/pair/Quadro.java @@ -1,5 +1,7 @@ package net.codingarea.commons.common.collection.pair; +import lombok.Getter; + import javax.annotation.CheckReturnValue; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -12,6 +14,7 @@ * @param The type of the third value * @param The type of the fourth value */ +@Getter public class Quadro implements Pair { protected F first; @@ -40,23 +43,7 @@ public final Object[] values() { return new Object[] { first, second, third, first }; } - public F getFirst() { - return first; - } - - public S getSecond() { - return second; - } - - public T getThird() { - return third; - } - - public FF getFourth() { - return fourth; - } - - public void setFirst(@Nullable F first) { + public void setFirst(@Nullable F first) { this.first = first; } diff --git a/plugin/src/main/java/net/codingarea/commons/common/collection/pair/Triple.java b/plugin/src/main/java/net/codingarea/commons/common/collection/pair/Triple.java index 48c8dfcde..b62f55777 100644 --- a/plugin/src/main/java/net/codingarea/commons/common/collection/pair/Triple.java +++ b/plugin/src/main/java/net/codingarea/commons/common/collection/pair/Triple.java @@ -1,5 +1,7 @@ package net.codingarea.commons.common.collection.pair; +import lombok.Getter; + import javax.annotation.CheckReturnValue; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -11,6 +13,7 @@ * @param The type of the second value * @param The type of the third value */ +@Getter public class Triple implements Pair { protected F first; @@ -37,19 +40,7 @@ public final Object[] values() { return new Object[] { first, second, third }; } - public F getFirst() { - return first; - } - - public S getSecond() { - return second; - } - - public T getThird() { - return third; - } - - public void setFirst(@Nullable F first) { + public void setFirst(@Nullable F first) { this.first = first; } diff --git a/plugin/src/main/java/net/codingarea/commons/common/collection/pair/Tuple.java b/plugin/src/main/java/net/codingarea/commons/common/collection/pair/Tuple.java index 9d320ba6e..ce1901dbf 100644 --- a/plugin/src/main/java/net/codingarea/commons/common/collection/pair/Tuple.java +++ b/plugin/src/main/java/net/codingarea/commons/common/collection/pair/Tuple.java @@ -1,5 +1,7 @@ package net.codingarea.commons.common.collection.pair; +import lombok.Getter; + import javax.annotation.CheckReturnValue; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -10,6 +12,7 @@ * @param The type of the first value * @param The type of the second value */ +@Getter public class Tuple implements Pair { protected F first; @@ -34,15 +37,7 @@ public final Object[] values() { return new Object[] { first, second }; } - public F getFirst() { - return first; - } - - public S getSecond() { - return second; - } - - public void setFirst(@Nullable F first) { + public void setFirst(@Nullable F first) { this.first = first; } diff --git a/plugin/src/main/java/net/codingarea/commons/common/concurrent/task/CompletableTask.java b/plugin/src/main/java/net/codingarea/commons/common/concurrent/task/CompletableTask.java index 37b71703f..08ab891a7 100644 --- a/plugin/src/main/java/net/codingarea/commons/common/concurrent/task/CompletableTask.java +++ b/plugin/src/main/java/net/codingarea/commons/common/concurrent/task/CompletableTask.java @@ -64,7 +64,7 @@ public Task addListener(@Nonnull TaskListener listener) { } else if (failure != null) { listener.onFailure(this, failure); } else { - listener.onComplete(this, value); + listener.onComplete(this, null); } return this; } diff --git a/plugin/src/main/java/net/codingarea/commons/common/config/document/AbstractConfig.java b/plugin/src/main/java/net/codingarea/commons/common/config/document/AbstractConfig.java index cce0be2e8..2f9fec69b 100644 --- a/plugin/src/main/java/net/codingarea/commons/common/config/document/AbstractConfig.java +++ b/plugin/src/main/java/net/codingarea/commons/common/config/document/AbstractConfig.java @@ -46,7 +46,7 @@ public char getChar(@Nonnull String path) { @Override public char getChar(@Nonnull String path, char def) { try { - return getString(path).charAt(0); + return Objects.requireNonNull(getString(path)).charAt(0); } catch (NullPointerException | IndexOutOfBoundsException ex) { return def; } @@ -175,7 +175,7 @@ public > List getEnumList(@Nonnull String path, @Nonnull Cl @Nonnull @Override public List getCharacterList(@Nonnull String path) { - return mapList(path, string -> string == null || string.length() == 0 ? (char) 0 : string.charAt(0)); + return mapList(path, string -> string == null || string.isEmpty() ? (char) 0 : string.charAt(0)); } @Nonnull diff --git a/plugin/src/main/java/net/codingarea/commons/common/config/document/MapDocument.java b/plugin/src/main/java/net/codingarea/commons/common/config/document/MapDocument.java index b0b194d05..eabc2e1a7 100644 --- a/plugin/src/main/java/net/codingarea/commons/common/config/document/MapDocument.java +++ b/plugin/src/main/java/net/codingarea/commons/common/config/document/MapDocument.java @@ -129,7 +129,7 @@ public String getString(@Nonnull String path) { @Override public long getLong(@Nonnull String path, long def) { try { - return Long.parseLong(getString(path)); + return Long.parseLong(Objects.requireNonNull(getString(path))); } catch (Exception ex) { return def; } @@ -138,7 +138,7 @@ public long getLong(@Nonnull String path, long def) { @Override public int getInt(@Nonnull String path, int def) { try { - return Integer.parseInt(getString(path)); + return Integer.parseInt(Objects.requireNonNull(getString(path))); } catch (Exception ex) { return def; } @@ -147,7 +147,7 @@ public int getInt(@Nonnull String path, int def) { @Override public short getShort(@Nonnull String path, short def) { try { - return Short.parseShort(getString(path)); + return Short.parseShort(Objects.requireNonNull(getString(path))); } catch (Exception ex) { return def; } @@ -156,7 +156,7 @@ public short getShort(@Nonnull String path, short def) { @Override public byte getByte(@Nonnull String path, byte def) { try { - return Byte.parseByte(getString(path)); + return Byte.parseByte(Objects.requireNonNull(getString(path))); } catch (Exception ex) { return def; } @@ -165,7 +165,7 @@ public byte getByte(@Nonnull String path, byte def) { @Override public float getFloat(@Nonnull String path, float def) { try { - return Float.parseFloat(getString(path)); + return Float.parseFloat(Objects.requireNonNull(getString(path))); } catch (Exception ex) { return def; } @@ -174,7 +174,7 @@ public float getFloat(@Nonnull String path, float def) { @Override public double getDouble(@Nonnull String path, double def) { try { - return Double.parseDouble(getString(path)); + return Double.parseDouble(Objects.requireNonNull(getString(path))); } catch (Exception ex) { return def; } @@ -184,7 +184,7 @@ public double getDouble(@Nonnull String path, double def) { public boolean getBoolean(@Nonnull String path, boolean def) { try { if (!contains(path)) return def; - switch (getString(path).toLowerCase()) { + switch (Objects.requireNonNull(getString(path)).toLowerCase()) { case "true": case "1": return true; diff --git a/plugin/src/main/java/net/codingarea/commons/common/config/document/PropertiesDocument.java b/plugin/src/main/java/net/codingarea/commons/common/config/document/PropertiesDocument.java index 58fa7b100..7f5213806 100644 --- a/plugin/src/main/java/net/codingarea/commons/common/config/document/PropertiesDocument.java +++ b/plugin/src/main/java/net/codingarea/commons/common/config/document/PropertiesDocument.java @@ -78,7 +78,7 @@ public String getString(@Nonnull String path) { @Override public long getLong(@Nonnull String path, long def) { try { - return Long.parseLong(getString(path)); + return Long.parseLong(Objects.requireNonNull(getString(path))); } catch (Exception ex) { return def; } @@ -87,7 +87,7 @@ public long getLong(@Nonnull String path, long def) { @Override public int getInt(@Nonnull String path, int def) { try { - return Integer.parseInt(getString(path)); + return Integer.parseInt(Objects.requireNonNull(getString(path))); } catch (Exception ex) { return def; } @@ -96,7 +96,7 @@ public int getInt(@Nonnull String path, int def) { @Override public short getShort(@Nonnull String path, short def) { try { - return Short.parseShort(getString(path)); + return Short.parseShort(Objects.requireNonNull(getString(path))); } catch (Exception ex) { return def; } @@ -105,7 +105,7 @@ public short getShort(@Nonnull String path, short def) { @Override public byte getByte(@Nonnull String path, byte def) { try { - return Byte.parseByte(getString(path)); + return Byte.parseByte(Objects.requireNonNull(getString(path))); } catch (Exception ex) { return def; } @@ -114,7 +114,7 @@ public byte getByte(@Nonnull String path, byte def) { @Override public float getFloat(@Nonnull String path, float def) { try { - return Float.parseFloat(getString(path)); + return Float.parseFloat(Objects.requireNonNull(getString(path))); } catch (Exception ex) { return def; } @@ -123,7 +123,7 @@ public float getFloat(@Nonnull String path, float def) { @Override public double getDouble(@Nonnull String path, double def) { try { - return Double.parseDouble(getString(path)); + return Double.parseDouble(Objects.requireNonNull(getString(path))); } catch (Exception ex) { return def; } @@ -139,7 +139,7 @@ public boolean getBoolean(@Nonnull String path, boolean def) { @Override public UUID getUUID(@Nonnull String path) { try { - return UUID.fromString(getString(path)); + return UUID.fromString(Objects.requireNonNull(getString(path))); } catch (Exception ex) { return null; } @@ -155,7 +155,7 @@ public Date getDate(@Nonnull String path) { @Override public OffsetDateTime getDateTime(@Nonnull String path) { try { - return OffsetDateTime.parse(getString(path)); + return OffsetDateTime.parse(Objects.requireNonNull(getString(path))); } catch (Exception ex) { return null; } diff --git a/plugin/src/main/java/net/codingarea/commons/common/config/document/YamlDocument.java b/plugin/src/main/java/net/codingarea/commons/common/config/document/YamlDocument.java index 03bdf14d3..faf4fe162 100644 --- a/plugin/src/main/java/net/codingarea/commons/common/config/document/YamlDocument.java +++ b/plugin/src/main/java/net/codingarea/commons/common/config/document/YamlDocument.java @@ -54,7 +54,7 @@ public String getString(@Nonnull String path) { @Override public String getString(@Nonnull String path, @Nonnull String def) { String string = config.getString(path, def); - return string == null ? def : string; + return string; } @Nullable @@ -67,7 +67,7 @@ public Object getObject(@Nonnull String path) { @Override public Object getObject(@Nonnull String path, @Nonnull Object def) { Object value = config.get(path, def); - return value == null ? def : value; + return value; } @Override @@ -147,7 +147,7 @@ public char getChar(@Nonnull String path) { @Override public char getChar(@Nonnull String path, char def) { try { - return getString(path).charAt(0); + return Objects.requireNonNull(getString(path)).charAt(0); } catch (NullPointerException | StringIndexOutOfBoundsException ex) { return def; } @@ -193,7 +193,7 @@ public List getStringList(@Nonnull String path) { @Override public UUID getUUID(@Nonnull String path) { try { - return UUID.fromString(getString(path)); + return UUID.fromString(Objects.requireNonNull(getString(path))); } catch (Exception ex) { return null; } @@ -213,7 +213,7 @@ public Date getDate(@Nonnull String path) { @Override public OffsetDateTime getDateTime(@Nonnull String path) { try { - return OffsetDateTime.parse(getString(path)); + return OffsetDateTime.parse(Objects.requireNonNull(getString(path))); } catch (Exception ex) { return null; } @@ -223,7 +223,7 @@ public OffsetDateTime getDateTime(@Nonnull String path) { @Override public Color getColor(@Nonnull String path) { try { - return Color.decode(getString(path)); + return Color.decode(Objects.requireNonNull(getString(path))); } catch (Exception ex) { return null; } diff --git a/plugin/src/main/java/net/codingarea/commons/common/config/document/gson/BukkitReflectionSerializableTypeAdapter.java b/plugin/src/main/java/net/codingarea/commons/common/config/document/gson/BukkitReflectionSerializableTypeAdapter.java index ed36fd787..71f9f7744 100644 --- a/plugin/src/main/java/net/codingarea/commons/common/config/document/gson/BukkitReflectionSerializableTypeAdapter.java +++ b/plugin/src/main/java/net/codingarea/commons/common/config/document/gson/BukkitReflectionSerializableTypeAdapter.java @@ -43,7 +43,7 @@ public Object read(@Nonnull Gson gson, @Nonnull JsonReader reader) throws IOExce Class clazz = null; try { clazz = Class.forName(classOfType); - } catch (ClassNotFoundException | NullPointerException ex) { + } catch (ClassNotFoundException | NullPointerException ignored) { } Map map = GsonUtils.convertJsonObjectToMap(json); diff --git a/plugin/src/main/java/net/codingarea/commons/common/discord/DiscordWebhook.java b/plugin/src/main/java/net/codingarea/commons/common/discord/DiscordWebhook.java index 49eeec955..b75f88549 100644 --- a/plugin/src/main/java/net/codingarea/commons/common/discord/DiscordWebhook.java +++ b/plugin/src/main/java/net/codingarea/commons/common/discord/DiscordWebhook.java @@ -1,5 +1,6 @@ package net.codingarea.commons.common.discord; +import lombok.Getter; import net.codingarea.commons.common.config.Document; import javax.annotation.Nonnull; @@ -214,7 +215,8 @@ public DiscordWebhook replaceEverywhere(@Nonnull String trigger, @Nonnull String return this; } - public static class EmbedObject { + @Getter + public static class EmbedObject { protected String title; protected String description; @@ -244,43 +246,7 @@ public EmbedObject(@Nullable String title, @Nullable String description, @Nullab this.fields = fields; } - public String getTitle() { - return title; - } - - public String getDescription() { - return description; - } - - public String getUrl() { - return url; - } - - public Color getColor() { - return color; - } - - public Footer getFooter() { - return footer; - } - - public Thumbnail getThumbnail() { - return thumbnail; - } - - public Image getImage() { - return image; - } - - public Author getAuthor() { - return author; - } - - public List getFields() { - return fields; - } - - @Nonnull + @Nonnull public EmbedObject setTitle(String title) { this.title = title; return this; @@ -336,7 +302,8 @@ public EmbedObject addField(String name, String value, boolean inline) { @Override public EmbedObject clone() { - return new EmbedObject( + EmbedObject embedObject = (EmbedObject) super.clone(); + return new EmbedObject( title, description, url, color, footer == null ? null : footer.clone(), thumbnail == null ? null : thumbnail.clone(), @@ -368,8 +335,9 @@ private String getIconUrl() { } @Override - protected Footer clone() { - return new Footer(text, iconUrl); + protected Footer clone() throws CloneNotSupportedException { + Footer footer1 = (Footer) super.clone(); + return new Footer(text, iconUrl); } } @@ -389,8 +357,9 @@ private String getUrl() { } @Override - protected Thumbnail clone() { - return new Thumbnail(url); + protected Thumbnail clone() throws CloneNotSupportedException { + Thumbnail thumbnail1 = (Thumbnail) super.clone(); + return new Thumbnail(url); } } @@ -411,7 +380,8 @@ private String getUrl() { @Override public Image clone() { - return new Image(url); + Image image1 = (Image) super.clone(); + return new Image(url); } } @@ -443,8 +413,9 @@ private String getIconUrl() { } @Override - protected Author clone() { - return new Author(name, url, iconUrl); + protected Author clone() throws CloneNotSupportedException { + Author author1 = (Author) super.clone(); + return new Author(name, url, iconUrl); } } @@ -476,15 +447,17 @@ private boolean isInline() { } @Override - protected Field clone() { - return new Field(name, value, inline); + protected Field clone() throws CloneNotSupportedException { + Field field = (Field) super.clone(); + return new Field(name, value, inline); } } } @Override public DiscordWebhook clone() { - return new DiscordWebhook(url, username, avatarUrl, content, clone(embeds, EmbedObject::clone), tts); + DiscordWebhook discordWebhook = (DiscordWebhook) super.clone(); + return new DiscordWebhook(url, username, avatarUrl, content, clone(embeds, EmbedObject::clone), tts); } @Nonnull diff --git a/plugin/src/main/java/net/codingarea/commons/common/logging/ILogger.java b/plugin/src/main/java/net/codingarea/commons/common/logging/ILogger.java index 02ec550a7..eb337e206 100644 --- a/plugin/src/main/java/net/codingarea/commons/common/logging/ILogger.java +++ b/plugin/src/main/java/net/codingarea/commons/common/logging/ILogger.java @@ -260,7 +260,7 @@ default JavaILogger java() { @CheckReturnValue default PrintStream asPrintStream(@Nonnull LogLevel level) { try { - return new PrintStream(new LogOutputStream(this, level), true, StandardCharsets.UTF_8.name()); + return new PrintStream(new LogOutputStream(this, level), true, StandardCharsets.UTF_8); } catch (Exception ex) { throw new WrappedException(ex); } diff --git a/plugin/src/main/java/net/codingarea/commons/common/logging/LogLevel.java b/plugin/src/main/java/net/codingarea/commons/common/logging/LogLevel.java index ddf6d01c8..58d6c7262 100644 --- a/plugin/src/main/java/net/codingarea/commons/common/logging/LogLevel.java +++ b/plugin/src/main/java/net/codingarea/commons/common/logging/LogLevel.java @@ -1,5 +1,7 @@ package net.codingarea.commons.common.logging; +import lombok.Getter; + import javax.annotation.Nonnull; import java.util.logging.Level; @@ -15,8 +17,10 @@ public enum LogLevel { private final String uppercaseName, lowercaseName; private final Level javaLevel; - private final int value; - private final boolean highlighted; + @Getter + private final int value; + @Getter + private final boolean highlighted; LogLevel(int value, @Nonnull String uppercaseName, @Nonnull String lowercaseName, @Nonnull Level javaLevel, boolean highlighted) { this.uppercaseName = uppercaseName; @@ -35,11 +39,7 @@ public boolean isShownAtLoggerLevel(@Nonnull LogLevel loggerLevel) { return this.getValue() >= loggerLevel.getValue(); } - public int getValue() { - return value; - } - - @Nonnull + @Nonnull public String getLowerCaseName() { return lowercaseName; } @@ -49,11 +49,7 @@ public String getUpperCaseName() { return uppercaseName; } - public boolean isHighlighted() { - return highlighted; - } - - @Nonnull + @Nonnull public static LogLevel fromJavaLevel(@Nonnull Level level) { for (LogLevel logLevel : values()) { if (logLevel.getJavaUtilLevel().intValue() == level.intValue()) diff --git a/plugin/src/main/java/net/codingarea/commons/common/logging/LogOutputStream.java b/plugin/src/main/java/net/codingarea/commons/common/logging/LogOutputStream.java index 7095492ed..c747fbf1a 100644 --- a/plugin/src/main/java/net/codingarea/commons/common/logging/LogOutputStream.java +++ b/plugin/src/main/java/net/codingarea/commons/common/logging/LogOutputStream.java @@ -17,7 +17,7 @@ public LogOutputStream(@Nonnull ILogger logger, @Nonnull LogLevel level) { @Override public void flush() throws IOException { - String input = this.toString(StandardCharsets.UTF_8.name()); + String input = this.toString(StandardCharsets.UTF_8); this.reset(); if (input != null && !input.isEmpty() && !input.equals(System.lineSeparator())) { diff --git a/plugin/src/main/java/net/codingarea/commons/common/logging/handler/LogEntry.java b/plugin/src/main/java/net/codingarea/commons/common/logging/handler/LogEntry.java index 5068d301b..3212680b9 100644 --- a/plugin/src/main/java/net/codingarea/commons/common/logging/handler/LogEntry.java +++ b/plugin/src/main/java/net/codingarea/commons/common/logging/handler/LogEntry.java @@ -8,11 +8,11 @@ public class LogEntry { - private Instant timestamp; - private String threadName; - private String message; - private LogLevel level; - private Throwable exception; + private final Instant timestamp; + private final String threadName; + private final String message; + private final LogLevel level; + private final Throwable exception; public LogEntry(@Nonnull Instant timestamp, @Nonnull String threadName, @Nonnull String message, @Nonnull LogLevel level, @Nullable Throwable exception) { this.timestamp = timestamp; diff --git a/plugin/src/main/java/net/codingarea/commons/common/logging/internal/JavaLoggerWrapper.java b/plugin/src/main/java/net/codingarea/commons/common/logging/internal/JavaLoggerWrapper.java index f0c64bf8d..b9c95d540 100644 --- a/plugin/src/main/java/net/codingarea/commons/common/logging/internal/JavaLoggerWrapper.java +++ b/plugin/src/main/java/net/codingarea/commons/common/logging/internal/JavaLoggerWrapper.java @@ -393,274 +393,4 @@ public void debug(@Nullable Object message, @Nonnull Object... args) { } - @Override - public boolean isTraceEnabled() { - return isLevelEnabled(LogLevel.TRACE); - } - -// @Override -// public void trace(String msg) { -// trace(msg, new Object[0]); -// } -// -// @Override -// public void trace(String format, Object arg) { -// trace(format, new Object[] { arg }); -// } -// -// @Override -// public void trace(String format, Object arg1, Object arg2) { -// trace(format, new Object[] { arg1, arg2 }); -// } -// -// @Override -// public void trace(String msg, Throwable t) { -// trace(msg, new Object[] { t }); -// } -// -// @Override -// public boolean isTraceEnabled(Marker marker) { -// return isTraceEnabled(); -// } -// -// @Override -// public void trace(Marker marker, String msg) { -// trace(msg); -// } -// -// @Override -// public void trace(Marker marker, String format, Object arg) { -// trace(format, arg); -// } -// -// @Override -// public void trace(Marker marker, String format, Object arg1, Object arg2) { -// trace(format, arg1, arg2); -// } -// -// @Override -// public void trace(Marker marker, String format, Object... argArray) { -// trace(format, argArray); -// } -// -// @Override -// public void trace(Marker marker, String msg, Throwable t) { -// trace(msg, t); -// } -// -// @Override -// public boolean isDebugEnabled() { -// return isLevelEnabled(LogLevel.DEBUG); -// } -// -// @Override -// public void debug(String msg) { -// debug(msg, new Object[0]); -// } -// -// @Override -// public void debug(String format, Object arg) { -// debug(format, new Object[] { arg }); -// } -// -// @Override -// public void debug(String format, Object arg1, Object arg2) { -// debug(format, new Object[] { arg1, arg2 }); -// } -// -// @Override -// public void debug(String msg, Throwable t) { -// debug(msg, new Object[] { t }); -// } -// -// @Override -// public boolean isDebugEnabled(Marker marker) { -// return isDebugEnabled(); -// } -// -// @Override -// public void debug(Marker marker, String msg) { -// debug(msg); -// } -// -// @Override -// public void debug(Marker marker, String format, Object arg) { -// debug(format, arg); -// } -// -// @Override -// public void debug(Marker marker, String format, Object arg1, Object arg2) { -// debug(format, arg1, arg2); -// } -// -// @Override -// public void debug(Marker marker, String format, Object... arguments) { -// debug(format, arguments); -// } -// -// @Override -// public void debug(Marker marker, String msg, Throwable t) { -// debug(msg, t); -// } -// -// @Override -// public boolean isInfoEnabled() { -// return isLevelEnabled(LogLevel.INFO); -// } -// -// @Override -// public void info(String format, Object arg) { -// info(format, new Object[] { arg }); -// } -// -// @Override -// public void info(String format, Object arg1, Object arg2) { -// info(format, new Object[] { arg1, arg2 }); -// } -// -// @Override -// public void info(String msg, Throwable t) { -// info(msg, new Object[] { t }); -// } -// -// @Override -// public boolean isInfoEnabled(Marker marker) { -// return isInfoEnabled(); -// } -// -// @Override -// public void info(Marker marker, String msg) { -// info(msg); -// } -// -// @Override -// public void info(Marker marker, String format, Object arg) { -// info(format, arg); -// } -// -// @Override -// public void info(Marker marker, String format, Object arg1, Object arg2) { -// info(format, arg1, arg2); -// } -// -// @Override -// public void info(Marker marker, String format, Object... arguments) { -// info(format, arguments); -// } -// -// @Override -// public void info(Marker marker, String msg, Throwable t) { -// info(msg, t); -// } -// -// @Override -// public boolean isWarnEnabled() { -// return isLevelEnabled(LogLevel.WARN); -// } -// -// @Override -// public void warn(String msg) { -// warn(msg, new Object[0]); -// } -// -// @Override -// public void warn(String format, Object arg) { -// warn(format, new Object[] { arg }); -// } -// -// @Override -// public void warn(String format, Object arg1, Object arg2) { -// warn(format, new Object[] { arg1, arg2 }); -// } -// -// @Override -// public void warn(String msg, Throwable t) { -// warn(msg, new Object[] { t }); -// } -// -// @Override -// public boolean isWarnEnabled(Marker marker) { -// return isWarnEnabled(); -// } -// -// @Override -// public void warn(Marker marker, String msg) { -// warn(marker); -// } -// -// @Override -// public void warn(Marker marker, String format, Object arg) { -// warn(format, arg); -// } -// -// @Override -// public void warn(Marker marker, String format, Object arg1, Object arg2) { -// warn(format, arg1, arg2); -// } -// -// @Override -// public void warn(Marker marker, String format, Object... arguments) { -// warn(format, arguments); -// } -// -// @Override -// public void warn(Marker marker, String msg, Throwable t) { -// warn(msg, t); -// } -// -// @Override -// public boolean isErrorEnabled() { -// return isLevelEnabled(LogLevel.ERROR); -// } -// -// @Override -// public void error(String msg) { -// error(msg, new Object[0]); -// } -// -// @Override -// public void error(String format, Object arg) { -// error(format, new Object[] { arg }); -// } -// -// @Override -// public void error(String format, Object arg1, Object arg2) { -// error(format, new Object[] { arg1, arg2 }); -// } -// -// @Override -// public void error(String msg, Throwable t) { -// error(msg, new Object[] { t }); -// } -// -// @Override -// public boolean isErrorEnabled(Marker marker) { -// return isErrorEnabled(); -// } -// -// @Override -// public void error(Marker marker, String msg) { -// error(msg); -// } -// -// @Override -// public void error(Marker marker, String format, Object arg) { -// error(format, arg); -// } -// -// @Override -// public void error(Marker marker, String format, Object arg1, Object arg2) { -// error(format, arg1, arg2); -// } -// -// @Override -// public void error(Marker marker, String format, Object... arguments) { -// error(format, arguments); -// } -// -// @Override -// public void error(Marker marker, String msg, Throwable t) { -// error(msg, t); -// } - } diff --git a/plugin/src/main/java/net/codingarea/commons/common/misc/BukkitReflectionSerializationUtils.java b/plugin/src/main/java/net/codingarea/commons/common/misc/BukkitReflectionSerializationUtils.java index fc9a86c16..b01426a87 100644 --- a/plugin/src/main/java/net/codingarea/commons/common/misc/BukkitReflectionSerializationUtils.java +++ b/plugin/src/main/java/net/codingarea/commons/common/misc/BukkitReflectionSerializationUtils.java @@ -12,7 +12,7 @@ public final class BukkitReflectionSerializationUtils { private BukkitReflectionSerializationUtils() {} - protected static final ILogger logger = ILogger.forThisClass(); + private static final ILogger logger = ILogger.forThisClass(); public static boolean isSerializable(@Nonnull Class clazz) { try { @@ -56,7 +56,7 @@ public static T deserializeObject(@Nonnull Map map, @Nullabl return (T) object; - } catch (Throwable ex) { + } catch (Throwable ignored) { } if (classOfT == null) diff --git a/plugin/src/main/java/net/codingarea/commons/common/misc/FileUtils.java b/plugin/src/main/java/net/codingarea/commons/common/misc/FileUtils.java index b8733488f..e3438e1fe 100644 --- a/plugin/src/main/java/net/codingarea/commons/common/misc/FileUtils.java +++ b/plugin/src/main/java/net/codingarea/commons/common/misc/FileUtils.java @@ -531,7 +531,7 @@ public static void createFile(@Nullable Path filePath) { if (filePath.getParent() != null) Files.createDirectories(filePath.getParent()); Files.createFile(filePath); - } catch (IOException ex) { + } catch (IOException ignored) { } } } diff --git a/plugin/src/main/java/net/codingarea/commons/common/misc/GsonUtils.java b/plugin/src/main/java/net/codingarea/commons/common/misc/GsonUtils.java index ce3988f94..4f7d07eee 100644 --- a/plugin/src/main/java/net/codingarea/commons/common/misc/GsonUtils.java +++ b/plugin/src/main/java/net/codingarea/commons/common/misc/GsonUtils.java @@ -118,7 +118,7 @@ public static void setDocumentProperties(@Nonnull Gson gson, @Nonnull JsonObject public static int getSize(@Nonnull JsonObject object) { try { return object.size(); - } catch (NoSuchMethodError ex) { + } catch (NoSuchMethodError ignored) { } return object.entrySet().size(); diff --git a/plugin/src/main/java/net/codingarea/commons/common/misc/ImageUtils.java b/plugin/src/main/java/net/codingarea/commons/common/misc/ImageUtils.java index 6be9f8af1..a19e89e89 100644 --- a/plugin/src/main/java/net/codingarea/commons/common/misc/ImageUtils.java +++ b/plugin/src/main/java/net/codingarea/commons/common/misc/ImageUtils.java @@ -73,7 +73,8 @@ public static BufferedImage loadUrl(@Nonnull String url) throws IOException { public static BufferedImage loadResource(@Nonnull String path) throws IOException { InputStream stream = ImageUtils.class.getClassLoader().getResourceAsStream(path); - return ImageIO.read(stream); + assert stream != null; + return ImageIO.read(stream); } public static BufferedImage loadFile(@Nonnull File file) throws IOException { diff --git a/plugin/src/main/java/net/codingarea/commons/common/misc/ReflectionUtils.java b/plugin/src/main/java/net/codingarea/commons/common/misc/ReflectionUtils.java index 2c4566199..4fb6cb7a4 100644 --- a/plugin/src/main/java/net/codingarea/commons/common/misc/ReflectionUtils.java +++ b/plugin/src/main/java/net/codingarea/commons/common/misc/ReflectionUtils.java @@ -49,7 +49,7 @@ public static Method getInheritedPrivateMethod(@Nonnull Class clazz, @Nonnull for (Class current : ClassWalker.walk(clazz)) { try { return current.getDeclaredMethod(name, parameterTypes); - } catch (Throwable ex) { + } catch (Throwable ignored) { } } @@ -61,7 +61,7 @@ public static Field getInheritedPrivateField(@Nonnull Class clazz, @Nonnull S for (Class current : ClassWalker.walk(clazz)) { try { return current.getDeclaredField(name); - } catch (Throwable ex) { + } catch (Throwable ignored) { } } @@ -77,7 +77,7 @@ public static > E getFirstEnumByNames(@Nonnull Class classO for (String name : names) { try { return Enum.valueOf(classOfEnum, name); - } catch (IllegalArgumentException | NoSuchFieldError ex) { } + } catch (IllegalArgumentException | NoSuchFieldError ignored) { } } throw new IllegalArgumentException("No enum found in " + classOfEnum.getName() + " for " + Arrays.toString(names)); } @@ -234,7 +234,8 @@ public static T getAnnotationValue(@Nonnull Annotation annotation) { public static > E getEnumByAlternateNames(@Nonnull Class classOfE, @Nonnull String input) { E[] values = invokeStaticMethodOrNull(classOfE, "values"); String[] methodNames = { "getName", "getNames", "getAlias", "getAliases", "getKey", "getKeys", "name", "toString", "ordinal", "getId", "id" }; - for (E value : values) { + assert values != null; + for (E value : values) { for (String method : methodNames) { if (check(input, invokeMethodOrNull(value, method))) return value; diff --git a/plugin/src/main/java/net/codingarea/commons/common/misc/SimpleCollectionUtils.java b/plugin/src/main/java/net/codingarea/commons/common/misc/SimpleCollectionUtils.java index 66faae82d..e92d8938e 100644 --- a/plugin/src/main/java/net/codingarea/commons/common/misc/SimpleCollectionUtils.java +++ b/plugin/src/main/java/net/codingarea/commons/common/misc/SimpleCollectionUtils.java @@ -35,7 +35,7 @@ public static void disableErrorLogging() { public static String convertMapToString(@Nonnull Map map, @Nonnull Function key, @Nonnull Function value) { StringBuilder builder = new StringBuilder(); for (Entry entry : map.entrySet()) { - if (builder.length() != 0) builder.append(REGEX_1); + if (!builder.isEmpty()) builder.append(REGEX_1); builder.append(key.apply(entry.getKey())); builder.append(REGEX_2); builder.append(value.apply(entry.getValue())); diff --git a/plugin/src/main/java/net/codingarea/commons/common/version/VersionInfo.java b/plugin/src/main/java/net/codingarea/commons/common/version/VersionInfo.java index 29dbac10b..b24f8cd0b 100644 --- a/plugin/src/main/java/net/codingarea/commons/common/version/VersionInfo.java +++ b/plugin/src/main/java/net/codingarea/commons/common/version/VersionInfo.java @@ -1,10 +1,12 @@ package net.codingarea.commons.common.version; +import lombok.Getter; import net.codingarea.commons.common.logging.ILogger; import javax.annotation.Nullable; import java.util.Objects; +@Getter public class VersionInfo implements Version { protected static final ILogger logger = ILogger.forThisClass(); @@ -21,19 +23,7 @@ public VersionInfo(int major, int minor, int revision) { this.revision = revision; } - public int getMajor() { - return major; - } - - public int getMinor() { - return minor; - } - - public int getRevision() { - return revision; - } - - @Override + @Override public boolean equals(Object other) { if (this == other) return true; if (!(other instanceof Version)) return false; diff --git a/plugin/src/main/java/net/codingarea/commons/database/DatabaseConfig.java b/plugin/src/main/java/net/codingarea/commons/database/DatabaseConfig.java index 8c67b2b87..2c169866d 100644 --- a/plugin/src/main/java/net/codingarea/commons/database/DatabaseConfig.java +++ b/plugin/src/main/java/net/codingarea/commons/database/DatabaseConfig.java @@ -1,18 +1,26 @@ package net.codingarea.commons.database; +import lombok.Getter; import net.codingarea.commons.common.config.Propertyable; import javax.annotation.Nonnull; public final class DatabaseConfig { - private final String host; - private final String database; - private final String authDatabase; - private final String password; - private final String user; - private final String file; - private final int port; + @Getter + private final String host; + @Getter + private final String database; + @Getter + private final String authDatabase; + @Getter + private final String password; + @Getter + private final String user; + @Getter + private final String file; + @Getter + private final int port; private final boolean portIsSet; public DatabaseConfig(String host, String database, String password, String user, int port) { @@ -57,39 +65,11 @@ public DatabaseConfig(@Nonnull Propertyable config) { ); } - public int getPort() { - return port; - } - - public String getAuthDatabase() { - return authDatabase; - } - - public String getDatabase() { - return database; - } - - public String getHost() { - return host; - } - - public String getPassword() { - return password; - } - - public String getUser() { - return user; - } - - public boolean isPortSet() { + public boolean isPortSet() { return portIsSet; } - public String getFile() { - return file; - } - - @Override + @Override public String toString() { return "DatabaseConfig{" + "host='" + host + '\'' + diff --git a/plugin/src/main/java/net/codingarea/commons/database/EmptyDatabase.java b/plugin/src/main/java/net/codingarea/commons/database/EmptyDatabase.java index 0770c8b67..ea78c59a7 100644 --- a/plugin/src/main/java/net/codingarea/commons/database/EmptyDatabase.java +++ b/plugin/src/main/java/net/codingarea/commons/database/EmptyDatabase.java @@ -1,5 +1,6 @@ package net.codingarea.commons.database; +import lombok.Getter; import net.codingarea.commons.common.concurrent.task.Task; import net.codingarea.commons.database.action.*; import net.codingarea.commons.database.exceptions.DatabaseException; @@ -11,6 +12,7 @@ import java.util.Collections; import java.util.List; +@Getter public class EmptyDatabase implements Database { private final boolean silent; @@ -19,11 +21,7 @@ public EmptyDatabase(boolean silent) { this.silent = silent; } - public boolean isSilent() { - return silent; - } - - protected void exception(@Nonnull String message) { + protected void exception(@Nonnull String message) { throw new UnsupportedOperationException(message); } diff --git a/plugin/src/main/java/net/codingarea/commons/database/sql/abstraction/query/SQLQuery.java b/plugin/src/main/java/net/codingarea/commons/database/sql/abstraction/query/SQLQuery.java index 75536fe81..66f00bfbb 100644 --- a/plugin/src/main/java/net/codingarea/commons/database/sql/abstraction/query/SQLQuery.java +++ b/plugin/src/main/java/net/codingarea/commons/database/sql/abstraction/query/SQLQuery.java @@ -121,7 +121,7 @@ protected PreparedStatement prepare() throws SQLException, DatabaseException { command.append(" ORDER BY "); command.append(orderBy); if (order != null) - command.append(" " + (order == Order.HIGHEST ? "DESC" : "ASC")); + command.append(" ").append(order == Order.HIGHEST ? "DESC" : "ASC"); command.append(" "); } diff --git a/plugin/src/main/java/net/codingarea/commons/database/sql/abstraction/query/SQLResult.java b/plugin/src/main/java/net/codingarea/commons/database/sql/abstraction/query/SQLResult.java index 2d6536855..b0cb9da9c 100644 --- a/plugin/src/main/java/net/codingarea/commons/database/sql/abstraction/query/SQLResult.java +++ b/plugin/src/main/java/net/codingarea/commons/database/sql/abstraction/query/SQLResult.java @@ -8,6 +8,7 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.Map; +import java.util.Objects; public final class SQLResult extends MapDocument { @@ -19,7 +20,7 @@ public SQLResult(@Nonnull Map values) { @Override public Document getDocument0(@Nonnull String path, @Nonnull Document root, @Nullable Document parent) { try { - return new GsonDocument(getString(path), this, this).readonly(); + return new GsonDocument(Objects.requireNonNull(getString(path)), this, this).readonly(); } catch (Exception ex) { return new EmptyDocument(this, null); } diff --git a/plugin/src/main/java/net/codingarea/commons/database/sql/abstraction/update/SQLUpdate.java b/plugin/src/main/java/net/codingarea/commons/database/sql/abstraction/update/SQLUpdate.java index d3b4cd844..47dae0851 100644 --- a/plugin/src/main/java/net/codingarea/commons/database/sql/abstraction/update/SQLUpdate.java +++ b/plugin/src/main/java/net/codingarea/commons/database/sql/abstraction/update/SQLUpdate.java @@ -92,7 +92,7 @@ protected PreparedStatement prepare() throws SQLException, DatabaseException { int index = 0; for (Entry entry : values.entrySet()) { if (index > 0) command.append(", "); - command.append("`" + entry.getKey() + "` = ?"); + command.append("`").append(entry.getKey()).append("` = ?"); args.add(entry.getValue()); index++; }