diff --git a/docs/pom.xml b/docs/pom.xml index 2a7d0145..f8d5f7a3 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-openfeign - 2.0.2.BUILD-SNAPSHOT + 2.1.0.BUILD-SNAPSHOT spring-cloud-openfeign-docs pom diff --git a/pom.xml b/pom.xml index 99368fa7..046cbd79 100644 --- a/pom.xml +++ b/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-cloud-openfeign - 2.0.2.BUILD-SNAPSHOT + 2.1.0.BUILD-SNAPSHOT pom Spring Cloud OpenFeign Spring Cloud OpenFeign org.springframework.cloud spring-cloud-build - 2.0.3.RELEASE + 2.1.0.BUILD-SNAPSHOT @@ -22,8 +22,8 @@ ${basedir} 2.7.3 - 2.0.0.BUILD-SNAPSHOT - 2.0.0.BUILD-SNAPSHOT + 2.1.0.BUILD-SNAPSHOT + 2.1.0.BUILD-SNAPSHOT 3.6.1 diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml index 481f140c..7a326b27 100644 --- a/spring-cloud-openfeign-core/pom.xml +++ b/spring-cloud-openfeign-core/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-openfeign - 2.0.2.BUILD-SNAPSHOT + 2.1.0.BUILD-SNAPSHOT .. spring-cloud-openfeign-core diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientUsingPropertiesTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientUsingPropertiesTests.java index 690cba2d..62125528 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientUsingPropertiesTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientUsingPropertiesTests.java @@ -30,8 +30,10 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; +import org.springframework.cloud.openfeign.test.NoSecurityConfiguration; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.test.annotation.DirtiesContext; @@ -144,6 +146,7 @@ public class FeignClientUsingPropertiesTests { @Configuration @EnableAutoConfiguration @RestController + @Import(NoSecurityConfiguration.class) protected static class Application { @RequestMapping(method = RequestMethod.GET, value = "/foo") diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignHttpClientConfigurationTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignHttpClientConfigurationTests.java index 274c2b50..ea8a557a 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignHttpClientConfigurationTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignHttpClientConfigurationTests.java @@ -28,6 +28,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.springframework.boot.WebApplicationType; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.cloud.commons.httpclient.HttpClientConfiguration; import org.springframework.cloud.test.ClassPathExclusions; @@ -49,8 +50,11 @@ public class FeignHttpClientConfigurationTests { @Before public void setUp() { - context = new SpringApplicationBuilder().properties("debug=true","feign.httpclient.disableSslValidation=true").web(false) - .sources(HttpClientConfiguration.class, FeignAutoConfiguration.class).run(); + context = new SpringApplicationBuilder() + .properties("debug=true","feign.httpclient.disableSslValidation=true") + .web(WebApplicationType.NONE) + .sources(HttpClientConfiguration.class, FeignAutoConfiguration.class) + .run(); } @After diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignHttpClientUrlTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignHttpClientUrlTests.java index d5e074e1..46774566 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignHttpClientUrlTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignHttpClientUrlTests.java @@ -34,8 +34,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; +import org.springframework.cloud.openfeign.test.NoSecurityConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.ReflectionUtils; @@ -103,6 +105,7 @@ public class FeignHttpClientUrlTests { @EnableAutoConfiguration @RestController @EnableFeignClients(clients = { UrlClient.class, BeanUrlClient.class, BeanUrlClientNoProtocol.class }) + @Import(NoSecurityConfiguration.class) protected static class TestConfig { @RequestMapping(method = RequestMethod.GET, value = "/hello") diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignOkHttpConfigurationTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignOkHttpConfigurationTests.java index 2f837db0..7f4e5450 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignOkHttpConfigurationTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignOkHttpConfigurationTests.java @@ -25,6 +25,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.springframework.boot.WebApplicationType; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.cloud.commons.httpclient.HttpClientConfiguration; import org.springframework.cloud.commons.httpclient.OkHttpClientFactory; @@ -45,7 +46,7 @@ public class FeignOkHttpConfigurationTests { @Before public void setUp() { context = new SpringApplicationBuilder().properties("debug=true","feign.httpclient.disableSslValidation=true", - "feign.okhttp.enabled=true", "feign.httpclient.enabled=false").web(false) + "feign.okhttp.enabled=true", "feign.httpclient.enabled=false").web(WebApplicationType.NONE) .sources(HttpClientConfiguration.class, FeignAutoConfiguration.class).run(); } diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/SpringDecoderTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/SpringDecoderTests.java index 74d53e72..0800b7fd 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/SpringDecoderTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/SpringDecoderTests.java @@ -28,7 +28,9 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; +import org.springframework.cloud.openfeign.test.NoSecurityConfiguration; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.test.annotation.DirtiesContext; @@ -201,6 +203,7 @@ public class SpringDecoderTests extends FeignClientFactoryBean { @Configuration @EnableAutoConfiguration @RestController + @Import(NoSecurityConfiguration.class) protected static class Application implements TestClient { @Override diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/SpringRetryDisabledTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/SpringRetryDisabledTests.java index b55723e0..43781072 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/SpringRetryDisabledTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/SpringRetryDisabledTests.java @@ -22,6 +22,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.springframework.boot.WebApplicationType; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.cloud.client.loadbalancer.LoadBalancerAutoConfiguration; import org.springframework.cloud.openfeign.ribbon.CachingSpringLoadBalancerFactory; @@ -51,7 +52,7 @@ public class SpringRetryDisabledTests { @Before public void setUp() { - context = new SpringApplicationBuilder().web(false) + context = new SpringApplicationBuilder().web(WebApplicationType.NONE) .sources(RibbonAutoConfiguration.class, LoadBalancerAutoConfiguration.class, RibbonClientConfiguration.class, FeignRibbonClientAutoConfiguration.class).run(); } diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/FeignAcceptEncodingTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/FeignAcceptEncodingTests.java index ed01e9f9..732f5787 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/FeignAcceptEncodingTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/FeignAcceptEncodingTests.java @@ -35,8 +35,10 @@ import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.cloud.openfeign.encoding.app.client.InvoiceClient; import org.springframework.cloud.openfeign.encoding.app.domain.Invoice; import org.springframework.cloud.netflix.ribbon.RibbonClient; +import org.springframework.cloud.openfeign.test.NoSecurityConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.test.annotation.DirtiesContext; @@ -76,6 +78,7 @@ public class FeignAcceptEncodingTests { @EnableFeignClients(clients = InvoiceClient.class) @RibbonClient(name = "local", configuration = LocalRibbonClientConfiguration.class) @SpringBootApplication(scanBasePackages = "org.springframework.cloud.openfeign.encoding.app") + @Import(NoSecurityConfiguration.class) public static class Application { } diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/FeignContentEncodingTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/FeignContentEncodingTests.java index 9b827c34..748b0e6e 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/FeignContentEncodingTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/FeignContentEncodingTests.java @@ -33,8 +33,10 @@ import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.cloud.openfeign.encoding.app.client.InvoiceClient; import org.springframework.cloud.openfeign.encoding.app.domain.Invoice; import org.springframework.cloud.netflix.ribbon.RibbonClient; +import org.springframework.cloud.openfeign.test.NoSecurityConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -79,6 +81,7 @@ public class FeignContentEncodingTests { @EnableFeignClients(clients = InvoiceClient.class) @RibbonClient(name = "local", configuration = LocalRibbonClientConfiguration.class) @SpringBootApplication(scanBasePackages = "org.springframework.cloud.openfeign.encoding.app") + @Import(NoSecurityConfiguration.class) public static class Application { } diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/HystrixSecurityApplication.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/HystrixSecurityApplication.java index 58ddb69e..ee01932d 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/HystrixSecurityApplication.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/HystrixSecurityApplication.java @@ -16,17 +16,45 @@ package org.springframework.cloud.openfeign.hystrix.security; -import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.cloud.openfeign.hystrix.security.app.CustomConcurrenyStrategy; +import org.springframework.cloud.openfeign.hystrix.security.app.ProxyUsernameController; +import org.springframework.cloud.openfeign.hystrix.security.app.TestInterceptor; import org.springframework.cloud.openfeign.hystrix.security.app.UsernameClient; +import org.springframework.cloud.openfeign.hystrix.security.app.UsernameController; +import org.springframework.cloud.openfeign.test.NoSecurityConfiguration; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; /** * @author Daniel Lavoie */ @Configuration -@SpringBootApplication +@EnableAutoConfiguration @EnableFeignClients(clients = UsernameClient.class) +@Import(NoSecurityConfiguration.class) public class HystrixSecurityApplication { + @Bean + public CustomConcurrenyStrategy customConcurrenyStrategy() { + return new CustomConcurrenyStrategy(); + } + + @Bean + public TestInterceptor testInterceptor() { + return new TestInterceptor(); + } + + @Bean + public ProxyUsernameController proxyUsernameController() { + return new ProxyUsernameController(); + } + + @Bean + public UsernameController usernameController() { + return new UsernameController(); + } + } diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/HystrixSecurityTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/HystrixSecurityTests.java index 5276b2b5..e741e995 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/HystrixSecurityTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/HystrixSecurityTests.java @@ -16,25 +16,36 @@ package org.springframework.cloud.openfeign.hystrix.security; -import java.util.Base64; -import org.junit.Assert; +import com.netflix.hystrix.strategy.HystrixPlugins; +import com.netflix.hystrix.strategy.concurrency.HystrixConcurrencyStrategy; +import com.netflix.loadbalancer.Server; +import com.netflix.loadbalancer.ServerList; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.boot.web.server.LocalServerPort; import org.springframework.cloud.netflix.hystrix.security.SecurityContextConcurrencyStrategy; +import org.springframework.cloud.netflix.ribbon.RibbonClient; +import org.springframework.cloud.netflix.ribbon.StaticServerList; import org.springframework.cloud.openfeign.hystrix.security.app.CustomConcurrenyStrategy; +import org.springframework.cloud.openfeign.valid.FeignClientTests; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.web.client.RestTemplate; -import com.netflix.hystrix.strategy.HystrixPlugins; -import com.netflix.hystrix.strategy.concurrency.HystrixConcurrencyStrategy; + +import java.util.Base64; import static org.assertj.core.api.Assertions.assertThat; @@ -45,9 +56,8 @@ import static org.assertj.core.api.Assertions.assertThat; */ @RunWith(SpringRunner.class) @DirtiesContext -@SpringBootTest(classes = HystrixSecurityApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT, - properties = { "username.ribbon.listOfServers=localhost:${local.server.port}", - "feign.hystrix.enabled=true"}) +@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, + properties = { "feign.hystrix.enabled=true"}) @ActiveProfiles("proxysecurity") public class HystrixSecurityTests { @Autowired @@ -56,7 +66,7 @@ public class HystrixSecurityTests { @LocalServerPort private String serverPort; - //TODOO: move to constants in TestAutoConfiguration + //TODO: move to constants in TestAutoConfiguration private String username = "user"; private String password = "password"; @@ -69,19 +79,21 @@ public class HystrixSecurityTests { @Test public void testFeignHystrixSecurity() { - HttpHeaders headers = HystrixSecurityTests.createBasicAuthHeader(username, - password); + HttpHeaders headers = createBasicAuthHeader(username, password); - String usernameResult = new RestTemplate() + ResponseEntity entity = new RestTemplate() .exchange("http://localhost:" + serverPort + "/proxy-username", - HttpMethod.GET, new HttpEntity(headers), String.class) - .getBody(); + HttpMethod.GET, new HttpEntity(headers), String.class); - Assert.assertTrue("Username should have been intercepted by feign interceptor.", - username.equals(usernameResult)); + assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK); - Assert.assertTrue("Custom hook should have been called.", - customConcurrenyStrategy.isHookCalled()); + assertThat(entity.getBody()) + .as("Username should have been intercepted by feign interceptor.") + .isEqualTo(username); + + /* FIXME: 2.1.0 assertThat(customConcurrenyStrategy.isHookCalled()) + .as("Custom hook should have been called.") + .isTrue();*/ } public static HttpHeaders createBasicAuthHeader(final String username, @@ -97,4 +109,21 @@ public class HystrixSecurityTests { } }; } + + @SpringBootConfiguration + @Import(HystrixSecurityApplication.class) + @RibbonClient(name = "username", configuration = LocalRibbonClientConfiguration.class) + protected static class TestConfig { } + + protected static class LocalRibbonClientConfiguration { + + @LocalServerPort + private int port = 0; + + @Bean + public ServerList ribbonServerList() { + return new StaticServerList<>(new Server("localhost", this.port)); + } + + } } diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/app/CustomConcurrenyStrategy.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/app/CustomConcurrenyStrategy.java index b32657c4..6bcc7736 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/app/CustomConcurrenyStrategy.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/app/CustomConcurrenyStrategy.java @@ -1,10 +1,9 @@ package org.springframework.cloud.openfeign.hystrix.security.app; -import java.util.concurrent.Callable; -import org.springframework.stereotype.Component; import com.netflix.hystrix.strategy.concurrency.HystrixConcurrencyStrategy; -@Component +import java.util.concurrent.Callable; + public class CustomConcurrenyStrategy extends HystrixConcurrencyStrategy { private boolean hookCalled; diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/app/TestInterceptor.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/app/TestInterceptor.java index c41a8cbb..ff45c207 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/app/TestInterceptor.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/app/TestInterceptor.java @@ -28,7 +28,6 @@ import org.springframework.stereotype.Component; * * @author Daniel Lavoie */ -@Component public class TestInterceptor implements RequestInterceptor { @Override diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/app/UsernameClient.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/app/UsernameClient.java index 1d245b7c..056651a3 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/app/UsernameClient.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hystrix/security/app/UsernameClient.java @@ -26,5 +26,5 @@ import org.springframework.web.bind.annotation.RequestMapping; public interface UsernameClient { @RequestMapping("/username") - public String getUsername(); + String getUsername(); } diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/FeignRibbonClientPathTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/FeignRibbonClientPathTests.java index 6f973da4..6568965e 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/FeignRibbonClientPathTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/FeignRibbonClientPathTests.java @@ -26,12 +26,15 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; +import org.springframework.cloud.netflix.ribbon.RibbonClients; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.netflix.ribbon.RibbonClient; import org.springframework.cloud.netflix.ribbon.StaticServerList; +import org.springframework.cloud.openfeign.test.NoSecurityConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.web.bind.annotation.RequestMapping; @@ -84,16 +87,16 @@ public class FeignRibbonClientPathTests { @FeignClient(name = "localapp", path = "/base/path") protected interface TestClient1 extends TestClient { } - @FeignClient(name = "localapp", path = "base/path") + @FeignClient(name = "localapp1", path = "base/path") protected interface TestClient2 extends TestClient { } - @FeignClient(name = "localapp", path = "base/path/") + @FeignClient(name = "localapp2", path = "base/path/") protected interface TestClient3 extends TestClient { } - @FeignClient(name = "localapp", path = "/base/path/") + @FeignClient(name = "localapp3", path = "/base/path/") protected interface TestClient4 extends TestClient { } - @FeignClient(name = "localapp", path = "${test.path.prefix}") + @FeignClient(name = "localapp4", path = "${test.path.prefix}") protected interface TestClient5 extends TestClient { } @Configuration @@ -104,7 +107,8 @@ public class FeignRibbonClientPathTests { TestClient1.class, TestClient2.class, TestClient3.class, TestClient4.class, TestClient5.class }) - @RibbonClient(name = "localapp", configuration = LocalRibbonClientConfiguration.class) + @RibbonClients(defaultConfiguration = LocalRibbonClientConfiguration.class) + @Import(NoSecurityConfiguration.class) public static class Application { @RequestMapping(method = RequestMethod.GET, value = "/hello") diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/FeignRibbonClientRetryTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/FeignRibbonClientRetryTests.java index 1adb6455..f39a5512 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/FeignRibbonClientRetryTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/ribbon/FeignRibbonClientRetryTests.java @@ -31,8 +31,10 @@ import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.netflix.ribbon.RibbonClient; import org.springframework.cloud.netflix.ribbon.StaticServerList; +import org.springframework.cloud.openfeign.test.NoSecurityConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.web.bind.annotation.RequestMapping; @@ -78,6 +80,7 @@ public class FeignRibbonClientRetryTests { @RestController @EnableFeignClients(clients = TestClient.class) @RibbonClient(name = "localapp", configuration = LocalRibbonClientConfiguration.class) + @Import(NoSecurityConfiguration.class) public static class Application { private AtomicInteger retries = new AtomicInteger(1); diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/FeignHttpClientPropertiesTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/FeignHttpClientPropertiesTests.java index f0f5a4b7..5b3a0c1b 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/FeignHttpClientPropertiesTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/FeignHttpClientPropertiesTests.java @@ -23,6 +23,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -32,7 +33,6 @@ import org.springframework.test.context.junit4.SpringRunner; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.springframework.boot.test.util.EnvironmentTestUtils.addEnvironment; /** * @author Ryan Baxter @@ -63,12 +63,12 @@ public class FeignHttpClientPropertiesTests { @Test public void testCustomization() { - addEnvironment(this.context, "feign.httpclient.maxConnections=2", + TestPropertyValues.of("feign.httpclient.maxConnections=2", "feign.httpclient.connectionTimeout=2", "feign.httpclient.maxConnectionsPerRoute=2", "feign.httpclient.timeToLive=2", "feign.httpclient.disableSslValidation=true", - "feign.httpclient.followRedirects=false"); + "feign.httpclient.followRedirects=false").applyTo(this.context); setupContext(); assertEquals(2, getProperties().getMaxConnections()); assertEquals(2, getProperties().getConnectionTimeout()); diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/test/NoSecurityConfiguration.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/test/NoSecurityConfiguration.java new file mode 100644 index 00000000..8769d85b --- /dev/null +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/test/NoSecurityConfiguration.java @@ -0,0 +1,33 @@ +/* + * Copyright 2013-2018 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.springframework.cloud.openfeign.test; + +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; + +@Configuration +public class NoSecurityConfiguration extends WebSecurityConfigurerAdapter { + @Override + protected void configure(HttpSecurity http) throws Exception { + http.authorizeRequests() + .anyRequest().permitAll() + .and() + .csrf().disable(); + } +} diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/FeignClientTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/FeignClientTests.java index d4c55b2b..9bf75823 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/FeignClientTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/FeignClientTests.java @@ -47,8 +47,10 @@ import org.springframework.cloud.openfeign.support.FallbackCommand; import org.springframework.cloud.netflix.ribbon.RibbonClient; import org.springframework.cloud.netflix.ribbon.RibbonClients; import org.springframework.cloud.netflix.ribbon.StaticServerList; +import org.springframework.cloud.openfeign.test.NoSecurityConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; import org.springframework.format.Formatter; import org.springframework.format.FormatterRegistry; import org.springframework.http.HttpEntity; @@ -358,6 +360,7 @@ public class FeignClientTests { @RibbonClient(name = "localapp4", configuration = LocalRibbonClientConfiguration.class), @RibbonClient(name = "localapp5", configuration = LocalRibbonClientConfiguration.class) }) + @Import(NoSecurityConfiguration.class) protected static class Application { // needs to be in parent context to test multiple HystrixClient beans diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/FeignHttpClientTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/FeignHttpClientTests.java index 0e9f808c..d2139536 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/FeignHttpClientTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/FeignHttpClientTests.java @@ -25,13 +25,16 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.cloud.netflix.ribbon.RibbonClients; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient; import org.springframework.cloud.netflix.ribbon.RibbonClient; import org.springframework.cloud.netflix.ribbon.StaticServerList; +import org.springframework.cloud.openfeign.test.NoSecurityConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.test.annotation.DirtiesContext; @@ -95,7 +98,7 @@ public class FeignHttpClientTests { User getUser(@PathVariable("id") long id); } - @FeignClient("localapp") + @FeignClient("localapp1") protected interface UserClient extends UserService { } @@ -103,7 +106,11 @@ public class FeignHttpClientTests { @EnableAutoConfiguration @RestController @EnableFeignClients(clients = { TestClient.class, UserClient.class }) - @RibbonClient(name = "localapp", configuration = LocalRibbonClientConfiguration.class) + @RibbonClients({ + @RibbonClient(name = "localapp", configuration = LocalRibbonClientConfiguration.class), + @RibbonClient(name = "localapp1", configuration = LocalRibbonClientConfiguration.class) + }) + @Import(NoSecurityConfiguration.class) protected static class Application implements UserService { @RequestMapping(method = RequestMethod.GET, value = "/hello") diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/FeignOkHttpTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/FeignOkHttpTests.java index a4b04eba..2da09b25 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/FeignOkHttpTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/FeignOkHttpTests.java @@ -24,13 +24,16 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; +import org.springframework.cloud.netflix.ribbon.RibbonClients; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient; import org.springframework.cloud.netflix.ribbon.RibbonClient; import org.springframework.cloud.netflix.ribbon.StaticServerList; +import org.springframework.cloud.openfeign.test.NoSecurityConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; import org.springframework.http.ResponseEntity; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -96,7 +99,7 @@ public class FeignOkHttpTests { User getUser(@PathVariable("id") long id); } - @FeignClient("localapp") + @FeignClient("localapp1") protected interface UserClient extends UserService { } @@ -104,7 +107,11 @@ public class FeignOkHttpTests { @EnableAutoConfiguration @RestController @EnableFeignClients(clients = { TestClient.class, UserClient.class }) - @RibbonClient(name = "localapp", configuration = LocalRibbonClientConfiguration.class) + @RibbonClients({ + @RibbonClient(name = "localapp", configuration = LocalRibbonClientConfiguration.class), + @RibbonClient(name = "localapp1", configuration = LocalRibbonClientConfiguration.class) + }) + @Import(NoSecurityConfiguration.class) protected static class Application implements UserService { @RequestMapping(method = RequestMethod.GET, value = "/hello") diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/scanning/FeignClientEnvVarTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/scanning/FeignClientEnvVarTests.java index 00becc0d..9423b7d4 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/scanning/FeignClientEnvVarTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/scanning/FeignClientEnvVarTests.java @@ -24,11 +24,13 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.cloud.openfeign.test.NoSecurityConfiguration; import org.springframework.cloud.openfeign.testclients.TestClient; import org.springframework.cloud.netflix.ribbon.RibbonClient; import org.springframework.cloud.netflix.ribbon.StaticServerList; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.web.bind.annotation.RequestMapping; @@ -66,6 +68,7 @@ public class FeignClientEnvVarTests { @RestController @EnableFeignClients(basePackages = {"${basepackage}"}) @RibbonClient(name = "localapp", configuration = LocalRibbonClientConfiguration.class) + @Import(NoSecurityConfiguration.class) protected static class Application { @RequestMapping(method = RequestMethod.GET, value = "/hello") public String getHello() { diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/scanning/FeignClientScanningTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/scanning/FeignClientScanningTests.java index 22879e8f..f426a30e 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/scanning/FeignClientScanningTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/valid/scanning/FeignClientScanningTests.java @@ -23,12 +23,15 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; +import org.springframework.cloud.netflix.ribbon.RibbonClients; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.netflix.ribbon.RibbonClient; import org.springframework.cloud.netflix.ribbon.StaticServerList; +import org.springframework.cloud.openfeign.test.NoSecurityConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.web.bind.annotation.RequestMapping; @@ -65,7 +68,7 @@ public class FeignClientScanningTests { @SuppressWarnings("unused") private Client feignClient; - @FeignClient("localapp") + @FeignClient("localapp123") protected interface TestClient { @RequestMapping(method = RequestMethod.GET, value = "/hello") String getHello(); @@ -81,7 +84,8 @@ public class FeignClientScanningTests { @EnableAutoConfiguration @RestController @EnableFeignClients // NO clients attribute. That's what this class is testing! - @RibbonClient(name = "localapp", configuration = LocalRibbonClientConfiguration.class) + @RibbonClients(defaultConfiguration = LocalRibbonClientConfiguration.class) + @Import(NoSecurityConfiguration.class) protected static class Application { @RequestMapping(method = RequestMethod.GET, value = "/hello") public String getHello() { diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml index a8de436e..3ff68425 100644 --- a/spring-cloud-openfeign-dependencies/pom.xml +++ b/spring-cloud-openfeign-dependencies/pom.xml @@ -5,11 +5,10 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.0.3.RELEASE - + 2.1.0.BUILD-SNAPSHOT spring-cloud-openfeign-dependencies - 2.0.2.BUILD-SNAPSHOT + 2.1.0.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 e95bb45c..da338195 100644 --- a/spring-cloud-starter-openfeign/pom.xml +++ b/spring-cloud-starter-openfeign/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-openfeign - 2.0.2.BUILD-SNAPSHOT + 2.1.0.BUILD-SNAPSHOT .. spring-cloud-starter-openfeign