Spencer Gibb
71bd19d5df
Merge branch 'master' into 2.0.x
...
# Conflicts:
# spring-cloud-netflix-hystrix-stream/src/test/java/org/springframework/cloud/netflix/hystrix/stream/HystrixStreamTests.java
# spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/ZuulProxyAutoConfiguration.java
2017-10-18 11:36:41 -04:00
Spencer Gibb
28de82e63c
Use updated Registration rather than getLocalServiceInstance()
...
See https://github.com/spring-cloud/spring-cloud-commons/issues/265
2017-10-18 11:34:38 -04:00
Spencer Gibb
b4709f5db5
Update to hystrix-contract.
...
Updates to 2.0.0
2017-10-17 15:07:07 -04:00
Spencer Gibb
b0dccc0f81
Merge branch 'master' into 2.0.x
...
# Conflicts:
# spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/metrics/DefaultMetricsTagProvider.java
# spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/rx/DeferredResultSubscriber.java
# spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/rx/ResponseBodyEmitterSubscriber.java
# spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/rx/RxResponse.java
# spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/support/RibbonCommandContextTest.java
# spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/rx/ObservableReturnValueHandlerTests.java
# spring-cloud-netflix-dependencies/pom.xml
2017-10-17 14:10:22 -04:00
Spencer Gibb
6c65266f05
Formatting spaces->tabs
2017-10-17 13:37:28 -04:00
Spencer Gibb
6ffe2f1af2
Downgrade archaius to 0.7.4 for java 7 compatibility.
...
see https://github.com/Netflix/archaius/pull/522
2017-10-17 13:12:26 -04:00
Dave Syer
5f26d02433
Merge branch 'master' into 2.0.x
2017-10-17 10:47:46 +01:00
Dave Syer
68ce0cf25f
Merge branch 'feature/eureka-stubs'
2017-10-17 10:47:35 +01:00
Dave Syer
0b638884f7
Fix merge in Turbine Stream tests
2017-10-17 10:46:08 +01:00
Dave Syer
b704dc50c3
Add restassured dependency manually
2017-10-17 10:22:15 +01:00
Dave Syer
62b6d6def2
Fix hystrix tests broken by 2.0 migration
2017-10-17 10:19:20 +01:00
Dave Syer
8d886eedfe
Merge branch 'feature/eureka-stubs' into 2.0.x
2017-10-16 21:35:02 +01:00
Spencer Gibb
7cff8ddbd3
Add missing jackson serialization for instanceinfo.
...
Port information was missing from data sent to eureka.
fixes gh-2372
2017-10-16 16:23:51 -04:00
Dave Syer
9d1eed6a82
Add script to build contract utils
2017-10-16 16:54:35 +01:00
Dave Syer
eeadc829b9
Parameterize contract version
2017-10-13 15:17:46 +01:00
Dave Syer
efe040549c
Move contract helper out of the reactor build
2017-10-13 15:17:46 +01:00
Dave Syer
5bc9e65cdd
Add tests for server metadata
2017-10-13 15:17:46 +01:00
Dave Syer
d6a604051f
Split tests up into individual methods
2017-10-13 15:17:46 +01:00
Dave Syer
51a03b30f2
Consolidate stub tests into one place
2017-10-13 15:17:46 +01:00
Dave Syer
561f3b2fbf
Add wiremock verification
2017-10-13 15:17:46 +01:00
Dave Syer
3a7af2c8fe
Generate some stubs, yay!
2017-10-13 15:17:46 +01:00
Dave Syer
26c7c362d2
Add property to tests, parameterizing stubs
2017-10-13 15:17:46 +01:00
Dave Syer
0642ea52c9
Remove unused stubs file
2017-10-13 15:17:46 +01:00
Dave Syer
957e33207e
Stabilise some tests
2017-10-13 15:17:46 +01:00
Dave Syer
a39fe345b5
Remove deprecated annotation
2017-10-13 15:17:46 +01:00
Dave Syer
40e72ddb8c
Tweak assertions a bit
2017-10-13 15:17:46 +01:00
Dave Syer
195c3fd75d
Extract utility class into shared library for contract tests
2017-10-13 15:17:46 +01:00
Dave Syer
c626bccad3
Add rest template to extract SSE events and assert them
...
The message has to be sent after the endpoint starts up, which only
happens after the first request is accepted, so we put that logic
in the response extractor.
2017-10-13 15:17:46 +01:00
Dave Syer
e295188075
Add tests for body of message
2017-10-13 15:17:46 +01:00
Dave Syer
7804e1bd59
Add Spring Cloud Contract for hystrix stream
2017-10-13 15:17:46 +01:00
Spencer Gibb
2870007392
Adds HystrixCommands helper object.
2017-10-11 23:18:06 -04:00
Spencer Gibb
fc9d442599
No longer require spring-boot-starter-web in eureka-client starter.
...
See gh-2359
2017-10-11 23:17:47 -04:00
Spencer Gibb
f4321dd3d6
Add dependency management for rxjava-reactive-streams
...
Allows for bridging webflux when using hystrix commands.
fixes gh-2355
2017-10-10 12:25:39 -04:00
Spencer Gibb
d76416f03c
Merge branch 'master' into 2.0.x
2017-10-04 19:35:34 -04:00
Spencer Gibb
6b6889b8b4
Fixes refresh scope bean type.
2017-10-04 19:32:57 -04:00
Spencer Gibb
070e4b5c50
Move to zuul.test package.
2017-10-04 19:16:30 -04:00
Fahim Farook
f809c119bd
Allow init params to be set on ProxyStreamServlet. ( #2335 )
...
* Allow init params to be set on ProxyStreamServlet.
Fixes gh-2301
* Added unit test for #gh-2301
2017-10-03 13:43:17 -04:00
Ryan Baxter
a806dc920f
Bumping versions to 1.3.6.BUILD-SNAPSHOT after release
2017-10-02 16:22:49 -04:00
Ryan Baxter
74fc02b2cc
Going back to snapshots
2017-10-02 16:22:48 -04:00
Ryan Baxter
c1fc987d96
Update SNAPSHOT to 1.3.5.RELEASE
2017-10-02 16:17:55 -04:00
Alex Sartan
7f97a61ed5
Fix minor grammar issue in Zuul doc ( #2336 )
2017-10-01 13:25:32 -04:00
Spencer Gibb
94e8c5196c
Fix hystrix stream servlet name.
2017-10-01 11:47:17 -04:00
Spencer Gibb
39b1c0fe0d
Update routes endpoint to new endpoint infrastructure.
...
fixes gh-2318
2017-09-29 16:30:46 -04:00
Spencer Gibb
6f2fc1deae
Update to BindingServiceProperties
2017-09-29 15:43:09 -04:00
Spencer Gibb
a2d8f0639c
Move zuul to its own module. ( #2332 )
...
fixes gh-2298
2017-09-29 15:35:57 -04:00
Spencer Gibb
91808bb042
Add support for feign OptionalDecoder
...
fixes gh-1982
2017-09-28 22:18:52 -04:00
Ryan Baxter
25337dd440
Move Archaius to its own module ( #2308 )
...
* Move Archaius to its own module.
Fixes gh-2300\
2017-09-28 21:28:40 -04:00
Spencer Gibb
ec25771453
Upgrade Eureka to v1.8.2
...
fixes gh-2216
2017-09-28 20:16:02 -04:00
Spencer Gibb
c544f4aef6
Move zuul metrics to micrometer.
...
fixes gh-2317
2017-09-28 18:20:11 -04:00
Spencer Gibb
0ce21c4b15
Fix SpringMvcContractTests
...
fixes gh-2312
2017-09-28 17:38:39 -04:00
