SpringCloud/spring-cloud-openfeign
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,845 Commits 28 Branches 0 Tags
fix-pageable-processing-when-querymap-present
Commit Graph

2845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Spencer Gibb
f92e0103bb Merge branch 'master' into feignclient 
Conflicts:
	spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/SpringDecoderTests.java
 2014-12-08 11:30:44 -07:00
Spencer Gibb
c1e6832dee add @DirtiesContext to tests 2014-12-08 10:32:08 -07:00
Dave Syer
6417923523 Extract ribbon client factory into ApplicationContext 
Using Spring as an object factory to control the lifecycle of ribbon clients.
So far we have a single, parameterized configuration class for all clients, but
can be extended to allow user to supply additional configuration. The current
model for user extensions is

@EnableRibbonClient(@RibbonClient(name = "foo", configuration = FooConfiguration.class))
public class MainConfiguration {
    ...
}

So in this example, MainConfiguration is part of the "main" application context
and FooConfiguration is used to create the Ribbon client and load balancer for
the "foo" service.
 2014-12-08 15:54:38 +00:00
Dave Syer
bfb6ca6d8d Ditch SpringFilter in favour of proper dependency injection 2014-12-06 09:15:01 +00:00
Spencer Gibb
92a3454237 Polish 2014-12-05 15:40:40 -07:00
Spencer Gibb
05e8777fc3 add missing feign objects as not required values. 
Document FeignClient
 2014-12-05 15:31:40 -07:00
Spencer Gibb
7f9642ff38 new @FeignClient annotation 2014-12-05 15:24:00 -07:00
Spencer Gibb
b7db65863f rename FeignConfigurer to FeignConfiguration 
fixes gh-91
 2014-12-05 12:23:02 -07:00
Spencer Gibb
3b7cc53c27 Merge branch 'jlouns-master' 2014-12-04 17:06:54 -07:00
Spencer Gibb
45e9a6208b Merge branch 'master' of github.com:jlouns/spring-cloud-netflix into jlouns-master 2014-12-04 16:32:04 -07:00
Jonathan Lounsbury
51f7dbd724 Simplifying readdition of route 2014-12-04 14:26:08 -05:00
Jonathan Lounsbury
d999b802bc Fixing issue with default routes 2014-12-04 14:05:38 -05:00
Spencer Gibb
5964d160a1 remove deprecated @EnableEurekaClient and replace with @EnableDiscoveryClient 
fixes gh-85
 2014-12-04 11:51:18 -07:00
Spencer Gibb
3333cbeb99 remove deprecated @EnableHystrix 
fixes gh-87
 2014-12-04 11:50:31 -07:00
Spencer Gibb
88a8201693 Polish 2014-12-04 11:49:39 -07:00
Dave Syer
fc0aac3b01 Add paragraph in docs about eureka instance id 
Fixes gh-63
 2014-12-04 18:00:54 +00:00
Dave Syer
0f281bc9e1 Initialize log4j to prevent blitz4j from freaking out 2014-12-04 18:00:38 +00:00
Dave Syer
4e2148d634 Add default value (and log warning) if applicationId is null 
Fixes gh-86
 2014-12-04 15:59:30 +00:00
Dave Syer
aed4369502 Add ignored test to show that blitz4j is not responding 
Blitz4j is definitely preventing the log levels from being changed at runtime
through the normal Spring boot channels.

Fixes gh-48
 2014-12-04 15:23:10 +00:00
Dave Syer
a1ae9673bf Add ignored test to show that blitz4j is not responding 
Blitz4j is definitely preventing the log levels from being changed at runtime
through the normal Spring boot channels.

Fixes gh-48
 2014-12-04 15:15:48 +00:00
Dave Syer
4a6193e790 Ensure app without Actuator can start 2014-12-04 15:15:38 +00:00
Dave Syer
dfae445499 Strip prefixes from zuul routes by default 
The default behaviour is now to strip the prefixes (global and
route-specific) by default. E.g.

