Skip to content

Commit fe42988

Browse files
salesonsaleson
authored
Merge pull request #17 from SpringCloud/A
A
2 parents 07fa2f1 + 22a93ea commit fe42988

File tree

53 files changed

+287
-166
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+287
-166
lines changed

‎pom.xml‎

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<groupId>cn.springcloud.gray</groupId>
1313
<artifactId>spring-cloud-gray</artifactId>
1414
<packaging>pom</packaging>
15-
<version>A.1.0.1</version>
15+
<version>A.1.0.3</version>
1616
<url>https://github.com/SpringCloud/spring-cloud-gray</url>
1717
<organization>
1818
<name>Spring Cloud中国社区</name>
@@ -225,6 +225,35 @@
225225
<build>
226226
<defaultGoal>spring-boot:run</defaultGoal>
227227
<plugins>
228+
<!-- Source -->
229+
<plugin>
230+
<groupId>org.apache.maven.plugins</groupId>
231+
<artifactId>maven-source-plugin</artifactId>
232+
<version>2.2.1</version>
233+
<executions>
234+
<execution>
235+
<phase>package</phase>
236+
<goals>
237+
<goal>jar-no-fork</goal>
238+
</goals>
239+
</execution>
240+
</executions>
241+
</plugin>
242+
<!-- Javadoc -->
243+
<plugin>
244+
<groupId>org.apache.maven.plugins</groupId>
245+
<artifactId>maven-javadoc-plugin</artifactId>
246+
<version>2.9.1</version>
247+
<executions>
248+
<execution>
249+
<phase>package</phase>
250+
<goals>
251+
<goal>jar</goal>
252+
</goals>
253+
</execution>
254+
</executions>
255+
</plugin>
256+
<!-- Compile -->
228257
<plugin>
229258
<groupId>org.apache.maven.plugins</groupId>
230259
<artifactId>maven-compiler-plugin</artifactId>
@@ -252,34 +281,6 @@
252281
<id>sonatype-oss-release</id>
253282
<build>
254283
<plugins>
255-
<!-- Source -->
256-
<plugin>
257-
<groupId>org.apache.maven.plugins</groupId>
258-
<artifactId>maven-source-plugin</artifactId>
259-
<version>2.2.1</version>
260-
<executions>
261-
<execution>
262-
<phase>package</phase>
263-
<goals>
264-
<goal>jar-no-fork</goal>
265-
</goals>
266-
</execution>
267-
</executions>
268-
</plugin>
269-
<!-- Javadoc -->
270-
<plugin>
271-
<groupId>org.apache.maven.plugins</groupId>
272-
<artifactId>maven-javadoc-plugin</artifactId>
273-
<version>2.9.1</version>
274-
<executions>
275-
<execution>
276-
<phase>package</phase>
277-
<goals>
278-
<goal>jar</goal>
279-
</goals>
280-
</execution>
281-
</executions>
282-
</plugin>
283284
<!-- GPG -->
284285
<plugin>
285286
<groupId>org.apache.maven.plugins</groupId>

‎spring-cloud-gray-client-netflix/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>spring-cloud-gray</artifactId>
77
<groupId>cn.springcloud.gray</groupId>
8-
<version>A.1.0.1</version>
8+
<version>A.1.0.3</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/configuration/HystrixGrayAutoConfiguration.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@
99
import feign.hystrix.HystrixFeign;
1010
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
1111
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
12+
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
1213
import org.springframework.context.annotation.Bean;
1314
import org.springframework.context.annotation.Configuration;
1415
import org.springframework.context.annotation.Import;
1516

