Issue ReactiveX#887: Merged the divided packages between spring boot …

…2 and spri… (ReactiveX#888)
jihoonson · Mar 2, 2020 · 577025d · 577025d
1 parent 4ecc7c8
commit 577025d
Show file tree

Hide file tree

Showing 27 changed files with 3 additions and 35 deletions.
diff --git a/build.gradle b/build.gradle
@@ -126,7 +126,7 @@ subprojects {
     afterEvaluate {
         // exclude subprojects that don't produce a jar file or by design.
         if (!project.name.equals('resilience4j-bom') && !project.name.equals('resilience4j-documentation')
-                && !project.name.equals('resilience4j-test') && !project.name.equals('resilience4j-spring-boot-common')) {
+                && !project.name.equals('resilience4j-test')) {
             jar {
                 inputs.property('moduleName', moduleName)
                 manifest.attributes(

diff --git a/resilience4j-spring-boot-common/README.adoc b/resilience4j-spring-boot-common/README.adoc
diff --git a/resilience4j-spring-boot-common/build.gradle b/resilience4j-spring-boot-common/build.gradle
diff --git a/resilience4j-spring-boot2/build.gradle b/resilience4j-spring-boot2/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
-    compile project(':resilience4j-spring-boot-common')
+    compile project(':resilience4j-spring')
     compile project(':resilience4j-micrometer')
 
     compileOnly(libraries.spring_boot2_aop)

diff --git a/...ctBulkheadConfigurationOnMissingBean.java → ...ctBulkheadConfigurationOnMissingBean.java b/...ctBulkheadConfigurationOnMissingBean.java → ...ctBulkheadConfigurationOnMissingBean.java
diff --git a/...ead/autoconfigure/BulkheadProperties.java → ...ead/autoconfigure/BulkheadProperties.java b/...ead/autoconfigure/BulkheadProperties.java → ...ead/autoconfigure/BulkheadProperties.java
diff --git a/...nfigure/ThreadPoolBulkheadProperties.java → ...nfigure/ThreadPoolBulkheadProperties.java b/...nfigure/ThreadPoolBulkheadProperties.java → ...nfigure/ThreadPoolBulkheadProperties.java
diff --git a/...uitBreakerConfigurationOnMissingBean.java → ...uitBreakerConfigurationOnMissingBean.java b/...uitBreakerConfigurationOnMissingBean.java → ...uitBreakerConfigurationOnMissingBean.java
diff --git a/...toconfigure/CircuitBreakerProperties.java → ...toconfigure/CircuitBreakerProperties.java b/...toconfigure/CircuitBreakerProperties.java → ...toconfigure/CircuitBreakerProperties.java
@@ -1,4 +1,3 @@
-package io.github.resilience4j.circuitbreaker.autoconfigure;
 /*
  * Copyright 2017 Robert Winkler
  *
@@ -14,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package io.github.resilience4j.circuitbreaker.autoconfigure;
 
 import io.github.resilience4j.circuitbreaker.configure.CircuitBreakerConfigurationProperties;
 import org.springframework.boot.context.properties.ConfigurationProperties;

diff --git a/...ealth/CircuitBreakersHealthIndicator.java → ...ealth/CircuitBreakersHealthIndicator.java b/...ealth/CircuitBreakersHealthIndicator.java → ...ealth/CircuitBreakersHealthIndicator.java
diff --git a/...eaker/monitoring/health/package-info.java → ...eaker/monitoring/health/package-info.java b/...eaker/monitoring/health/package-info.java → ...eaker/monitoring/health/package-info.java
diff --git a/...e/FallbackConfigurationOnMissingBean.java → ...e/FallbackConfigurationOnMissingBean.java b/...e/FallbackConfigurationOnMissingBean.java → ...e/FallbackConfigurationOnMissingBean.java
diff --git a/...ateLimiterConfigurationOnMissingBean.java → ...ateLimiterConfigurationOnMissingBean.java b/...ateLimiterConfigurationOnMissingBean.java → ...ateLimiterConfigurationOnMissingBean.java
diff --git a/.../autoconfigure/RateLimiterProperties.java → .../autoconfigure/RateLimiterProperties.java b/.../autoconfigure/RateLimiterProperties.java → .../autoconfigure/RateLimiterProperties.java
diff --git a/...g/health/RateLimitersHealthIndicator.java → ...g/health/RateLimitersHealthIndicator.java b/...g/health/RateLimitersHealthIndicator.java → ...g/health/RateLimitersHealthIndicator.java
diff --git a/...miter/monitoring/health/package-info.java → ...miter/monitoring/health/package-info.java b/...miter/monitoring/health/package-info.java → ...miter/monitoring/health/package-info.java
diff --git a/...tractRetryConfigurationOnMissingBean.java → ...tractRetryConfigurationOnMissingBean.java b/...tractRetryConfigurationOnMissingBean.java → ...tractRetryConfigurationOnMissingBean.java
diff --git a/.../retry/autoconfigure/RetryProperties.java → .../retry/autoconfigure/RetryProperties.java b/.../retry/autoconfigure/RetryProperties.java → .../retry/autoconfigure/RetryProperties.java
diff --git a/...imeLimiterConfigurationOnMissingBean.java → ...imeLimiterConfigurationOnMissingBean.java b/...imeLimiterConfigurationOnMissingBean.java → ...imeLimiterConfigurationOnMissingBean.java
diff --git a/.../autoconfigure/TimeLimiterProperties.java → .../autoconfigure/TimeLimiterProperties.java b/.../autoconfigure/TimeLimiterProperties.java → .../autoconfigure/TimeLimiterProperties.java
diff --git a/...ub/resilience4j/SpringBootCommonTest.java → ...ub/resilience4j/SpringBootCommonTest.java b/...ub/resilience4j/SpringBootCommonTest.java → ...ub/resilience4j/SpringBootCommonTest.java
diff --git a/...h/CircuitBreakersHealthIndicatorTest.java → ...h/CircuitBreakersHealthIndicatorTest.java b/...h/CircuitBreakersHealthIndicatorTest.java → ...h/CircuitBreakersHealthIndicatorTest.java
diff --git a/...llbackConfigurationOnMissingBeanTest.java → ...llbackConfigurationOnMissingBeanTest.java b/...llbackConfigurationOnMissingBeanTest.java → ...llbackConfigurationOnMissingBeanTest.java
diff --git a/...alth/RateLimitersHealthIndicatorTest.java → ...alth/RateLimitersHealthIndicatorTest.java b/...alth/RateLimitersHealthIndicatorTest.java → ...alth/RateLimitersHealthIndicatorTest.java
diff --git a/...ce4j-spring-boot2/src/test/java/io/github/resilience4j/service/test/DummyServiceImpl.java b/...ce4j-spring-boot2/src/test/java/io/github/resilience4j/service/test/DummyServiceImpl.java
@@ -3,7 +3,6 @@
 
 import io.github.resilience4j.circuitbreaker.annotation.CircuitBreaker;
 import io.github.resilience4j.ratelimiter.annotation.RateLimiter;
-import io.github.resilience4j.retry.annotation.Retry;
 import io.github.resilience4j.timelimiter.annotation.TimeLimiter;
 import org.springframework.stereotype.Component;
 

diff --git a/...nce4j-spring-boot2/src/test/java/io/github/resilience4j/service/test/TestApplication.java b/...nce4j-spring-boot2/src/test/java/io/github/resilience4j/service/test/TestApplication.java
@@ -2,7 +2,6 @@
 
 import io.github.resilience4j.bulkhead.BulkheadConfig;
 import io.github.resilience4j.bulkhead.ContextPropagator;
-import io.github.resilience4j.bulkhead.ThreadPoolBulkheadConfig;
 import io.github.resilience4j.common.bulkhead.configuration.BulkheadConfigCustomizer;
 import io.github.resilience4j.common.bulkhead.configuration.ThreadPoolBulkheadConfigCustomizer;
 import io.github.resilience4j.common.circuitbreaker.configuration.CircuitBreakerConfigCustomizer;

diff --git a/settings.gradle b/settings.gradle
@@ -27,6 +27,5 @@ include 'resilience4j-rxjava3'
 include 'resilience4j-reactor'
 include 'resilience4j-micrometer'
 include 'resilience4j-bom'
-include 'resilience4j-spring-boot-common'
 include 'resilience4j-framework-common'
 include 'resilience4j-kotlin'