zuul:
  prefix: /api
  routes:
    customers: /customers/**

Will forward /api/customers/101 to /101 on the customers service

See gh-43
 2014-12-04 11:55:57 +00:00
Dave Syer
7b270c4b46 Add support for X-Forwarded-Prefix to Zuul proxy 
Fixes gh-43
 2014-12-04 09:57:34 +00:00
Spencer Gibb
9c6474fba1 Make ZuulHandlerMapping @RefreshScope. 
Handle InstanceRegisteredEvent and RefreshScopeRefreshedEvent in ZuulHandlerMapping rather than ProxyRouteLocator.
Move /routes endpoint out of ZuulHandlerMapping into RoutesEndpoint (because of a problem when I added @RefreshScope to ZuulHandlerMapping)
 2014-12-03 11:50:19 -07:00
Dave Syer
5246b93295 Remove reflection hack 2014-12-03 15:06:24 +00:00
Dave Syer
aca1897f85 Compiler warnings 2014-12-03 12:51:27 +00:00
Dave Syer
2cdcd767ac Move some of the routing logic into the route locator 
We now support prefix stripping per service, e.g.

zuul:
  routes:
    customers:
      path: /customers/**
      stripPrefix: true

Will route /customers/101 -> /101 (on the customers service)

See gh-77
 2014-12-03 10:51:17 +00:00
Dave Syer
34f277b816 Add ZuulRoute as values object in zuul.routes 
User can now specify zuul.routes.*.{path,url,serviceId} (with
"url" and "serviceId" mutually exclusive (and "location" is a
synonym) separately, or can use a one-one short form, like the
old style.

See gh-77
 2014-12-03 10:31:09 +00:00
Dave Syer
7e91b9ea21 Rename some Zuul config keys 
zuul.route -> zuul.routes
zuul.mapping -> zuul.prefix
 2014-12-03 10:31:09 +00:00
Spencer Gibb
e272f8d660 change caches to ConcurrentHashMap 2014-12-02 16:41:18 -07:00
Spencer Gibb
acfecc38ff renamed Hystrix and Eureka configurations 2014-12-02 15:32:53 -07:00
Spencer Gibb
3a06632301 added @EnableCircuitBreaker deprecated @EnableHystrix. 
removed classes now in spring-cloud-commons
 2014-12-02 15:28:45 -07:00
Spencer Gibb
61ea784300 added @EnableDiscoveryClient, deprecated @EnableEurekaClient 2014-12-02 13:47:55 -07:00
Spencer Gibb
79ceebb1d0 Merge branch 'vanroy-feign-ribbon' 2014-12-01 13:15:48 -07:00
Spencer Gibb
a7c6c88ff0 renamed RibbonLoadBalancerClient to FeignRibbonClient 2014-12-01 13:14:14 -07:00
Spencer Gibb
3d7cc70757 Merge branch 'feign-ribbon' of github.com:VanRoy/spring-cloud-netflix into vanroy-feign-ribbon 2014-12-01 11:52:33 -07:00
Julien Roy
943d1b9bbe Connect Feign to resilient Ribbon client 2014-12-01 14:31:51 +01:00
Dave Syer
70c3d9e784 Ensure user-suppplied ZuulFilters are added properly 
Bean instantiation ordering was causing external (user-supplied)
filter beans to replace the defaults, not append to them. Separating
out the autowired map of beans into a spearate class was enough to
fix it.

Fixes gh-78
 2014-11-29 09:29:24 +00:00
Spencer Gibb
9add6f1edf don't send an entity on DELETE's through RibbonRoutingFilter 
fixes gh-73
 2014-11-26 13:38:26 -07:00
Spencer Gibb
c28b3252fb added a get to the same path as a delete 2014-11-26 11:38:51 -07:00
Spencer Gibb
f79166cb8e fixed test broken by change in functionality in ZuulHandlerMapping.reset 2014-11-26 11:28:00 -07:00
Spencer Gibb
c0903c5a22 add pkg protected resetRoutes so new mappings can be created via post to /routes 2014-11-26 11:00:55 -07:00
Dave Syer
8e16789ee3 /route -> /routes 2014-11-26 17:42:28 +00:00
Dave Syer
ddf7edebf9 /proxy/routes -> /routes 2014-11-26 17:17:12 +00:00
Dave Syer
de4822e801 Add test for DELETE on zuul proxy route 
Also adds support for context paths in physical URL mappings, e.g.

zuul.route.http\://localhost\:8081/app=/stores/**

will result in a proxy forward of /stores/foo to
http://localhost:8081/app/stores/foo

Fixes gh-73
 2014-11-26 13:50:27 +00:00
Dave Syer
9c6566bc9b Explicitly allow all HTTP methods in ZuulController 2014-11-26 13:14:40 +00:00
Dave Syer
45420b9618 Remove debug logging (use /trace instead) 2014-11-26 13:14:10 +00:00
Dave Syer
065d91fdbe Allow user to map physical routes in zuul.route 
E.g.

zuul:
  route:
    testclient: /testing123/**         # service mapping
    http://localhost:8081: /stores/**  # physical mapping
 2014-11-26 11:58:06 +00:00
Dave Syer
ce1fcb1552 Remove ugly depednency on Environment 
You can bind to a Map<String,String> with application.yml, so there's
no need to work so hard to extract the zuul routes.
 2014-11-26 11:05:49 +00:00
Dave Syer
243e163de4 Add JMX and MVC endpoints to ZuulHandlerMapping 
User can now list routes with /zuul/routes and reset with a
POST.

Fixes gh-75
 2014-11-26 10:50:23 +00:00