Commit Graph

1329 Commits

Author SHA1 Message Date
Ryan Baxter
90d6490fea Version changes for the release 2016-10-18 09:44:57 -04:00
Gregor Zurowski
acb9e5ebdf Fix formatting (#1397)
Signed-off-by: Gregor Zurowski <gregor@zurowski.org>
2016-10-13 16:08:28 -04:00
Spencer Gibb
12fff7c97f Merge pull request #1339 from alenavorozhbieva/master
* pull1339:
  Support DELETE method body for SimpleHostRoutingFilter
2016-10-13 09:34:22 -06:00
Alena
acb12ea7d4 Support DELETE method body for SimpleHostRoutingFilter
fixes gh-1329
2016-10-13 09:34:08 -06:00
Dave Syer
e94c35d331 Exclude aws jars from eureka client by default
Saves about 5MB in the final executable jar, and it should be
optional for Spring Cloud users.
2016-10-13 10:03:19 +01:00
Ryan Baxter
a685a72660 Merge pull request #1384 from bslota/master
#1376 Register and cancel event sending fix
2016-10-11 19:34:25 -04:00
Bartłomiej Słota
4aaa7d0555 InstanceRegistry class refactor + renew method test #1376 2016-10-11 21:46:25 +02:00
Ryan Baxter
2f09aa291b Merge pull request #1390 from ryanjbaxter/upgrade-zuul-1.3.0
Upgrade zuul 1.3.0
2016-10-11 14:53:39 -04:00
Ryan Baxter
bdf2f25259 Fixes #1306 2016-10-11 14:27:47 -04:00
Ryan Baxter
5a0af27115 Merge remote-tracking branch 'Upstream/master' 2016-10-11 14:20:12 -04:00
Ryan Baxter
18c4bc060b Upgrade hystrix 1.5.6 (#1388)
Fixes gh-1374
2016-10-11 13:41:31 -04:00
Spencer Gibb
d23aa67f7b Merge pull request #1370 from tiny-dancer/master
* pull1370:
  Warning for GC Overhead Limit Reached with servo.
2016-10-11 10:29:19 -06:00
mg
5a127d0700 Warning for GC Overhead Limit Reached with servo.
Fixes gh-947
2016-10-11 10:29:04 -06:00
Spencer Gibb
aa160940df import order 2016-10-11 10:25:02 -06:00
Max Ishchenko
c8829f2aa4 Prevent double url encoding for secure ribbon urls (#1389)
Secure ribbon urls were forced to use https scheme via UriComponentsBuilder, that was created from original uri. This transformation url encoded previously encoded url parts that were used to create builder. This was introduced in c883495.

This change fixes double url encoding using RibbonUtils.updateToHttpsIfNeeded that fixes double escaping case and corner case with '+' in url as well.

Fixes gh-1382
2016-10-11 10:19:33 -04:00
Bartłomiej Słota
0985c8f092 Merge pull request #1 from spring-cloud/master
Remove @Autowired from FeignClientFactoryBean
2016-10-11 00:09:45 +02:00
Bartłomiej Słota
279edf0665 super class method wrappers removal and test update #1376 2016-10-10 22:54:39 +02:00
Ryan Baxter
50fac81a30 Revert "Fixes #1374"
This reverts commit 99b86e7a29.
2016-10-10 15:32:20 -04:00
Ryan Baxter
99b86e7a29 Fixes #1374 2016-10-10 15:31:42 -04:00
Bartłomiej Słota
151e021ef9 formatting fixed + tests, fixes #1376 2016-10-08 00:24:35 +02:00
Bartłomiej Słota
dd97b6a4b7 #1376 Register and cancel event sending fix 2016-10-07 00:11:24 +02:00
Spencer Gibb
f30e8b7b46 Remove @Autowired from FeignClientFactoryBean
@Autowired causes NullPointerExceptions because of some unknown lifecycle issues.

fixes gh-1366
2016-10-06 10:19:46 -06:00
Spencer Gibb
ba3923d706 Fix zuul error when there are colons in request param name.
Previously, parameter names with colons (ie foo:bar), caused an IllegalArgumentException because 41c364002f introduced UriTemplate to properly encode.

fixes gh-1193
2016-10-05 12:51:28 -06:00
Spencer Gibb
622cc83204 polish 2016-10-04 18:48:28 -06:00
bpicode
8e18c3d3b6 Add support for fallback factories in feign client annotation. (#1373)
Adds `@FeignClient.fallbackFactory` to define a `feign.hystrix.FallbackFactory`.

fixes gh-1117
2016-10-04 20:46:33 -04:00
Spencer Gibb
0adbd5662f polish 2016-10-04 18:39:07 -06:00
Mathias Düsterhöft
e109093b83 add config option to not ignore security headers (#1354)
* add config option to not ignore security headers
* fix field documentation of ignoreSecurityHeaders
* add documenation for  zuul.ignoreSecurityHeaders

fixes gh-1096
2016-10-03 23:30:17 -04:00
Ryan Baxter
4ba3411292 Clarified zuul.stripPrefix usage
Helps with the confusion seen in #1365
2016-10-03 13:44:02 -07:00
Jacques-Etienne Beaudet
8e1be54759 Support '+' in encoded query string when rebuilding the URI to https
RibbonUtils now replace the encoded space character '+' in the query string in favor of the equivalent '%20' when rewriting the URI in https. This is due to UriComponentsBuilder verifying the allowed characters in the encoded URI when building to the URI java.net class. The '+' is considered illegal but is widely used in the field. (#1367)
2016-10-03 14:35:30 -04:00
Spencer Gibb
be6f2634b5 Allow OkHttpClient to be customized.
Moved common functionality to AbstractLoadBalancingClient
2016-09-23 14:09:41 -06:00
Spencer Gibb
9eed249028 Allow customization of HttpClient.
Uses ribbon settings to set MaxConnTotal and MaxConnPerRoute. Also allows user to create a custom HttpClient as a constructor argument.

fixes gh-1149
2016-09-22 19:42:20 -06:00
Spencer Gibb
bbff2b24d0 Put Apache Http Client and OkHttpClient in ribbon context.
This eliminates them being created for every zuul request.

Also makes properties consistent accross modules: ribbon.httpclient.*, ribbon.restclient.* and ribbon.okhttp.*

fixes gh-1150
2016-09-22 15:46:53 -06:00
Ryan Baxter
b91fa734d2 Bumping versions for next release 2016-09-22 14:55:08 -04:00
Ryan Baxter
302eae6aeb Revert "version changes for Camden release"
This reverts commit 088afa6d71.
2016-09-22 14:21:39 -04:00
Ryan Baxter
088afa6d71 version changes for Camden release 2016-09-22 13:15:22 -04:00
Dave Syer
5f96c415e3 Upgrade xstream to 1.4.9
Fixes XXE vulnerability in Eureka Server (external entity processing
on by default in older versions of the library).
2016-09-22 16:23:27 +01:00
Ryan Baxter
6c9fa68d5a Translate ribbon.ReadTimeout to apache http client socket timeout. Fixes #1357. (#1358) 2016-09-21 14:03:14 -04:00
Dave Syer
bc4f5a3788 Ensure version is scraped from parent pom 2016-09-20 13:34:30 +01:00
Dave Syer
f094ecfd88 Allow user to set system properties to control http client in zuul
The SimpleHostRoutingFilter now accepts normal -Dhttps.proxy= and
-Dhttps.port= settings (and other things that generally work with
java.net).

Fixes gh-510
2016-09-20 12:30:49 +01:00
Marcin Grzejszczak
13268f7c63 Updating mvnw for all projects 2016-09-19 19:31:33 +02:00
Marcin Grzejszczak
aa820ce347 Updating mvnw for all projects 2016-09-19 14:18:37 +02:00
Dave Syer
6310059531 Move unnecessary dependencies up a level 2016-09-19 12:02:34 +01:00
Marcin Grzejszczak
6f92859608 Updating mvnw for all projects 2016-09-19 12:46:58 +02:00
Spencer Gibb
758ff920fc Merge pull request #1351 from VanRoy/improve-formbodywrapperfilter-test
* improve-formbodywrapperfilter-test:
  Add test on FormBodyWrapperFilter to avoid regressions (#1171)
2016-09-16 14:42:48 -06:00
Julien Roy
7ba8063940 Add test on FormBodyWrapperFilter to avoid regressions (#1171) 2016-09-16 14:42:31 -06:00
Niklas Herder
61de118130 Use management.port for locating hystrix.stream (#1317)
Allow override of /hystrix.stream location via management.port metadata.
2016-09-16 15:15:46 -04:00
Matthew Jenkins
4bf64f7005 Use statusPage/healthCheckUrlPath w/ custom management.port (#1349)
Use statusPage/healthCheckUrlPath w/ custom management.port

Added RelaxedPropertyResolver to handle multiple valid formats for
eureka properties.  Added tests.

Fixes gh-1348
2016-09-15 21:20:35 -04:00
Spencer Gibb
85eab87dce formatting 2016-09-15 08:34:59 -06:00
rockinrimmer
5ba0cc5860 Check if object is already a ResponseEntity, if so return instead of … (#1343)
* Check if object is already a ResponseEntity, if so return instead of wrapping in another ResponseEnitiy. Which caused headers and status code from original ResponseEnitiy to be lost and for body to be output with whole ResponseEntity instead of just the body

* added test
2016-09-15 10:15:42 -04:00
Marcin Grzejszczak
08aae5be3b Updating mvnw for all projects 2016-09-15 16:13:07 +02:00