Remove JDA and ShardManager from BotBlockAPI

Andre601 · Andre601 · commit 09275ee95504 · 2019-06-23T15:07:03.000+02:00
- Let the RequestHandle handle it.
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ plugins{
 }
 
 group = 'com.andre601'
-version = '1.0.1'
+version = '1.0.2'
 
 sourceCompatibility = 1.8
 
diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,2 @@
-bintrayUser=
-bintrayApiKey=
+bintrayUser=andre601
+bintrayApiKey=0dff36a653798e30b2c9a8f1198cee460671e4fc
diff --git a/src/main/java/com/andre601/javabotblockapi/BotBlockAPI.java b/src/main/java/com/andre601/javabotblockapi/BotBlockAPI.java
@@ -18,21 +18,15 @@
  */
 package com.andre601.javabotblockapi;
 
-import net.dv8tion.jda.bot.sharding.ShardManager;
-import net.dv8tion.jda.core.JDA;
 import org.apache.commons.lang3.ObjectUtils;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.HashMap;
 import java.util.Map;
 
 public class BotBlockAPI{
-    private Map<String, String> authTokens = new HashMap<>();
-
+    private Map<String, String> authTokens;
     private int updateInterval;
-    private boolean jdaDisabled;
-    private JDA jda;
-    private ShardManager shardManager;
 
     /**
      * Creates an instance of BotBlockAPI with the provided api tokens (as Map) and update interval.
@@ -45,65 +39,12 @@ public class BotBlockAPI{
     public BotBlockAPI(@NotNull Map<String, String> authTokens, int updateInterval){
         this.authTokens = authTokens;
         this.updateInterval = updateInterval;
-        this.jdaDisabled = true;
-        this.jda = null;
-        this.shardManager = null;
-    }
-
-    /**
-     * Creates an instance of BotBlockAPI with the provided api tokens (as Map), update interval and
-     * {@link net.dv8tion.jda.core.JDA JDA instance}.
-     *
-     * @param authTokens
-     *        A Map of sites and their tokens. May not be null.
-     * @param updateInterval
-     *        The update interval to set.
-     * @param jda
-     *        An instance of {@link net.dv8tion.jda.core.JDA JDA}. May not be null.
-     */
-    public BotBlockAPI(@NotNull Map<String, String> authTokens, int updateInterval, @NotNull JDA jda){
-        this.authTokens = authTokens;
-        this.updateInterval = updateInterval;
-        this.jdaDisabled = false;
-        this.jda = jda;
-        this.shardManager = null;
-    }
-
-    /**
-     * Creates an instance of BotBlockAPI with the provided api tokens (as Map), update interval and
-     * {@link net.dv8tion.jda.bot.sharding.ShardManager ShardManager instance}.
-     *
-     * @param authTokens
-     *        A Map of sites and their tokens. May not be null.
-     * @param updateInterval
-     *        The update interval to set.
-     * @param shardManager
-     *        An instance of {@link net.dv8tion.jda.bot.sharding.ShardManager ShardManager}.
-     */
-    public BotBlockAPI(@NotNull Map<String, String> authTokens, int updateInterval, @NotNull ShardManager shardManager){
-        this.authTokens = authTokens;
-        this.updateInterval = updateInterval;
-        this.jdaDisabled = false;
-        this.jda = null;
-        this.shardManager = shardManager;
     }
 
     Map<String, String> getAuthTokens(){
         return authTokens;
     }
 
-    boolean isJdaDisabled(){
-        return jdaDisabled;
-    }
-
-    JDA getJDA(){
-        return jda;
-    }
-
-    ShardManager getShardManager(){
-        return shardManager;
-    }
-
     int getUpdateInterval(){
         return updateInterval;
     }
@@ -113,37 +54,13 @@ int getUpdateInterval(){
      */
     public static class Builder{
         private Map<String, String> authTokens = new HashMap<>();
-
         private int updateInterval = 30;
-        private boolean jdaDisabled = false;
-        private JDA jda = null;
-        private ShardManager shardManager = null;
 
         /**
          * Empty Builder class
          */
         public Builder(){}
 
-        /**
-         * Constructor that also sets the {@link net.dv8tion.jda.core.JDA JDA instance}.
-         *
-         * @param jda
-         *        The instance of {@link net.dv8tion.jda.core.JDA JDA}.
-         */
-        public Builder(JDA jda){
-            this.jda = jda;
-        }
-
-        /**
-         * Constructor that also sets the {@link net.dv8tion.jda.bot.sharding.ShardManager ShardManager instance}.
-         *
-         * @param shardManager
-         *        The instance of {@link net.dv8tion.jda.bot.sharding.ShardManager ShardManager}.
-         */
-        public Builder(ShardManager shardManager){
-            this.shardManager = shardManager;
-        }
-
         /**
          * Adds the provided Site name and token to the Map.
          * <br>If there is already an entry with the same key, it will be overwritten.
@@ -210,100 +127,13 @@ public Builder setUpdateInteval(int updateInterval){
             return this;
         }
 
-        /**
-         * Sets if an instance of {@link net.dv8tion.jda.core.JDA JDA} or {@link net.dv8tion.jda.bot.sharding.ShardManager ShardManager}
-         * need to be set.
-         * <br>{@code true} means that it is *NOT* required to set. Default is false.
-         *
-         * <p><b>This will be ignored when either {@link #setJDA(JDA)} or {@link #setShardManager(ShardManager)} are set!</b>
-         *
-         * @param  disable
-         *         The boolean to set if JDA/ShardManager is required. True means it's *NOT* required.
-         *
-         * @return The Builder after the boolean was set. Useful for chaining.
-         */
-        public Builder disableJDA(boolean disable){
-            this.jdaDisabled = disable;
-
-            return this;
-        }
-
-        /**
-         * Sets the instance of {@link net.dv8tion.jda.core.JDA JDA}. This will be ignored when {@link #setShardManager(ShardManager)}
-         * is used!
-         * <br>It will also disable {@link #disableJDA(boolean)} (set it to false) when it was set.
-         *
-         * <p>You can as an alternative define JDA directly through the constructor.
-         *
-         * <p><b>Example:</b>
-         * <pre><code>
-         * JDA jda = // Getting the JDA from somewhere
-         *
-         * BotBlockAPI api = new BotBlockAPI.Builder(jda) // Setting the JDA
-         *     // Adding sites through addAuthToken(String, String) and the build it with build()
-         * </code></pre>
-         *
-         * @param  jda
-         *         The instance of {@link net.dv8tion.jda.core.JDA JDA} to use. May not be null.
-         *
-         * @return The Builder after JDA was set. Useful for chaining.
-         */
-        public Builder setJDA(@NotNull JDA jda){
-            if(jdaDisabled)
-                jdaDisabled = false;
-
-            this.jda = jda;
-
-            return this;
-        }
-
-        /**
-         * Sets the instance of {@link net.dv8tion.jda.bot.sharding.ShardManager ShardManager}.
-         * <br>This will disable {@link #disableJDA(boolean)} (set it to false) when it was set.
-         *
-         * <p>You can as an alternative define ShardManager directly through the constructor.
-         *
-         * <p><b>Example:</b>
-         * <pre><code>
-         * ShardManager shardManager = // Getting the ShardManager from somewhere
-         *
-         * BotBlockAPI api = new BotBlockAPI.Builder(shardManager) // Setting the ShardManager.
-         *     // Adding sites through addAuthToken(String, String) and the build it with build()
-         * </code></pre>
-         *
-         * @param  shardManager
-         *         The instance of {@link net.dv8tion.jda.bot.sharding.ShardManager ShardManager} to use. May not be null.
-         *
-         * @return The Builder after ShardManager was set. Useful for chaining.
-         */
-        public Builder setShardManager(@NotNull ShardManager shardManager){
-            if(jdaDisabled)
-                jdaDisabled = false;
-
-            this.shardManager = shardManager;
-
-            return this;
-        }
-
         /**
          * Builds the instance of {@link com.andre601.javabotblockapi.BotBlockAPI BotBlockAPI}.
          *
-         * @throws NullPointerException
-         *         When JDA nor ShardManager are set (null) and {@link #disableJDA(boolean)} is false.
-         *
          * @return The built, usable {@link com.andre601.javabotblockapi.BotBlockAPI BotBlockAPI}.
          */
         public BotBlockAPI build(){
-            if(shardManager != null)
-                return new BotBlockAPI(authTokens, updateInterval, shardManager);
-            else
-            if(jda != null)
-                return new BotBlockAPI(authTokens, updateInterval, jda);
-            else
-            if(jdaDisabled)
-                return new BotBlockAPI(authTokens, updateInterval);
-            else
-                throw new NullPointerException("disableJDA(Boolean) is false and JDA as-well as ShardManager are null!");
+            return new BotBlockAPI(authTokens, updateInterval);
         }
     }
 }
diff --git a/src/main/java/com/andre601/javabotblockapi/RequestHandler.java b/src/main/java/com/andre601/javabotblockapi/RequestHandler.java
@@ -28,13 +28,11 @@
 import org.apache.commons.lang3.ObjectUtils;
 import org.jetbrains.annotations.NotNull;
 import org.json.JSONArray;
+import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -50,24 +48,6 @@ public class RequestHandler {
 
     private JSONObject json = new JSONObject();
 
-    /**
-     * Creates an instance of this class and sets the values defined in {@link com.andre601.javabotblockapi.BotBlockAPI BotBlockAPI}.
-     * <br>This can only be used when you set either a ShardManager or a JDA instance through their respective method.
-     *
-     * @param botBlockAPI
-     *        An instance of {@link com.andre601.javabotblockapi.BotBlockAPI BotBlockAPI}. Can't be null.
-     */
-    public RequestHandler(@NotNull BotBlockAPI botBlockAPI){
-        if(botBlockAPI.getShardManager() != null){
-            new RequestHandler(botBlockAPI.getShardManager(), botBlockAPI);
-        }else
-        if(botBlockAPI.getJDA() != null){
-            new RequestHandler(botBlockAPI.getJDA(), botBlockAPI);
-        }else{
-            throw new NullPointerException("You need to set a JDA or ShardManager instance with BotBlockAPI!");
-        }
-    }
-
     /**
      * Creates an instance of this class and sets the {@link net.dv8tion.jda.core.JDA JDA instance} and
      * {@link com.andre601.javabotblockapi.BotBlockAPI BotBlockAPI instance}.
@@ -116,7 +96,7 @@ public RequestHandler(@NotNull ShardManager shardManager, @NotNull BotBlockAPI b
 
         List<Integer> shards = new ArrayList<>();
         for(JDA jda : shardManager.getShards())
-            shards.add((int)jda.getGuildCache().size());
+            shards.add(jda.getGuilds().size());
 
         json.put("shards", new JSONArray(Arrays.deepToString(shards.toArray())));
 
@@ -146,7 +126,6 @@ public RequestHandler(long botId, int guilds, @NotNull BotBlockAPI botBlockAPI){
     /**
      * Creates an instance of this class and sets the bots ID, the guild count and the
      * {@link com.andre601.javabotblockapi.BotBlockAPI BotBlockAPI}.
-     * <br>This is essentially a shortcut to {@link #RequestHandler(String, int, BotBlockAPI)}.
      *
      * @param botId
      *        The ID of the bot. Can't be null.
@@ -185,17 +164,15 @@ public void postGuilds() throws IOException, RatelimitedException{
     /**
      * Starts a scheduler to auto-post the guild counts to the BotBlock API.
      *
-     * @throws IllegalStateException
-     *         When {@link com.andre601.javabotblockapi.BotBlockAPI.Builder#disableJDA(boolean) BotBlockAPI.Builder#disableJDA(Boolean)}
-     *         is true.
      * @throws NullPointerException
-     *         When {@link com.andre601.javabotblockapi.BotBlockAPI BotBlockAPI} is null.
+     *         When {@link com.andre601.javabotblockapi.BotBlockAPI BotBlockAPI} is null or both
+     *         {@link net.dv8tion.jda.core.JDA JDA} and {@link net.dv8tion.jda.bot.sharding.ShardManager ShardManager} are null.
      */
     public void startAutoPosting(){
         Objects.requireNonNull(botBlockAPI, "BotBlockAPI may not be null.");
 
-        if(botBlockAPI.isJdaDisabled())
-            throw new IllegalStateException("startAutoPosting can't be used while disableJDA(Boolean) is true!");
+        if(!ObjectUtils.anyNotNull(jda, shardManager))
+            throw new NullPointerException("startAutoPost() requires either JDA or ShardManager!");
 
         scheduler.scheduleAtFixedRate(() -> {
             try {
@@ -217,9 +194,6 @@ private void performRequest() throws IOException, RatelimitedException{
         Objects.requireNonNull(json, "JSON may not be null.");
         Objects.requireNonNull(id, "Id may not be null.");
 
-        if(!ObjectUtils.anyNotNull(jda, shardManager) && !botBlockAPI.isJdaDisabled())
-            throw new NullPointerException("ShardManager AND JDA can't be null! Either set one or use disableJDA(true).");
-
         RequestBody body = RequestBody.create(null, json.toString());
         Request request = new Request.Builder()
                 .url("https://botblock.org/api/count")
@@ -248,13 +222,18 @@ private void performRequest() throws IOException, RatelimitedException{
 
                 List<String> sites = new ArrayList<>();
                 for(String key : failures.keySet()){
-                    JSONArray array = failures.getJSONArray(key);
-                    sites.add(String.format(
-                            "Name: %s, Error code: %d, Error Message: %s",
-                            key,
-                            array.getInt(0),
-                            array.getString(1)
-                    ));
+                    try {
+                        JSONArray array = failures.getJSONArray(key);
+                        sites.add(String.format(
+                                "Name: %s, Error code: %d, Error Message: %s",
+                                key,
+                                array.getInt(0),
+                                array.getString(1)
+                        ));
+                    }catch(JSONException ex){
+                        Map<String, Object> notFound = failures.toMap();
+                        sites.add("Errors: " + notFound.toString());
+                    }
                 }
 
                 throw new IOException(String.format(

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ plugins{`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`group = 'com.andre601'`
`10`		`-version = '1.0.1'`
	`10`	`+version = '1.0.2'`
`11`	`11`
`12`	`12`	`sourceCompatibility = 1.8`
`13`	`13`