Skip to content

Commit 0de54e0

Browse files
Dan MaasRobWin
Dan Maas
authored and
RobWin
committed
Use single retry registry, update config paths (ReactiveX#524)
1 parent d6470ba commit 0de54e0

File tree

9 files changed

+78
-78
lines changed

9 files changed

+78
-78
lines changed

‎resilience4j-ratpack/src/main/java/io/github/resilience4j/ratpack/EndpointsConfig.java

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -23,71 +23,71 @@
2323

2424
public class EndpointsConfig {
2525

26-
private EndpointConfig circuitBreakers = new EndpointConfig("circuitbreaker");
27-
private EndpointConfig rateLimiters = new EndpointConfig("ratelimiter");
28-
private EndpointConfig retries = new EndpointConfig("retry");
29-
private EndpointConfig bulkheads = new EndpointConfig("bulkhead");
30-
private EndpointConfig threadPoolBulkheads = new EndpointConfig("threadPoolBulkhead");
31-
32-
public EndpointConfig getCircuitBreakers() {
33-
return circuitBreakers;
26+
private EndpointConfig circuitbreaker = new EndpointConfig("circuitbreaker");
27+
private EndpointConfig ratelimiter = new EndpointConfig("ratelimiter");
28+
private EndpointConfig retry = new EndpointConfig("retry");
29+
private EndpointConfig bulkhead = new EndpointConfig("bulkhead");
30+
private EndpointConfig threadpoolbulkhead = new EndpointConfig("threadpoolbulkhead");
31+
32+
public EndpointConfig getCircuitbreaker() {
33+
return circuitbreaker;
3434
}
3535

3636
public EndpointsConfig circuitBreakers(Function<? super EndpointConfig, ? extends EndpointConfig> configure) {
3737
try {
38-
circuitBreakers = configure.apply(new EndpointConfig("circuitbreaker"));
38+
circuitbreaker = configure.apply(new EndpointConfig("circuitbreaker"));
3939
return this;
4040
} catch (Exception e) {
4141
throw uncheck(e);
4242
}
4343
}
4444

45-
public EndpointConfig getRateLimiters() {
46-
return rateLimiters;
45+
public EndpointConfig getRatelimiter() {
46+
return ratelimiter;
4747
}
4848

4949
public EndpointsConfig rateLimiters(Function<? super EndpointConfig, ? extends EndpointConfig> configure) {
5050
try {
51-
rateLimiters = configure.apply(new EndpointConfig("ratelimiter"));
51+
ratelimiter = configure.apply(new EndpointConfig("ratelimiter"));
5252
return this;
5353
} catch (Exception e) {
5454
throw uncheck(e);
5555
}
5656
}
5757

58-
public EndpointConfig getRetries() {
59-
return retries;
58+
public EndpointConfig getRetry() {
59+
return retry;
6060
}
6161

6262
public EndpointsConfig retries(Function<? super EndpointConfig, ? extends EndpointConfig> configure) {
6363
try {
64-
retries = configure.apply(new EndpointConfig("retry"));
64+
retry = configure.apply(new EndpointConfig("retry"));
6565
return this;
6666
} catch (Exception e) {
6767
throw uncheck(e);
6868
}
6969
}
7070

71-
public EndpointConfig getBulkheads() {
72-
return bulkheads;
71+
public EndpointConfig getBulkhead() {
72+
return bulkhead;
7373
}
7474

7575
public EndpointsConfig bulkheads(Function<? super EndpointConfig, ? extends EndpointConfig> configure) {
7676
try {
77-
bulkheads = configure.apply(new EndpointConfig("bulkhead"));
77+
bulkhead = configure.apply(new EndpointConfig("bulkhead"));
7878
return this;
7979
} catch (Exception e) {
8080
throw uncheck(e);
8181
}
8282
}
8383

84-
public EndpointConfig getThreadPoolBulkheads() {
85-
return threadPoolBulkheads;
84+
public EndpointConfig getThreadpoolbulkhead() {
85+
return threadpoolbulkhead;
8686
}
8787

8888
public EndpointsConfig threadPoolBulkheads(Function<? super EndpointConfig, ? extends EndpointConfig> configure) {
8989
try {
90-
threadPoolBulkheads = configure.apply(new EndpointConfig("threadPoolBulkhead"));
90+
threadpoolbulkhead = configure.apply(new EndpointConfig("threadpoolpulkhead"));
9191
return this;
9292
} catch (Exception e) {
9393
throw uncheck(e);

‎resilience4j-ratpack/src/main/java/io/github/resilience4j/ratpack/Resilience4jConfig.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727

2828
public class Resilience4jConfig {
2929
private BulkheadConfigurationProperties bulkhead = new BulkheadConfigurationProperties();
30-
// ratpack does not have the ability to name things with "-", so we must use threadPoolBulkhead instead of thread-pool-bulkhead
31-
private ThreadPoolBulkheadConfigurationProperties threadPoolBulkhead = new ThreadPoolBulkheadConfigurationProperties();
32-
private CircuitBreakerConfigurationProperties circuitBreaker = new CircuitBreakerConfigurationProperties();
33-
private RateLimiterConfigurationProperties rateLimiter = new RateLimiterConfigurationProperties();
30+
// ratpack does not have the ability to name things with "-", so we must use threadpoolbulkhead instead of thread-pool-bulkhead
31+
private ThreadPoolBulkheadConfigurationProperties threadpoolbulkhead = new ThreadPoolBulkheadConfigurationProperties();
32+
private CircuitBreakerConfigurationProperties circuitbreaker = new CircuitBreakerConfigurationProperties();
33+
private RateLimiterConfigurationProperties ratelimiter = new RateLimiterConfigurationProperties();
3434
private RetryConfigurationProperties retry = new RetryConfigurationProperties();
3535
private boolean metrics = false;
3636
private boolean prometheus = false;
@@ -43,7 +43,7 @@ public Resilience4jConfig circuitBreaker(String name) {
4343
public Resilience4jConfig circuitBreaker(String name, Function<? super CircuitBreakerConfigurationProperties.InstanceProperties, ? extends CircuitBreakerConfigurationProperties.InstanceProperties> configure) {
4444
try {
4545
CircuitBreakerConfigurationProperties.InstanceProperties finalConfig = configure.apply(new CircuitBreakerConfigurationProperties.InstanceProperties());
46-
circuitBreaker.getInstances().put(name, finalConfig);
46+
circuitbreaker.getInstances().put(name, finalConfig);
4747
return this;
4848
} catch (Exception e) {
4949
throw uncheck(e);
@@ -57,7 +57,7 @@ public Resilience4jConfig rateLimiter(String name) {
5757
public Resilience4jConfig rateLimiter(String name, Function<? super RateLimiterConfigurationProperties.InstanceProperties, ? extends RateLimiterConfigurationProperties.InstanceProperties> configure) {
5858
try {
5959
RateLimiterConfigurationProperties.InstanceProperties finalConfig = configure.apply(new RateLimiterConfigurationProperties.InstanceProperties());
60-
rateLimiter.getInstances().put(name, finalConfig);
60+
ratelimiter.getInstances().put(name, finalConfig);
6161
return this;
6262
} catch (Exception e) {
6363
throw uncheck(e);
@@ -99,7 +99,7 @@ public Resilience4jConfig threadPoolBulkhead(String name) {
9999
public Resilience4jConfig threadPoolBulkhead(String name, Function<? super ThreadPoolBulkheadConfigurationProperties.InstanceProperties, ? extends ThreadPoolBulkheadConfigurationProperties.InstanceProperties> configure) {
100100
try {
101101
ThreadPoolBulkheadConfigurationProperties.InstanceProperties finalConfig = configure.apply(new ThreadPoolBulkheadConfigurationProperties.InstanceProperties());
102-
threadPoolBulkhead.getInstances().put(name, finalConfig);
102+
threadpoolbulkhead.getInstances().put(name, finalConfig);
103103
return this;
104104
} catch (Exception e) {
105105
throw uncheck(e);
@@ -125,12 +125,12 @@ public Resilience4jConfig endpoints(Function<? super EndpointsConfig, ? extends
125125
}
126126
}
127127

128-
public CircuitBreakerConfigurationProperties getCircuitBreaker() {
129-
return circuitBreaker;
128+
public CircuitBreakerConfigurationProperties getCircuitbreaker() {
129+
return circuitbreaker;
130130
}
131131

132-
public RateLimiterConfigurationProperties getRateLimiter() {
133-
return rateLimiter;
132+
public RateLimiterConfigurationProperties getRatelimiter() {
133+
return ratelimiter;
134134
}
135135

136136
public RetryConfigurationProperties getRetry() {
@@ -141,8 +141,8 @@ public BulkheadConfigurationProperties getBulkhead() {
141141
return bulkhead;
142142
}
143143

144-
public ThreadPoolBulkheadConfigurationProperties getThreadPoolBulkhead() {
145-
return threadPoolBulkhead;
144+
public ThreadPoolBulkheadConfigurationProperties getThreadpoolbulkhead() {
145+
return threadpoolbulkhead;
146146
}
147147

148148
public boolean isMetrics() {

‎resilience4j-ratpack/src/main/java/io/github/resilience4j/ratpack/Resilience4jModule.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ protected void configure() {
112112
// default registries
113113
OptionalBinder.newOptionalBinder(binder(), CircuitBreakerRegistry.class).setDefault().toProvider(CircuitBreakerRegistryProvider.class).in(Scopes.SINGLETON);
114114
OptionalBinder.newOptionalBinder(binder(), RateLimiterRegistry.class).setDefault().toProvider(RateLimiterRegistryProvider.class).in(Scopes.SINGLETON);
115-
OptionalBinder.newOptionalBinder(binder(), RetryRegistry.class).setDefault().toProvider(RetryRegistryProvider.class);
115+
OptionalBinder.newOptionalBinder(binder(), RetryRegistry.class).setDefault().toProvider(RetryRegistryProvider.class).in(Scopes.SINGLETON);
116116
OptionalBinder.newOptionalBinder(binder(), BulkheadRegistry.class).setDefault().toProvider(BulkheadRegistryProvider.class).in(Scopes.SINGLETON);
117117
OptionalBinder.newOptionalBinder(binder(), ThreadPoolBulkheadRegistry.class).setDefault().toProvider(ThreadPoolBulkheadRegistryProvider.class).in(Scopes.SINGLETON);
118118

@@ -129,28 +129,28 @@ protected void configure() {
129129
bind(RetryChain.class).in(Scopes.SINGLETON);
130130
bind(BulkheadChain.class).in(Scopes.SINGLETON);
131131
binder.addBinding().toProvider(() -> (registry, rest) -> {
132-
if (registry.get(Resilience4jConfig.class).getEndpoints().getCircuitBreakers().isEnabled()) {
132+
if (registry.get(Resilience4jConfig.class).getEndpoints().getCircuitbreaker().isEnabled()) {
133133
return Handlers.chain(Handlers.chain(registry, registry.get(CircuitBreakerChain.class)), rest);
134134
} else {
135135
return rest;
136136
}
137137
});
138138
binder.addBinding().toProvider(() -> (registry, rest) -> {
139-
if (registry.get(Resilience4jConfig.class).getEndpoints().getRateLimiters().isEnabled()) {
139+
if (registry.get(Resilience4jConfig.class).getEndpoints().getRatelimiter().isEnabled()) {
140140
return Handlers.chain(Handlers.chain(registry, registry.get(RateLimiterChain.class)), rest);
141141
} else {
142142
return rest;
143143
}
144144
});
145145
binder.addBinding().toProvider(() -> (registry, rest) -> {
146-
if (registry.get(Resilience4jConfig.class).getEndpoints().getRetries().isEnabled()) {
146+
if (registry.get(Resilience4jConfig.class).getEndpoints().getRetry().isEnabled()) {
147147
return Handlers.chain(Handlers.chain(registry, registry.get(RetryChain.class)), rest);
148148
} else {
149149
return rest;
150150
}
151151
});
152152
binder.addBinding().toProvider(() -> (registry, rest) -> {
153-
if (registry.get(Resilience4jConfig.class).getEndpoints().getBulkheads().isEnabled()) {
153+
if (registry.get(Resilience4jConfig.class).getEndpoints().getBulkhead().isEnabled()) {
154154
return Handlers.chain(Handlers.chain(registry, registry.get(BulkheadChain.class)), rest);
155155
} else {
156156
return rest;
@@ -175,7 +175,7 @@ public CircuitBreakerRegistryProvider(Resilience4jConfig resilience4jConfig, Eve
175175
@Override
176176
public CircuitBreakerRegistry get() {
177177
// build configs
178-
CircuitBreakerConfigurationProperties circuitBreakerProperties = resilience4jConfig.getCircuitBreaker();
178+
CircuitBreakerConfigurationProperties circuitBreakerProperties = resilience4jConfig.getCircuitbreaker();
179179
Map<String, CircuitBreakerConfig> configs = circuitBreakerProperties.getConfigs()
180180
.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey,
181181
entry -> circuitBreakerProperties.createCircuitBreakerConfig(entry.getValue())));
@@ -186,7 +186,7 @@ public CircuitBreakerRegistry get() {
186186
circuitBreakerProperties.getInstances().forEach((name, circuitBreakerConfig) -> {
187187
io.github.resilience4j.circuitbreaker.CircuitBreaker circuitBreaker =
188188
circuitBreakerRegistry.circuitBreaker(name, circuitBreakerProperties.createCircuitBreakerConfig(circuitBreakerConfig));
189-
if (endpointsConfig.getCircuitBreakers().isEnabled()) {
189+
if (endpointsConfig.getCircuitbreaker().isEnabled()) {
190190
circuitBreaker.getEventPublisher().onEvent(eventConsumerRegistry.createEventConsumer(name, circuitBreakerConfig.getEventConsumerBufferSize() != null ? circuitBreakerConfig.getEventConsumerBufferSize() : 100));
191191
}
192192
});
@@ -209,7 +209,7 @@ public RateLimiterRegistryProvider(Resilience4jConfig resilience4jConfig, EventC
209209
@Override
210210
public RateLimiterRegistry get() {
211211
// build configs
212-
RateLimiterConfigurationProperties rateLimiterProperties = resilience4jConfig.getRateLimiter();
212+
RateLimiterConfigurationProperties rateLimiterProperties = resilience4jConfig.getRatelimiter();
213213
Map<String, RateLimiterConfig> configs = rateLimiterProperties.getConfigs()
214214
.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey,
215215
entry -> rateLimiterProperties.createRateLimiterConfig(entry.getValue())));
@@ -220,7 +220,7 @@ public RateLimiterRegistry get() {
220220
rateLimiterProperties.getInstances().forEach((name, rateLimiterConfig) -> {
221221
io.github.resilience4j.ratelimiter.RateLimiter rateLimiter =
222222
rateLimiterRegistry.rateLimiter(name, rateLimiterProperties.createRateLimiterConfig(rateLimiterConfig));
223-
if (endpointsConfig.getRateLimiters().isEnabled()) {
223+
if (endpointsConfig.getRatelimiter().isEnabled()) {
224224
rateLimiter.getEventPublisher().onEvent(eventConsumerRegistry.createEventConsumer(name, rateLimiterConfig.getEventConsumerBufferSize() != null ? rateLimiterConfig.getEventConsumerBufferSize() : 100));
225225
}
226226
});
@@ -254,7 +254,7 @@ public RetryRegistry get() {
254254
RetryProperties.getInstances().forEach((name, retryConfig) -> {
255255
io.github.resilience4j.retry.Retry retry =
256256
retryRegistry.retry(name, RetryProperties.createRetryConfig(retryConfig));
257-
if (endpointsConfig.getRetries().isEnabled()) {
257+
if (endpointsConfig.getRetry().isEnabled()) {
258258
retry.getEventPublisher().onEvent(eventConsumerRegistry.createEventConsumer(name, retryConfig.getEventConsumerBufferSize() != null ? retryConfig.getEventConsumerBufferSize() : 100));
259259
}
260260
});
@@ -288,7 +288,7 @@ public BulkheadRegistry get() {
288288
bulkheadProperties.getInstances().forEach((name, bulkheadConfig) -> {
289289
io.github.resilience4j.bulkhead.Bulkhead bulkhead =
290290
bulkheadRegistry.bulkhead(name, bulkheadProperties.createBulkheadConfig(bulkheadConfig));
291-
if (endpointsConfig.getBulkheads().isEnabled()) {
291+
if (endpointsConfig.getBulkhead().isEnabled()) {
292292
bulkhead.getEventPublisher().onEvent(eventConsumerRegistry.createEventConsumer(name, bulkheadConfig.getEventConsumerBufferSize() != null ? bulkheadConfig.getEventConsumerBufferSize() : 100));
293293
}
294294
});
@@ -311,7 +311,7 @@ public ThreadPoolBulkheadRegistryProvider(Resilience4jConfig resilience4jConfig,
311311
@Override
312312
public ThreadPoolBulkheadRegistry get() {
313313
// build configs
314-
ThreadPoolBulkheadConfigurationProperties threadPoolBulkheadProperties = resilience4jConfig.getThreadPoolBulkhead();
314+
ThreadPoolBulkheadConfigurationProperties threadPoolBulkheadProperties = resilience4jConfig.getThreadpoolbulkhead();
315315
Map<String, ThreadPoolBulkheadConfig> configs = threadPoolBulkheadProperties.getConfigs()
316316
.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey,
317317
entry -> threadPoolBulkheadProperties.createThreadPoolBulkheadConfig(entry.getValue())));
@@ -322,7 +322,7 @@ public ThreadPoolBulkheadRegistry get() {
322322
threadPoolBulkheadProperties.getInstances().forEach((name, threadPoolBulkheadConfig) -> {
323323
io.github.resilience4j.bulkhead.ThreadPoolBulkhead threadPoolBulkhead =
324324
threadPoolBulkheadRegistry.bulkhead(name, threadPoolBulkheadProperties.createThreadPoolBulkheadConfig(threadPoolBulkheadConfig));
325-
if (endpointsConfig.getThreadPoolBulkheads().isEnabled()) {
325+
if (endpointsConfig.getThreadpoolbulkhead().isEnabled()) {
326326
threadPoolBulkhead.getEventPublisher().onEvent(eventConsumerRegistry.createEventConsumer(name, threadPoolBulkheadConfig.getEventConsumerBufferSize() != null ? threadPoolBulkheadConfig.getEventConsumerBufferSize() : 100));
327327
}
328328
});

‎resilience4j-ratpack/src/main/java/io/github/resilience4j/ratpack/bulkhead/monitoring/endpoint/BulkheadChain.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public BulkheadChain(EventConsumerRegistry<BulkheadEvent> eventConsumerRegistry)
4747

4848
@Override
4949
public void execute(Chain chain) throws Exception {
50-
String prefix = chain.getRegistry().get(Resilience4jConfig.class).getEndpoints().getBulkheads().getPath();
50+
String prefix = chain.getRegistry().get(Resilience4jConfig.class).getEndpoints().getBulkhead().getPath();
5151
chain.prefix(prefix, chain1 -> {
5252
chain1.get("events", ctx ->
5353
Promise.<BulkheadEventsEndpointResponse>async(d -> {

‎resilience4j-ratpack/src/main/java/io/github/resilience4j/ratpack/circuitbreaker/monitoring/endpoint/CircuitBreakerChain.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public CircuitBreakerChain(EventConsumerRegistry<CircuitBreakerEvent> eventConsu
5656

5757
@Override
5858
public void execute(Chain chain) throws Exception {
59-
String prefix = chain.getRegistry().get(Resilience4jConfig.class).getEndpoints().getCircuitBreakers().getPath();
59+
String prefix = chain.getRegistry().get(Resilience4jConfig.class).getEndpoints().getCircuitbreaker().getPath();
6060
chain.prefix(prefix, chain1 -> {
6161
chain1.get("states/:name", ctx -> {
6262
String circuitBreakerName = ctx.getPathTokens().get("name");

‎resilience4j-ratpack/src/main/java/io/github/resilience4j/ratpack/ratelimiter/monitoring/endpoint/RateLimiterChain.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public RateLimiterChain(EventConsumerRegistry<RateLimiterEvent> eventConsumerReg
5454

5555
@Override
5656
public void execute(Chain chain) throws Exception {
57-
String prefix = chain.getRegistry().get(Resilience4jConfig.class).getEndpoints().getRateLimiters().getPath();
57+
String prefix = chain.getRegistry().get(Resilience4jConfig.class).getEndpoints().getRatelimiter().getPath();
5858
chain.prefix(prefix, chain1 -> {
5959
chain1.get("events", ctx ->
6060
Promise.<RateLimiterEventsEndpointResponse>async(d -> {

‎resilience4j-ratpack/src/main/java/io/github/resilience4j/ratpack/retry/monitoring/endpoint/RetryChain.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public RetryChain(EventConsumerRegistry<RetryEvent> eventConsumerRegistry, Retry
5555

5656
@Override
5757
public void execute(Chain chain) throws Exception {
58-
String prefix = chain.getRegistry().get(Resilience4jConfig.class).getEndpoints().getRetries().getPath();
58+
String prefix = chain.getRegistry().get(Resilience4jConfig.class).getEndpoints().getRetry().getPath();
5959
chain.prefix(prefix, chain1 -> {
6060
chain1.get("events", ctx ->
6161
Promise.<RetryEventsEndpointResponse>async(d -> {

0 commit comments

Comments
 (0)