Merge pull request #43 from celesteoficial/fixes

multiple fixes and refactoring

Author: mluizaa00

bungeecord/build.gradle

@@ -7,12 +7,7 @@ dependencies {
     /**
      * BUNGEECORD FRAMEWORK
      */
-    implementation 'com.github.SaiintBrisson.command-framework:bungee:1.2.0'
-
-    /**
-     * REFLECTION FRAMEWORK
-     */
-    implementation 'org.reflections:reflections:0.9.12'
+    implementation 'com.github.SaiintBrisson.command-framework:bungee:1.3.0'
 
     /**
      * SHARED FRAMEWORK

bungeecord/src/main/java/com/celeste/library/bungee/AbstractBungeePlugin.java

@@ -1,14 +1,7 @@
 package com.celeste.library.bungee;
 
-import com.celeste.library.bungee.annotation.CommandHolder;
-import com.celeste.library.bungee.exception.InvalidCommandException;
-import com.celeste.library.bungee.exception.InvalidListenerException;
 import com.celeste.library.core.factory.ThreadingFactory;
-import com.celeste.library.core.util.Reflection;
-import java.lang.reflect.Constructor;
-import java.util.AbstractMap.SimpleImmutableEntry;
 import java.util.Arrays;
-import java.util.Map.Entry;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ScheduledExecutorService;
 import lombok.Getter;
@@ -18,7 +11,6 @@
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.api.plugin.Plugin;
 import net.md_5.bungee.api.plugin.PluginManager;
-import org.reflections.Reflections;
 
 @Getter
 public abstract class AbstractBungeePlugin extends Plugin {
@@ -46,9 +38,9 @@ public void registerCommands(final Object... instances) {
     final MessageHolder holder = frame.getMessageHolder();
 
     holder.setMessage(MessageType.ERROR, "§cA error occurred.");
-    holder.setMessage(MessageType.INCORRECT_TARGET, "Only {target} can execute this command..");
-    holder.setMessage(MessageType.INCORRECT_USAGE, "Wrong use! The correct is: /{usage}");
-    holder.setMessage(MessageType.NO_PERMISSION, "You don't have enough permissions.");
+    holder.setMessage(MessageType.INCORRECT_TARGET, "§cOnly {target} can execute this command..");
+    holder.setMessage(MessageType.INCORRECT_USAGE, "§cWrong use! The correct is: /{usage}");
+    holder.setMessage(MessageType.NO_PERMISSION, "§cYou don't have enough permissions.");
 
     frame.registerCommands(instances);
   }
@@ -65,103 +57,6 @@ public void registerCommands(final String[] messages, final Object... instances)
     frame.registerCommands(instances);
   }
 
-  @Deprecated
-  public void register(final String path, final Class<?> clazz, final Object instance) {
-    registerListeners(path, clazz, instance);
-    registerCommands(path, clazz, instance);
-  }
-
-  @Deprecated
-  @SafeVarargs
-  public final void register(final String path, final Entry<Class<?>, Object>... entries) {
-    registerListeners(path, entries);
-    registerCommands(path, entries);
-  }
-
-  @Deprecated
-  public void registerListeners(final String path, final Class<?> clazz, final Object instance) {
-    registerListeners(path, new SimpleImmutableEntry<>(clazz, instance));
-  }
-
-  @Deprecated
-  @SafeVarargs
-  public final void registerListeners(final String path, final Entry<Class<?>, Object>... entries) {
-    try {
-      final Class<?>[] parameters = Arrays.stream(entries)
-          .map(Entry::getKey)
-          .toArray(Class[]::new);
-
-      final Object[] instances = Arrays.stream(entries)
-          .map(Entry::getValue)
-          .toArray();
-
-      final Reflections reflections = new Reflections(path);
-
-      for (final Class<? extends Listener> clazz : reflections.getSubTypesOf(Listener.class)) {
-        final Constructor<? extends Listener>[] constructors = Reflection.getConstructors(clazz);
-
-        final Constructor<? extends Listener> constructor = Arrays.stream(constructors)
-            .filter(newConstructor -> Arrays.equals(newConstructor.getParameterTypes(), parameters))
-            .findFirst()
-            .orElse(null);
-
-        if (constructor == null) {
-          continue;
-        }
-
-        manager.registerListener(this, constructor.newInstance(instances));
-      }
-    } catch (Exception exception) {
-      throw new InvalidListenerException("Unable to register listener: ", exception);
-    }
-  }
-
-  @Deprecated
-  public void registerCommands(final String path, final Class<?> clazz, final Object instance) {
-    registerCommands(path, new SimpleImmutableEntry<>(clazz, instance));
-  }
-
-  @Deprecated
-  @SafeVarargs
-  public final void registerCommands(final String path, final Entry<Class<?>, Object>... entries) {
-    try {
-      final Class<?>[] parameters = Arrays.stream(entries)
-          .map(Entry::getKey)
-          .toArray(Class[]::new);
-
-      final Object[] instances = Arrays.stream(entries)
-          .map(Entry::getValue)
-          .toArray();
-
-      final Reflections reflections = new Reflections(path);
-
-      final BungeeFrame frame = new BungeeFrame(this);
-      final MessageHolder holder = frame.getMessageHolder();
-
-      holder.setMessage(MessageType.ERROR, "§cA error occurred.");
-      holder.setMessage(MessageType.INCORRECT_TARGET, "§cOnly {target} can execute this command.");
-      holder.setMessage(MessageType.INCORRECT_USAGE, "§cWrong use! The correct is: /{usage}");
-      holder.setMessage(MessageType.NO_PERMISSION, "§cYou don't have enough permissions.");
-
-      for (final Class<?> clazz : reflections.getTypesAnnotatedWith(CommandHolder.class)) {
-        final Constructor<?>[] constructors = Reflection.getConstructors(clazz);
-
-        final Constructor<?> constructor = Arrays.stream(constructors)
-            .filter(newConstructor -> Arrays.equals(newConstructor.getParameterTypes(), parameters))
-            .findFirst()
-            .orElse(null);
-
-        if (constructor == null) {
-          continue;
-        }
-
-        frame.registerCommands(constructor.newInstance(instances));
-      }
-    } catch (Exception exception) {
-      throw new InvalidCommandException("Unable to register command: ", exception);
-    }
-  }
-
   public static ExecutorService getExecutor() {
     return EXECUTOR;
   }

bungeecord/src/main/java/com/celeste/library/bungee/annotation/CommandHolder.java

@@ -2,6 +2,6 @@ dependencies {
     /**
      * JSON DEPENDENCY
      */
-    implementation 'com.fasterxml.jackson.core:jackson-databind:2.12.3'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.12.4'
     implementation 'com.google.code.gson:gson:2.8.7'
 }

