Add proper super boundaries to consumers in RestAction

Author: MinnDevelopment

src/main/java/net/dv8tion/jda/core/exceptions/ContextException.java

@@ -47,7 +47,7 @@ public static Consumer<Throwable> herePrintingTrace()
      * @return Wrapper of the provided consumer that will append a context with the current stack-trace
      */
     @Nonnull
-    public static Consumer<Throwable> here(@Nonnull Consumer<Throwable> acceptor)
+    public static Consumer<Throwable> here(@Nonnull Consumer<? super Throwable> acceptor)
     {
         ContextException context = new ContextException();
         return (ex) ->

src/main/java/net/dv8tion/jda/core/managers/impl/ManagerBase.java

@@ -107,7 +107,7 @@ protected ManagerBase reset()
 
     @Override
     @SuppressWarnings("unchecked")
-    public void queue(Consumer<Void> success, Consumer<Throwable> failure)
+    public void queue(Consumer<? super Void> success, Consumer<? super Throwable> failure)
     {
         if (shouldUpdate())
             super.queue(success, failure);
@@ -155,7 +155,7 @@ protected boolean shouldUpdate(long bit)
         return (set & bit) == bit;
     }
 
-    protected <E> void withLock(E object, Consumer<E> consumer)
+    protected <E> void withLock(E object, Consumer<? super E> consumer)
     {
         synchronized (object)
         {

src/main/java/net/dv8tion/jda/core/requests/Request.java

@@ -32,8 +32,8 @@ public class Request<T>
 {
     private final JDAImpl api;
     private final RestAction<T> restAction;
-    private final Consumer<T> onSuccess;
-    private final Consumer<Throwable> onFailure;
+    private final Consumer<? super T> onSuccess;
+    private final Consumer<? super Throwable> onFailure;
     private final BooleanSupplier checks;
     private final boolean shouldQueue;
     private final Route.CompiledRoute route;
@@ -43,7 +43,7 @@ public class Request<T>
 
     private boolean isCanceled = false;
 
-    public Request(RestAction<T> restAction, Consumer<T> onSuccess, Consumer<Throwable> onFailure,
+    public Request(RestAction<T> restAction, Consumer<? super T> onSuccess, Consumer<? super Throwable> onFailure,
                    BooleanSupplier checks, boolean shouldQueue, RequestBody body, Object rawBody,
                    Route.CompiledRoute route, CaseInsensitiveMap<String, String> headers)
     {
@@ -122,12 +122,12 @@ public RestAction<T> getRestAction()
         return restAction;
     }
 
-    public Consumer<T> getOnSuccess()
+    public Consumer<? super T> getOnSuccess()
     {
         return onSuccess;
     }
 
-    public Consumer<Throwable> getOnFailure()
+    public Consumer<? super Throwable> getOnFailure()
     {
         return onFailure;
     }

src/main/java/net/dv8tion/jda/core/requests/RestAction.java

@@ -306,7 +306,7 @@ public void queue()
      *         The success callback that will be called at a convenient time
      *         for the API. (can be null)
      */
-    public void queue(Consumer<T> success)
+    public void queue(Consumer<? super T> success)
     {
         queue(success, null);
     }
@@ -324,7 +324,7 @@ public void queue(Consumer<T> success)
      *         encounters an exception at its execution point.
      */
     @SuppressWarnings("unchecked")
-    public void queue(Consumer<T> success, Consumer<Throwable> failure)
+    public void queue(Consumer<? super T> success, Consumer<? super Throwable> failure)
     {
         Route.CompiledRoute route = finalizeRoute();
         Checks.notNull(route, "Route");
@@ -582,7 +582,7 @@ public ScheduledFuture<?> queueAfter(long delay, TimeUnit unit)
      * @return {@link java.util.concurrent.ScheduledFuture ScheduledFuture}
      *         representing the delayed operation
      */
-    public ScheduledFuture<?> queueAfter(long delay, TimeUnit unit, Consumer<T> success)
+    public ScheduledFuture<?> queueAfter(long delay, TimeUnit unit, Consumer<? super T> success)
     {
         return queueAfter(delay, unit, success, api.pool);
     }
@@ -615,7 +615,7 @@ public ScheduledFuture<?> queueAfter(long delay, TimeUnit unit, Consumer<T> succ
      * @return {@link java.util.concurrent.ScheduledFuture ScheduledFuture}
      *         representing the delayed operation
      */
-    public ScheduledFuture<?> queueAfter(long delay, TimeUnit unit, Consumer<T> success, Consumer<Throwable> failure)
+    public ScheduledFuture<?> queueAfter(long delay, TimeUnit unit, Consumer<? super T> success, Consumer<? super Throwable> failure)
     {
         return queueAfter(delay, unit, success, failure, api.pool);
     }
@@ -678,7 +678,7 @@ public ScheduledFuture<?> queueAfter(long delay, TimeUnit unit, ScheduledExecuto
      * @return {@link java.util.concurrent.ScheduledFuture ScheduledFuture}
      *         representing the delayed operation
      */
-    public ScheduledFuture<?> queueAfter(long delay, TimeUnit unit, Consumer<T> success, ScheduledExecutorService executor)
+    public ScheduledFuture<?> queueAfter(long delay, TimeUnit unit, Consumer<? super T> success, ScheduledExecutorService executor)
     {
         return queueAfter(delay, unit, success, null, executor);
     }
@@ -711,7 +711,7 @@ public ScheduledFuture<?> queueAfter(long delay, TimeUnit unit, Consumer<T> succ
      * @return {@link java.util.concurrent.ScheduledFuture ScheduledFuture}
      *         representing the delayed operation
      */
-    public ScheduledFuture<?> queueAfter(long delay, TimeUnit unit, Consumer<T> success, Consumer<Throwable> failure, ScheduledExecutorService executor)
+    public ScheduledFuture<?> queueAfter(long delay, TimeUnit unit, Consumer<? super T> success, Consumer<? super Throwable> failure, ScheduledExecutorService executor)
     {
         Checks.notNull(executor, "Scheduler");
         Checks.notNull(unit, "TimeUnit");
@@ -765,7 +765,7 @@ public EmptyRestAction(JDA api, T returnObj)
         }
 
         @Override
-        public void queue(Consumer<T> success, Consumer<Throwable> failure)
+        public void queue(Consumer<? super T> success, Consumer<? super Throwable> failure)
         {
             if (success != null)
                 success.accept(returnObj);

src/main/java/net/dv8tion/jda/core/requests/restaction/AuditableRestAction.java

@@ -134,7 +134,7 @@ public EmptyRestAction(JDA api, T content)
         }
 
         @Override
-        public void queue(Consumer<T> success, Consumer<Throwable> failure)
+        public void queue(Consumer<? super T> success, Consumer<? super Throwable> failure)
         {
             if (success != null)
                 success.accept(content);