Merge pull request #8 from ChillyCheesy/dev

Dev

Author: AymericHenouille

build.gradle

@@ -1,5 +1,5 @@
 allprojects {
-    version = modulo_version as Object
+    version = modulo_version
     group = 'com.chillycheesy'
     repositories {
         mavenCentral()

gradle.properties

@@ -1,2 +1,2 @@
-modulo_modulename=Modulo
-modulo_version=BINKS-0.1.0
+modulo_modulename=ModuloServer
+modulo_version=BINKS-0.1.1

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 #Thu Dec 03 16:10:48 CET 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists

modulo-api/build.gradle

@@ -7,21 +7,24 @@ archivesBaseName = 'modulo-api'
 sourceCompatibility = 11
 
 dependencies {
-    compile 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.1'
-    compile 'commons-io:commons-io:2.11.0'
-    compile 'org.apache.tomcat.embed:tomcat-embed-core:9.0.39'
+    implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.3'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-websocket:9.0.39'
 
-    testCompile 'org.junit.jupiter:junit-jupiter-api:5.8.2'
-    testCompile 'org.junit.jupiter:junit-jupiter-params:5.8.2'
-    testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
-    testCompile 'org.mockito:mockito-core:4.3.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
+    testImplementation 'org.mockito:mockito-core:4.5.1'
 }
 
 java {
     withSourcesJar()
     withJavadocJar()
 }
 
+test {
+    useJUnitPlatform()
+}
+
 final deployPropertiesFile = rootProject.file('deploy.properties')
 final deployProperty = new Properties()
 if (deployPropertiesFile.exists()) {
@@ -61,7 +64,3 @@ publishing {
         }
     }
 }
-
-test {
-    useJUnitPlatform()
-}

modulo-api/src/main/java/com/chillycheesy/modulo/commands/Command.java

@@ -1,5 +1,7 @@
 package com.chillycheesy.modulo.commands;
 
+import java.util.Arrays;
+
 /**
  * This class represents a command that can be executed by the {@link CommandManager}.
  * A command contain a label, a description, and an example of how to use it named usage.
@@ -123,4 +125,15 @@ public void setLabel(String label) {
     public void setUsage(String usage) {
         this.usage = usage;
     }
+
+    @Override
+    public String toString() {
+        return "Command{" +
+                "label='" + label + '\'' +
+                ", alias=" + Arrays.toString(alias) +
+                ", description='" + description + '\'' +
+                ", usage='" + usage + '\'' +
+                ", commandListener=" + commandListener +
+                '}';
+    }
 }

modulo-api/src/main/java/com/chillycheesy/modulo/commands/natif/HelpCommand.java

@@ -30,16 +30,16 @@ public CommandFlow onCommand(Module caller, String label, String[] args, Command
 
     private String getAllCommand(){
         final StringBuilder commands = new StringBuilder();
-        for(Command c: ModuloAPI.getCommand().getCommandManager().getAllItems()){
+        for (Command c: ModuloAPI.getCommand().getCommandManager().getAllItems()) {
             commands.append(getCommandByLabel(c.getLabel()));
         }
         return commands.toString();
     }
 
     private String getCommandByLabel(String label){
-        final StringBuilder command = new StringBuilder();
-        Command c = ModuloAPI.getCommand().getCommandManager().getCommandByLabel(label);
-        command.append("\t"+c.getLabel()+" : "+c.getDescription()+"\n");
-        return command.toString();
+        final StringBuilder builder = new StringBuilder();
+        final Command command = ModuloAPI.getCommand().getCommandManager().getCommandByLabel(label);
+        builder.append("\t").append(command.getLabel()).append(" : ").append(command.getDescription()).append("\n");
+        return builder.toString();
     }
 }

modulo-api/src/main/java/com/chillycheesy/modulo/modules/Module.java

@@ -64,17 +64,17 @@ public Module() {
     /**
      * Method called when the {@link #load()} method is called
      */
-    protected abstract void onLoad() throws Exception;
+    protected abstract <E extends Throwable> void onLoad() throws E;
 
     /**
      * Method called when the {@link #start()} method is called
      */
-    protected abstract void onStart() throws Exception;
+    protected abstract <E extends Throwable> void onStart() throws E;
 
     /**
      * Method called when the {@link #stop()} method is called
      */
-    protected abstract void onStop() throws Exception;
+    protected abstract <E extends Throwable> void onStop() throws E;
 
     /**
      * Method calls to load the module<br>
@@ -88,6 +88,7 @@ public void load() {
                 this.onLoad();
             } catch (Exception e) {
                 ModuloAPI.getLogger().error(this, e.getMessage());
+                e.printStackTrace();
             }
         });
         ModuloAPI.getEvent().getEventManager().emitEvent(this, onLoadEvent);
@@ -104,6 +105,7 @@ public void start() {
                 this.onStart();
             } catch (Exception e) {
                 ModuloAPI.getLogger().error(this, e.getMessage());
+                e.printStackTrace();
             }
         });
         ModuloAPI.getEvent().getEventManager().emitEvent(this, onStartEvent);
@@ -122,6 +124,7 @@ public void stop() {
                 this.onStop();
             } catch (Exception e) {
                 ModuloAPI.getLogger().error(this, e.getMessage());
+                e.printStackTrace();
             }
         });
         ModuloAPI.getEvent().getEventManager().emitEvent(this, onStopEvent);

modulo-api/src/main/java/com/chillycheesy/modulo/modules/ModuleAdapter.java

@@ -35,16 +35,16 @@ public ModuleAdapter() { }
     /**
      * Method called when the {@link Module#load()}  method is called
      */
-    protected void onLoad() throws Exception { }
+    protected <E extends Throwable> void onLoad() throws E { }
 
     /**
      * Method called when the {@link Module#start()} method is called
      */
-    protected void onStart() throws Exception { }
+    protected <E extends Throwable> void onStart() throws E { }
 
     /**
      * Method called when the {@link Module#stop()}  method is called
      */
     @Override
-    protected void onStop() throws Exception { }
+    protected <E extends Throwable> void onStop() throws E { }
 }