1617
@Configuration
1718
@ConditionalOnBean(GrayManager.class)
1819
@ConditionalOnClass({HystrixCommand.class, HystrixFeign.class})
20+
@ConditionalOnProperty(value = "gray.hystrix.enabled")
1921
@Import(HystrixGrayTrackWebConfiguration.class)
2022
public class HystrixGrayAutoConfiguration {
2123

@@ -32,7 +34,7 @@ public RequestLocalStorage requestLocalStorage() {
3234
* @return DefaultHystrixRibbonConnectionPoint
3335
*/
3436
@Bean
35-
public RibbonConnectionPoint hystrixRibbonConnectionPoint(
37+
public RibbonConnectionPoint ribbonConnectionPoint(
3638
GrayManager grayManager, RequestLocalStorage requestLocalStorage) {
3739
return new DefaultHystrixRibbonConnectionPoint(grayManager, requestLocalStorage);
3840
}

spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/configuration/NetflixGrayAutoConfiguration.java renamed to spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/configuration/NetflixRibbonGrayAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
@Configuration
1515
@ConditionalOnBean(GrayManager.class)
1616
@RibbonClients(defaultConfiguration = GrayRibbonClientsConfiguration.class)
17-
public class NetflixGrayAutoConfiguration {
17+
public class NetflixRibbonGrayAutoConfiguration {
1818

1919

2020
@Bean

‎spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/feign/configuration/GrayFeignAutoConfiguration.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package cn.springcloud.gray.client.netflix.feign.configuration;
22

33
import cn.springcloud.gray.GrayManager;
4-
import cn.springcloud.gray.client.netflix.configuration.HystrixGrayAutoConfiguration;
54
import cn.springcloud.gray.client.netflix.feign.GrayTrackFeignRequestInterceptor;
65
import cn.springcloud.gray.request.RequestLocalStorage;
76
import com.netflix.loadbalancer.ILoadBalancer;
@@ -41,10 +40,4 @@ public GrayTrackFeignRequestInterceptor grayTrackFeignRequestInterceptor(Request
4140
}
4241

4342

44-
@Configuration
45-
@ConditionalOnProperty(value = "feign.hystrix.enabled")
46-
public static class HystrixConfiguration extends HystrixGrayAutoConfiguration {
47-
48-
}
49-
5043
}

‎spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/feign/configuration/GrayFeignClientsConfiguration.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,10 @@ public class GrayFeignClientsConfiguration {
1515
@Autowired
1616
private Client feignClient;
1717
@Autowired
18-
private RibbonConnectionPoint ribbonConnectionPoint;
19-
@Autowired
2018
private GrayRequestProperties grayRequestProperties;
2119

2220
@Bean
23-
public Client getFeignClient() {
21+
public Client getFeignClient(RibbonConnectionPoint ribbonConnectionPoint) {
2422
return new GrayFeignClient(feignClient, ribbonConnectionPoint, grayRequestProperties);
2523
}
2624

‎spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/ribbon/GrayLoadBalanceRule.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package cn.springcloud.gray.client.netflix.ribbon;
22

3+
import cn.springcloud.gray.GrayClientHolder;
34
import cn.springcloud.gray.GrayManager;
4-
import cn.springcloud.gray.client.netflix.GrayClientHolder;
55
import cn.springcloud.gray.model.GrayService;
66
import cn.springcloud.gray.request.GrayRequest;
77
import cn.springcloud.gray.request.RequestLocalStorage;

‎spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/ribbon/configuration/GrayRibbonClientsConfiguration.java‎

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,28 @@
11
package cn.springcloud.gray.client.netflix.ribbon.configuration;
22

33
import cn.springcloud.gray.GrayManager;
4-
import cn.springcloud.gray.client.netflix.GrayClientHolder;
54
import cn.springcloud.gray.client.netflix.ribbon.GrayLoadBalanceRule;
6-
import cn.springcloud.gray.servernode.ServerExplainer;
75
import cn.springcloud.gray.request.RequestLocalStorage;
6+
import cn.springcloud.gray.servernode.ServerExplainer;
87
import com.netflix.client.config.IClientConfig;
98
import com.netflix.loadbalancer.IRule;
109
import com.netflix.loadbalancer.Server;
11-
import org.springframework.beans.factory.InitializingBean;
1210
import org.springframework.beans.factory.annotation.Autowired;
1311
import org.springframework.context.annotation.Bean;
1412
import org.springframework.context.annotation.Configuration;
1513

1614
@Configuration
17-
public class GrayRibbonClientsConfiguration implements InitializingBean {
18-
19-
@Autowired
20-
private GrayManager grayManager;
21-
@Autowired
22-
private RequestLocalStorage requestLocalStorage;
23-
@Autowired
24-
private ServerExplainer<Server> serverExplainer;
15+
public class GrayRibbonClientsConfiguration {
2516

2617
@Bean
27-
public IRule ribbonRule(@Autowired(required = false) IClientConfig config) {
18+
public IRule ribbonRule(
19+
@Autowired(required = false) IClientConfig config,
20+
GrayManager grayManager,
21+
RequestLocalStorage requestLocalStorage,
22+
ServerExplainer<Server> serverExplainer) {
2823
GrayLoadBalanceRule rule = new GrayLoadBalanceRule(grayManager, requestLocalStorage, serverExplainer);
2924
rule.initWithNiwsConfig(config);
3025
return rule;
3126
}
3227

33-
34-
@Override
35-
public void afterPropertiesSet() throws Exception {
36-
GrayClientHolder.setGrayManager(grayManager);
37-
GrayClientHolder.setRequestLocalStorage(requestLocalStorage);
38-
GrayClientHolder.setServerExplainer(serverExplainer);
39-
}
4028
}

‎spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/zuul/configuration/GrayZuulAutoConfiguration.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import cn.springcloud.gray.GrayManager;
44
import cn.springcloud.gray.client.config.properties.GrayRequestProperties;
5-
import cn.springcloud.gray.client.netflix.configuration.HystrixGrayAutoConfiguration;
65
import cn.springcloud.gray.client.netflix.connectionpoint.RibbonConnectionPoint;
76
import cn.springcloud.gray.client.netflix.zuul.GrayPostZuulFilter;
87
import cn.springcloud.gray.client.netflix.zuul.GrayPreZuulFilter;
@@ -48,11 +47,4 @@ public ZuulRequestInterceptor zuulRequestInterceptor() {
4847

4948
}
5049

51-
52-
@Configuration
53-
@ConditionalOnProperty(value = "zuul.ribbonIsolationStrategy", havingValue = "THREAD")
54-
public static class HystrixConfiguration extends HystrixGrayAutoConfiguration {
55-
56-
}
57-
5850
}

‎spring-cloud-gray-client/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>spring-cloud-gray</artifactId>
77
<groupId>cn.springcloud.gray</groupId>
8-
<version>A.1.0.1</version>
8+
<version>A.1.0.3</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

0 commit comments

Comments
 (0)