Commit Graph

1221 Commits

Author SHA1 Message Date
Stéphane Lagraulet
f5bb5ff9c1 Keep old constructors to maintain backwards compatibility with spring cloud sleuth 2016-08-18 11:24:15 +02:00
Stéphane Lagraulet
ca2c9018c6 Merge branch 'master' of https://github.com/spring-cloud/spring-cloud-netflix into zuul_hystrix_threadpool 2016-08-17 18:11:52 +02:00
Spencer Gibb
9ed5621a78 Revert "Adds zuul property to customize Hystrix ExecutionIsolationStrategy"
This reverts commit 21df6e43a3.
2016-08-17 09:57:35 -06:00
Dave Syer
58cf528463 Remove extra (redundant) condition
A problem in Spring Boot means that the extra conditions are combined
with OR not AND, so it's a bug to have more than one until that
gets fixed (in an AnyNestedCondition).

See https://github.com/spring-projects/spring-boot/pull/6672
2016-08-17 14:04:45 +01:00
Marcin Grzejszczak
4602fc1105 Updating ghpages for all projects 2016-08-17 12:45:28 +02:00
Dave Syer
b9e2a1b21e Fix test so it actually works if there is a server on localhost:80 2016-08-17 09:19:33 +01:00
Dave Syer
f76f294f7f Rename test to conform to usual pattern 2016-08-17 09:04:37 +01:00
Spencer Gibb
64fff7edd2 Merge branch 'context-path-prefix-support' of https://github.com/kakawait/spring-cloud-netflix into kakawait-context-path-prefix-support 2016-08-16 12:59:10 -06:00
Spencer Gibb
beb84dbe07 Merge branch 'molindo-1108-proxy-headers' 2016-08-16 12:57:10 -06:00
Stefan Fussenegger
d9768b5378 Improved zuul proxy header support.
- add zuul.add-host-header property to add Host header
- add port to X-Forwarded-Host as defined in RFC 7239
- extract PreDecorationFilter.filterOrder() into a public constant

fixes gh-1108
2016-08-16 12:56:54 -06:00
Spencer Gibb
34befdf1d2 Merge branch 'stephlag-zuul_hystrix_threadpool' 2016-08-16 10:44:32 -06:00
Stéphane Lagraulet
21df6e43a3 Adds zuul property to customize Hystrix ExecutionIsolationStrategy
Add a check to current context as contentLength is already in the context
Get content length from Headers when RibbonCommandContext is built + add tests
Use request content length RibbonRoutingFilter
Add documentation for new zuul.ribbonIsolationStrategy property

