Skip to content

S
spring-cloud-netflix
Unverified Commit 54931afa by Spencer Gibb
Options

Remove assertion that fails in spring 4.3.x

Need to make this class 4.2.x compatible. see gh-1192
parent 2bdd2dab
Showing with 0 additions and 2 deletions
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignClientsRegistrar.java
...@@ -190,8 +190,6 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar, ...@@ -190,8 +190,6 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar,
private void validate(Map<String, Object> attributes) { private void validate(Map<String, Object> attributes) {
if (StringUtils.hasText((String) attributes.get("value"))) { if (StringUtils.hasText((String) attributes.get("value"))) {
Assert.isTrue(!StringUtils.hasText((String) attributes.get("name")),
"Either name or value can be specified, but not both");
Assert.isTrue(!StringUtils.hasText((String) attributes.get("serviceId")), Assert.isTrue(!StringUtils.hasText((String) attributes.get("serviceId")),
"Either name (serviceId) or value can be specified, but not both"); "Either name (serviceId) or value can be specified, but not both");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment