Commit Graph

1165 Commits

Author SHA1 Message Date
Dave Syer
8cf581d496 Correct description of cloud foundry instance id
Fixes gh-1214
2016-07-27 11:37:47 +01:00
Dave Syer
afb43c5883 Actually fix the feign client validation issue
We need to still assert that the FeignClient is valid (no name and
value specified together for instance). Added missing tests.
2016-07-21 10:36:18 +01:00
Dave Syer
85ef54a9a1 Fix Feign validation for Spring 4.2 and 4.3
There is a utility method in Spring that we can use to merge all
the aliases. That way 4.2 and 4.3 behave the same way.

Fixes gh-1192
2016-07-21 08:28:33 +01:00
Dave Syer
2f581a1181 Use JUnit assertions 2016-07-21 08:28:31 +01:00
Dave Syer
110f872779 Fix generic type signature (otherwise breaks with Spring 4.3) 2016-07-21 08:28:27 +01:00
Spencer Gibb
54931afa8b Remove assertion that fails in spring 4.3.x
Need to make this class 4.2.x compatible.

see gh-1192
2016-07-16 10:36:27 -06:00
Ryan Baxter
2bdd2dab78 Merge pull request #1173 from denyska/master
Disable cookie management for RibbonLoadBalancingHttpClient Fixes gh-301
2016-07-14 12:55:32 -04:00
Spencer Gibb
2908323702 Add debug logging that code is setting spring.aop.proxyTargetClass=true
See gh-1105
2016-07-13 18:08:12 -06:00
Ryan Baxter
5d37bfe2fa Merge pull request #1183 from ryanjbaxter/master
Upgrade Eureka to 1.4.10.  Fixes #1180.
2016-07-13 10:26:41 -04:00
Ryan Baxter
0b0bdb17aa Upgrade Eureka to 1.4.10. Fixes #1180. 2016-07-13 09:19:38 -04:00
Spencer Gibb
e5b2ae967b Remove phantom spring-cloud-netflix-zuul-server from dependencies pom
fixes gh-1175
2016-07-11 21:49:43 -06:00
Dave Syer
c03ae0ab47 Update README with new CLA link 2016-07-11 14:35:10 +01:00
Denys Kurylenko
5d664cd00d Disable cookie management for RibbonLoadBalancingHttpClient Fixes gh-301 2016-07-08 18:48:47 -07:00
Ryan Baxter
00ed67f1b7 Upgrade Eureka to 1.4.9. Fixes #1167. 2016-07-08 10:31:34 -04:00
Spencer Gibb
277ded519d Merge pull request #1156 from brenuart/gh1155
remove Guava ImmutableMap in favour of Collections.unmodifiab…

fixes gh-1155
2016-07-01 16:41:37 -06:00
Spencer Gibb
7835c4047b temporarily comment out FormZuulProxyApplicationTests.postWithMultipartForm 2016-07-01 15:34:46 -06:00
Spencer Gibb
ab0af4554c Update to s-c-build 1.2.0 2016-07-01 15:14:19 -06:00
Bertrand Renuart
926414a014 GH1155: remove Guava ImmutableMap in favour of Collections.unmodifiableMap()
Make sanitizeUrlTemplate() protected for easy sub-classing
2016-07-01 14:14:58 +02:00
Spencer Gibb
3991c8c5f7 Allow custom feign clients when not using ribbon.
fixes gh-1143
2016-06-29 12:39:58 -06:00
Spencer Gibb
cb4d60ca8d fix typo 2016-06-29 11:39:04 -06:00
Spencer Gibb
5e9c71e0e3 Merge pull request #1138 from orchit/master
* orchit-master:
  Adds ability to disable hostname validation.
2016-06-28 10:33:50 -06:00
Patrick Cornelißen
723287b305 Adds ability to disable hostname validation.
Adds property zuul.sslHostnameValidationEnabled to be able to disable the hostname validation in the simpleHostRoutingFilter

fixes gh-1057
2016-06-28 10:32:49 -06:00
Spencer Gibb
46b2e45fd5 Adds a RibbonRequestCustomizer.
This allows developers to customize the request builders for zuul requests to inject headers or modify the request in general.  Each zuul request type (RestClient, Apache HttpClient and OkHttp) is supported.

fixes gh-1141
2016-06-27 13:15:54 -06:00
Spencer Gibb
390999e042 Add default zuul.ribbon.httpclient.enabled=true 2016-06-24 16:17:33 -06:00
Spencer Gibb
8a7e165214 Split ProxyRequestHelper to function without Actuator.
Previously ProxyRequestHelper contained a TraceRepository field. This caused zuul apps to fail with a class not found exception if they excluded actuator. This splits TraceRepository functionality into a new TraceProxyRequestHelper that extends ProxyRequestHelper. Auto configuration creates the appropriate ProxyRequestHelper based on the existence or not of actuator classes.

