Refactoring

Author: surajkumar

core/src/main/java/com/javadiscord/jdi/core/interaction/InteractionEventHandler.java

@@ -45,44 +45,61 @@ public void onInteractionCreate(Interaction interaction, Guild guild) {
             Class<?> handler = reflectiveSlashCommandClassMethod.clazz();
             Method method = reflectiveSlashCommandClassMethod.method();
 
-            List<Object> paramOrder = new ArrayList<>();
-            Parameter[] parameters = method.getParameters();
-
-            for (Parameter parameter : parameters) {
-                if (parameter.getParameterizedType() == interaction.getClass()) {
-                    paramOrder.add(interaction);
-                } else if (parameter.getParameterizedType() == Discord.class) {
-                    paramOrder.add(discord);
-                } else if (parameter.getParameterizedType() == Guild.class) {
-                    paramOrder.add(GatewayEventListener.getGuild(discord, interaction.guild()));
-                } else if (parameter.getParameterizedType() == SlashCommandEvent.class) {
-                    paramOrder.add(new SlashCommandEvent(interaction, discord));
-                }
-            }
-
-            if (paramOrder.size() != method.getParameterCount()) {
-                throw new RuntimeException(
-                    "Bound "
-                        + paramOrder.size()
-                        + " parameters but expected "
-                        + method.getParameterCount()
-                );
-            }
+            List<Object> paramOrder = getOrderOfParameters(method, interaction);
 
-            if (cachedInstances.containsKey(handler.getName())) {
-                method.invoke(cachedInstances.get(handler.getName()), paramOrder.toArray());
-            } else {
-                Object handlerInstance = handler.getDeclaredConstructor().newInstance();
-                cachedInstances.put(handler.getName(), handlerInstance);
-                injectComponents(handlerInstance);
-                method.invoke(handlerInstance, paramOrder.toArray());
+            if (validateParameterCount(method, paramOrder)) {
+                invokeHandler(handler, method, paramOrder);
             }
 
         } catch (Exception e) {
             LOGGER.error("Failed to invoke handler for /{}", command, e);
         }
     }
 
+    private List<Object> getOrderOfParameters(Method method, Interaction interaction) {
+        List<Object> paramOrder = new ArrayList<>();
+        Parameter[] parameters = method.getParameters();
+
+        for (Parameter parameter : parameters) {
+            if (parameter.getParameterizedType() == interaction.getClass()) {
+                paramOrder.add(interaction);
+            } else if (parameter.getParameterizedType() == Discord.class) {
+                paramOrder.add(discord);
+            } else if (parameter.getParameterizedType() == Guild.class) {
+                paramOrder.add(GatewayEventListener.getGuild(discord, interaction.guild()));
+            } else if (parameter.getParameterizedType() == SlashCommandEvent.class) {
+                paramOrder.add(new SlashCommandEvent(interaction, discord));
+            }
+        }
+
+        return paramOrder;
+    }
+
+    private boolean validateParameterCount(Method method, List<Object> paramOrder) {
+        if (paramOrder.size() != method.getParameterCount()) {
+            throw new RuntimeException(
+                "Bound " + paramOrder.size() + " parameters but expected "
+                    + method.getParameterCount()
+            );
+        }
+        return true;
+    }
+
+    private void invokeHandler(
+        Class<?> handler,
+        Method method,
+        List<Object> paramOrder
+    ) throws Exception {
+        if (cachedInstances.containsKey(handler.getName())) {
+            method.invoke(cachedInstances.get(handler.getName()), paramOrder.toArray());
+        } else {
+            Object handlerInstance = handler.getDeclaredConstructor().newInstance();
+            cachedInstances.put(handler.getName(), handlerInstance);
+            injectComponents(handlerInstance);
+            method.invoke(handlerInstance, paramOrder.toArray());
+        }
+    }
+
     private void injectComponents(Object object) {
         ReflectiveSlashCommandLoader reflectiveSlashCommandLoader =
             ReflectiveLoader.proxy(slashCommandLoader, ReflectiveSlashCommandLoader.class);