Add type to RetryListener class

build.gradle

@@ -81,7 +81,7 @@ repositories {
 }
 
 dependencies {
-    compile 'com.google.guava:guava:[10.+,)'
+    compile 'com.google.guava:guava:[10.0,19.0]'
     compile 'com.google.code.findbugs:jsr305:2.0.2'
 
     // junit testing
@@ -200,4 +200,4 @@ idea {
         languageLevel = project_jdk
         vcs = 'Git'
     }
-}
+}

src/main/java/com/github/rholder/retry/RetryListener.java

@@ -23,14 +23,13 @@
  * code through a {@link Retryer} instance.
  */
 @Beta
-public interface RetryListener {
+public interface RetryListener<V> {
 
     /**
      * This method with fire no matter what the result is and before the
      * rejection predicate and stop strategies are applied.
      *
      * @param attempt the current {@link Attempt}
-     * @param <V>     the type returned by the retryer callable
      */
-    <V> void onRetry(Attempt<V> attempt);
+    void onRetry(Attempt<V> attempt);
 }

src/main/java/com/github/rholder/retry/Retryer.java

@@ -49,7 +49,7 @@ public final class Retryer<V> {
     private final BlockStrategy blockStrategy;
     private final AttemptTimeLimiter<V> attemptTimeLimiter;
     private final Predicate<Attempt<V>> rejectionPredicate;
-    private final Collection<RetryListener> listeners;
+    private final Collection<RetryListener<V>> listeners;
 
     /**
      * Constructor
@@ -100,7 +100,7 @@ public Retryer(@Nonnull AttemptTimeLimiter<V> attemptTimeLimiter,
                    @Nonnull WaitStrategy waitStrategy,
                    @Nonnull BlockStrategy blockStrategy,
                    @Nonnull Predicate<Attempt<V>> rejectionPredicate) {
-        this(attemptTimeLimiter, stopStrategy, waitStrategy, blockStrategy, rejectionPredicate, new ArrayList<RetryListener>());
+        this(attemptTimeLimiter, stopStrategy, waitStrategy, blockStrategy, rejectionPredicate, new ArrayList<RetryListener<V>>());
     }
 
     /**
@@ -121,7 +121,7 @@ public Retryer(@Nonnull AttemptTimeLimiter<V> attemptTimeLimiter,
                    @Nonnull WaitStrategy waitStrategy,
                    @Nonnull BlockStrategy blockStrategy,
                    @Nonnull Predicate<Attempt<V>> rejectionPredicate,
-                   @Nonnull Collection<RetryListener> listeners) {
+                   @Nonnull Collection<RetryListener<V>> listeners) {
         Preconditions.checkNotNull(attemptTimeLimiter, "timeLimiter may not be null");
         Preconditions.checkNotNull(stopStrategy, "stopStrategy may not be null");
         Preconditions.checkNotNull(waitStrategy, "waitStrategy may not be null");
@@ -163,7 +163,7 @@ public V call(Callable<V> callable) throws ExecutionException, RetryException {
                 attempt = new ExceptionAttempt<V>(t, attemptNumber, TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startTime));
             }
 
-            for (RetryListener listener : listeners) {
+            for (RetryListener<V> listener : listeners) {
                 listener.onRetry(attempt);
             }
 

src/main/java/com/github/rholder/retry/RetryerBuilder.java

@@ -37,7 +37,7 @@ public class RetryerBuilder<V> {
     private WaitStrategy waitStrategy;
     private BlockStrategy blockStrategy;
     private Predicate<Attempt<V>> rejectionPredicate = Predicates.alwaysFalse();
-    private List<RetryListener> listeners = new ArrayList<RetryListener>();
+    private List<RetryListener<V>> listeners = new ArrayList<RetryListener<V>>();
 
     private RetryerBuilder() {
     }

src/test/java/com/github/rholder/retry/RetryerBuilderTest.java

@@ -16,11 +16,11 @@
 
 package com.github.rholder.retry;
 
+import static org.junit.Assert.*;
+
 import com.github.rholder.retry.Retryer.RetryerCallable;
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
-import org.junit.Test;
-
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
@@ -30,12 +30,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import org.junit.Test;
 
 public class RetryerBuilderTest {
 
@@ -463,9 +458,9 @@ public void testWhetherBuilderFailsForNullWaitStrategyWithCompositeStrategies()
     public void testRetryListener_SuccessfulAttempt() throws Exception {
         final Map<Long, Attempt> attempts = new HashMap<Long, Attempt>();
 
-        RetryListener listener = new RetryListener() {
+        RetryListener<Long> listener = new RetryListener<Long>() {
             @Override
-            public <V> void onRetry(Attempt<V> attempt) {
+            public void onRetry(Attempt<Long> attempt) {
                 attempts.put(attempt.getAttemptNumber(), attempt);
             }
         };
@@ -492,9 +487,9 @@ public <V> void onRetry(Attempt<V> attempt) {
     public void testRetryListener_WithException() throws Exception {
         final Map<Long, Attempt> attempts = new HashMap<Long, Attempt>();
 
-        RetryListener listener = new RetryListener() {
+        RetryListener listener = new RetryListener<Long>() {
             @Override
-            public <V> void onRetry(Attempt<V> attempt) {
+            public void onRetry(Attempt<Long> attempt) {
                 attempts.put(attempt.getAttemptNumber(), attempt);
             }
         };
@@ -531,15 +526,15 @@ public Boolean call() throws Exception {
         final AtomicBoolean listenerTwo = new AtomicBoolean(false);
 
         Retryer<Boolean> retryer = RetryerBuilder.<Boolean>newBuilder()
-                .withRetryListener(new RetryListener() {
+                .withRetryListener(new RetryListener<Boolean>() {
                     @Override
-                    public <V> void onRetry(Attempt<V> attempt) {
+                    public void onRetry(Attempt<Boolean> attempt) {
                         listenerOne.set(true);
                     }
                 })
-                .withRetryListener(new RetryListener() {
+                .withRetryListener(new RetryListener<Boolean>() {
                     @Override
-                    public <V> void onRetry(Attempt<V> attempt) {
+                    public void onRetry(Attempt<Boolean> attempt) {
                         listenerTwo.set(true);
                     }
                 })