Gregor Zurowski
a08b661af6
Remove usage of Lombok
...
Signed-off-by: Gregor Zurowski <gregor@zurowski.org >
2017-07-11 10:38:51 +02:00
Spencer Gibb
068b236eba
fix compilation error
2017-07-10 11:54:27 -06:00
Ryan Baxter
726fa3910d
Merge remote-tracking branch 'origin/master' into 2.0.x
2017-07-10 13:34:37 -04:00
Ryan Baxter
d0009ba05a
Merge pull request #2087 from brenuart/gh1534
...
React on ContextClosedEvent only if from "our" context
2017-07-10 13:33:39 -04:00
Ryan Baxter
e2a19ce086
Merge remote-tracking branch 'origin/master' into 2.0.x
2017-07-10 11:49:57 -04:00
Ryan Baxter
ab9b5ba3ec
Merge pull request #2104 from gzurowski/use-filter-constants
...
Use filter constants where appropriate
2017-07-10 11:49:06 -04:00
Ryan Baxter
3b4ed6c0a4
Merge remote-tracking branch 'origin/master' into 2.0.x
2017-07-10 11:42:06 -04:00
Ryan Baxter
70d39aae7b
Merge pull request #2107 from yongsungyoon/fix-compile-error-on-ejc
...
Fix compilation problem on eclipse java compiler
2017-07-10 11:39:04 -04:00
Ryan Baxter
56ccc46f5f
Added documentation
2017-07-09 15:26:24 -04:00
Ryan Baxter
ff33905704
Updating property names
2017-07-09 14:21:10 -04:00
Ryan Baxter
69739420fa
Takes advantage of new builder pattern. Also reverted elimination of properties for feign and ribbon.
2017-07-09 13:39:04 -04:00
Yongsung Yoon
2b593bc742
Fix compilation problem on eclipse java compiler
2017-07-10 00:36:07 +09:00
Gregor Zurowski
eb1b7baf1c
Provide more Zuul route details in the routes actuator endpoint
...
Add a parameter to control the level of details returned with the
routes actuator endpoint. If requested, return all available Zuul route
details including ID, prefix, sensitive headers, etc.
Signed-off-by: Gregor Zurowski <gregor@zurowski.org >
2017-07-08 22:40:39 +02:00
Gregor Zurowski
05eef0e8f5
Use filter constants
...
Signed-off-by: Gregor Zurowski <gregor@zurowski.org >
2017-07-07 22:16:11 +02:00
Eko Kurniawan Khannedy
c2c634707e
FeignClient Configuration Properties ( #1942 )
...
* add feign client properties
* configure feign builder from properties if exists
* change string config to class config and add unit test for feign client using configuration properties
* refactoring and add primary flag configuration
* add decode404 in feign client configuration properties
* change unit test properties decode404 to true
* remove lombok from FeignClientProperties and change primary attribute to default-to-properties
fixes gh-1931
2017-07-07 15:31:56 -04:00
Biju Kunjummen
0579b326be
Support for re-writing Location Headers ( #1863 )
...
* Support for re-writing Location Headers
* Added additional constructor for Route, removed auto-configuration of LocationRewriteFilter
* Polished docs, more tests
2017-07-07 15:21:44 -04:00
Gregor Zurowski
70a26fec26
Use static import for constants ( #2103 )
...
Signed-off-by: Gregor Zurowski <gregor@zurowski.org >
2017-07-07 14:35:49 -04:00
Ryan Baxter
02ec9bb98e
Merge remote-tracking branch 'Upstream/master' into http-client-centralization
2017-07-07 10:54:08 -04:00
Ryan Baxter
b2f608b884
OK HTTP Client changes
2017-07-07 10:10:53 -04:00
Gregor Zurowski
a496dc8170
Use constant utility classes instead of constant interfaces ( #2081 )
...
Signed-off-by: Gregor Zurowski <gregor@zurowski.org >
2017-07-06 12:01:26 -04:00
Bertrand Renuart
8ad15399d6
React on ContextClosedEvent only if originating from "our" context (not another like a child)
2017-07-03 15:52:01 +02:00
Yongsung Yoon
8e11514e7c
Add options for RibbonCommand to use separate thread pools for hystrix ( #2074 )
...
* Add options for RibbonCommand to use separate thread pools for hystrix
* Remove lombok annotation and Add getter/setter for ZuulProperties$HystrixThreadPool
* Add doc about how to configure hystrix thread pools in Zuul Developer Guide
* Add testcases for HystrixThreadPoolKey of RibbonCommand
* Tiny change about if block in AbstractRibbonCommand
2017-06-30 20:03:52 -04:00
Spencer Gibb
89cb5573d9
bump commons to 1.3.0ˆ
2017-06-30 17:33:57 -06:00
Spencer Gibb
23ebd6ac08
Merge branch 'master' into 2.0.x
2017-06-30 17:12:10 -06:00
Spencer Gibb
5856d76e65
Merge branch '1.3.x'
2017-06-30 17:11:18 -06:00
Spencer Gibb
86b1f6ede3
Make aspect method public
...
fixes gh-2063
2017-06-30 17:10:27 -06:00
Spencer Gibb
68f13c4985
Going back to snapshots
2017-06-28 10:40:29 -06:00
Spencer Gibb
3f4783dfab
Update SNAPSHOT to 2.0.0.M1
2017-06-28 10:38:12 -06:00
Spencer Gibb
03df8cbf43
remove rxjava mvc documentation.
...
this is now handled by spring-framework
2017-06-28 10:32:02 -06:00
Ryan Baxter
572305d7c8
Fixing code formatting
2017-06-28 12:00:11 -04:00
Ryan Baxter
2aa93abc0f
Centralizing HTTP client creation and configuration
2017-06-28 11:43:52 -04:00
Ryan Baxter
0be3d23369
Merge remote-tracking branch 'origin/master' into 2.0.x
2017-06-20 13:27:13 -04:00
Ryan Baxter
e2954d0117
Merge pull request #2059 from brandon-atkinson/gh-2042
...
Rename *Test.java -> *Tests.java. Fixes #2042
2017-06-20 10:49:11 -04:00
Brandon Atkinson
497b95ec64
Rename *Test.java -> *Tests.java. Fixes #2042
2017-06-19 20:41:54 -04:00
Ryan Baxter
02e7594de5
Bumping s-c-stream to Ditmars
2017-06-19 14:06:44 -04:00
Ryan Baxter
7efa68e853
Merge remote-tracking branch 'origin/1.3.x'
2017-06-19 14:05:29 -04:00
Ryan Baxter
003fefa61d
Bumping release version
2017-06-19 14:04:29 -04:00
Ryan Baxter
619580afe5
Merge remote-tracking branch 'origin/master' into 2.0.x
2017-06-16 12:31:00 -04:00
Ryan Baxter
5c035768b0
Merge remote-tracking branch 'origin/1.3.x'
2017-06-16 11:51:09 -04:00
Ryan Baxter
9a878b0fbd
Merge pull request #2044 from bright/override_all_hystrix_concurrency_strategy_methods
...
Override getThreadPool from HystrixConcurrencyStrategy and delegate to
2017-06-16 11:27:06 -04:00
Piotr Mionskowski
779b026e6b
Override getThreadPool from HystrixConcurrencyStrategy and delegate to
...
existing strategy if present. Fixes #2035
2017-06-15 06:06:58 +02:00
Ryan Baxter
ccae4e4ce2
Bumping s-c-config version to 1.4.0
2017-06-14 16:40:48 -04:00
Dave Syer
a7675470ab
Merge branch 'master' into 2.0.x
2017-06-13 14:21:59 +01:00
Dave Syer
d39a22945b
Merge branch '1.3.x'
2017-06-13 13:58:08 +01:00
Dave Syer
aac7799e3e
Clean up Zuul context in all tests
2017-06-13 13:57:16 +01:00
Dave Syer
63b2916993
Merge branch 'master' into 2.0.x
2017-06-12 16:16:54 +01:00
Dave Syer
310f558e9c
Merge branch '1.3.x'
2017-06-12 16:15:44 +01:00
Dave Syer
1a0428da97
Merge branch '1.3.x'
2017-06-12 15:52:24 +01:00
Dave Syer
4783b07407
Support for multi-valued (batched) events in stream aggregator
...
This allows clients to send batched up events in the same format as
before (or to continue to send single events). We can switch the
default format to an array in 1.4.x.
2017-06-12 15:44:35 +01:00
André Dörnbrack
0334c5a289
Cleanup. Cherry picking #2031 .
2017-06-09 12:42:12 -04:00