diff --git a/docs/pom.xml b/docs/pom.xml index b646c85a..04a53db1 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-openfeign - 2.2.6.RELEASE + 2.2.6.BUILD-SNAPSHOT spring-cloud-openfeign-docs pom diff --git a/pom.xml b/pom.xml index 7998ab70..81842c9f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-cloud-openfeign - 2.2.6.RELEASE + 2.2.6.BUILD-SNAPSHOT pom Spring Cloud OpenFeign Spring Cloud OpenFeign @@ -26,8 +26,8 @@ ${basedir} 2.11.3 - 2.2.6.RELEASE - 2.2.6.RELEASE + 2.2.6.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT 2.10 diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml index 857fb4b8..3f4a1dd8 100644 --- a/spring-cloud-openfeign-core/pom.xml +++ b/spring-cloud-openfeign-core/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-openfeign - 2.2.6.RELEASE + 2.2.6.BUILD-SNAPSHOT .. spring-cloud-openfeign-core diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsRegistrar.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsRegistrar.java index e340e420..dbb04fef 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsRegistrar.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsRegistrar.java @@ -192,7 +192,8 @@ class FeignClientsRegistrar "@FeignClient can only be specified on an interface"); Map attributes = annotationMetadata - .getAnnotationAttributes(FeignClient.class.getCanonicalName()); + .getAnnotationAttributes( + FeignClient.class.getCanonicalName()); String name = getClientName(attributes); registerClientConfiguration(registry, name, diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientsRegistrarTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientsRegistrarTests.java index b25f5a06..b9c924dc 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientsRegistrarTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientsRegistrarTests.java @@ -96,12 +96,11 @@ public class FeignClientsRegistrarTests { @Test public void shouldPassSubLevelFeignClient() { AnnotationConfigApplicationContext config = new AnnotationConfigApplicationContext(); - ((DefaultListableBeanFactory) config.getBeanFactory()) - .setAllowBeanDefinitionOverriding(false); + ((DefaultListableBeanFactory) config.getBeanFactory()).setAllowBeanDefinitionOverriding(false); config.register(TopLevelSubLevelTestConfig.class); - assertThatCode(() -> config.refresh()).as( - "Case https://github.com/spring-cloud/spring-cloud-openfeign/issues/331 should be solved") - .doesNotThrowAnyException(); + assertThatCode(() -> config.refresh()) + .as("Case https://github.com/spring-cloud/spring-cloud-openfeign/issues/331 should be solved") + .doesNotThrowAnyException(); } @@ -139,11 +138,10 @@ public class FeignClientsRegistrarTests { } @EnableFeignClients(clients = { - org.springframework.cloud.openfeign.feignclientsregistrar.TopLevelClient.class, - org.springframework.cloud.openfeign.feignclientsregistrar.sub.SubLevelClient.class }) + org.springframework.cloud.openfeign.feignclientsregistrar.TopLevelClient.class, + org.springframework.cloud.openfeign.feignclientsregistrar.sub.SubLevelClient.class}) @EnableAutoConfiguration(exclude = TestAutoConfiguration.class) protected static class TopLevelSubLevelTestConfig { - } } diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/feignclientsregistrar/TopLevelClient.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/feignclientsregistrar/TopLevelClient.java index d52cc4a1..2128bce4 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/feignclientsregistrar/TopLevelClient.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/feignclientsregistrar/TopLevelClient.java @@ -24,5 +24,4 @@ import org.springframework.cloud.openfeign.FeignClient; @FeignClient("top-level") public interface TopLevelClient { - } diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/feignclientsregistrar/sub/SubLevelClient.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/feignclientsregistrar/sub/SubLevelClient.java index 29126482..84d01aea 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/feignclientsregistrar/sub/SubLevelClient.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/feignclientsregistrar/sub/SubLevelClient.java @@ -24,5 +24,4 @@ import org.springframework.cloud.openfeign.FeignClient; @FeignClient("sub-level") public interface SubLevelClient { - } diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml index ab0c56f7..aff93012 100644 --- a/spring-cloud-openfeign-dependencies/pom.xml +++ b/spring-cloud-openfeign-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.3.1.RELEASE + 2.3.2.BUILD-SNAPSHOT spring-cloud-openfeign-dependencies - 2.2.6.RELEASE + 2.2.6.BUILD-SNAPSHOT pom spring-cloud-openfeign-dependencies Spring Cloud OpenFeign Dependencies diff --git a/spring-cloud-starter-openfeign/pom.xml b/spring-cloud-starter-openfeign/pom.xml index 0b1ef5e2..83e778f0 100644 --- a/spring-cloud-starter-openfeign/pom.xml +++ b/spring-cloud-starter-openfeign/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-openfeign - 2.2.6.RELEASE + 2.2.6.BUILD-SNAPSHOT .. spring-cloud-starter-openfeign