modulo-api/src/main/java/com/chillycheesy/modulo/modules/ModuleBuilder.java

@@ -114,8 +114,8 @@ public static ModuleConfig readYml(File file, InputStream inputStream) throws IO
      *     <li>Name of your {@link Module}</li>
      * </ul>
      *
-     * @param file
-     * @param config
+     * @param file the jar file of your {@link Module}
+     * @param config the configuration of your {@link Module}
      * @throws InvalidModuleConfigurationException
      */
     private static void checkField(File file, ModuleConfig config) throws InvalidModuleConfigurationException {
@@ -133,8 +133,7 @@ private Module build() throws ClassNotFoundException, NoSuchMethodException, Ill
         final InputStream is = jar.getInputStream(jarEntry);
         final ModuleConfig config = readYml(file, is);
         final Class<?> moduleClass = Class.forName(config.getMain(), true, urlClassLoader);
-        final Object object = moduleClass.getConstructor().newInstance();
-        final Module module = (Module) object;
+        final Module module = (Module) moduleClass.getConstructor().newInstance();
         module.setConfig(config);
         module.setJarFile(jar);
         return module;

modulo-api/src/main/java/com/chillycheesy/modulo/modules/ModuleLoader.java

@@ -9,6 +9,7 @@
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
 import java.util.jar.JarFile;
@@ -44,7 +45,8 @@ public List<Module> loadModules(File file) throws FileIsNotAModuleDirectoryExcep
         if (!file.isDirectory()) throw new FileIsNotAModuleDirectoryException(file);
         final List<Module> loadedModules = new ArrayList<>();
         for (File jarFile : Objects.requireNonNull(file.listFiles())) {
-            loadedModules.add(this.loadModule(jarFile));
+            final Module loadedModule = loadModule(jarFile);
+            if (loadedModule != null) loadedModules.add(loadedModule);
         }
         return loadedModules;
     }
@@ -84,7 +86,10 @@ public Module loadModule(Module module) {
      * @throws IOException If the file was not a JarFile.
      */
     public Module loadModule(File file) throws IOException {
-        return loadModule(file, URLClassLoader.newInstance(new URL[]{file.toURI().toURL()}));
+        final URL[] urls = new URL[]{file.toURI().toURL()};
+        final ClassLoader classLoader = this.getClass().getClassLoader();
+        final URLClassLoader urlClassLoader = URLClassLoader.newInstance(urls, classLoader);
+        return loadModule(file, urlClassLoader);
     }
 
     /**
@@ -110,12 +115,11 @@ public List<Module> startModules() throws MissingDependenciesModuleException {
     }
 
     public List<Module> startModules(List<Module> modules) throws MissingDependenciesModuleException {
-        for (Module module : modules)
-            module = startModule(module);
+        for (Module module : modules) startModule(module);
         return modules;
     }
 
-    private Module startModule(Module module) throws MissingDependenciesModuleException {
+    public Module startModule(Module module) throws MissingDependenciesModuleException {
         if (!startedModule.contains(module)) {
             final ModuleManager moduleManager = ModuloAPI.getModule().getModuleManager();
             final List<String> dependencies = module.getDependencies();
@@ -126,7 +130,7 @@ private Module startModule(Module module) throws MissingDependenciesModuleExcept
                     .filter(Objects::nonNull)
                     .collect(Collectors.toList());
             for (Module dependency : allDependencies) this.startModule(dependency);
-            if (!startedModule.containsAll(dependencies.stream().map(this::getLoadedModuleByName).collect(Collectors.toList())))
+            if (!new HashSet<>(startedModule).containsAll(dependencies.stream().map(this::getLoadedModuleByName).collect(Collectors.toList())))
                 throw new MissingDependenciesModuleException(module, getMissingDependenciesList(dependencies));
             moduleManager.addModule(module);
             startedModule.add(module);
@@ -182,7 +186,7 @@ public boolean isValid(JarFile file) {
      * @throws IOException If the file was not a JarFile.
      */
     public boolean isValid(File file) throws IOException {
-        return isValid(new JarFile(file));
+        return file.getName().endsWith(".jar") && isValid(new JarFile(file));
     }
 
     /**