Changed properties name and update build process

src/main/java/netneutrality/NetNeutrality.java

@@ -39,9 +39,9 @@ public class NetNeutrality {
     public static final String VERSION = "2.0.0";
 
     public static void main(String[] args) {
-        String env = Settings.getInstance().get("BOT_ENV", "dev");
+        String env = Settings.getInstance().get("NETNEUTRALITY_BOT_ENV", "dev");
 
-        String sentryDsn = Settings.getInstance().get("SENTRY_DSN");
+        String sentryDsn = Settings.getInstance().get("NETNEUTRALITY_SENTRY_DSN");
         if (sentryDsn != null) {
             logger.info("Found Sentry DSN in config, setting up the SDK..");
 
@@ -50,7 +50,6 @@ public class NetNeutrality {
                 options.setEnvironment(env);
                 options.setTracesSampleRate(1.0);
                 options.setDebug(false);
-                options.setRelease(String.format("netneutrality@%s", VERSION));
             });
         }
 
@@ -64,7 +63,7 @@ public class NetNeutrality {
         MusicManager.initPlayerManager();
         jda.addEventListener(new MessageReceivedHandler(), new EditHandler(), new ServerJoinHandler());
         jda.addEventListener(new SlashCommandHooks());
-        new WebApi(Integer.parseInt(Settings.getInstance().get("API_PORT", "9000")));
+        new WebApi(Integer.parseInt(Settings.getInstance().get("NETNEUTRALITY_API_PORT", "9000")));
         jda.getPresence().setActivity(Activity.watching("you"));
 
         Runtime.getRuntime().addShutdownHook(new BaseThreadFactory("shutdown").newThread(new ShutdownThread()));
@@ -72,7 +71,7 @@ public class NetNeutrality {
     }
 
     public static void initJDA() {
-        String token = Settings.getInstance().get("BOT_TOKEN");
+        String token = Settings.getInstance().get("NETNEUTRALITY_BOT_TOKEN");
         if (token == null) {
             DBController.shutdown();
             throw new RuntimeException("No bot token provided, exiting.");

src/main/java/netneutrality/core/SessionManager.java

@@ -29,10 +29,10 @@ public class SessionManager {
             try {
                 StandardServiceRegistryBuilder registryBuilder = new StandardServiceRegistryBuilder().configure();
                 Map<String, Object> settings = new HashMap<>();
-                String dbName = Settings.getInstance().get("MYSQL_DATABASE", "netneutrality");
-                String dbUser = Settings.getInstance().get("MYSQL_USER", "root");
-                String dbPass = Settings.getInstance().get("MYSQL_PASSWORD", "");
-                String dbHost = Settings.getInstance().get("MYSQL_HOST", "localhost");
+                String dbName = Settings.getInstance().get("NETNEUTRALITY_MYSQL_DATABASE", "netneutrality");
+                String dbUser = Settings.getInstance().get("NETNEUTRALITY_MYSQL_USER", "root");
+                String dbPass = Settings.getInstance().get("NETNEUTRALITY_MYSQL_PASSWORD", "");
+                String dbHost = Settings.getInstance().get("NETNEUTRALITY_MYSQL_HOST", "localhost");
                 logger.info(String.format("Connecting to database '%s' at %s:3306 with user '%s'", dbName, dbHost, dbUser));
 
                 settings.put(Environment.URL, String.format("jdbc:mysql://%s:3306/%s", dbHost, dbName));
@@ -46,7 +46,7 @@ public class SessionManager {
                 sessionFactory = metadata.getSessionFactoryBuilder().build();
 
             } catch (Exception e) {
-                String env = Settings.getInstance().get("BOT_ENV", "dev");
+                String env = Settings.getInstance().get("NETNEUTRALITY_BOT_ENV", "dev");
                 if (!"dev".equals(env)) {
                     Sentry.captureException(e);
                 }

src/main/java/netneutrality/core/context/MessageCommandContext.java

@@ -72,7 +72,7 @@ public class MessageCommandContext implements CommandContext {
 
     public String[] getArgs() {
         String msg = message.getContentDisplay().trim();
-        msg = msg.substring(Settings.getInstance().get("BOT_PREFIX", "$").length()).trim();
+        msg = msg.substring(Settings.getInstance().get("NETNEUTRALITY_BOT_PREFIX", "$").length()).trim();
         String cmd = msg.split(" ", 2)[0];
         String[] args = msg.replaceFirst("(" + cmd + ")(\\s+)?", "").split("\s");
 
@@ -84,7 +84,7 @@ public class MessageCommandContext implements CommandContext {
 
     public String getMessageText() {
         String msg = message.getContentDisplay().trim();
-        msg = msg.substring(Settings.getInstance().get("BOT_PREFIX", "$").length()).trim();
+        msg = msg.substring(Settings.getInstance().get("NETNEUTRALITY_BOT_PREFIX", "$").length()).trim();
         String cmd = msg.split(" ", 2)[0];
 
         return msg.replaceFirst("(" + cmd + ")(\s)?", "");
@@ -184,7 +184,7 @@ public class MessageCommandContext implements CommandContext {
     }
 
     public boolean isMessageFromCreator() {
-        String creatorId = Settings.getInstance().get("BOT_OWNER");
+        String creatorId = Settings.getInstance().get("NETNEUTRALITY_BOT_OWNER");
 
         return creatorId.equals(member.getId());
     }

src/main/java/netneutrality/hooks/message/MessageReceivedHandler.java

@@ -33,7 +33,7 @@ public class MessageReceivedHandler extends ListenerAdapter {
         GuildManager.getManager(context.getGuild()).checkAndLogMessage(message, context.getGuildUser(), context.getChannel());
 
         String rawMessage = message.getContentDisplay().trim();
-        String prefix = Settings.getInstance().get("BOT_PREFIX", "$");
+        String prefix = Settings.getInstance().get("NETNEUTRALITY_BOT_PREFIX", "$");
 
         if (rawMessage.startsWith(prefix)) {
             rawMessage = rawMessage.replaceFirst(String.format("^[%s\\s]{1,}", prefix), "").trim();

src/main/java/netneutrality/utils/Settings.java

@@ -17,6 +17,7 @@ import java.util.Properties;
 public class Settings {
 
     private static Settings INSTANCE;
+    private final File propFile = new File("bot.properties");
     private final Properties prop = new Properties();
     public final String DATETIMEFORMAT = "yyyy-MM-dd HH:mm:ss";
 
@@ -26,8 +27,6 @@ public class Settings {
     }
 
     private void checkAndLoadPropertiesFile() {
-        File propFile = new File("bot.properties");
-
         try (FileInputStream fis = new FileInputStream(propFile)) {
             prop.load(fis);
         } catch (IOException e) {

src/main/resources/META-INF/MANIFEST.MF

@@ -1,3 +1,2 @@
 Manifest-Version: 1.0
 Main-Class: netneutrality.NetNeutrality
-