Skip to content

Commit

Permalink
Fixed sonar code smells
Browse files Browse the repository at this point in the history
  • Loading branch information
@RobWin
RobWin committed Apr 29, 2022
1 parent 297dc71 commit ebd49df
Show file tree
Hide file tree
Showing 13 changed files with 201 additions and 201 deletions.
88 changes: 44 additions & 44 deletions ...breaker/src/test/java/io/github/resilience4j/circuitbreaker/CircuitBreakerConfigTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ public void shouldSetLowFailureRateThreshold() {
public void shouldSetWritableStackTraces() {
CircuitBreakerConfig circuitBreakerConfig = custom().writableStackTraceEnabled(false)
.build();
then(circuitBreakerConfig.isWritableStackTraceEnabled()).isEqualTo(false);
then(circuitBreakerConfig.isWritableStackTraceEnabled()).isFalse();
}

@Test
Expand Down Expand Up @@ -239,11 +239,11 @@ public void shouldUseCustomRecordExceptionPredicate() {
.recordException(e -> "test".equals(e.getMessage())).build();
Predicate<Throwable> recordExceptionPredicate = circuitBreakerConfig
.getRecordExceptionPredicate();
then(recordExceptionPredicate.test(new Error("test"))).isEqualTo(true);
then(recordExceptionPredicate.test(new Error("fail"))).isEqualTo(false);
then(recordExceptionPredicate.test(new RuntimeException("test"))).isEqualTo(true);
then(recordExceptionPredicate.test(new Error())).isEqualTo(false);
then(recordExceptionPredicate.test(new RuntimeException())).isEqualTo(false);
then(recordExceptionPredicate.test(new Error("test"))).isTrue();
then(recordExceptionPredicate.test(new Error("fail"))).isFalse();
then(recordExceptionPredicate.test(new RuntimeException("test"))).isTrue();
then(recordExceptionPredicate.test(new Error())).isFalse();
then(recordExceptionPredicate.test(new RuntimeException())).isFalse();
}

@Test
Expand All @@ -252,11 +252,11 @@ public void shouldUseCustomIgnoreExceptionPredicate() {
.ignoreException(e -> "ignore".equals(e.getMessage())).build();
Predicate<Throwable> ignoreExceptionPredicate = circuitBreakerConfig
.getIgnoreExceptionPredicate();
then(ignoreExceptionPredicate.test(new Error("ignore"))).isEqualTo(true);
then(ignoreExceptionPredicate.test(new Error("fail"))).isEqualTo(false);
then(ignoreExceptionPredicate.test(new RuntimeException("ignore"))).isEqualTo(true);
then(ignoreExceptionPredicate.test(new Error())).isEqualTo(false);
then(ignoreExceptionPredicate.test(new RuntimeException())).isEqualTo(false);
then(ignoreExceptionPredicate.test(new Error("ignore"))).isTrue();
then(ignoreExceptionPredicate.test(new Error("fail"))).isFalse();
then(ignoreExceptionPredicate.test(new RuntimeException("ignore"))).isTrue();
then(ignoreExceptionPredicate.test(new Error())).isFalse();
then(ignoreExceptionPredicate.test(new RuntimeException())).isFalse();
}

@Test
Expand All @@ -267,19 +267,19 @@ public void shouldUseIgnoreExceptionsToBuildPredicate() {
final Predicate<? super Throwable> ignoreExceptionPredicate = circuitBreakerConfig
.getIgnoreExceptionPredicate();
then(ignoreExceptionPredicate.test(new Exception()))
.isEqualTo(false); // not explicitly ignored
.isFalse(); // not explicitly ignored
then(ignoreExceptionPredicate.test(new ExtendsError()))
.isEqualTo(false); // not explicitly ignored
.isFalse(); // not explicitly ignored
then(ignoreExceptionPredicate.test(new ExtendsException()))
.isEqualTo(false); // not explicitly ignored
.isFalse(); // not explicitly ignored
then(ignoreExceptionPredicate.test(new BusinessException()))
.isEqualTo(true); // explicitly ignored
.isTrue(); // explicitly ignored
then(ignoreExceptionPredicate.test(new RuntimeException()))
.isEqualTo(true); // explicitly ignored
.isTrue(); // explicitly ignored
then(ignoreExceptionPredicate.test(new ExtendsRuntimeException()))
.isEqualTo(true); // inherits ignored because of RuntimeException is ignored
.isTrue(); // inherits ignored because of RuntimeException is ignored
then(ignoreExceptionPredicate.test(new ExtendsExtendsException()))
.isEqualTo(true); // explicitly ignored
.isTrue(); // explicitly ignored
}

@Test
Expand All @@ -288,17 +288,17 @@ public void shouldUseRecordExceptionsToBuildPredicate() {
.recordExceptions(RuntimeException.class, ExtendsExtendsException.class).build();
final Predicate<? super Throwable> failurePredicate = circuitBreakerConfig
.getRecordExceptionPredicate();
then(failurePredicate.test(new Exception())).isEqualTo(false); // not explicitly record
then(failurePredicate.test(new ExtendsError())).isEqualTo(false); // not explicitly included
then(failurePredicate.test(new Exception())).isFalse(); // not explicitly record
then(failurePredicate.test(new ExtendsError())).isFalse(); // not explicitly included
then(failurePredicate.test(new ExtendsException()))
.isEqualTo(false); // not explicitly included
.isFalse(); // not explicitly included
then(failurePredicate.test(new BusinessException()))
.isEqualTo(false); // not explicitly included
then(failurePredicate.test(new RuntimeException())).isEqualTo(true); // explicitly included
.isFalse(); // not explicitly included
then(failurePredicate.test(new RuntimeException())).isTrue(); // explicitly included
then(failurePredicate.test(new ExtendsRuntimeException()))
.isEqualTo(true); // inherits included because RuntimeException is included
.isTrue(); // inherits included because RuntimeException is included
then(failurePredicate.test(new ExtendsExtendsException()))
.isEqualTo(true); // explicitly included
.isTrue(); // explicitly included
}

@Test
Expand All @@ -310,23 +310,23 @@ public void shouldCreateCombinedRecordExceptionPredicate() {
final Predicate<? super Throwable> recordExceptionPredicate = circuitBreakerConfig
.getRecordExceptionPredicate();
then(recordExceptionPredicate.test(new Exception()))
.isEqualTo(false); // not explicitly included
.isFalse(); // not explicitly included
then(recordExceptionPredicate.test(new Exception("test")))
.isEqualTo(true); // explicitly included by 1
.isTrue(); // explicitly included by 1
then(recordExceptionPredicate.test(new ExtendsError()))
.isEqualTo(false); // not explicitly included
.isFalse(); // not explicitly included
then(recordExceptionPredicate.test(new ExtendsException()))
.isEqualTo(false); // explicitly excluded by 3
.isFalse(); // explicitly excluded by 3
then(recordExceptionPredicate.test(new ExtendsException("test")))
.isEqualTo(true); // explicitly included by 1
.isTrue(); // explicitly included by 1
then(recordExceptionPredicate.test(new BusinessException()))
.isEqualTo(false); // not explicitly included
.isFalse(); // not explicitly included
then(recordExceptionPredicate.test(new RuntimeException()))
.isEqualTo(true); // explicitly included by 2
.isTrue(); // explicitly included by 2
then(recordExceptionPredicate.test(new ExtendsRuntimeException()))
.isEqualTo(true); // implicitly included by RuntimeException
.isTrue(); // implicitly included by RuntimeException
then(recordExceptionPredicate.test(new ExtendsExtendsException()))
.isEqualTo(true); // explicitly included
.isTrue(); // explicitly included
}

@Test
Expand Down Expand Up @@ -379,23 +379,23 @@ public void shouldCreateCombinedIgnoreExceptionPredicate() {
final Predicate<? super Throwable> ignoreExceptionPredicate = circuitBreakerConfig
.getIgnoreExceptionPredicate();
then(ignoreExceptionPredicate.test(new Exception()))
.isEqualTo(false); // not explicitly ignored
.isFalse(); // not explicitly ignored
then(ignoreExceptionPredicate.test(new Exception("ignore")))
.isEqualTo(true); // explicitly ignored by 1
.isTrue(); // explicitly ignored by 1
then(ignoreExceptionPredicate.test(new ExtendsError()))
.isEqualTo(false); // not explicitly ignored
.isFalse(); // not explicitly ignored
then(ignoreExceptionPredicate.test(new ExtendsException()))
.isEqualTo(false); // not explicitly ignored
.isFalse(); // not explicitly ignored
then(ignoreExceptionPredicate.test(new ExtendsException("ignore")))
.isEqualTo(true); // explicitly ignored 1
.isTrue(); // explicitly ignored 1
then(ignoreExceptionPredicate.test(new BusinessException()))
.isEqualTo(true); // explicitly ignored 2
.isTrue(); // explicitly ignored 2
then(ignoreExceptionPredicate.test(new RuntimeException()))
.isEqualTo(false); // not explicitly ignored
.isFalse(); // not explicitly ignored
then(ignoreExceptionPredicate.test(new ExtendsRuntimeException()))
.isEqualTo(true); // explicitly ignored 2
.isTrue(); // explicitly ignored 2
then(ignoreExceptionPredicate.test(new ExtendsExtendsException()))
.isEqualTo(true); // implicitly ignored by ExtendsRuntimeException
.isTrue(); // implicitly ignored by ExtendsRuntimeException
}

@Test
Expand Down Expand Up @@ -424,7 +424,7 @@ public void shouldUseBaseConfigAndOverwriteProperties() {
.build();

then(extendedConfig.getFailureRateThreshold()).isEqualTo(20f);
then(extendedConfig.isWritableStackTraceEnabled()).isEqualTo(false);
then(extendedConfig.isWritableStackTraceEnabled()).isFalse();
then(extendedConfig.getWaitIntervalFunctionInOpenState().apply(1)).isEqualTo(20_000);
then(extendedConfig.getSlidingWindowSize()).isEqualTo(1000);
then(extendedConfig.getPermittedNumberOfCallsInHalfOpenState()).isEqualTo(100);
Expand Down
16 changes: 8 additions & 8 deletions ...a/io/github/resilience4j/circuitbreaker/internal/CircuitBreakerExceptionHandlingTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ public void shouldRecordRuntimeExceptionAsFailureAndBusinessExceptionAsSuccess()
.recordException(ex -> !(ex instanceof BusinessException))
.build());

assertThat(circuitBreaker.tryAcquirePermission()).isEqualTo(true);
assertThat(circuitBreaker.tryAcquirePermission()).isTrue();
circuitBreaker.onError(0, TimeUnit.NANOSECONDS, new RuntimeException());

// Call 2 is a failure
assertThat(circuitBreaker.tryAcquirePermission()).isEqualTo(true);
assertThat(circuitBreaker.tryAcquirePermission()).isTrue();
circuitBreaker.onError(0, TimeUnit.NANOSECONDS, new BusinessException("test"));

assertThat(circuitBreaker.getMetrics().getNumberOfFailedCalls()).isEqualTo(1);
Expand All @@ -38,11 +38,11 @@ public void shouldRecordIOExceptionAsFailureAndBusinessExceptionAsSuccess() {
.recordExceptions(IOException.class)
.build());

assertThat(circuitBreaker.tryAcquirePermission()).isEqualTo(true);
assertThat(circuitBreaker.tryAcquirePermission()).isTrue();
circuitBreaker.onError(0, TimeUnit.NANOSECONDS, new IOException());

// Call 2 is a failure
assertThat(circuitBreaker.tryAcquirePermission()).isEqualTo(true);
assertThat(circuitBreaker.tryAcquirePermission()).isTrue();
circuitBreaker.onError(0, TimeUnit.NANOSECONDS, new BusinessException("test"));

assertThat(circuitBreaker.getMetrics().getNumberOfFailedCalls()).isEqualTo(1);
Expand All @@ -57,11 +57,11 @@ public void shouldRecordBusinessExceptionAsFailure() {
.recordException(ex -> "record".equals(ex.getMessage()))
.build());

assertThat(circuitBreaker.tryAcquirePermission()).isEqualTo(true);
assertThat(circuitBreaker.tryAcquirePermission()).isTrue();
circuitBreaker.onError(0, TimeUnit.NANOSECONDS, new BusinessException("record"));

// Call 2 is a failure
assertThat(circuitBreaker.tryAcquirePermission()).isEqualTo(true);
assertThat(circuitBreaker.tryAcquirePermission()).isTrue();
circuitBreaker.onError(0, TimeUnit.NANOSECONDS, new BusinessException("bla"));

assertThat(circuitBreaker.getMetrics().getNumberOfFailedCalls()).isEqualTo(1);
Expand All @@ -78,11 +78,11 @@ public void shouldIgnoreNumberFormatException() {
.ignoreExceptions(NumberFormatException.class)
.build());

assertThat(circuitBreaker.tryAcquirePermission()).isEqualTo(true);
assertThat(circuitBreaker.tryAcquirePermission()).isTrue();
circuitBreaker.onError(0, TimeUnit.NANOSECONDS, new RuntimeException());

// Call 2 is a failure
assertThat(circuitBreaker.tryAcquirePermission()).isEqualTo(true);
assertThat(circuitBreaker.tryAcquirePermission()).isTrue();
circuitBreaker.onError(0, TimeUnit.NANOSECONDS, new NumberFormatException());

assertThat(circuitBreaker.getMetrics().getNumberOfFailedCalls()).isEqualTo(1);
Expand Down
2 changes: 1 addition & 1 deletion ...c/test/java/io/github/resilience4j/circuitbreaker/internal/CircuitBreakerMetricsTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public void testCircuitBreakerMetrics() {
assertThat(circuitBreakerMetrics.getNumberOfFailedCalls()).isEqualTo(6);
assertThat(circuitBreakerMetrics.getNumberOfSuccessfulCalls()).isEqualTo(4);
assertThat(circuitBreakerMetrics.getFailureRate()).isEqualTo(60);
assertThat(Result.hasExceededThresholds(result)).isEqualTo(true);
assertThat(Result.hasExceededThresholds(result)).isTrue();

circuitBreakerMetrics.onSuccess(0, TimeUnit.NANOSECONDS);
circuitBreakerMetrics.onSuccess(0, TimeUnit.NANOSECONDS);
Expand Down
Loading

0 comments on commit ebd49df

Please sign in to comment.