From b48189790c070923f757da0cffd60162dfa32404 Mon Sep 17 00:00:00 2001
From: Igor Kryvenko <kryvenko7igor@gmail.com>
Date: Thu, 4 Jan 2018 18:08:38 +0200
Subject: [PATCH] Fixes gh - 2594 (#2611)

---
 .../ConditionalOnRibbonAndEurekaEnabled.java     | 16 ++++++++++++++++
 .../eureka/RibbonEurekaAutoConfiguration.java    | 12 ++----------
 2 files changed, 18 insertions(+), 10 deletions(-)
 create mode 100644 spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/ConditionalOnRibbonAndEurekaEnabled.java

diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/ConditionalOnRibbonAndEurekaEnabled.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/ConditionalOnRibbonAndEurekaEnabled.java
new file mode 100644
index 00000000..b796b67f
--- /dev/null
+++ b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/ConditionalOnRibbonAndEurekaEnabled.java
@@ -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 {
+
+}
diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/RibbonEurekaAutoConfiguration.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/RibbonEurekaAutoConfiguration.java
index e29a452c..28f31422 100644
--- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/RibbonEurekaAutoConfiguration.java
+++ b/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);