From 9b6b558002cc9b23fc69c60884d52df55e6c0142 Mon Sep 17 00:00:00 2001
From: Starmism <iamstarmism@gmail.com>
Date: Wed, 30 Jun 2021 10:13:47 -0600
Subject: [PATCH] Add method implementation checking and nullchecking for
 fields.

---
 .../manager/LocalExpansionManager.java        | 46 +++++++++++++++----
 1 file changed, 38 insertions(+), 8 deletions(-)

diff --git a/src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java b/src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java
index bbf01e9..872215c 100644
--- a/src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java
+++ b/src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java
@@ -46,18 +46,25 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.Unmodifiable;
 
 import java.io.File;
+import java.lang.reflect.Modifier;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.logging.Level;
+import java.util.stream.Collectors;
 
 public final class LocalExpansionManager implements Listener {
 
   @NotNull
   private static final String EXPANSIONS_FOLDER_NAME = "expansions";
 
+  @NotNull
+  private static final Set<MethodSignature> ABSTRACT_EXPANSION_METHODS = Arrays.stream(PlaceholderExpansion.class.getDeclaredMethods())
+          .filter(method -> Modifier.isAbstract(method.getModifiers()))
+          .map(method -> new MethodSignature(method.getName(), method.getParameterTypes()))
+          .collect(Collectors.toSet());
 
   @NotNull
   private final File folder;
@@ -153,20 +160,33 @@ public final class LocalExpansionManager implements Listener {
       @NotNull final Class<? extends PlaceholderExpansion> clazz) {
     try {
       final PlaceholderExpansion expansion = createExpansionInstance(clazz);
-      if (expansion == null || !expansion.register()) {
+
+      Objects.requireNonNull(expansion.getAuthor(), "The expansion author is null!");
+      Objects.requireNonNull(expansion.getIdentifier(), "The expansion identifier is null!");
+      Objects.requireNonNull(expansion.getVersion(), "The expansion version is null!");
+
+      if (!expansion.register()) {
         return Optional.empty();
       }
 
       return Optional.of(expansion);
-    } catch (final LinkageError ex) {
-      plugin.getLogger().severe("Failed to load Expansion class " + clazz.getSimpleName() +
-          " (Is a dependency missing?)");
-      plugin.getLogger().severe("Cause: " + ex.getClass().getSimpleName() + " " + ex.getMessage());
+    } catch (LinkageError | NullPointerException ex) {
+      final String reason;
+
+      if (ex instanceof LinkageError) {
+        reason = " (Is a dependency missing?)";
+      } else {
+        reason = " - One of its properties is null which is not allowed!";
+      }
+
+      plugin.getLogger().severe("Failed to load expansion class " + clazz.getSimpleName() +
+              reason);
+      plugin.getLogger().log(Level.SEVERE, "", ex);
     }
 
     return Optional.empty();
   }
-  
+
   @ApiStatus.Internal
   public boolean register(@NotNull final PlaceholderExpansion expansion) {
     final String identifier = expansion.getIdentifier().toLowerCase();
@@ -341,6 +361,16 @@ public final class LocalExpansionManager implements Listener {
         if (expansionClass == null) {
           plugin.getLogger().severe("Failed to load Expansion: " + file.getName() + ", as it does not have" +
                   " a class which extends PlaceholderExpansion.");
+          return null;
+        }
+
+        Set<MethodSignature> expansionMethods = Arrays.stream(expansionClass.getDeclaredMethods())
+                .map(method -> new MethodSignature(method.getName(), method.getParameterTypes()))
+                .collect(Collectors.toSet());
+        if (!expansionMethods.containsAll(ABSTRACT_EXPANSION_METHODS)) {
+          plugin.getLogger().severe("Failed to load Expansion: " + file.getName() + ", as it does not have the" +
+                  " required methods declared for a PlaceholderExpansion.");
+          return null;
         }
 
         return expansionClass;
@@ -365,8 +395,8 @@ public final class LocalExpansionManager implements Listener {
       if (ex.getCause() instanceof LinkageError) {
         throw ((LinkageError) ex.getCause());
       }
-      
-      plugin.getLogger().warning("There was an issue with loading an expansion");
+
+      plugin.getLogger().warning("There was an issue with loading an expansion.");
       
       return null;
     }