fixes gh-1135
2016-06-24 16:08:23 -06:00
Spencer Gibb
5742f5e811 add .shelf to .gitignore 2016-06-24 09:58:30 -06:00
Spencer Gibb
52b6578fcf polish 2016-06-24 09:32:18 -06:00
Spencer Gibb
2f205f20c5 Skip tests that only fail in travis for now. 2016-06-24 09:20:19 -06:00
Spencer Gibb
e1df7c3b4d Add back RestClientRibbonCommand api's. 2016-06-24 09:13:18 -06:00
Spencer Gibb
7c2f806745 Add hystrix.stream.queue.size to customize queue size.
Also added descriptions to properties.

fixes gh-1131
2016-06-24 08:41:45 -06:00
Spencer Gibb
6877f0898f Move RestClientRibbonCommand back to original place.
Made it public and undid other refactorings.
2016-06-24 08:15:12 -06:00
Marcin Grzejszczak
74ac6eae8f Made RestClientRibbonCommand public 2016-06-24 09:10:54 +02:00
Spencer Gibb
75610e92a7 added todo 2016-06-23 22:34:34 -06:00
Spencer Gibb
7dc8b86001 Load ribbon classes if defined via properties.
Allows ribbon class name properties to be used to define beans.

This seems like boilerplate, but works, though not easily extensible.

fixes gh-927
2016-06-23 20:20:34 -06:00
Will Tran
dfbfcfecc7 Without explicit client config of IsSecure, lookup from registration
instead of defaulting to false.

Fixes gh-1126
2016-06-23 15:12:35 -06:00
Spencer Gibb
7ac81f8fd5 Adds zuul okhttp support & zuul refactor.
Adds a OkHttpRibbonCommand and accomanying classes. They should be
considered beta.

Refactors zuul ribbon command classes and tests.

fixes gh-1125
2016-06-23 12:10:59 -06:00
Spencer Gibb
fd36a0cc72 Default to HttpClientRibbonCommandFactory 2016-06-22 21:08:34 -06:00
Spencer Gibb
398c5aa009 upgrade feign to v8.17.0
fixes gh-1081
2016-06-22 15:53:18 -06:00
Spencer Gibb
7a90c0cd88 Set entity contentLength to 0 for GET requests.
Zuul sets an empty entity for GET requests. The apache http client either sets transfer encoding to chunked or a content length header. This change sets the apache entity contentLength to 0 (not the header), to that in RequestContent the "content-length" header is set to 0 rathern than transfer encoding.

See gh-1042
2016-06-22 13:01:51 -06:00
Spencer Gibb
cfcca5f881 Set entity contentLength for HttpClientRibbonCommand.
If the content length isn't set on the entity, when http client determines which header to set, it sets transfer-encoding to chunked rather than content-length.

This fixes a missing content-length issue when using `HttpClientRibbonCommandFactory`.

See gh-1042
2016-06-22 13:01:34 -06:00
Spencer Gibb
ca67265c79 Merge pull request #1120 from jmirc/master
* pull1120:
  Fix hystrix dashboard TPS.
2016-06-21 15:23:05 -06:00
Jérôme Mirc
b422fe297c Fix hystrix dashboard TPS.
fixes gh-1113

See https://github.com/Netflix/Hystrix/issues/1251
2016-06-21 15:21:10 -06:00
Spencer Gibb
856c47138a Don't use deprecated constructor.
Eliminates a legacy use of a static singleton. This will help allow multiple registrations.
2016-06-20 18:27:12 -06:00
Spencer Gibb
83cdf647c9 Angel eureka clients can use brixton eureka servers.
Updates so CloudJacksonJson extension is properly recognized by Eureka
Server as LegacyJacksonJson.

see gh-978
fixes gh-1111
2016-06-17 16:53:44 -06:00
Dave Syer
ff46a7dc50 Merge branch '1.1.x'
Conflicts:
	spring-cloud-netflix-dependencies/pom.xml
2016-06-17 15:10:51 +01:00
Dave Syer
9e479481cc Exempt @RequestParams of type Collection from feign expander
It isn't very helpful to have a Collection converted to a String
anyway. We need to implement something new in Feign to apply
the converter (expander) to individual elements in the collection
but this change should get back to the old behaviour with
List<String> at least.

Fixes gh-1115
2016-06-17 14:55:35 +01:00
Spencer Gibb
532627fad2 Merge pull request #1106 from spring-cloud/zuul-122
Upgrade to zuul 1.2.2
2016-06-16 13:58:10 -06:00
Spencer Gibb
aa23660d0c Upgrade to zuul 1.2.2
fixes gh-1091
closes gh-958
2016-06-16 13:50:33 -06:00
Spencer Gibb
20db868592 Don't send 4xx errors to /error
fixes gh-1110
2016-06-16 11:47:31 -06:00
Spencer Gibb
02948657a4 Don't send 4xx errors to /error
fixes gh-1110
2016-06-16 11:45:52 -06:00