Commit Graph

71 Commits

Author SHA1 Message Date
Dave Syer
9d4584bb5c Add flag spring.cloud.config.overrideNone
If true (and spring.cloud.config.allowOverride=true) then the bootstrap
property source is added *last*, so all other property sources can override
it (including local config files).

Fixes gh-26, fixes gh-27.
2015-04-28 12:31:25 +01:00
Dave Syer
ecaecb6d32 Re-initialize logging system if the logging.config path changes
Fixes https://github.com/spring-cloud/spring-cloud-config/issues/132
2015-04-27 17:41:04 +01:00
Dave Syer
17f15447e9 Update to 1.0.2 snapshots 2015-04-23 11:11:21 +01:00
Dave Syer
598819bd66 Add support for @Order in BootstrapConfiguration 2015-04-21 08:19:36 +02:00
Spencer Gibb
964550bc1e Only attempt to get status from discovery client if it is initialized.
Attempt to fix https://github.com/spring-cloud/spring-cloud-netflix/issues/278
2015-04-08 11:29:09 -06:00
Spencer Gibb
64d7a57190 RestTemplateCustomizer to customize the @LoadBalanced RestTemplate.
By default, creates a RestTemplateCustomizer adds a LoadBalancerInterceptor

fixes gh-16
2015-03-26 10:46:15 -06:00
Spencer Gibb
3fd824ef22 remove bad add header 2015-03-25 10:46:54 -06:00
Spencer Gibb
56fbc5e970 In LoadBalancerInterceptor add ServiceInstance to static ThreadLocal and provide static getter. 2015-03-25 09:53:48 -06:00
Spencer Gibb
9e9e30fd70 create RestTemplate with LoadBalancerInterceptor using @LoadBalanced qualifier.
fixes https://github.com/spring-cloud/spring-cloud-netflix/issues/267
2015-03-20 11:31:22 -06:00
Dave Syer
3002f3c3ea Add link to github in rendered docs 2015-03-20 11:46:59 +00:00
Spencer Gibb
7339b6dbac added missing ghpages.sh 2015-03-19 12:31:00 -06:00
Dave Syer
92adcefe8a Shake up docs for new library layout 2015-03-19 17:15:37 +00:00
Dave Syer
ae74fe7228 Add annotation processor 2015-03-19 14:27:17 +00:00
Dave Syer
7d480ab41b Extract former config-client features to a new spring-cloud-context
Fixes gh-14
2015-03-19 11:52:25 +00:00
Dave Syer
0b0999fde8 Move all of non-config client related stuff into commons
Refresh, bootstrap, encryption all moved in to the common jar, for
now at least
2015-03-18 15:39:59 +00:00
Dave Syer
0ad7c65e6d Remove grocer's apostrophes 2015-03-13 09:35:54 +00:00
Dave Syer
7df3790711 Add bintray properties 2015-03-05 16:26:59 +00:00
Dave Syer
a824cc2f43 Re-enable javadoc 2015-03-03 21:52:34 +00:00
Dave Syer
b55d48614e Update to next snapshot 2015-03-03 14:56:26 +00:00
Spencer Gibb
f7a37eb1b4 undo ParentHeartbeatEvent extends HeartbeatEvent 2015-02-25 09:22:03 -07:00
Dave Syer
5892a7c846 Move LoadBalancerInterceptor into commons
It was previously in the Netflix project, but didn't depend on Ribbon
2015-02-25 14:57:54 +00:00
Dave Syer
61dbef8e5f Add HeartbeatMonitor convenience class
Users monitoring a heartbeat can use it to determine if a new state
has been reached.
2015-02-25 09:15:02 +00:00
Spencer Gibb
273905ac3c @SpringCloudApplication = @SpringBootApplication + @EnableDiscoveryClient + @EnableCircuitBreaker
fixes https://twitter.com/danveloper/status/558046646765125633 :-)

fixes gh-13
2015-02-16 11:55:44 -07:00
Spencer Gibb
3296d9b79f remove AllInstances 2015-02-13 13:28:33 -07:00
Spencer Gibb
9d29064534 adds some javadocs 2015-02-13 13:16:15 -07:00
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