Merge pull request #78 from Parabot/cleanup/remove-bugsnag

[CLEANUP] Removed Bugsnag and deployment files

deploy/clean.bat

@@ -1 +0,0 @@
-mvn clean

deploy/deploy.bat

@@ -1,5 +0,0 @@
-mvn install:install-file -DgroupId=${project.groupId} -DartifactId=${project.artifactId} -Dversion=${project.version} -Dpackaging=jar -Dfile=../target/final/${project.build.finalName}-jar-with-dependencies.jar -DlocalRepositoryPath=../../Maven-Repository
-
-:: mvn install:install-file -DgroupId=org.parabot -DartifactId=client -Dversion=2.4.1.1 -Dpackaging=jar -Dfile=../target/Parabot-V2.4.1.1-jar-with-dependencies.jar -DlocalRepositoryPath=../../Maven-Repository
-:: mvn install:install-file -DgroupId=org.parabot -DartifactId=client -Dversion=2.4.3 -Dpackaging=jar -Dfile=../target/Parabot-V2.4.3-jar-with-dependencies.jar -DlocalRepositoryPath=../../Maven-Repository
-:: mvn install:install-file -DgroupId=org.parabot -DartifactId=client -Dversion=2.5 -Dpackaging=jar -Dfile=../target/final/Parabot-V2.5-jar-with-dependencies.jar -DlocalRepositoryPath=../../Maven-Repository

deploy/package.bat

@@ -1 +0,0 @@
-mvn package

pom.xml

@@ -59,24 +59,16 @@
             <version>1.1.1</version>
             <exclusions>
                 <exclusion>
-                    <groupId>junit</groupId>
+                    <groupId>*</groupId>
-                    <artifactId>junit</artifactId>
+                    <artifactId>*</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.hamcrest</groupId>
-                    <artifactId>hamcrest-core</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>com.bugsnag</groupId>
-            <artifactId>bugsnag</artifactId>
-            <version>1.2.8</version>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.11</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
@@ -90,14 +82,6 @@
             <resource>
                 <directory>deploy</directory>
                 <filtering>true</filtering>
-                <excludes>
-                    <exclude>deploy.bat</exclude>
-                    <exclude>package.bat</exclude>
-                    <exclude>clean.bat</exclude>
-                </excludes>
-                <!--<includes>-->
-                    <!--<include>deploy.bat</include>-->
-                <!--</includes>-->
             </resource>
         </resources>
 
@@ -139,6 +123,7 @@
                     <outputDirectory>${project.build.directory}/final/</outputDirectory>
                     <appendAssemblyId>false</appendAssemblyId>
                 </configuration>
+
                 <executions>
                     <execution>
                         <id>make-assembly</id>

src/main/java/org/parabot/Landing.java

@@ -1,6 +1,5 @@
 package org.parabot;
 
-import com.bugsnag.Client;
 import org.parabot.core.Configuration;
 import org.parabot.core.Core;
 import org.parabot.core.Directories;
@@ -11,7 +10,6 @@ import org.parabot.core.network.proxy.ProxyType;
 import org.parabot.core.ui.BotUI;
 import org.parabot.core.ui.ServerSelector;
 import org.parabot.core.ui.utils.UILog;
-import org.parabot.environment.api.utils.JavaUtil;
 
 import javax.swing.*;
 import java.awt.*;
@@ -29,8 +27,8 @@ import java.net.URI;
 public final class Landing {
     private static String username;
     private static String password;
+
     public static void main(String... args) throws IOException {
-		Core.initiateBugsnagInstance();
 
         parseArgs(args);
 

src/main/java/org/parabot/core/Core.java

@@ -1,8 +1,5 @@
 package org.parabot.core;
 
-import com.bugsnag.BeforeNotify;
-import com.bugsnag.Client;
-import com.bugsnag.Error;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.ParseException;
 import org.parabot.Landing;
@@ -39,8 +36,6 @@ public class Core {
     private static Version currentVersion = Configuration.BOT_VERSION;
     private static Version latestVersion;
 
-    private static Client bugsnagInstance;
-
     public static void disableValidation() {
         Core.validate = false;
     }
@@ -286,8 +281,6 @@ public class Core {
         Core.verbose("Checking for updates...");
         validateCache();
 
-        setBugsnagVersion();
-
         if ((validVersion() && checksumValid()) || (!checksumValid() && currentVersion.compareTo(latestVersion) >= 0)){
             Core.verbose("No updates available.");
             return true;
@@ -297,29 +290,6 @@ public class Core {
         }
     }
 
-    public static void initiateBugsnagInstance() {
-        bugsnagInstance = new Client(Configuration.BUGSNAG_API);
-        bugsnagInstance.setSendThreads(true);
-    }
-
-    public static void setBugsnagVersion(){
-        Core.bugsnagInstance.setReleaseStage(currentVersion != latestVersion ? "development" : "production");
-    }
-
-    public static void setBugsnagUser(String id, String email, String username){
-        // TODO Check order of parameters
-        Core.bugsnagInstance.setUser(username, email, id);
-    }
-
-    public static void setBugsnagServer(String server){
-        Core.setBugsnagInformation("Server", "Server", server);
-    }
-
-    public static void setBugsnagInformation(String tab, String key, String value){
-        // TODO Should be checked if correct
-        Core.bugsnagInstance.addToTab(tab, key, value);
-    }
-
     public static void debug(int i) {
     	if(mDebug) {
     		System.out.println("DEBUG: " + i);

src/main/java/org/parabot/core/forum/Account.java

@@ -33,8 +33,6 @@ public class Account {
         this.username = username;
         this.password = password;
         this.api = api;
-
-        Core.setBugsnagUser("Null", this.username, "Null");
     }
 
     /**

src/main/java/org/parabot/environment/scripts/Script.java

@@ -156,7 +156,6 @@ public class Script implements Runnable {
 		if(state < 0 || state > 2) {
 			throw new IllegalArgumentException("Illegal state");
 		}
-		Core.setBugsnagInformation("Script", "State", String.valueOf(state));
 		this.state = state;
 	}
 
@@ -181,6 +180,5 @@ public class Script implements Runnable {
 
 	public void setScriptID(int scriptID){
 		this.scriptID = scriptID;
-		Core.setBugsnagInformation("Script", "State", String.valueOf(scriptID));
 	}
 }

src/main/java/org/parabot/environment/servers/executers/ServerExecuter.java

@@ -24,8 +24,6 @@ public abstract class ServerExecuter {
 			@Override
 			public void run() {
 				try {
-					Core.setBugsnagServer(serverName);
-
 					Context context = Context.getInstance(provider);
 					context.load();
 					PaintComponent.getInstance().startPainting(context);

src/main/resources/storage/app.properties

@@ -1 +1 @@
-application.version=${project.version}
+application.version=${project.version}${build.version}