Commit Graph

1076 Commits

Author SHA1 Message Date
Spencer Gibb
5e2db65383 Upgrade Hystrix to v1.5.3
fixes gh-1074
2016-06-03 15:44:28 -06:00
Spencer Gibb
fc08b55eac Merge pull request #1071 from jebeaudet/fix-hardcoded-path-encoding
* fix-hardcoded-path-encoding:
  Fixed the path encoding in ProxyRequestHelper when the character encoding was specifically set on HttpServletRequest.
2016-06-03 13:28:49 -06:00
Jacques-Etienne Beaudet
8229eb657e Fixed the path encoding in ProxyRequestHelper when the character encoding was specifically set on HttpServletRequest.
When the character encoding was set to UTF-8 for example, the path was correctly decoded in PreDecorationFilter but was reencoded in ProxyRequestHelper using the Servlet default ISO-8859-1. This commit uses the character encoding when set and fallback on default.
2016-06-03 13:24:29 -06:00
Spencer Gibb
1c532d9637 Merge pull request #979 from marcosbarbero/master
* pull979:
  Use request.characterEncoding prior to default encoding
2016-06-03 13:21:06 -06:00
Marcos Barbero
c743ba893c Use request.characterEncoding prior to default encoding
fixes gh-647
2016-06-03 13:19:38 -06:00
Spencer Gibb
a5eb3b6012 Merge pull request #1046 from venilnoronha/issue-1041-fix
* issue-1041-fix:
  Enables Hystrix metrics poll interval config.
2016-06-03 13:05:53 -06:00
Venil Noronha
2d6306644c Enables Hystrix metrics poll interval config.
Fixes gh-1041
2016-06-03 13:05:43 -06:00
Spencer Gibb
711f095ebc Merge pull request #1059 from acennan/patch-1
* patch-1:
  Support header placeholders in SpringMvcContract.
2016-06-03 12:56:29 -06:00
Damian Jackson
0705c9f540 Support header placeholders in SpringMvcContract.
When using property placeholders in the @RequestMapping annotation the ones placed in the headers attribute do not get replaced. This appears to be because the other attributes, such as the url, use the resolve() function to perform the substitution whereas the header is parsed as-is. This change adds a call to resolve for each side of the equals in the header string so that the properties are substituted correctly.
2016-06-03 12:56:21 -06:00
Spencer Gibb
1e52fe2749 Merge pull request #1061 from daniellavoie/ribbon-2.2.0
* ribbon-2.2.0:
  Upgrade ribbon to 2.2.0
2016-06-03 12:28:19 -06:00
Daniel Lavoie
65e7650b16 Upgrade ribbon to 2.2.0
fix gh-1045
2016-06-03 11:22:52 -06:00
Spencer Gibb
cc16a7a741 Mark @HystrixConnectionFactory as @Deprecated. 2016-06-03 11:22:17 -06:00
Spencer Gibb
9d3f2d0cfd revert to old .travis.yml 2016-05-27 18:31:00 -06:00
Spencer Gibb
0cc3fe6ab4 reduce logging more 2016-05-27 18:15:36 -06:00
Spencer Gibb
9e03342690 travis logs filling up, switch to INFO 2016-05-27 18:13:04 -06:00
Spencer Gibb
8501969643 don't fork jar plugin so it gets Xmx setting. 2016-05-27 17:54:47 -06:00
Spencer Gibb
0f5d8ec2a6 revert 2016-05-27 17:40:38 -06:00
Spencer Gibb
7c084f855f I'm an idiot and should now stop coding. 2016-05-27 17:32:00 -06:00
Spencer Gibb
af26f0f41e attempt to fix build 2016-05-27 17:28:08 -06:00
Spencer Gibb
1c0e44cc8e attempt to fix build 2016-05-27 17:26:30 -06:00
Spencer Gibb
e0ae584ea7 attempt to fix build 2016-05-27 17:14:22 -06:00
Spencer Gibb
ab056f3190 attempt to fix build 2016-05-27 17:06:43 -06:00
Spencer Gibb
16e827f3ba Merge branch 'daniellavoie-fix-unit-test' 2016-05-27 16:36:38 -06:00
Daniel Lavoie
4fd36592dc Fix RestTemplateRetryTest Unit test 2016-05-27 16:29:26 -06:00
Dave Syer
4a1e637b83 Fix content type when missing from incoming request
If there is no content type incoming, then it should be
absent in the outgoing request (not "null").

