Skip to content

Commit 7579b72

Browse files
salesonsaleson
committed
适配maven中央库的标准
1 parent 1d3f6cb commit 7579b72

File tree

15 files changed

+89
-91
lines changed

15 files changed

+89
-91
lines changed

‎pom.xml‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,19 @@
1313
<artifactId>spring-cloud-gray</artifactId>
1414
<packaging>pom</packaging>
1515
<version>2.0.0</version>
16+
<url>https://github.com/SpringCloud/spring-cloud-gray</url>
17+
<organization>
18+
<name>Spring Cloud中国社区</name>
19+
<url>http://springcloud.cn/</url>
20+
</organization>
21+
<developers>
22+
<developer>
23+
<name>saleson</name>
24+
<email>[email protected]</email>
25+
<organization>Spring Cloud中国社区</organization>
26+
<url>https://github.com/saleson</url>
27+
</developer>
28+
</developers>
1629
<modules>
1730

1831
<module>spring-cloud-gray-dependencies</module>
@@ -43,13 +56,7 @@
4356
<connection>scm:git:[email protected]:SpringCloud/spring-cloud-gray.git</connection>
4457
<developerConnection>scm:git:[email protected]:SpringCloud/spring-cloud-gray.git</developerConnection>
4558
</scm>
46-
<developers>
47-
<developer>
48-
<name>saleson</name>
49-
<email>[email protected]</email>
50-
<organization>Spring Cloud中国社区</organization>
51-
</developer>
52-
</developers>
59+
5360

5461
<properties>
5562
<maven.compiler.source>1.8</maven.compiler.source>
@@ -199,6 +206,11 @@
199206
<scope>provided</scope>
200207
</dependency>
201208

209+
<dependency>
210+
<groupId>javax.interceptor</groupId>
211+
<artifactId>javax.interceptor-api</artifactId>
212+
<version>1.2.2</version>
213+
</dependency>
202214
</dependencies>
203215

204216

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

Lines changed: 20 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -11,37 +11,28 @@
1111
import org.springframework.context.annotation.Bean;
1212
import org.springframework.context.annotation.Configuration;
1313

