Skip to content

Commit db91474

Browse files
Minor style fixes (#69)
1 parent 589ee5c commit db91474

File tree

1 file changed

+9
-23
lines changed

1 file changed

+9
-23
lines changed

grpc-circuitbreaker-utils/src/main/java/org/hypertrace/circuitbreaker/grpcutils/resilience/ResilienceCircuitBreakerProvider.java

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,7 @@ class ResilienceCircuitBreakerProvider {
2727
CacheBuilder.newBuilder()
2828
.expireAfterAccess(60, TimeUnit.MINUTES) // Auto-evict after 60 minutes
2929
.maximumSize(10000) // Limit max cache size
30-
.build(
31-
new CacheLoader<>() {
32-
@Override
33-
public Optional<CircuitBreaker> load(String key) {
34-
return buildNewCircuitBreaker(key);
35-
}
36-
});
30+
.build(CacheLoader.from(this::buildNewCircuitBreaker));
3731

3832
public ResilienceCircuitBreakerProvider(
3933
CircuitBreakerRegistry circuitBreakerRegistry,
@@ -81,24 +75,16 @@ private static void attachListeners(CircuitBreaker circuitBreaker) {
8175

8276
private Optional<CircuitBreaker> buildNewCircuitBreaker(String circuitBreakerKey) {
8377
return Optional.ofNullable(circuitBreakerConfigMap.get(circuitBreakerKey))
78+
.map(config -> circuitBreakerRegistry.circuitBreaker(circuitBreakerKey, config))
79+
.or(
80+
() ->
81+
defaultEnabled
82+
? Optional.of(circuitBreakerRegistry.circuitBreaker(circuitBreakerKey))
83+
: Optional.empty())
8484
.map(
85-
config -> {
86-
CircuitBreaker circuitBreaker =
87-
circuitBreakerRegistry.circuitBreaker(circuitBreakerKey, config);
88-
attachListeners(circuitBreaker); // Attach listeners here
85+
circuitBreaker -> {
86+
attachListeners(circuitBreaker);
8987
return circuitBreaker;
90-
})
91-
.or(
92-
() -> {
93-
if (defaultEnabled) {
94-
CircuitBreaker circuitBreaker =
95-
circuitBreakerRegistry.circuitBreaker(circuitBreakerKey);
96-
attachListeners(
97-
circuitBreaker); // Attach listeners here for default circuit breaker
98-
return Optional.of(circuitBreaker);
99-
} else {
100-
return Optional.empty();
101-
}
10288
});
10389
}
10490
}

0 commit comments

Comments
 (0)