Commit Graph

2046 Commits

Author SHA1 Message Date
Spencer Gibb
ab6f01a98b Add ServiceInstance.getUri and implement in DefaultServiceInstance
fixes gh-12
2015-02-13 11:17:26 -07:00
Dave Syer
88d56844ac Defensive check for web classes before using
NoopDiscoveryClientAutoConfiguration now checks defensively for the
spring-web classes before trying to use them.

Fixes gh-10
2015-02-09 13:29:18 +00:00
Dave Syer
222b33af29 Extract common config utility into a separate package 2015-02-06 10:14:39 +00:00
Spencer Gibb
376065c41a fixed registeringManagement if mngmnt port is null 2015-02-05 10:29:41 -07:00
Spencer Gibb
f8f4408972 Move some discovery classes to subpackages.
Create discovey.event.ParentHeartbeatEvent for passing HearbeatEvents originating in a parent context to child contexts
2015-01-26 21:15:16 -07:00
Spencer Gibb
3596e67e11 create NoopDiscoveryClient if there is not a DiscoveryClient bean via auto config rather than import selector.
The import selector does not take into account @Conditional* annotations on the imported configurations.

fixes gh-g again
2015-01-23 10:44:37 -07:00
Spencer Gibb
91150c7c83 Tests that if @EnableDiscoveryClient is used, but there is no implementation on the classpath, then fail 2015-01-19 12:59:48 -07:00
Spencer Gibb
7e0494a0bf test if @EnableDiscoveryClient is NOT used that NoopDiscoveryClient gets created 2015-01-19 12:59:04 -07:00
Spencer Gibb
d96115c1b8 uses a ImportSelector that imports the NoopDiscoveryClientConfiguration if @EnableDiscoveryClient is not used.
fixes gh-6
2015-01-19 12:12:08 -07:00
Dave Syer
c6a9104f5d Remove guava dependency (only in tests) 2015-01-17 15:10:53 +00:00
Spencer Gibb
83485f77f6 move from slf4j to commons logging 2015-01-15 14:34:55 -07:00
Spencer Gibb
bfe651860e change package or protected fields to private
fixes gh-7
2015-01-15 11:57:07 -07:00
Spencer Gibb
7d14db9642 Merge branch 'philwebb-polish' 2015-01-15 11:18:51 -07:00
Spencer Gibb
2e485ca44c Merge branch 'polish' of https://github.com/philwebb/spring-cloud-commons into philwebb-polish
Conflicts:
	src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java
	src/main/java/org/springframework/cloud/client/discovery/NoopDiscoveryClientConfiguration.java
2015-01-15 11:18:35 -07:00
Dave Syer
7d751b76ee Use @ConditionalOnProperty where possible 2015-01-15 14:07:43 +00:00
Phillip Webb
17f55470f3 Use BDD Mockito methods 2015-01-14 12:15:08 -08:00
Phillip Webb
b9759f42f5 Replace @ConditionalOnExpression with OnProperty
Replace @ConditionalOnExpression with @ConditionalOnProperty which is
usually faster.
2015-01-14 12:13:10 -08:00
Phillip Webb
5168937f93 Polish 2015-01-14 12:11:18 -08:00
Phillip Webb
903d6738ab Add copyright headers 2015-01-14 11:56:36 -08:00
Phillip Webb
4d941e1c0a Apply formatting and code cleanup rules 2015-01-14 11:56:10 -08:00
Phillip Webb
8ac6edc577 Add eclipse code conventions 2015-01-14 11:56:04 -08:00
Phillip Webb
d1201469e6 Polish POM 2015-01-14 11:35:36 -08:00
Phillip Webb
d63014c9ee Format POM to use tabs rather than spaces 2015-01-14 11:32:52 -08:00
Dave Syer
760062ee3f Compiler warnings 2015-01-02 09:49:44 +00:00
Dave Syer
cfa00e2801 Encapsulate some fields into protected methods 2015-01-02 08:59:45 +00:00
Dave Syer
d3c2f89049 Add NoopDiscoveryClient and configuration
This is so that @EnableDiscoveryClient can be used (e.g. accidentally
or transitively via @EnableZuulProxy) without any actual discovery
provider on the classpath.

Fixes gh-3
2015-01-02 07:31:39 +00:00
Spencer Gibb
e48dff74e5 only create Discovery*HealthIndicator beans if DiscoveryClient is a bean and spring.cloud.discovery.enable = true.
Allow discovery and circuit breaker to be turned off by properties.

fixes gh-2
2014-12-19 14:36:17 -07:00
Dave Syer
8d3375101e Compiler warnings 2014-12-16 10:53:41 +00:00
Spencer Gibb
90451ac681 added new DiscoveryHeartbeatEvent 2014-12-15 16:04:57 -07:00
Spencer Gibb
a4d461aae0 Change DiscoveryHealthIndicator to an interface and create a DiscoveryCompositeHealthIndicator
fixes gh-1
2014-12-15 12:17:03 -07:00
Dave Syer
2e7b2d0e17 Update travis build where appropriate 2014-12-15 07:34:42 +00:00
Dave Syer
83c9b5ed51 Add optional/runtime to lombok 2014-12-11 15:32:48 +00:00
Spencer Gibb
9a73f65129 Polish 2014-12-04 11:54:01 -07:00
Dave Syer
568013a68b Prevent error if Actuator not present 2014-12-04 15:21:29 +00:00
Dave Syer
f8f885617b Compiler warnings 2014-12-03 12:51:21 +00:00
Spencer Gibb
112f8ef895 removed preview term 2014-12-02 15:21:41 -07:00
Spencer Gibb
2874ae543e updates to interfaces from netflix 2014-12-02 15:20:58 -07:00
Spencer Gibb
f96d9947df added @EnableCircuitBreaker and SingleImplementationImportSelector 2014-12-02 14:43:20 -07:00
Spencer Gibb
d80b02dfe2 reenable maven command 2014-12-02 12:49:21 -07:00
Spencer Gibb
ffef818e0b disable docs in travis for now 2014-12-02 12:42:21 -07:00
Spencer Gibb
80b151be61 updated README 2014-12-02 12:37:14 -07:00
Spencer Gibb
9e0c103e65 add @EnableDiscoveryClient and update travis 2014-12-02 12:32:17 -07:00
Spencer Gibb
037ee52111 add InstanceRegisteredEvent 2014-12-01 15:13:17 -07:00
Spencer Gibb
26fc691085 temporarily disable javadocs 2014-12-01 15:08:33 -07:00
Spencer Gibb
90c1e5750a format README 2014-12-01 14:55:24 -07:00
Spencer Gibb
0aa9ae5de2 initial commit 2014-12-01 14:54:06 -07:00