SpringCloud/spring-cloud-openfeign
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes gh - 2594 (#2611)

Browse Source
This commit is contained in:
Igor Kryvenko
2018-01-04 18:08:38 +02:00
committed by Ryan Baxter
parent bf67680f4b
commit b48189790c
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/ConditionalOnRibbonAndEurekaEnabled.java Normal file
View File

@@ -0,0 +1,16 @@
package org.springframework.cloud.netflix.ribbon.eureka;
import org.springframework.context.annotation.Conditional;
import java.lang.annotation.*;
/**
* @author Igor Kryvenko
*/
@Target({ElementType.TYPE, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
@Documented
@Conditional(RibbonEurekaAutoConfiguration.OnRibbonAndEurekaEnabledCondition.class)
public @interface ConditionalOnRibbonAndEurekaEnabled {
}

12
spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/RibbonEurekaAutoConfiguration.java
View File

@@ -46,20 +46,12 @@ import com.netflix.niws.loadbalancer.DiscoveryEnabledNIWSServerList;
*/
@Configuration
@EnableConfigurationProperties
@RibbonEurekaAutoConfiguration.ConditionalOnRibbonAndEurekaEnabled
@ConditionalOnRibbonAndEurekaEnabled
@AutoConfigureAfter(RibbonAutoConfiguration.class)
@RibbonClients(defaultConfiguration = EurekaRibbonClientConfiguration.class)
public class RibbonEurekaAutoConfiguration {
@Target({ ElementType.TYPE, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)
@Documented
@Conditional(OnRibbonAndEurekaEnabledCondition.class)
@interface ConditionalOnRibbonAndEurekaEnabled {
}
private static class OnRibbonAndEurekaEnabledCondition extends AllNestedConditions {
static class OnRibbonAndEurekaEnabledCondition extends AllNestedConditions {
public OnRibbonAndEurekaEnabledCondition() {
super(ConfigurationPhase.REGISTER_BEAN);