Version 5.2.2

Author: Andre601

build.gradle

@@ -30,8 +30,7 @@ jar{
 dependencies{
     api group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.7.2'
     api group: 'org.json', name: 'json', version: '20200518'
-    api group: 'org.jetbrains', name: 'annotations', version: '19.0.0'
-    api(group: 'net.dv8tion', name: 'JDA', version: '4.2.0_171'){
+    api(group: 'net.dv8tion', name: 'JDA', version: '4.2.0_172'){
         exclude(module: 'opus-java')
     }
     api group: 'com.github.ben-manes.caffeine', name: 'caffeine', version: '2.8.0'

src/main/java/org/botblock/javabotblockapi/BotBlockAPI.java

@@ -18,10 +18,11 @@
 package org.botblock.javabotblockapi;
 
 import org.botblock.javabotblockapi.annotations.DeprecatedSince;
+import org.botblock.javabotblockapi.annotations.PlannedRemoval;
 import org.botblock.javabotblockapi.requests.CheckUtil;
 import org.botblock.javabotblockapi.requests.PostAction;
-import org.jetbrains.annotations.NotNull;
 
+import javax.annotation.Nonnull;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -52,11 +53,12 @@ public class BotBlockAPI{
      */
     @Deprecated
     @DeprecatedSince(version = "5.2.0")
-    public BotBlockAPI(@NotNull Map<String, String> tokens){
+    @PlannedRemoval(version = "5.2.3")
+    public BotBlockAPI(@Nonnull Map<String, String> tokens){
         this(tokens, DEFAULT_DELAY);
     }
 
-    private BotBlockAPI(@NotNull Map<String, String> tokens, int updateDelay){
+    private BotBlockAPI(@Nonnull Map<String, String> tokens, int updateDelay){
         if(tokens.isEmpty())
             throw new NullPointerException("Tokens may not be empty.");
 
@@ -104,7 +106,7 @@ public Builder(){}
          *
          * @since 2.1.0
          */
-        public Builder addAuthToken(@NotNull Site site, @NotNull String token){
+        public Builder addAuthToken(@Nonnull Site site, @Nonnull String token){
             CheckUtil.notEmpty(token, "Token");
 
             tokens.put(site.getSite(), token);
@@ -128,7 +130,7 @@ public Builder addAuthToken(@NotNull Site site, @NotNull String token){
          *
          * @return The Builder after the site and token were set. Useful for chaining.
          */
-        public Builder addAuthToken(@NotNull String site, @NotNull String token){
+        public Builder addAuthToken(@Nonnull String site, @Nonnull String token){
             CheckUtil.notEmpty(site, "Site");
             CheckUtil.notEmpty(token, "Token");
 
@@ -149,7 +151,7 @@ public Builder addAuthToken(@NotNull String site, @NotNull String token){
          *
          * @return The Builder after the Map was set. Useful for chaining.
          */
-        public Builder setAuthTokens(@NotNull Map<String, String> tokens){
+        public Builder setAuthTokens(@Nonnull Map<String, String> tokens){
             CheckUtil.notEmpty(tokens, "Tokens");
 
             this.tokens = tokens;
@@ -169,7 +171,7 @@ public Builder setAuthTokens(@NotNull Map<String, String> tokens){
          *
          * @return The Builder after the updateInterval was set. Useful for chaining.
          */
-        public Builder setUpdateDelay(@NotNull Integer updateDelay){
+        public Builder setUpdateDelay(@Nonnull Integer updateDelay){
             CheckUtil.condition(updateDelay < 2, "UpdateDelay may not be less than 2.");
 
             this.updateDelay = updateDelay;

src/main/java/org/botblock/javabotblockapi/annotations/DeprecatedSince.java

@@ -21,11 +21,11 @@
 import java.lang.annotation.*;
 
 /**
- * Annotation used to indicate since when a method or field is deprecated.
- * <br>This is paired with the {@link java.lang.Deprecated @Deprecated} annotation.
+ * Annotation used to indicate since when an Object is deprecated.
+ * <br>This is always paired with the {@link java.lang.Deprecated @Deprecated} annotation.
  * 
- * <p>Methods or fields annotated with this should be avoided as it may or may not be removed in a future release.
- * <br>A possible replacement method or field will be indicated when possible.
+ * <p>A replacement may be mentioned with the {@link #replacements() replacements String array} but is not guaranteed.
+ * <br>Anything annotated with this should be avoided as it may be removed in a future release.
  * 
  * @since 3.2.0
  */
@@ -38,7 +38,7 @@
      * Since what version this method or field is deprecated.
      * <br>This is field is required!
      * 
-     * @return The version since when this method/field is deprecated.
+     * @return The version since when this object is deprecated.
      */
     String version();
 

src/main/java/org/botblock/javabotblockapi/annotations/PlannedRemoval.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2019 - 2020 Andre601
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package org.botblock.javabotblockapi.annotations;
+
+import java.lang.annotation.*;
+
+/**
+ * Annotation to mark an Object to be planned for removal.
+ * <br>This is often paired with the {@link java.lang.Deprecated Deprecated} and {@link org.botblock.javabotblockapi.annotations.DeprecatedSince DeprecatedSince}
+ * annotations.
+ * 
+ * <p>This annotation will always contain {@link #version() the version} in which the annotated Object will be removed.
+ * 
+ * @since 5.2.2
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD, ElementType.FIELD, ElementType.TYPE, ElementType.CONSTRUCTOR})
+public @interface PlannedRemoval{
+    
+    /**
+     * The version for when the annotated object will be removed.
+     * 
+     * @return The version for when this Object will be removed.
+     */
+    String version();
+}

src/main/java/org/botblock/javabotblockapi/annotations/package-info.java

@@ -17,6 +17,6 @@
  */
 
 /**
- * Contains annotations used within the project for various things.
+ * The different annotations used to mark various Objects with it.
  */
 package org.botblock.javabotblockapi.annotations;