Fixes gh-1037
2016-05-24 09:02:48 +01:00
Spencer Gibb
d19a6f2615 Use RouteLocator interface.
fixes gh-1030
2016-05-23 16:07:08 -06:00
Spencer Gibb
c3f1210619 set MAVEN_OPTS = -Xms256m -Xmx1024m 2016-05-23 15:08:13 -06:00
Spencer Gibb
56fddcc5e2 remove trusty from travis 2016-05-23 14:42:15 -06:00
Spencer Gibb
2567e60834 Upgrade to eureka v1.4.8
fixes gh-1044
2016-05-23 14:15:42 -06:00
Spencer Gibb
315e3487a9 try to fix travis build 2016-05-23 12:50:43 -06:00
Spencer Gibb
f040726478 try to fix travis build 2016-05-23 12:47:54 -06:00
Spencer Gibb
27bb2cf826 update to dist trusty to get new jdk version 2016-05-23 12:35:25 -06:00
Spencer Gibb
2ff2ce4de4 Only prepend hostname if it has text 2016-05-23 12:17:06 -06:00
Spencer Gibb
69fd8e7eed Merge pull request #1043 from ryanwmoore/master
Fix minor misspelling in docs
2016-05-23 11:22:31 -06:00
Ryan W. Moore
66387a15b7 Fix minor misspelling in docs 2016-05-23 09:55:58 -04:00
Dave Syer
a0c1b4c05d Align instanceId calculation with the one done on the client
The Angel client has an idiosyncratic way of calculating an instance
id, and the Brixton client aligned with that already, but the
Brixton server did not. This change should make Brixton Eureka
Servers work with Angel clients.

See gh-978
2016-05-18 17:32:26 +02:00
Dave Syer
d5252375e1 Add back versions for deprecated *-amqp jars 2016-05-17 17:41:13 +01:00
Dave Syer
880efd1843 Remove @AliasFor from @FeignClient.serviceId()
The way it was being used internally means that we didn't need the
annotation anyway. It would be nice to have it back if the Spring
issue gets resolved, because then we could actually use it as
intended.

Fixes gh-1025
2016-05-17 15:33:42 +01:00
Dave Syer
9823d07817 Revert "Add support in SpringMvcContract for query string in Class @RequestMapping"
This reverts commit 2c502e3997.
2016-05-17 15:26:34 +01:00
Dave Syer
2b58487ad7 Fix typo Sream->Stream 2016-05-17 12:10:18 +01:00
Jacques-Etienne Beaudet
2c502e3997 Add support in SpringMvcContract for query string in Class @RequestMapping
This commit adds the support for query string defined in the class'
@RequestMapping Annotation that is applied to all method of a
controller.

Fxies gh-1023, fixes gh-1024
2016-05-17 12:08:49 +01:00
Dave Syer
32d481df26 Be defensive about classpath in eureka auto config
Before this change we were seeing test failures in
spring-cloud-netflix-eureka-server (but only with Spring Boot 1.4)
caused by annotation processing explosion when
RefreshScopeAutoConfiguration is not on the classpath.
2016-05-16 12:46:03 +01:00
Dave Syer
b084eb03ff Re-instate .settings.xml for Travis 2016-05-12 11:34:36 +01:00
Dave Syer
043a965db3 Update README and remove .settings.xml where appropriate 2016-05-12 10:47:36 +01:00
Marcin Grzejszczak
65b4b0310b Update runAcceptanceTests.sh 2016-05-11 14:30:32 +02:00
Dave Syer
5d50a773e7 Make test more robust by creating feign clients and validating them
This test should run with Spring Boot 1.4.0.M2 now.

See https://github.com/spring-projects/spring-boot/issues/5870
2016-05-11 10:22:57 +01:00
Dave Syer
c399f1117b Revert to snapshots 2016-05-10 17:09:04 +01:00
Dave Syer
d9327a02a2 Update for 1.1.0.RELEASE 2016-05-10 17:00:17 +01:00
Dave Syer
617ecf11ec Track customization of sensitive headers so route can be cleared
When the users explicitly sets the sensitive headers of a rroute to
empty, it means they should be empty, not the global defaults.

Fixes gh-1012
2016-05-09 11:47:41 +01:00
Spencer Gibb
83caebf384 Merge pull request #983 from venilnoronha/issue-966-fix
* issue-966-fix:
  Adds path parameter to @FeignClient.
2016-05-06 14:06:34 -06:00