bungeecord/src/main/java/com/celeste/library/bungee/exception/InvalidCommandException.java

@@ -11,7 +11,7 @@
  *
  * @param <T> Object
  */
-public final class Cooldown<T> extends TreeRegistry<T, Long> {
+public class Cooldown<T> extends TreeRegistry<T, Long> {
 
   public boolean isActive(final T key) {
     if (!contains(key)) {

bungeecord/src/main/java/com/celeste/library/bungee/exception/InvalidListenerException.java

@@ -13,7 +13,7 @@ public abstract class AbstractCollection<E> implements Collection<E> {
     MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
   }
 
-  public abstract Iterator<E> iterator();
+  public abstract @NotNull Iterator<E> iterator();
 
   public abstract int size();
 

core/build.gradle

@@ -186,9 +186,10 @@ private void transferLinks(final LinkedNode<K,V> src, final LinkedNode<K,V> dst)
 
     if (after == null) {
       setYoungest(dst);
-    } else {
-      after.setBefore(dst);
+      return;
     }
+
+    after.setBefore(dst);
   }
 
   public Node<K,V> newNode(final int hash, final K key, final V value, final Node<K,V> node) {
@@ -233,9 +234,10 @@ public void afterNodeRemoval(final Node<K,V> node) {
 
     if (after == null) {
       setYoungest(before);
-    } else {
-      after.setBefore(before);
+      return;
     }
+
+    after.setBefore(before);
   }
 
   public void afterNodeInsertion(final boolean evict) {

core/src/main/java/com/celeste/library/core/model/entity/Cooldown.java

@@ -25,7 +25,7 @@
 @Setter
 @Getter
 public class MapRegistry<K, V> extends AbstractRegistry<K, V>
-    implements Registry<K, V>, Cloneable, Serializable {
+    implements Registry<K, V>, Serializable {
 
   public static final int DEFAULT_INITIAL_CAPACITY;
   public static final int MAXIMUM_CAPACITY;
@@ -310,15 +310,14 @@ public final V registerValue(final int hash, final K key, V value, final boolean
     value = getKeyType().format(value);
 
     Node<K,V>[] tab = nodes;
-    Node<K,V> node; 
     int number, index;
 
     if (tab == null || (number = tab.length) == 0) {
       tab = resize();
       number = tab.length;
     }
 
-    node = tab[index = (number - 1) & hash];
+    Node<K,V> node = tab[index = (number - 1) & hash];
     if (node == null) {
       tab[index] = newNode(hash, key, value, null);
 
@@ -478,26 +477,29 @@ public final Node<K, V>[] resize() {
 
   public final void treeifyBin(final Node<K, V>[] tab, final int hash) {
     int n, index;
-    Node<K,V> node;
     if (tab == null || (n = tab.length) < MIN_TREEIFY_CAPACITY) {
       resize();
       return;
     }
 
-    if ((node = tab[index = (n - 1) & hash]) != null) {
-      TreeNode<K,V> hd = null, tl = null;
+    Node<K,V> node = tab[index = (n - 1) & hash];
+    if (node != null) {
+      TreeNode<K,V> treeNode = null, tl = null;
+
       do {
-        TreeNode<K,V> p = replacementTreeNode(node, null);
-        if (tl == null)
-          hd = p;
-        else {
-          p.setPrevious(tl);
-          tl.setNext(p);
+        TreeNode<K,V> replacement = replacementTreeNode(node, null);
+        if (tl == null) {
+          treeNode = replacement;
+        } else {
+          replacement.setPrevious(tl);
+          tl.setNext(replacement);
         }
-        tl = p;
+
+        tl = replacement;
       } while ((node = node.getNext()) != null);
-      if ((tab[index] = hd) != null) {
-        hd.treeify(tab);
+
+      if ((tab[index] = treeNode) != null) {
+        treeNode.treeify(tab);
       }
     }
   }
@@ -532,6 +534,10 @@ public final Node<K, V> removeNode(int hash, Object key, Object value, boolean m
       } while ((entry = entry.getNext()) != null);
     }
 
+    if (node == null) {
+      return null;
+    }
+
     final V v = node.getValue();
     if (v == null || (matchValue || !Objects.equals(value, v))) {
       return null;
@@ -619,10 +625,10 @@ public static Class<?> comparableClassFor(final Object comparableClazz) {
   }
 
   @SuppressWarnings({"rawtypes","unchecked"})
-  public static int compareComparables(final Class<?> clazz, final Object k, final Object x) {
-    return (x == null || x.getClass() != clazz
+  public static int compareComparables(final Class<?> clazz, final Object one, final Object two) {
+    return two == null || two.getClass() != clazz
         ? 0
-        : ((Comparable)k).compareTo(x));
+        : ((Comparable) one).compareTo(two);
   }
 
 }