Created a resilience4j-framework-common module which hosts common cod… (

ReactiveX#455) * Created a resilience4j-framework-common module which hosts common code which is shared between Spring Boot 1, Spring Boot 2, Ratpack and in future Micronaut.
jihoonson · May 19, 2019 · 8dfd276 · 8dfd276
1 parent de3bfbe
commit 8dfd276
Show file tree

Hide file tree

Showing 61 changed files with 102 additions and 687 deletions.
diff --git a/resilience4j-documentation/src/docs/asciidoc/addon_guides/springboot.adoc b/resilience4j-documentation/src/docs/asciidoc/addon_guides/springboot.adoc
@@ -616,7 +616,7 @@ List of available endpoints:
 Example of response:
 ----
 {
-  "eventsList": [
+  "rateLimiterEvents": [
     {
       "rateLimiterName": "backendA",
       "type": "SUCCESSFUL_ACQUIRE",

diff --git a/resilience4j-documentation/src/docs/asciidoc/addon_guides/springboot2.adoc b/resilience4j-documentation/src/docs/asciidoc/addon_guides/springboot2.adoc
@@ -754,7 +754,7 @@ List of available endpoints:
 Example of response:
 ----
 {
-  "eventsList": [
+  "rateLimiterEvents": [
     {
       "rateLimiterName": "backendA",
       "type": "SUCCESSFUL_ACQUIRE",

diff --git a/resilience4j-framework-common/build.gradle b/resilience4j-framework-common/build.gradle
@@ -0,0 +1,9 @@
+dependencies {
+    compile project(':resilience4j-core')
+    compile project(':resilience4j-circuitbreaker')
+    compile project(':resilience4j-ratelimiter')
+    compile project(':resilience4j-retry')
+    compile project(':resilience4j-bulkhead')
+}
+
+ext.moduleName='io.github.resilience4j.framework-common'
diff --git a/...ng/endpoint/BulkheadEndpointResponse.java → ...ng/endpoint/BulkheadEndpointResponse.java b/...ng/endpoint/BulkheadEndpointResponse.java → ...ng/endpoint/BulkheadEndpointResponse.java
diff --git a/...monitoring/endpoint/BulkheadEventDTO.java → ...monitoring/endpoint/BulkheadEventDTO.java b/...monitoring/endpoint/BulkheadEventDTO.java → ...monitoring/endpoint/BulkheadEventDTO.java
@@ -15,10 +15,8 @@
  */
 package io.github.resilience4j.bulkhead.monitoring.endpoint;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
 import io.github.resilience4j.bulkhead.event.BulkheadEvent;
 
-@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BulkheadEventDTO {
 
     private String bulkheadName;

diff --git a/...ing/endpoint/BulkheadEventDTOFactory.java → ...ing/endpoint/BulkheadEventDTOFactory.java b/...ing/endpoint/BulkheadEventDTOFactory.java → ...ing/endpoint/BulkheadEventDTOFactory.java
@@ -17,11 +17,11 @@
 
 import io.github.resilience4j.bulkhead.event.BulkheadEvent;
 
-class BulkheadEventDTOFactory {
+public class BulkheadEventDTOFactory {
 
     private BulkheadEventDTOFactory() {}
 
-    static BulkheadEventDTO createBulkheadEventDTOFactory(BulkheadEvent event){
+    public static BulkheadEventDTO createBulkheadEventDTO(BulkheadEvent event){
         switch(event.getEventType()) {
             case CALL_PERMITTED:
             case CALL_REJECTED:

diff --git a/...point/BulkheadEventsEndpointResponse.java → ...point/BulkheadEventsEndpointResponse.java b/...point/BulkheadEventsEndpointResponse.java → ...point/BulkheadEventsEndpointResponse.java
diff --git a/...ead/monitoring/endpoint/package-info.java → ...ead/monitoring/endpoint/package-info.java b/...ead/monitoring/endpoint/package-info.java → ...ead/monitoring/endpoint/package-info.java
diff --git a/...point/CircuitBreakerEndpointResponse.java → ...point/CircuitBreakerEndpointResponse.java b/...point/CircuitBreakerEndpointResponse.java → ...point/CircuitBreakerEndpointResponse.java
diff --git a/...ring/endpoint/CircuitBreakerEventDTO.java → ...ring/endpoint/CircuitBreakerEventDTO.java b/...ring/endpoint/CircuitBreakerEventDTO.java → ...ring/endpoint/CircuitBreakerEventDTO.java
@@ -15,12 +15,10 @@
  */
 package io.github.resilience4j.circuitbreaker.monitoring.endpoint;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
 import io.github.resilience4j.circuitbreaker.CircuitBreaker;
 import io.github.resilience4j.circuitbreaker.event.CircuitBreakerEvent;
 import io.github.resilience4j.core.lang.Nullable;
 
-@JsonInclude(JsonInclude.Include.NON_NULL)
 public class CircuitBreakerEventDTO {
 
     @Nullable

diff --git a/...dpoint/CircuitBreakerEventDTOBuilder.java → ...dpoint/CircuitBreakerEventDTOBuilder.java b/...dpoint/CircuitBreakerEventDTOBuilder.java → ...dpoint/CircuitBreakerEventDTOBuilder.java
diff --git a/...dpoint/CircuitBreakerEventDTOFactory.java → ...dpoint/CircuitBreakerEventDTOFactory.java b/...dpoint/CircuitBreakerEventDTOFactory.java → ...dpoint/CircuitBreakerEventDTOFactory.java
@@ -17,11 +17,11 @@
 
 import io.github.resilience4j.circuitbreaker.event.*;
 
-class CircuitBreakerEventDTOFactory {
+public class CircuitBreakerEventDTOFactory {
 
     private CircuitBreakerEventDTOFactory(){}
 
-    static CircuitBreakerEventDTO createCircuitBreakerEventDTO(CircuitBreakerEvent event){
+    public static CircuitBreakerEventDTO createCircuitBreakerEventDTO(CircuitBreakerEvent event){
         switch(event.getEventType()) {
             case ERROR:
                 CircuitBreakerOnErrorEvent onErrorEvent = (CircuitBreakerOnErrorEvent) event;

diff --git a/...CircuitBreakerEventsEndpointResponse.java → ...CircuitBreakerEventsEndpointResponse.java b/...CircuitBreakerEventsEndpointResponse.java → ...CircuitBreakerEventsEndpointResponse.java
diff --git a/...ker/monitoring/endpoint/package-info.java → ...ker/monitoring/endpoint/package-info.java b/...ker/monitoring/endpoint/package-info.java → ...ker/monitoring/endpoint/package-info.java
diff --git a/...endpoint/RateLimiterEndpointResponse.java → ...endpoint/RateLimiterEndpointResponse.java b/...endpoint/RateLimiterEndpointResponse.java → ...endpoint/RateLimiterEndpointResponse.java
@@ -23,21 +23,21 @@
 public class RateLimiterEndpointResponse {
 
     @Nullable
-    private List<String> rateLimitersNames;
+    private List<String> rateLimiters;
 
     // created for spring to be able to construct POJO
     public RateLimiterEndpointResponse() {}
 
-    public RateLimiterEndpointResponse(@Nullable List<String> rateLimitersNames) {
-        this.rateLimitersNames = rateLimitersNames;
+    public RateLimiterEndpointResponse(@Nullable List<String> rateLimiters) {
+        this.rateLimiters = rateLimiters;
     }
 
     @Nullable
-    public List<String> getRateLimitersNames() {
-        return rateLimitersNames;
+    public List<String> getRateLimiters() {
+        return rateLimiters;
     }
 
-    public void setRateLimitersNames(@Nullable List<String> rateLimitersNames) {
-        this.rateLimitersNames = rateLimitersNames;
+    public void setRateLimiters(@Nullable List<String> rateLimiters) {
+        this.rateLimiters = rateLimiters;
     }
 }
diff --git a/...itoring/endpoint/RateLimiterEventDTO.java → ...itoring/endpoint/RateLimiterEventDTO.java b/...itoring/endpoint/RateLimiterEventDTO.java → ...itoring/endpoint/RateLimiterEventDTO.java
@@ -15,11 +15,9 @@
  */
 package io.github.resilience4j.ratelimiter.monitoring.endpoint;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
 import io.github.resilience4j.core.lang.Nullable;
 import io.github.resilience4j.ratelimiter.event.RateLimiterEvent;
 
-@JsonInclude(JsonInclude.Include.NON_NULL)
 public class RateLimiterEventDTO {
 
     @Nullable private String rateLimiterName;

diff --git a/...nt/RateLimiterEventsEndpointResponse.java → ...nt/RateLimiterEventsEndpointResponse.java b/...nt/RateLimiterEventsEndpointResponse.java → ...nt/RateLimiterEventsEndpointResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Dan Maas
+ * Copyright 2017 Bohdan Storozhuk
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.resilience4j.ratpack.ratelimiter.endpoint;
+package io.github.resilience4j.ratelimiter.monitoring.endpoint;
 
 import io.github.resilience4j.core.lang.Nullable;
 
@@ -27,7 +27,7 @@ public class RateLimiterEventsEndpointResponse {
     public RateLimiterEventsEndpointResponse() {
     }
 
-    public RateLimiterEventsEndpointResponse(List<RateLimiterEventDTO> rateLimiterEvents) {
+    public RateLimiterEventsEndpointResponse(@Nullable List<RateLimiterEventDTO> rateLimiterEvents) {
         this.rateLimiterEvents = rateLimiterEvents;
     }
 
@@ -36,7 +36,7 @@ public List<RateLimiterEventDTO> getRateLimiterEvents() {
         return rateLimiterEvents;
     }
 
-    public void setRateLimiterEvents(List<RateLimiterEventDTO> rateLimiterEvents) {
+    public void setRateLimiterEvents(@Nullable List<RateLimiterEventDTO> rateLimiterEvents) {
         this.rateLimiterEvents = rateLimiterEvents;
     }
 }
diff --git a/...ter/monitoring/endpoint/package-info.java → ...ter/monitoring/endpoint/package-info.java b/...ter/monitoring/endpoint/package-info.java → ...ter/monitoring/endpoint/package-info.java
diff --git a/...oring/endpoint/RetryEndpointResponse.java → ...oring/endpoint/RetryEndpointResponse.java b/...oring/endpoint/RetryEndpointResponse.java → ...oring/endpoint/RetryEndpointResponse.java
diff --git a/...ry/monitoring/endpoint/RetryEventDTO.java → ...ry/monitoring/endpoint/RetryEventDTO.java b/...ry/monitoring/endpoint/RetryEventDTO.java → ...ry/monitoring/endpoint/RetryEventDTO.java
@@ -15,13 +15,11 @@
  */
 package io.github.resilience4j.retry.monitoring.endpoint;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
 import io.github.resilience4j.retry.event.RetryEvent;
 
 /**
  * Retry event data DTO which will be returned from the REST API
  */
-@JsonInclude(JsonInclude.Include.NON_NULL)
 public class RetryEventDTO {
 
 	private String retryName;

diff --git a/...toring/endpoint/RetryEventDTOBuilder.java → ...toring/endpoint/RetryEventDTOBuilder.java b/...toring/endpoint/RetryEventDTOBuilder.java → ...toring/endpoint/RetryEventDTOBuilder.java
diff --git a/...toring/endpoint/RetryEventDTOFactory.java → ...toring/endpoint/RetryEventDTOFactory.java b/...toring/endpoint/RetryEventDTOFactory.java → ...toring/endpoint/RetryEventDTOFactory.java
@@ -20,12 +20,12 @@
 /**
  * retry event DTO factory
  */
-class RetryEventDTOFactory {
+public class RetryEventDTOFactory {
 
 	private RetryEventDTOFactory() {
 	}
 
-	static RetryEventDTO createRetryEventDTO(RetryEvent event) {
+	public static RetryEventDTO createRetryEventDTO(RetryEvent event) {
 		switch (event.getEventType()) {
 			case ERROR:
 				RetryOnErrorEvent onErrorEvent = (RetryOnErrorEvent) event;

diff --git a/...endpoint/RetryEventsEndpointResponse.java → ...endpoint/RetryEventsEndpointResponse.java b/...endpoint/RetryEventsEndpointResponse.java → ...endpoint/RetryEventsEndpointResponse.java
@@ -15,12 +15,16 @@
  */
 package io.github.resilience4j.retry.monitoring.endpoint;
 
+import io.github.resilience4j.core.lang.Nullable;
+
 import java.util.List;
 
 /**
  * retry events DTP for rest API
  */
 public class RetryEventsEndpointResponse {
+
+	@Nullable
 	private List<RetryEventDTO> retryEvents;
 
 	public RetryEventsEndpointResponse() {
@@ -30,6 +34,7 @@ public RetryEventsEndpointResponse(List<RetryEventDTO> retryEvents) {
 		this.retryEvents = retryEvents;
 	}
 
+	@Nullable
 	public List<RetryEventDTO> getRetryEvents() {
 		return retryEvents;
 	}

diff --git a/...try/monitoring/endpoint/package-info.java → ...try/monitoring/endpoint/package-info.java b/...try/monitoring/endpoint/package-info.java → ...try/monitoring/endpoint/package-info.java
diff --git a/...endpoint/BulkheadEventDTOFactoryTest.java → ...endpoint/BulkheadEventDTOFactoryTest.java b/...endpoint/BulkheadEventDTOFactoryTest.java → ...endpoint/BulkheadEventDTOFactoryTest.java
@@ -14,7 +14,7 @@ public class BulkheadEventDTOFactoryTest {
     public void shouldMapBulkheadOnCallFinishedEvent(){
         BulkheadOnCallFinishedEvent event = new BulkheadOnCallFinishedEvent("name");
 
-        BulkheadEventDTO eventDTO = BulkheadEventDTOFactory.createBulkheadEventDTOFactory(event);
+        BulkheadEventDTO eventDTO = BulkheadEventDTOFactory.createBulkheadEventDTO(event);
 
         assertThat(eventDTO.getBulkheadName()).isEqualTo("name");
         assertThat(eventDTO.getType()).isEqualTo(CALL_FINISHED);
@@ -25,7 +25,7 @@ public void shouldMapBulkheadOnCallFinishedEvent(){
     public void shouldMapBulkheadOnCallPermittedEvent(){
         BulkheadOnCallPermittedEvent event = new BulkheadOnCallPermittedEvent("name");
 
-        BulkheadEventDTO eventDTO = BulkheadEventDTOFactory.createBulkheadEventDTOFactory(event);
+        BulkheadEventDTO eventDTO = BulkheadEventDTOFactory.createBulkheadEventDTO(event);
 
         assertThat(eventDTO.getBulkheadName()).isEqualTo("name");
         assertThat(eventDTO.getType()).isEqualTo(CALL_PERMITTED);
@@ -36,7 +36,7 @@ public void shouldMapBulkheadOnCallPermittedEvent(){
     public void shouldMapBulkheadOnCallRejectedEvent(){
         BulkheadOnCallRejectedEvent event = new BulkheadOnCallRejectedEvent("name");
 
-        BulkheadEventDTO eventDTO = BulkheadEventDTOFactory.createBulkheadEventDTOFactory(event);
+        BulkheadEventDTO eventDTO = BulkheadEventDTOFactory.createBulkheadEventDTO(event);
 
         assertThat(eventDTO.getBulkheadName()).isEqualTo("name");
         assertThat(eventDTO.getType()).isEqualTo(CALL_REJECTED);

diff --git a/...nt/CircuitBreakerEventDTOFactoryTest.java → ...nt/CircuitBreakerEventDTOFactoryTest.java b/...nt/CircuitBreakerEventDTOFactoryTest.java → ...nt/CircuitBreakerEventDTOFactoryTest.java
diff --git a/...ing/endpoint/RateLimiterEventDTOTest.java → ...ing/endpoint/RateLimiterEventDTOTest.java b/...ing/endpoint/RateLimiterEventDTOTest.java → ...ing/endpoint/RateLimiterEventDTOTest.java
diff --git a/...ng/endpoint/RetryEventDTOFactoryTest.java → ...ng/endpoint/RetryEventDTOFactoryTest.java b/...ng/endpoint/RetryEventDTOFactoryTest.java → ...ng/endpoint/RetryEventDTOFactoryTest.java
diff --git a/resilience4j-ratpack/build.gradle b/resilience4j-ratpack/build.gradle
@@ -4,6 +4,7 @@ dependencies {
     implementation ( libraries.groovy )
     compileOnly ( libraries.ratpack )
     compile project(':resilience4j-annotations')
+    compile project(':resilience4j-framework-common')
     compile project(':resilience4j-bulkhead')
     compile project(':resilience4j-circuitbreaker')
     compile project(':resilience4j-ratelimiter')

diff --git a/resilience4j-ratpack/src/main/java/io/github/resilience4j/ratpack/Resilience4jModule.java b/resilience4j-ratpack/src/main/java/io/github/resilience4j/ratpack/Resilience4jModule.java
@@ -45,13 +45,13 @@
 import io.github.resilience4j.ratelimiter.annotation.RateLimiter;
 import io.github.resilience4j.ratelimiter.event.RateLimiterEvent;
 import io.github.resilience4j.ratpack.bulkhead.BulkheadMethodInterceptor;
-import io.github.resilience4j.ratpack.bulkhead.endpoint.BulkheadChain;
+import io.github.resilience4j.ratpack.bulkhead.monitoring.endpoint.BulkheadChain;
 import io.github.resilience4j.ratpack.circuitbreaker.CircuitBreakerMethodInterceptor;
-import io.github.resilience4j.ratpack.circuitbreaker.endpoint.CircuitBreakerChain;
+import io.github.resilience4j.ratpack.circuitbreaker.monitoring.endpoint.CircuitBreakerChain;
 import io.github.resilience4j.ratpack.ratelimiter.RateLimiterMethodInterceptor;
-import io.github.resilience4j.ratpack.ratelimiter.endpoint.RateLimiterChain;
+import io.github.resilience4j.ratpack.ratelimiter.monitoring.endpoint.RateLimiterChain;
 import io.github.resilience4j.ratpack.retry.RetryMethodInterceptor;
-import io.github.resilience4j.ratpack.retry.endpoint.RetryChain;
+import io.github.resilience4j.ratpack.retry.monitoring.endpoint.RetryChain;
 import io.github.resilience4j.retry.RetryConfig;
 import io.github.resilience4j.retry.RetryRegistry;
 import io.github.resilience4j.retry.annotation.Retry;

diff --git a/...pack/src/main/java/io/github/resilience4j/ratpack/bulkhead/endpoint/BulkheadEventDTO.java b/...pack/src/main/java/io/github/resilience4j/ratpack/bulkhead/endpoint/BulkheadEventDTO.java
diff --git a/...java/io/github/resilience4j/ratpack/bulkhead/endpoint/BulkheadEventsEndpointResponse.java b/...java/io/github/resilience4j/ratpack/bulkhead/endpoint/BulkheadEventsEndpointResponse.java