fixes gh-339
2016-08-16 10:43:24 -06:00
Jin Zhang
bc7b8367a9 add *.swp *.swo to .gitignore (#1181) 2016-08-16 12:01:04 -04:00
Marcin Grzejszczak
c7a6720593 Updated e2e tests with new brewery parameters 2016-08-16 15:27:29 +02:00
Marcin Grzejszczak
cf0c3bda92 Deploying documentation to proper folder
What we're missing ATM is different documentation versions for different application versions. What this change does is that it's:

- finding out what is the current branch (e.g. 1.0.x)
- finding out out what is the name of the main adoc file (e.g. spring-cloud-sleuth)
- pulling the changes from gh-pages after checkout
- finding out what is the list of comma separated whitelisted branches (via the `docs.whitelisted.branches` prop)
- in gh-pages creating a folder with name of the branch  (e.g. /1.0.x)
copying all the docs/target/generated-docs/ to that folder
- if the branch from which we're calling the script is NOT master then we're changing the ${main.adoc}.html to index.html so that it's easier to access the docs (e.g. http://cloud.spring.io/spring-cloud-sleuth/1.0.x/)
2016-08-16 14:57:22 +02:00
Stéphane Lagraulet
62344dccda Merge branch 'master' into zuul_hystrix_threadpool 2016-08-11 09:42:03 +02:00
Stéphane Lagraulet
03caa1b8ce Remove deprecated and unused constructors for RibbonCommandContext and RestClientRibbonCommand 2016-08-11 09:41:15 +02:00
Spencer Gibb
674e45f473 Add Client to list of feign objects that can be customized. 2016-08-10 14:13:28 -06:00
Ryan Baxter
36fec07a17 Merge pull request #1093 from daniellavoie/hystrix-security
Expose security context to any Hystrix command.
2016-08-10 15:20:19 -04:00
Spencer Gibb
0c694a018c Merge pull request #1242 from mikexliu/master
* pull1242:
  Add @Qualifier customization for @FeignClient
2016-08-10 12:22:45 -06:00
Mike Liu
f37b513f21 Add @Qualifier customization for @FeignClient
Changed test to use @Qualifier.
Add documentation to reference the new attribute.
2016-08-10 12:22:33 -06:00
Spencer Gibb
56c7466e64 Merge branch 'Egencia-master' 2016-08-10 12:01:27 -06:00
libetl
519be4db06 MetricsInterceptorConfiguration modifies potenially unmodifiable list.
fixes gh-1240
2016-08-10 12:00:49 -06:00
Spencer Gibb
4255c5578b Merge pull request #1244 from cah-oster/master
* pull1244:
  Fixed double-encoding issue in RibbonClientConfiguration
2016-08-10 11:25:10 -06:00
Scott Oster
5e698278a8 Fixed double-encoding issue in RibbonClientConfiguration
fixes gh-1241
2016-08-10 11:24:59 -06:00
Ryan Baxter
b09b0bcdbd Added Codacy badge to README 2016-08-10 10:36:34 -04:00
Spencer Gibb
909a51000f Remove @Ignore
fixes gh-1157
2016-08-09 16:50:57 -06:00
Spencer Gibb
306b43624b update readme 2016-08-09 14:51:19 -06:00
Ryan Baxter
ec22c23bc5 Added CircleCI and Codecov badges 2016-08-09 16:45:26 -04:00
Ryan Baxter
a4ba11eabb Updated sonar profile configuration 2016-08-09 14:31:13 -04:00
Stéphane Lagraulet
58559aff16 Add documentation for new zuul.ribbonIsolationStrategy property 2016-08-09 18:32:36 +02:00
Ryan Baxter
3e3511ac44 merge 2016-08-09 11:46:03 -04:00
Ryan Baxter
36ae029c18 circleci updates 2016-08-09 11:44:01 -04:00
Stéphane Lagraulet
4dc016f3e5 Merge branch 'master' into zuul_hystrix_threadpool
Conflicts:
	spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/support/AbstractRibbonCommand.java
2016-08-09 17:40:30 +02:00
Ryan Baxter
d90e99216b Merge pull request #1225 from coveord/fix-content-length
Content-length not properly set when using the FormBodyWrapperFilter
2016-08-09 10:30:20 -04:00
Stéphane Lagraulet
67838807e8 Add zuulProperties as a method parameter 2016-08-09 09:36:30 +02:00
Jacques-Etienne Beaudet
dc2cdd55c0 Merge branch 'master' into fix-content-length 2016-08-08 22:45:20 -04:00
Daniel Lavoie
5b0f6013e8 Expose security context to any Hystrix command.
Fix issue gh-1054
2016-08-08 23:05:10 +02:00
Ryan Baxter
52c956831e circleci updates 2016-08-08 15:03:00 -04:00
Ryan Baxter
4f93897b71 more circle ci configuration 2016-08-08 13:57:23 -04:00
Ryan Baxter
5676c8f753 added artifacts directory to circle config 2016-08-08 13:20:12 -04:00
Ryan Baxter
eed72600c5 initial commit for circleci build 2016-08-08 11:47:29 -04:00
Stéphane Lagraulet
35ca9691d2 Merge branch 'master' into zuul_hystrix_threadpool
Conflicts:
	spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/okhttp/OkHttpRibbonCommandIntegrationTests.java
2016-08-08 17:29:10 +02:00
Stéphane Lagraulet
072f7760a4 Use request content length RibbonRoutingFilter 2016-08-08 17:07:35 +02:00
Ryan Baxter
3c1599a1f4 Merge pull request #1213 from mhartle/master
FormBodyWrapperFilter may add multiples of every multipart part to a request
2016-08-08 10:58:59 -04:00
Ryan Baxter
90808124f5 Merge pull request #1206 from daniellavoie/spring-boot-test-1.4
Migrate tests to Spring Boot Test 1.4
2016-08-08 10:53:17 -04:00
Stéphane Lagraulet
3c96fcc888 Get content length from Headers when RibbonCommandContext is built + add tests 2016-08-05 18:57:20 +02:00
Jacques-Etienne Beaudet
d21a7ef8e2 Fix an issue where the FormBodyWrapperFilter would encode the form parameters differently than on the original request.
The FormBodyWrapperFilter handles the application/x-www-form-urlencoded. In the case of requests received by curl or javascript, the FormHttpMessageConverter will reencode the parameters differently (for example, '(' will be encoded while it's not with the javascript encodeURIComponent method).

While this doesn't create any problem, the content length was not properly set in AbstractRibbonCommand. This causes the form params being stripped or the backend server would wait a long time for additional bytes depending on if the content length header was bigger/smaller than the actual data.
2016-08-03 14:27:46 -04:00
Stéphane Lagraulet
b1ec12af43 Add a check to current context as contentLength is already in the context 2016-08-03 15:32:08 +02:00
Stéphane Lagraulet
7929dfec0f Add a zuul property to customize Hystrix ExecutionIsolationStrategy 2016-08-02 13:39:04 +02:00