Merge pull request #4 from Java-Discord/andrew/properties

Added MultiProperties to Clean Up Bot Configuration

Author: Dynxsty

src/main/java/com/javadiscord/javabot/Bot.java

@@ -1,44 +1,46 @@
 package com.javadiscord.javabot;
 
+import com.jagrosh.jdautilities.command.CommandClientBuilder;
+import com.jagrosh.jdautilities.commons.waiter.EventWaiter;
 import com.javadiscord.javabot.commands.configuation.Config;
 import com.javadiscord.javabot.commands.configuation.WelcomeImage;
 import com.javadiscord.javabot.commands.custom_commands.CustomCommands;
 import com.javadiscord.javabot.commands.moderation.*;
 import com.javadiscord.javabot.commands.other.GuildConfig;
+import com.javadiscord.javabot.commands.other.Question;
+import com.javadiscord.javabot.commands.other.Shutdown;
+import com.javadiscord.javabot.commands.other.Version;
 import com.javadiscord.javabot.commands.other.qotw.ClearQOTW;
 import com.javadiscord.javabot.commands.other.qotw.Correct;
 import com.javadiscord.javabot.commands.other.qotw.Leaderboard;
-import com.javadiscord.javabot.commands.other.Question;
-import com.javadiscord.javabot.commands.other.Shutdown;
 import com.javadiscord.javabot.commands.other.suggestions.Accept;
 import com.javadiscord.javabot.commands.other.suggestions.Clear;
 import com.javadiscord.javabot.commands.other.suggestions.Decline;
 import com.javadiscord.javabot.commands.other.suggestions.Response;
 import com.javadiscord.javabot.commands.other.testing.*;
-import com.javadiscord.javabot.commands.other.Version;
 import com.javadiscord.javabot.commands.reaction_roles.ReactionRoles;
 import com.javadiscord.javabot.commands.user_commands.*;
 import com.javadiscord.javabot.events.*;
-import com.javadiscord.javabot.properties.ConfigString;
-import com.jagrosh.jdautilities.command.CommandClientBuilder;
-import com.jagrosh.jdautilities.commons.waiter.EventWaiter;
+import com.javadiscord.javabot.properties.MultiProperties;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.JDABuilder;
 import net.dv8tion.jda.api.OnlineStatus;
 import net.dv8tion.jda.api.requests.GatewayIntent;
 import net.dv8tion.jda.api.utils.MemberCachePolicy;
 import net.dv8tion.jda.api.utils.cache.CacheFlag;
 
+import java.nio.file.Path;
+import java.util.Properties;
+
 
 public class Bot {
 
     public static JDA jda;
     public static EventWaiter waiter;
 
+    private static final Properties properties = new MultiProperties(Path.of("bot.props"));
 
     public static void main(String[] args) throws Exception {
-
-            ConfigString token = new ConfigString("token", "null");
             waiter = new EventWaiter();
 
             CommandClientBuilder client = new CommandClientBuilder()
@@ -113,7 +115,7 @@ public static void main(String[] args) throws Exception {
                     );
 
 
-            jda = JDABuilder.createDefault(token.getValue())
+            jda = JDABuilder.createDefault(properties.getProperty("token", "null"))
                     .setStatus(OnlineStatus.DO_NOT_DISTURB)
                     .setMemberCachePolicy(MemberCachePolicy.ALL)
                     .enableCache(CacheFlag.ACTIVITY)
@@ -136,5 +138,26 @@ public static void main(String[] args) throws Exception {
             jda.addEventListener(new SlashCommands());
             //jda.addEventListener(new StarboardListener());
     }
+
+    /**
+     * Gets the value of a property from the bot's loaded properties.
+     * @see Properties#getProperty(String)
+     * @param key The name of the property to get.
+     * @return The value of the property, or <code>null</code> if none was found.
+     */
+    public static String getProperty(String key) {
+        return properties.getProperty(key);
+    }
+
+    /**
+     * Gets the value of a property from the bot's loaded properties.
+     * @see Properties#getProperty(String, String)
+     * @param key The name of the property to get.
+     * @param defaultValue The value to return if no property was found.
+     * @return The value of the property, or the default value.
+     */
+    public static String getProperty(String key, String defaultValue) {
+        return properties.getProperty(key, defaultValue);
+    }
 }
 

src/main/java/com/javadiscord/javabot/events/Startup.java

@@ -1,8 +1,8 @@
 package com.javadiscord.javabot.events;
 
+import com.javadiscord.javabot.Bot;
 import com.javadiscord.javabot.commands.other.Version;
 import com.javadiscord.javabot.other.Misc;
-import com.javadiscord.javabot.properties.ConfigString;
 import com.mongodb.MongoClient;
 import com.mongodb.MongoClientURI;
 import net.dv8tion.jda.api.entities.SelfUser;
@@ -28,9 +28,7 @@ public void onReady(ReadyEvent event){
         bot = event.getJDA().getSelfUser();
 
         try {
-
-            ConfigString login = new ConfigString("mongologin", "default");
-            MongoClientURI uri = new MongoClientURI(login.getValue());
+            MongoClientURI uri = new MongoClientURI(Bot.getProperty("mongologin", "default"));
             mongoClient = new MongoClient(uri);
 
             LoggerFactory.getLogger(Startup.class).info("* Successfully connected to Database!");

src/main/java/com/javadiscord/javabot/properties/ConfigElement.java

@@ -0,0 +1,42 @@
+package com.javadiscord.javabot.properties;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Properties;
+
+/**
+ * This class is an extension of the standard Java properties, and supports
+ * loading properties from multiple sources.
+ */
+public class MultiProperties extends Properties {
+	/**
+	 * Initializes the properties from the list of paths, where each path should
+	 * point to a properties file. <strong>Properties in paths specified last
+	 * take precedence over those specified first.</strong>
+	 * <p>
+	 *     For example, suppose this object is constructed from two properties
+	 *     files, in this order:
+	 *     <ol>
+	 *         <li>props1.properties</li>
+	 *         <li>props2.properties</li>
+	 *     </ol>
+	 *     If props1 contains <code>x=a</code> and props2 contains <code>x=b</code>,
+	 *     then calling <code>getProperty("x")</code> on an instance of this
+	 *     class with both those files given will return <code>"b"</code>,
+	 *     because the later file overrides the earlier one.
+	 * </p>
+	 * @param paths The list of paths to read properties from.
+	 */
+	public MultiProperties(Path... paths) {
+		for (Path path : paths) {
+			Properties props = new Properties();
+			try {
+				props.load(new FileInputStream(path.toFile()));
+			} catch (IOException e) {
+				System.err.println("Could not load properties from path: " + path + ", Exception: " + e.getMessage());
+			}
+			this.putAll(props);
+		}
+	}
+}