Removed deprecated methods and classes. (ReactiveX#512)

Author: RobWin

resilience4j-all/src/test/java/io/github/resilience4j/decorators/DecoratorsTest.java

@@ -313,7 +313,7 @@ public void testDecoratorBuilderWithRateLimiter() {
 
     private void alignTime(RateLimiter rateLimiter) {
         RateLimiter.Metrics metrics = rateLimiter.getMetrics();
-        while (rateLimiter.acquirePermission(Duration.ZERO)) {
+        while (rateLimiter.acquirePermission()) {
             state = !state;
         }
         // Wait to the start of the next cycle in spin loop

resilience4j-bulkhead/src/main/java/io/github/resilience4j/bulkhead/Bulkhead.java

@@ -60,15 +60,6 @@ public interface Bulkhead {
      */
     void changeConfig(BulkheadConfig newConfig);
 
-    /**
-     * Attempts to obtain a permission to execute a call.
-     * @deprecated Use {@link Bulkhead#tryAcquirePermission()} ()}. instead.
-     *
-     * @return {@code true} if a permission was acquired and {@code false} otherwise
-     */
-    @Deprecated
-    boolean isCallPermitted();
-
     /**
      * Acquires a permission to execute a call, only if one is available at the time of invocation.
      *

resilience4j-bulkhead/src/main/java/io/github/resilience4j/bulkhead/BulkheadConfig.java

@@ -94,26 +94,6 @@ public Builder maxConcurrentCalls(int maxConcurrentCalls) {
 			return this;
 		}
 
-		/**
-		 * Configures a maximum amount of time in ms the calling thread will wait to enter the bulkhead. If bulkhead has space available, entry
-		 * is guaranteed and immediate. If bulkhead is full, calling threads will contest for space, if it becomes available. maxWaitTime can be set to 0.
-		 * <p>
-		 * Note: for threads running on an event-loop or equivalent (rx computation pool, etc), setting maxWaitTime to 0 is highly recommended. Blocking
-		 * an event-loop thread will most likely have a negative effect on application throughput.
-		 *
-		 * @param maxWaitTime maximum wait time for bulkhead entry
-		 * @return the BulkheadConfig.Builder
-		 * @deprecated since 0.16.0 use {@link #maxWaitDuration(Duration)}
-		 */
-		@Deprecated
-		public Builder maxWaitTime(long maxWaitTime) {
-			if (maxWaitTime < 0) {
-				throw new IllegalArgumentException("maxWaitTime must be a positive integer value >= 0");
-			}
-			config.maxWaitDuration = Duration.ofMillis(maxWaitTime);
-			return this;
-		}
-
 		/**
 		 * Configures a maximum amount of time which the calling thread will wait to enter the bulkhead. If bulkhead has space available, entry
 		 * is guaranteed and immediate. If bulkhead is full, calling threads will contest for space, if it becomes available. maxWaitDuration can be set to 0.

resilience4j-bulkhead/src/main/java/io/github/resilience4j/bulkhead/BulkheadRegistry.java

@@ -73,16 +73,6 @@ public interface BulkheadRegistry extends Registry<Bulkhead, BulkheadConfig> {
 	 */
 	Bulkhead bulkhead(String name, String configName);
 
-	/**
-	 * @deprecated Use {@link BulkheadRegistry#getDefaultConfig()} instead
-	 * @since (0.15.0)
-	 * Returns a default BulkheadConfig instance this registry is using.
-	 *
-	 * @return BulkheadConfig instance
-	 */
-	@Deprecated
-	BulkheadConfig getDefaultBulkheadConfig();
-
 	/**
 	 * Creates a BulkheadRegistry with a custom Bulkhead configuration.
 	 *

resilience4j-bulkhead/src/main/java/io/github/resilience4j/bulkhead/ThreadPoolBulkheadRegistry.java

@@ -102,14 +102,4 @@ static ThreadPoolBulkheadRegistry of(Map<String, ThreadPoolBulkheadConfig> confi
 	 */
 	ThreadPoolBulkhead bulkhead(String name, String configName);
 
-	/**
-	 * @deprecated Use {@link ThreadPoolBulkheadRegistry#getDefaultConfig()} instead
-	 * @since (0.15.0)
-	 * Returns a default ThreadPoolBulkheadConfig instance this registry is using.
-	 *
-	 * @return ThreadPoolBulkheadConfig instance
-	 */
-	@Deprecated
-	ThreadPoolBulkheadConfig getDefaultBulkheadConfig();
-
 }

resilience4j-bulkhead/src/main/java/io/github/resilience4j/bulkhead/internal/InMemoryBulkheadRegistry.java

@@ -97,9 +97,4 @@ public Bulkhead bulkhead(String name, String configName) {
 		return computeIfAbsent(name, () -> Bulkhead.of(name, getConfiguration(configName)
 				.orElseThrow(() -> new ConfigurationNotFoundException(configName))));
 	}
-
-	@Override
-	public BulkheadConfig getDefaultBulkheadConfig() {
-		return getDefaultConfig();
-	}
 }

resilience4j-bulkhead/src/main/java/io/github/resilience4j/bulkhead/internal/InMemoryThreadPoolBulkheadRegistry.java

@@ -97,12 +97,4 @@ public ThreadPoolBulkhead bulkhead(String name, String configName) {
 		return computeIfAbsent(name, () -> ThreadPoolBulkhead.of(name, getConfiguration(configName)
 				.orElseThrow(() -> new ConfigurationNotFoundException(configName))));
 	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public ThreadPoolBulkheadConfig getDefaultBulkheadConfig() {
-		return getDefaultConfig();
-	}
 }

resilience4j-bulkhead/src/main/java/io/github/resilience4j/bulkhead/internal/SemaphoreBulkhead.java

@@ -101,14 +101,6 @@ public void changeConfig(final BulkheadConfig newConfig) {
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean isCallPermitted() {
-        return tryAcquirePermission();
-    }
-
     @Override
     public boolean tryAcquirePermission() {
         boolean callPermitted = tryEnterBulkhead();

resilience4j-bulkhead/src/main/java/io/github/resilience4j/bulkhead/utils/BulkheadUtils.java

@@ -56,7 +56,7 @@ public void testBuildCustom() {
         // when
         BulkheadConfig config = BulkheadConfig.custom()
                                               .maxConcurrentCalls(maxConcurrent)
-                                              .maxWaitTime(maxWait)
+                                              .maxWaitDuration(Duration.ofMillis(maxWait))
                                               .build();
 
         // then

resilience4j-bulkhead/src/test/java/io/github/resilience4j/bulkhead/BulkheadConfigTest.java

@@ -22,6 +22,7 @@
 import org.junit.Test;
 import org.slf4j.Logger;
 
+import java.time.Duration;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -43,7 +44,7 @@ public void setUp() {
 		// registry with custom config
 		config = BulkheadConfig.custom()
 				.maxConcurrentCalls(100)
-				.maxWaitTime(50)
+				.maxWaitDuration(Duration.ofMillis(50))
 				.build();
 	}
 

resilience4j-bulkhead/src/test/java/io/github/resilience4j/bulkhead/BulkheadRegistryTest.java

@@ -22,7 +22,7 @@
  * A {@link CallNotPermittedException} signals that the CircuitBreaker is HALF_OPEN or OPEN
  * and a call is not permitted to be executed.
  */
-public class CallNotPermittedException extends CircuitBreakerOpenException {
+public class CallNotPermittedException extends RuntimeException {
 
     /**
      * The constructor with a CircuitBreaker.

resilience4j-circuitbreaker/src/main/java/io/github/resilience4j/circuitbreaker/CallNotPermittedException.java

@@ -50,16 +50,6 @@
  */
 public interface CircuitBreaker {
 
-    /**
-     * Attempts to obtain a permission to execute a call.
-     * @deprecated Use {@link CircuitBreaker#tryAcquirePermission()} ()} instead.
-     * @since 0.15.0
-     *
-     * @return true when a call is permitted
-     */
-    @Deprecated
-    boolean isCallPermitted();
-
     /**
      * Acquires a permission to execute a call, only if one is available at the time of invocation.
      * If a call is not permitted, the number of not permitted calls is increased.

resilience4j-circuitbreaker/src/main/java/io/github/resilience4j/circuitbreaker/CircuitBreaker.java

@@ -124,16 +124,6 @@ public CircuitBreakerStateMachine(String name, Supplier<CircuitBreakerConfig> ci
         this(name, circuitBreakerConfig.get());
     }
 
-    /**
-     * Requests permission to call this backend.
-     *
-     * @return true, if the call is allowed.
-     */
-    @Override
-    public boolean isCallPermitted() {
-        return tryAcquirePermission();
-    }
-
     @Override
     public boolean tryAcquirePermission() {
         boolean callPermitted = stateReference.get().tryAcquirePermission();

resilience4j-circuitbreaker/src/main/java/io/github/resilience4j/circuitbreaker/CircuitBreakerOpenException.java

@@ -10,13 +10,13 @@ public class CircuitBreakerOpenExceptionTest {
     public void shouldReturnCorrectMessageWhenStateIsOpen(){
         CircuitBreaker circuitBreaker = CircuitBreaker.ofDefaults("testName");
         circuitBreaker.transitionToOpenState();
-        assertThat(new CircuitBreakerOpenException(circuitBreaker).getMessage()).isEqualTo("CircuitBreaker 'testName' is OPEN and does not permit further calls");
+        assertThat(new CallNotPermittedException(circuitBreaker).getMessage()).isEqualTo("CircuitBreaker 'testName' is OPEN and does not permit further calls");
     }
 
     @Test
     public void shouldReturnCorrectMessageWhenStateIsForcedOpen(){
         CircuitBreaker circuitBreaker = CircuitBreaker.ofDefaults("testName");
         circuitBreaker.transitionToForcedOpenState();
-        assertThat(new CircuitBreakerOpenException(circuitBreaker).getMessage()).isEqualTo("CircuitBreaker 'testName' is FORCED_OPEN and does not permit further calls");
+        assertThat(new CallNotPermittedException(circuitBreaker).getMessage()).isEqualTo("CircuitBreaker 'testName' is FORCED_OPEN and does not permit further calls");
     }
 }

resilience4j-circuitbreaker/src/main/java/io/github/resilience4j/circuitbreaker/internal/CircuitBreakerStateMachine.java

@@ -538,7 +538,7 @@ public void shouldReturnFailureWithCircuitBreakerOpenException() {
 
         //Then
         assertThat(result.isFailure()).isTrue();
-        assertThat(result.failed().get()).isInstanceOf(CircuitBreakerOpenException.class);
+        assertThat(result.failed().get()).isInstanceOf(CallNotPermittedException.class);
     }
 
     @Test
@@ -665,7 +665,7 @@ public void shouldThrowCircuitBreakerOpenException() {
 
         // Then the call fails, because CircuitBreaker is OPEN
         assertThat(result.isFailure()).isTrue();
-        // Exception is CircuitBreakerOpenException
+        // Exception is CallNotPermittedException
         assertThat(result.failed().get()).isInstanceOf(CallNotPermittedException.class);
         // end::shouldThrowCircuitBreakerOpenException[]
 

resilience4j-circuitbreaker/src/main/java/io/github/resilience4j/circuitbreaker/utils/CircuitBreakerUtils.java

@@ -21,7 +21,6 @@
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.*;
 
 public class FeignDecoratorsTest {
@@ -66,6 +65,6 @@ public void testWithRateLimiter() throws Throwable {
         assertThat(result)
                 .describedAs("Returned result is correct")
                 .isEqualTo("test01");
-        verify(rateLimiter, times(1)).acquirePermission(any());
+        verify(rateLimiter, times(1)).acquirePermission();
     }
 }