Fixes gh - 2594 (#2611)

spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/ConditionalOnRibbonAndEurekaEnabled.java

+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 {
+
+}

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

@@ -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);