Merge pull request #24 from ChillyCheesy/dev

Dev

Author: AymericHenouille

.gitignore

@@ -35,3 +35,6 @@ out/
 
 ### VS Code ###
 .vscode/
+
+### Mac ###
+.DS_Store

README.md

@@ -43,13 +43,13 @@ What is modulo...
     <dependency>
       <groupId>com.chillycheesy</groupId>
       <artifactId>modulo-api</artifactId>
-      <version>0.1.2</version>
+      <version>BINKS-0.3.0</version>
     </dependency>
     ```
   * With Gradle add the following dependency to your build.gradle: *(recommended)*
     ```gradle
     dependencies {
-      implementation 'com.chillycheesy:modulo-api:0.1.2'
+      implementation 'com.chillycheesy:modulo-api:BINKS-0.3.0'
     }
     ```
 ### Step 2:<a id="GettingStarted-2"></a>

gradle.properties

@@ -1,2 +1,2 @@
 modulo_modulename=ModuloServer
-modulo_version=BINKS-0.3.0
+modulo_version=BINKS-0.4.0

modulo-api/build.gradle

@@ -9,8 +9,9 @@ sourceCompatibility = 16
 targetCompatibility = JavaVersion.VERSION_16
 
 dependencies {
-    implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.3'
-    implementation 'org.apache.tomcat.embed:tomcat-embed-websocket:9.0.39'
+    api 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.3'
+    api 'org.apache.tomcat.embed:tomcat-embed-websocket:9.0.39'
+    api 'org.apache.tika:tika-core:1.26'
 
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.2'
@@ -70,3 +71,5 @@ publishing {
         }
     }
 }
+
+compileTestJava.options.compilerArgs << '-parameters'

modulo-api/src/main/java/com/chillycheesy/modulo/ModuloAPI.java

@@ -1,9 +1,8 @@
 package com.chillycheesy.modulo;
 
+import com.chillycheesy.modulo.controllers.ControllerContainer;
 import com.chillycheesy.modulo.events.EventContainer;
 import com.chillycheesy.modulo.modules.ModuleContainer;
-import com.chillycheesy.modulo.pages.PageContainer;
-import com.chillycheesy.modulo.signals.SignalContainer;
 import com.chillycheesy.modulo.utils.Logger;
 
 /**
@@ -23,13 +22,9 @@ public class ModuloAPI {
      */
     private static EventContainer event;
     /**
-     * Signal section.
+     * Controller container.
      */
-    private static SignalContainer signal;
-    /**
-     * Page manager.
-     */
-    private static PageContainer page;
+    private static ControllerContainer controller;
     /**
      * Logger section.
      */
@@ -53,24 +48,6 @@ public static EventContainer getEvent() {
         return event = event == null ? new EventContainer() : event;
     }
 
-    /**
-     * Getter for Signal logic section.
-     *
-     * @return The Signal section.
-     */
-    public static SignalContainer getSignal() {
-        return signal = signal == null ? new SignalContainer() : signal;
-    }
-
-    /**
-     * Getter for Signal logic section.
-     *
-     * @return The Signal section.
-     */
-    public static PageContainer getPage() {
-        return page = page == null ? new PageContainer() : page;
-    }
-
     /**
      * Getter for Logger logic section.
      *
@@ -80,4 +57,12 @@ public static Logger getLogger() {
         return logger = logger == null ? new Logger(getEvent()) : logger;
     }
 
+    /**
+     * Getter for Controller logic section.
+     *
+     * @return The Controller section.
+     */
+    public static ControllerContainer getController() {
+        return controller = controller == null ? new ControllerContainer() : controller;
+    }
 }

modulo-api/src/main/java/com/chillycheesy/modulo/config/ConfigurableEntity.java

@@ -0,0 +1,60 @@
+package com.chillycheesy.modulo.config;
+
+import com.chillycheesy.modulo.modules.Module;
+import com.chillycheesy.modulo.modules.ModuleEntityAdapter;
+
+import java.util.Objects;
+
+public class ConfigurableEntity extends ModuleEntityAdapter {
+
+    private static final String DEFAULT_CONFIG_PATH = "config.yml";
+
+    protected ConfigurationFactory configurationFactory;
+    protected ConfigurationLoaderStrategy loaderStrategy;
+    protected Configuration defaultConfiguration;
+
+    protected boolean autoSave = true;
+
+    public ConfigurableEntity(ConfigurationLoaderStrategy loaderStrategy) {
+        this.loaderStrategy = loaderStrategy;
+    }
+
+    public ConfigurableEntity() {
+        this(new YamlConfigurationStrategy());
+    }
+
+    @Override
+    public void load(Module module) {
+        configurationFactory = Objects.isNull(configurationFactory) ? new FileConfigurationFactory(module, DEFAULT_CONFIG_PATH) : configurationFactory;
+        defaultConfiguration = Objects.isNull(defaultConfiguration) ? configurationFactory.createConfiguration(loaderStrategy) : defaultConfiguration;
+    }
+
+    @Override
+    public void stop() {
+        if (autoSave) configurationFactory.saveConfiguration(defaultConfiguration, loaderStrategy);
+    }
+
+    public void enableAutoSave(boolean autoSave) {
+        this.autoSave = autoSave;
+    }
+
+    public Configuration getConfiguration() {
+        return defaultConfiguration;
+    }
+
+    public void setConfigurationFactory(ConfigurationFactory configurationFactory) {
+        this.configurationFactory = configurationFactory;
+    }
+
+    public void setConfiguration(Configuration configuration) {
+        this.defaultConfiguration = configuration;
+    }
+
+    public ConfigurationFactory getConfigurationFactory() {
+        return configurationFactory;
+    }
+
+    public ConfigurationLoaderStrategy getLoaderStrategy() {
+        return loaderStrategy;
+    }
+}

modulo-api/src/main/java/com/chillycheesy/modulo/config/Configuration.java

@@ -14,6 +14,13 @@ public Configuration(Map<String, Object> properties, Map<String, Object> default
         this.defaultProperties = defaultProperties;
     }
 
+    public Configuration(Configuration ...configurations) {
+        this();
+        for (Configuration configuration : configurations) {
+            merge(configuration);
+        }
+    }
+
     public Configuration() { this(new HashMap<>(), new HashMap<>()); }
 
     public Object get(String key) {
@@ -256,9 +263,14 @@ public boolean isModified() {
     }
 
     public void forEach(BiConsumer<String, String> setProperty) {
+        forEach("", setProperty);
+    }
+
+    public void forEach(String key, BiConsumer<String, String> setProperty) {
         getMergedProperties().entrySet().stream()
-                .collect(Collectors.toMap(Map.Entry::getKey, e -> String.valueOf(e.getValue())))
-                .forEach(setProperty);
+            .filter(entry -> entry.getKey().startsWith(key))
+            .collect(Collectors.toMap(keyEntry -> keyEntry.getKey().replaceFirst("properties\\.", ""), e -> String.valueOf(e.getValue())))
+            .forEach(setProperty);
     }
 
     @Override