14-
/**
15-
* @Author: duozl
16-
* @Date: 2018/6/5 18:18
17-
*/
1814
@Configuration
1915
@ConditionalOnBean(EurekaClient.class)
2016
public class GrayClientEurekaAutoConfiguration {
2117

22-
23-
@Autowired
24-
private SpringClientFactory springClientFactory;
25-
26-
@Bean
27-
@ConditionalOnMissingBean
28-
public InstanceLocalInfo instanceLocalInfo(@Autowired EurekaRegistration registration) {
29-
String instanceId = registration.getInstanceConfig().getInstanceId();
30-
31-
return InstanceLocalInfo.builder()
32-
.instanceId(instanceId)
33-
.serviceId(registration.getServiceId())
34-
.host(registration.getHost())
35-
.port(registration.getPort())
36-
.build();
37-
}
38-
39-
40-
@Bean
41-
@ConditionalOnMissingBean
42-
public EurekaServerExplainer eurekaServerExplainer() {
43-
return new EurekaServerExplainer(springClientFactory);
44-
}
45-
46-
18+
@Autowired private SpringClientFactory springClientFactory;
19+
20+
@Bean
21+
@ConditionalOnMissingBean
22+
public InstanceLocalInfo instanceLocalInfo(@Autowired EurekaRegistration registration) {
23+
String instanceId = registration.getInstanceConfig().getInstanceId();
24+
25+
return InstanceLocalInfo.builder()
26+
.instanceId(instanceId)
27+
.serviceId(registration.getServiceId())
28+
.host(registration.getHost())
29+
.port(registration.getPort())
30+
.build();
31+
}
32+
33+
@Bean
34+
@ConditionalOnMissingBean
35+
public EurekaServerExplainer eurekaServerExplainer() {
36+
return new EurekaServerExplainer(springClientFactory);
37+
}
4738
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import feign.Request;
99
import org.apache.commons.lang3.StringUtils;
1010

11-
import java.lang.annotation.Annotation;
1211
import java.util.Arrays;
1312

1413
public class FeignRequestInterceptor implements RequestInterceptor {
@@ -38,15 +37,15 @@ public boolean pre(GrayRequest request) {
3837
}
3938
if (grayTrack.getParameters() != null && !grayTrack.getParameters().isEmpty()) {
4039
grayTrack.getParameters().entrySet().forEach(entry -> {
41-
String name = new StringBuffer().append(GrayHttpTrackInfo.GRAY_TRACK_PARAMETER_PREFIX)
40+
String name = new StringBuilder().append(GrayHttpTrackInfo.GRAY_TRACK_PARAMETER_PREFIX)
4241
.append(GrayTrackInfo.GRAY_TRACK_SEPARATE)
4342
.append(entry.getKey()).toString();
4443
feignRequest.headers().put(name, entry.getValue());
4544
});
4645
}
4746
if (grayTrack.getHeaders() != null && !grayTrack.getHeaders().isEmpty()) {
4847
grayTrack.getHeaders().entrySet().forEach(entry -> {
49-
String name = new StringBuffer().append(GrayHttpTrackInfo.GRAY_TRACK_HEADER_PREFIX)
48+
String name = new StringBuilder().append(GrayHttpTrackInfo.GRAY_TRACK_HEADER_PREFIX)
5049
.append(GrayTrackInfo.GRAY_TRACK_SEPARATE)
5150
.append(entry.getKey()).toString();
5251
feignRequest.headers().put(name, entry.getValue());

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

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

3-
import cn.springcloud.gray.request.*;
3+
import cn.springcloud.gray.request.GrayHttpTrackInfo;
4+
import cn.springcloud.gray.request.GrayTrackInfo;
5+
import cn.springcloud.gray.request.RequestLocalStorage;
46
import feign.RequestInterceptor;
57
import feign.RequestTemplate;
68
import org.apache.commons.lang3.StringUtils;
@@ -30,15 +32,15 @@ public void apply(RequestTemplate template) {
3032
}
3133
if (grayTrack.getParameters() != null && !grayTrack.getParameters().isEmpty()) {
3234
grayTrack.getParameters().entrySet().forEach(entry -> {
33-
String name = new StringBuffer().append(GrayHttpTrackInfo.GRAY_TRACK_PARAMETER_PREFIX)
35+
String name = new StringBuilder().append(GrayHttpTrackInfo.GRAY_TRACK_PARAMETER_PREFIX)
3436
.append(GrayTrackInfo.GRAY_TRACK_SEPARATE)
3537
.append(entry.getKey()).toString();
3638
template.header(name, entry.getValue());
3739
});
3840
}
3941
if (grayTrack.getHeaders() != null && !grayTrack.getHeaders().isEmpty()) {
4042
grayTrack.getHeaders().entrySet().forEach(entry -> {
41-
String name = new StringBuffer().append(GrayHttpTrackInfo.GRAY_TRACK_HEADER_PREFIX)
43+
String name = new StringBuilder().append(GrayHttpTrackInfo.GRAY_TRACK_HEADER_PREFIX)
4244
.append(GrayTrackInfo.GRAY_TRACK_SEPARATE)
4345
.append(entry.getKey()).toString();
4446
template.header(name, entry.getValue());

‎spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/resttemplate/RestTemplateRequestInterceptor.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
import org.springframework.http.HttpHeaders;
1010
import org.springframework.http.HttpRequest;
1111

12-
import java.util.Arrays;
13-
1412
public class RestTemplateRequestInterceptor implements RequestInterceptor {
1513
@Override
1614
public String interceptroType() {
@@ -40,15 +38,15 @@ public boolean pre(GrayRequest request) {
4038
}
4139
if (grayTrack.getParameters() != null && !grayTrack.getParameters().isEmpty()) {
4240
grayTrack.getParameters().entrySet().forEach(entry -> {
43-
String name = new StringBuffer().append(GrayHttpTrackInfo.GRAY_TRACK_PARAMETER_PREFIX)
41+
String name = new StringBuilder().append(GrayHttpTrackInfo.GRAY_TRACK_PARAMETER_PREFIX)
4442
.append(GrayTrackInfo.GRAY_TRACK_SEPARATE)
4543
.append(entry.getKey()).toString();
4644
httpHeaders.put(name, entry.getValue());
4745
});
4846
}
4947
if (grayTrack.getHeaders() != null && !grayTrack.getHeaders().isEmpty()) {
5048
grayTrack.getHeaders().entrySet().forEach(entry -> {
51-
String name = new StringBuffer().append(GrayHttpTrackInfo.GRAY_TRACK_HEADER_PREFIX)
49+
String name = new StringBuilder().append(GrayHttpTrackInfo.GRAY_TRACK_HEADER_PREFIX)
5250
.append(GrayTrackInfo.GRAY_TRACK_SEPARATE)
5351
.append(entry.getKey()).toString();
5452
httpHeaders.put(name, entry.getValue());

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public boolean pre(GrayRequest request) {
3636
}
3737
if (grayTrack.getParameters() != null && !grayTrack.getParameters().isEmpty()) {
3838
grayTrack.getParameters().entrySet().forEach(entry -> {
39-
String name = new StringBuffer().append(GrayHttpTrackInfo.GRAY_TRACK_PARAMETER_PREFIX)
39+
String name = new StringBuilder().append(GrayHttpTrackInfo.GRAY_TRACK_PARAMETER_PREFIX)
4040
.append(GrayTrackInfo.GRAY_TRACK_SEPARATE)
4141
.append(entry.getKey()).toString();
4242
context.addOriginResponseHeader(GrayHttpTrackInfo.GRAY_TRACK_METHOD, grayTrack.getMethod());
@@ -48,7 +48,7 @@ public boolean pre(GrayRequest request) {
4848
}
4949
if (grayTrack.getHeaders() != null && !grayTrack.getHeaders().isEmpty()) {
5050
grayTrack.getHeaders().entrySet().forEach(entry -> {
51-
String name = new StringBuffer().append(GrayHttpTrackInfo.GRAY_TRACK_HEADER_PREFIX)
51+
String name = new StringBuilder().append(GrayHttpTrackInfo.GRAY_TRACK_HEADER_PREFIX)
5252
.append(GrayTrackInfo.GRAY_TRACK_SEPARATE)
5353
.append(entry.getKey()).toString();
5454
entry.getValue().forEach(v -> {

‎spring-cloud-gray-client/src/main/java/cn/springcloud/gray/GrayClientConfig.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ public interface GrayClientConfig {
55
/**
66
* 运行类型：web
77
*
8-
* @return
8+
* @return run env
99
*/
1010
String runenv();
1111

1212

1313
/**
1414
* 启动时是否灰度注册
1515
*
16-
* @return boolean
16+
* @return boolean true to register gray after started
1717
*/
1818
boolean isGrayEnroll();
1919

‎spring-cloud-gray-client/src/main/java/cn/springcloud/gray/client/config/properties/GrayClientProperties.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package cn.springcloud.gray.client.config.properties;
22

3-
import cn.springcloud.gray.communication.RetryableInformationClient;
43
import cn.springcloud.gray.GrayClientConfig;
4+
import cn.springcloud.gray.communication.RetryableInformationClient;
55
import org.springframework.boot.context.properties.ConfigurationProperties;
66

77
@ConfigurationProperties("gray.client")
@@ -116,7 +116,7 @@ public void setGrayEnrollDealyTimeInMs(int grayEnrollDealyTimeInMs) {
116116
/**
117117
* 是否使用多版本,默认不使用
118118
*
119-
* @return
119+
* @return ture to use service multi version control
120120
*/
121121
public boolean isUseMultiVersion() {
122122
return useMultiVersion;

‎spring-cloud-gray-client/src/main/java/cn/springcloud/gray/communication/InformationClient.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package cn.springcloud.gray.communication;
22

3-
import cn.springcloud.gray.model.GrayService;
43
import cn.springcloud.gray.model.GrayInstance;
54

65
import java.util.List;
@@ -32,7 +31,7 @@ public interface InformationClient {
3231
*
3332
* @param serviceId 服务id
3433
* @param instanceId 实例id
35-
* @return
34+
* @return gray instance info
3635
*/
3736
GrayInstance getGrayInstance(String serviceId, String instanceId);
3837

‎spring-cloud-gray-client/src/main/java/cn/springcloud/gray/web/GrayTrackRequestInterceptor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ private void initHandlers() {
8181
if (StringUtils.isNotEmpty(grayHttpTrackInfo.getUri())) {
8282
Map<String, List<String>> h = (Map<String, List<String>>) request.getHeaders();
8383
grayHttpTrackInfo.getHeaders().entrySet().forEach(entry -> {
84-
String name = new StringBuffer().append(GrayHttpTrackInfo.GRAY_TRACK_HEADER_PREFIX)
84+
String name = new StringBuilder().append(GrayHttpTrackInfo.GRAY_TRACK_HEADER_PREFIX)
8585
.append(GrayTrackInfo.GRAY_TRACK_SEPARATE)
8686
.append(entry.getKey()).toString();
8787
h.put(name, entry.getValue());
@@ -94,7 +94,7 @@ private void initHandlers() {
9494
if (StringUtils.isNotEmpty(grayHttpTrackInfo.getUri())) {
9595
Map<String, List<String>> h = (Map<String, List<String>>) request.getHeaders();
9696
grayHttpTrackInfo.getParameters().entrySet().forEach(entry -> {
97-
String name = new StringBuffer().append(GrayHttpTrackInfo.GRAY_TRACK_PARAMETER_PREFIX)
97+
String name = new StringBuilder().append(GrayHttpTrackInfo.GRAY_TRACK_PARAMETER_PREFIX)
9898
.append(GrayTrackInfo.GRAY_TRACK_SEPARATE)
9999
.append(entry.getKey()).toString();
100100
h.put(name, entry.getValue());

0 commit comments

Comments
 (0)