wyl/spring-cloud-openfeign
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,164 Commits 11 Branches 65 Tags
c8c745284841e3f7bea4d03cac0fb3ee533c3fdb
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dave Syer 08b8034eca Remove commons-logging as explicit dependency 
Hopefully spring boot logging provides enough of the API for
Archaius to work (I think that's the only reason it was there).
Causes issues with logging switching to JUL at odd times (like
on context closed events).
 2018-01-20 09:36:55 +00:00
Dave Syer 5f26d02433 Merge branch 'master' into 2.0.x 2017-10-17 10:47:46 +01:00
Dave Syer 68ce0cf25f Merge branch 'feature/eureka-stubs' 2017-10-17 10:47:35 +01:00
Dave Syer 0b638884f7 Fix merge in Turbine Stream tests 2017-10-17 10:46:08 +01:00
Dave Syer b704dc50c3 Add restassured dependency manually 2017-10-17 10:22:15 +01:00
Dave Syer 62b6d6def2 Fix hystrix tests broken by 2.0 migration 2017-10-17 10:19:20 +01:00
Dave Syer 8d886eedfe Merge branch 'feature/eureka-stubs' into 2.0.x 2017-10-16 21:35:02 +01:00
Dave Syer 9d1eed6a82 Add script to build contract utils 2017-10-16 16:54:35 +01:00
Dave Syer eeadc829b9 Parameterize contract version 2017-10-13 15:17:46 +01:00
Dave Syer efe040549c Move contract helper out of the reactor build 2017-10-13 15:17:46 +01:00
Dave Syer 5bc9e65cdd Add tests for server metadata 2017-10-13 15:17:46 +01:00
Dave Syer d6a604051f Split tests up into individual methods 2017-10-13 15:17:46 +01:00
Dave Syer 51a03b30f2 Consolidate stub tests into one place 2017-10-13 15:17:46 +01:00
Dave Syer 561f3b2fbf Add wiremock verification 2017-10-13 15:17:46 +01:00
Dave Syer 3a7af2c8fe Generate some stubs, yay! 2017-10-13 15:17:46 +01:00
Dave Syer 26c7c362d2 Add property to tests, parameterizing stubs 2017-10-13 15:17:46 +01:00
Dave Syer 0642ea52c9 Remove unused stubs file 2017-10-13 15:17:46 +01:00
Dave Syer 957e33207e Stabilise some tests 2017-10-13 15:17:46 +01:00
Dave Syer a39fe345b5 Remove deprecated annotation 2017-10-13 15:17:46 +01:00
Dave Syer 40e72ddb8c Tweak assertions a bit 2017-10-13 15:17:46 +01:00
Dave Syer 195c3fd75d Extract utility class into shared library for contract tests 2017-10-13 15:17:46 +01:00
Dave Syer c626bccad3 Add rest template to extract SSE events and assert them 
The message has to be sent after the endpoint starts up, which only
happens after the first request is accepted, so we put that logic
in the response extractor.
 2017-10-13 15:17:46 +01:00
Dave Syer e295188075 Add tests for body of message 2017-10-13 15:17:46 +01:00
Dave Syer 7804e1bd59 Add Spring Cloud Contract for hystrix stream 2017-10-13 15:17:46 +01:00
Dave Syer 7672ee3666 Fix hystrix command keys in tests to be unique 2017-09-21 12:13:19 +01:00
Dave Syer 7ca4f33dcf Remove System.err from test 2017-09-21 11:30:07 +01:00
Dave Syer 0bfd86880b Merge branch 'master' into 2.0.x 2017-07-26 12:14:25 +01:00
Dave Syer e5b14e4177 Fix all the start poms to be jars again 
They are all deprecated but that's no reason to break them.
 2017-07-26 12:13:25 +01: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
Dave Syer d4ba70db5c Merge branch '1.3.x' 2017-06-09 13:31:17 +01:00
Dave Syer a59f5e1c4f Clean up some resources to keep tests running 2017-06-09 13:24:57 +01:00
Dave Syer 16dc2f63f1 Merge master 2017-05-10 11:40:28 +01:00
Dave Syer 377bccf12a Update to latest cloud dependencies 2017-05-10 11:37:53 +01:00
Dave Syer 030a8e7111 Remove Lombok from hystrix stream 2017-05-10 11:09:15 +01:00
Dave Syer ced1f36d19 bump spring cloud build version 2017-05-05 17:16:18 +01:00
Dave Syer 69622e909b Fix typo in test method name 2017-04-27 10:29:59 +01:00
Dave Syer a99e23f9fc Update to Boot 1.5.0 2016-12-12 12:31:32 +00:00
Dave Syer 704a874e84 Add example of empty sensitive headers 
Emphasises that it's a black list, and clarifies that you need to
set it to empty to get authorization and cookie headers.
 2016-11-03 12:06:43 +00:00
Dave Syer 7f075d11ee Allow Cors requests through to backend by default 
Instead of blocking them (which is the default behaviour of a
Spring MVC controller) Cors requests will flow through the Zuul
filters by default. Users can control it by grabbing the
ZuulHandlerMapping in a @PostConstruct and injecting some
CorsConfiguration via its setCorsConfigurations() method.
 2016-10-25 14:33:53 +01:00
Dave Syer a38b7b71ac Append to X-Forwarded-* headers instead of replacing them 
This fixes most of the issues people encounter when there are
multiple proxies in the request. The tricky thing is that there
is another header "Forwarded" that we don't recognize, but which
backends probably do, at least some of the time (since it is
from an actual RFC). The problem is that "Forwarded" does not
contain the ports, so Spring UriComponentsBuilder cannot use it
to rewrite links to a specific port. Since we do not support it
already, this change doesn't make things any worse, but the
corner case is there still.
 2016-10-25 12:56:49 +01:00
Dave Syer 139ab95438 Make configuration imports deterministic 2016-10-25 12:20:31 +01:00
Dave Syer 71ac67f9f1 Suppress some warnings 2016-10-25 12:20:21 +01:00
Dave Syer 0e1b856fc5 Extract proxy header manipulation into method 2016-10-25 07:50:38 +01: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
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
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
Dave Syer 6310059531 Move unnecessary dependencies up a level 2016-09-19 12:02:34 +01:00
Dave Syer cb44cd2e33 Add additional test to look for null hosts in Zuul 
Conflicts:
	spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientConfigurationTests.java
 2016-08-18 12:59:05 +01:00
Dave Syer 68cf346025 Change repo URLs to https 2016-08-17 17:33:02 +01:00
Dave Syer 7927372b75 Polish 2016-08-17 17:33:02 +01: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
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
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
Dave Syer c03ae0ab47 Update README with new CLA link 2016-07-11 14:35:10 +01: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
Dave Syer 525c5852fb Add JAVA_OPTS to travis 2016-06-13 08:40:36 +01:00
Dave Syer 69501bd110 Merge 1.1.x 2016-06-13 08:05:07 +01:00
Dave Syer 95e086a543 Revert change to sources plugin 2016-06-13 07:58:13 +01:00
Dave Syer f6cd2d279d Update README 2016-06-11 10:50:32 +01:00
Dave Syer 9cab69a968 Update readme script to handle local includes 2016-06-11 09:54:41 +01:00
Dave Syer 6906c7ba55 Update to 1.1.3 snapshots 2016-06-10 17:05:29 +01:00
Dave Syer ad7e341b78 Clarify turnine config some more 2016-06-09 16:48:03 +01:00
Dave Syer 53a3076e1c Add docs on turbine.combineHostPort 2016-06-09 16:22:20 +01:00
Dave Syer 02d935dbaa Add @ConditionalOnEnabledEndpoint to archaius endpoint 
Fixes gh-936
 2016-06-09 11:22:47 +01:00
Dave Syer 4507d1d46d Add listener for HeartbeatEvent to refresh zuul routes 
Fixes gh-1084
 2016-06-09 11:22:47 +01:00
Dave Syer b6fa67c49f Use Servlet 3.0 Part instead of Spring MultipartFile 
So that it can handle multi-part requests that do not have a
file name.

Fixes gh-1067
 2016-06-06 14:32:43 +01:00
Dave Syer 1c7c96a245 Add local copies of hystrix images 
Fixes gh-1076
 2016-06-06 13:54:51 +01:00
Dave Syer 0da6f27aac Explicitly exclude form-body params that appear in query string 
Fixes gh-1080
 2016-06-06 13:43:18 +01:00
Dave Syer b5f8c73060 Update tp mvn 3.3.9 2016-06-04 09:14:45 +01: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
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
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
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
Dave Syer cbd398d7f6 Add explicit release disabled flag for artifactory for plugins 2016-05-06 18:09:41 +01:00
Dave Syer 12f3edd4ab Add explicit release disabled flag for artifactory in dependencies 2016-05-06 17:59:37 +01:00
Dave Syer e4f3428344 Add explicit release disabled flag for artifactory 2016-05-06 17:47:14 +01:00
Dave Syer c4e879ea96 Switch parent of docs poms 2016-05-06 17:40:09 +01:00
Dave Syer 83235b13c1 Update parent to 1.1.0.RELEASE 2016-05-06 17:13:33 +01:00