Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
spring-cloud-netflix
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
openSource
spring-cloud-netflix
Commits
1f2beba0
Commit
1f2beba0
authored
Oct 30, 2014
by
Dave Syer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add some @Conditionals to enable non-netflix apps to start
parent
d715ec57
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
0 deletions
+3
-0
EurekaClientAutoConfiguration.java
...k/cloud/netflix/eureka/EurekaClientAutoConfiguration.java
+1
-0
RibbonAutoConfiguration.java
...amework/cloud/netflix/ribbon/RibbonAutoConfiguration.java
+2
-0
No files found.
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java
View file @
1f2beba0
...
@@ -41,6 +41,7 @@ import com.netflix.discovery.converters.XmlXStream;
...
@@ -41,6 +41,7 @@ import com.netflix.discovery.converters.XmlXStream;
@Configuration
@Configuration
@EnableConfigurationProperties
@EnableConfigurationProperties
@ConditionalOnClass
(
EurekaClientConfig
.
class
)
@ConditionalOnClass
(
EurekaClientConfig
.
class
)
@ConditionalOnBean
(
DiscoveryClient
.
class
)
@ConditionalOnExpression
(
"${eureka.client.enabled:true}"
)
@ConditionalOnExpression
(
"${eureka.client.enabled:true}"
)
public
class
EurekaClientAutoConfiguration
{
public
class
EurekaClientAutoConfiguration
{
...
...
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfiguration.java
View file @
1f2beba0
...
@@ -6,6 +6,7 @@ import java.util.List;
...
@@ -6,6 +6,7 @@ import java.util.List;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.autoconfigure.AutoConfigureAfter
;
import
org.springframework.boot.autoconfigure.AutoConfigureAfter
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnBean
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
;
import
org.springframework.cloud.client.loadbalancer.LoadBalancerClient
;
import
org.springframework.cloud.client.loadbalancer.LoadBalancerClient
;
import
org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration
;
import
org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration
;
...
@@ -22,6 +23,7 @@ import com.netflix.loadbalancer.BaseLoadBalancer;
...
@@ -22,6 +23,7 @@ import com.netflix.loadbalancer.BaseLoadBalancer;
* @author Dave Syer
* @author Dave Syer
*/
*/
@Configuration
@Configuration
@ConditionalOnBean
(
SpringClientFactory
.
class
)
@AutoConfigureAfter
(
EurekaClientAutoConfiguration
.
class
)
@AutoConfigureAfter
(
EurekaClientAutoConfiguration
.
class
)
public
class
RibbonAutoConfiguration
{
public
class
RibbonAutoConfiguration
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment