2020 build done, unit test failed
theonefx
4 years ago
parent
29091948e9
commit
e7521c02c9
@ -1,44 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2013-2018 the original author or authors.
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* https://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.alibaba.cloud.examples.fallback;
|
|
||||||
|
|
||||||
import com.alibaba.cloud.examples.service.EchoService;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author lengleng
|
|
||||||
* <p>
|
|
||||||
* sentinel 降级处理
|
|
||||||
*/
|
|
||||||
public class EchoServiceFallback implements EchoService {
|
|
||||||
|
|
||||||
private Throwable throwable;
|
|
||||||
|
|
||||||
EchoServiceFallback(Throwable throwable) {
|
|
||||||
this.throwable = throwable;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 调用服务提供方的输出接口.
|
|
||||||
* @param str 用户输入
|
|
||||||
* @return String
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public String echo(String str) {
|
|
||||||
return "consumer-fallback-default-str" + throwable.getMessage();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2013-2018 the original author or authors.
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* https://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.alibaba.cloud.examples.fallback;
|
|
||||||
|
|
||||||
import feign.hystrix.FallbackFactory;
|
|
||||||
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author lengleng
|
|
||||||
*/
|
|
||||||
@Component
|
|
||||||
public class EchoServiceFallbackFactory implements FallbackFactory<EchoServiceFallback> {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public EchoServiceFallback create(Throwable throwable) {
|
|
||||||
return new EchoServiceFallback(throwable);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,102 +1,102 @@
|
|||||||
/*
|
///*
|
||||||
* Copyright 2013-2018 the original author or authors.
|
// * Copyright 2013-2018 the original author or authors.
|
||||||
*
|
// *
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
// * Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
// * you may not use this file except in compliance with the License.
|
||||||
* You may obtain a copy of the License at
|
// * You may obtain a copy of the License at
|
||||||
*
|
// *
|
||||||
* https://www.apache.org/licenses/LICENSE-2.0
|
// * https://www.apache.org/licenses/LICENSE-2.0
|
||||||
*
|
// *
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
// * Unless required by applicable law or agreed to in writing, software
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
// * distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
* See the License for the specific language governing permissions and
|
// * See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
// * limitations under the License.
|
||||||
*/
|
// */
|
||||||
|
//
|
||||||
package com.alibaba.cloud.sentinel.gateway.zuul;
|
//package com.alibaba.cloud.sentinel.gateway.zuul;
|
||||||
|
//
|
||||||
import java.util.Optional;
|
//import java.util.Optional;
|
||||||
|
//
|
||||||
import javax.annotation.PostConstruct;
|
//import javax.annotation.PostConstruct;
|
||||||
|
//
|
||||||
import com.alibaba.cloud.sentinel.gateway.ConfigConstants;
|
//import com.alibaba.cloud.sentinel.gateway.ConfigConstants;
|
||||||
import com.alibaba.csp.sentinel.adapter.gateway.zuul.callback.RequestOriginParser;
|
//import com.alibaba.csp.sentinel.adapter.gateway.zuul.callback.RequestOriginParser;
|
||||||
import com.alibaba.csp.sentinel.adapter.gateway.zuul.callback.ZuulGatewayCallbackManager;
|
//import com.alibaba.csp.sentinel.adapter.gateway.zuul.callback.ZuulGatewayCallbackManager;
|
||||||
import com.alibaba.csp.sentinel.adapter.gateway.zuul.filters.SentinelZuulErrorFilter;
|
//import com.alibaba.csp.sentinel.adapter.gateway.zuul.filters.SentinelZuulErrorFilter;
|
||||||
import com.alibaba.csp.sentinel.adapter.gateway.zuul.filters.SentinelZuulPostFilter;
|
//import com.alibaba.csp.sentinel.adapter.gateway.zuul.filters.SentinelZuulPostFilter;
|
||||||
import com.alibaba.csp.sentinel.adapter.gateway.zuul.filters.SentinelZuulPreFilter;
|
//import com.alibaba.csp.sentinel.adapter.gateway.zuul.filters.SentinelZuulPreFilter;
|
||||||
import com.alibaba.csp.sentinel.config.SentinelConfig;
|
//import com.alibaba.csp.sentinel.config.SentinelConfig;
|
||||||
import com.netflix.zuul.http.ZuulServlet;
|
//import com.netflix.zuul.http.ZuulServlet;
|
||||||
import org.slf4j.Logger;
|
//import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
//import org.slf4j.LoggerFactory;
|
||||||
|
//
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
//import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
|
//import org.springframework.beans.factory.support.DefaultListableBeanFactory;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
//import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
//import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
//import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||||
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
//import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
||||||
import org.springframework.context.annotation.Bean;
|
//import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
//import org.springframework.context.annotation.Configuration;
|
||||||
|
//
|
||||||
/**
|
///**
|
||||||
* Sentinel Spring Cloud Zuul AutoConfiguration.
|
// * Sentinel Spring Cloud Zuul AutoConfiguration.
|
||||||
*
|
// *
|
||||||
* @author tiger
|
// * @author tiger
|
||||||
*/
|
// */
|
||||||
@Configuration(proxyBeanMethods = false)
|
//@Configuration(proxyBeanMethods = false)
|
||||||
@ConditionalOnClass(ZuulServlet.class)
|
//@ConditionalOnClass(ZuulServlet.class)
|
||||||
@ConditionalOnProperty(prefix = ConfigConstants.ZUUL_PREFIX, name = "enabled",
|
//@ConditionalOnProperty(prefix = ConfigConstants.ZUUL_PREFIX, name = "enabled",
|
||||||
havingValue = "true", matchIfMissing = true)
|
// havingValue = "true", matchIfMissing = true)
|
||||||
@EnableConfigurationProperties(SentinelZuulProperties.class)
|
//@EnableConfigurationProperties(SentinelZuulProperties.class)
|
||||||
public class SentinelZuulAutoConfiguration {
|
//public class SentinelZuulAutoConfiguration {
|
||||||
|
//
|
||||||
private static final Logger logger = LoggerFactory
|
// private static final Logger logger = LoggerFactory
|
||||||
.getLogger(SentinelZuulAutoConfiguration.class);
|
// .getLogger(SentinelZuulAutoConfiguration.class);
|
||||||
|
//
|
||||||
@Autowired
|
// @Autowired
|
||||||
private Optional<RequestOriginParser> requestOriginParserOptional;
|
// private Optional<RequestOriginParser> requestOriginParserOptional;
|
||||||
|
//
|
||||||
@Autowired
|
// @Autowired
|
||||||
private SentinelZuulProperties zuulProperties;
|
// private SentinelZuulProperties zuulProperties;
|
||||||
|
//
|
||||||
@PostConstruct
|
// @PostConstruct
|
||||||
private void init() {
|
// private void init() {
|
||||||
requestOriginParserOptional
|
// requestOriginParserOptional
|
||||||
.ifPresent(ZuulGatewayCallbackManager::setOriginParser);
|
// .ifPresent(ZuulGatewayCallbackManager::setOriginParser);
|
||||||
System.setProperty(SentinelConfig.APP_TYPE_PROP_KEY,
|
// System.setProperty(SentinelConfig.APP_TYPE_PROP_KEY,
|
||||||
String.valueOf(ConfigConstants.APP_TYPE_ZUUL_GATEWAY));
|
// String.valueOf(ConfigConstants.APP_TYPE_ZUUL_GATEWAY));
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Bean
|
// @Bean
|
||||||
@ConditionalOnMissingBean
|
// @ConditionalOnMissingBean
|
||||||
public SentinelZuulPreFilter sentinelZuulPreFilter() {
|
// public SentinelZuulPreFilter sentinelZuulPreFilter() {
|
||||||
logger.info("[Sentinel Zuul] register SentinelZuulPreFilter {}",
|
// logger.info("[Sentinel Zuul] register SentinelZuulPreFilter {}",
|
||||||
zuulProperties.getOrder().getPre());
|
// zuulProperties.getOrder().getPre());
|
||||||
return new SentinelZuulPreFilter(zuulProperties.getOrder().getPre());
|
// return new SentinelZuulPreFilter(zuulProperties.getOrder().getPre());
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Bean
|
// @Bean
|
||||||
@ConditionalOnMissingBean
|
// @ConditionalOnMissingBean
|
||||||
public SentinelZuulPostFilter sentinelZuulPostFilter() {
|
// public SentinelZuulPostFilter sentinelZuulPostFilter() {
|
||||||
logger.info("[Sentinel Zuul] register SentinelZuulPostFilter {}",
|
// logger.info("[Sentinel Zuul] register SentinelZuulPostFilter {}",
|
||||||
zuulProperties.getOrder().getPost());
|
// zuulProperties.getOrder().getPost());
|
||||||
return new SentinelZuulPostFilter(zuulProperties.getOrder().getPost());
|
// return new SentinelZuulPostFilter(zuulProperties.getOrder().getPost());
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Bean
|
// @Bean
|
||||||
@ConditionalOnMissingBean
|
// @ConditionalOnMissingBean
|
||||||
public SentinelZuulErrorFilter sentinelZuulErrorFilter() {
|
// public SentinelZuulErrorFilter sentinelZuulErrorFilter() {
|
||||||
logger.info("[Sentinel Zuul] register SentinelZuulErrorFilter {}",
|
// logger.info("[Sentinel Zuul] register SentinelZuulErrorFilter {}",
|
||||||
zuulProperties.getOrder().getError());
|
// zuulProperties.getOrder().getError());
|
||||||
return new SentinelZuulErrorFilter(zuulProperties.getOrder().getError());
|
// return new SentinelZuulErrorFilter(zuulProperties.getOrder().getError());
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Bean
|
// @Bean
|
||||||
public FallBackProviderHandler fallBackProviderHandler(
|
// public FallBackProviderHandler fallBackProviderHandler(
|
||||||
DefaultListableBeanFactory beanFactory) {
|
// DefaultListableBeanFactory beanFactory) {
|
||||||
return new FallBackProviderHandler(beanFactory);
|
// return new FallBackProviderHandler(beanFactory);
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
}
|
//}
|
||||||
|
|||||||
@ -1,5 +1,4 @@
|
|||||||
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
|
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
|
||||||
com.alibaba.cloud.sentinel.gateway.zuul.SentinelZuulAutoConfiguration,\
|
|
||||||
com.alibaba.cloud.sentinel.gateway.scg.SentinelSCGAutoConfiguration,\
|
com.alibaba.cloud.sentinel.gateway.scg.SentinelSCGAutoConfiguration,\
|
||||||
com.alibaba.cloud.sentinel.gateway.SentinelGatewayAutoConfiguration
|
com.alibaba.cloud.sentinel.gateway.SentinelGatewayAutoConfiguration
|
||||||
org.springframework.boot.env.EnvironmentPostProcessor=com.alibaba.cloud.sentinel.gateway.GatewayEnvironmentPostProcessor
|
org.springframework.boot.env.EnvironmentPostProcessor=com.alibaba.cloud.sentinel.gateway.GatewayEnvironmentPostProcessor
|
||||||
@ -1,31 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2013-2018 the original author or authors.
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* https://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.alibaba.cloud.nacos.ribbon;
|
|
||||||
|
|
||||||
import java.lang.annotation.ElementType;
|
|
||||||
import java.lang.annotation.Retention;
|
|
||||||
import java.lang.annotation.RetentionPolicy;
|
|
||||||
import java.lang.annotation.Target;
|
|
||||||
|
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
|
||||||
|
|
||||||
@Retention(RetentionPolicy.RUNTIME)
|
|
||||||
@Target({ ElementType.TYPE, ElementType.METHOD })
|
|
||||||
@ConditionalOnProperty(value = "ribbon.nacos.enabled", matchIfMissing = true)
|
|
||||||
public @interface ConditionalOnRibbonNacos {
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,38 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2013-2018 the original author or authors.
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* https://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.alibaba.cloud.nacos.ribbon;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import com.alibaba.nacos.api.naming.pojo.Instance;
|
|
||||||
import com.alibaba.nacos.client.naming.core.Balancer;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author itmuch.com
|
|
||||||
*/
|
|
||||||
public class ExtendBalancer extends Balancer {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Choose instance by weight.
|
|
||||||
* @param instances Instance List
|
|
||||||
* @return the chosen instance
|
|
||||||
*/
|
|
||||||
public static Instance getHostByRandomWeight2(List<Instance> instances) {
|
|
||||||
return getHostByRandomWeight(instances);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,62 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2013-2018 the original author or authors.
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* https://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.alibaba.cloud.nacos.ribbon;
|
|
||||||
|
|
||||||
import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
|
|
||||||
import com.netflix.client.config.IClientConfig;
|
|
||||||
import com.netflix.loadbalancer.ServerList;
|
|
||||||
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
|
||||||
import org.springframework.cloud.netflix.ribbon.PropertiesFactory;
|
|
||||||
import org.springframework.context.annotation.Bean;
|
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* integrated Ribbon by default.
|
|
||||||
*
|
|
||||||
* @author xiaojing
|
|
||||||
* @author liujunjie
|
|
||||||
*/
|
|
||||||
@Configuration(proxyBeanMethods = false)
|
|
||||||
@ConditionalOnRibbonNacos
|
|
||||||
public class NacosRibbonClientConfiguration {
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private PropertiesFactory propertiesFactory;
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
@ConditionalOnMissingBean
|
|
||||||
public ServerList<?> ribbonServerList(IClientConfig config,
|
|
||||||
NacosDiscoveryProperties nacosDiscoveryProperties) {
|
|
||||||
if (this.propertiesFactory.isSet(ServerList.class, config.getClientName())) {
|
|
||||||
ServerList serverList = this.propertiesFactory.get(ServerList.class, config,
|
|
||||||
config.getClientName());
|
|
||||||
return serverList;
|
|
||||||
}
|
|
||||||
NacosServerList serverList = new NacosServerList(nacosDiscoveryProperties);
|
|
||||||
serverList.initWithNiwsConfig(config);
|
|
||||||
return serverList;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
@ConditionalOnMissingBean
|
|
||||||
public NacosServerIntrospector nacosServerIntrospector() {
|
|
||||||
return new NacosServerIntrospector();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,76 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2013-2018 the original author or authors.
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* https://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.alibaba.cloud.nacos.ribbon;
|
|
||||||
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
import com.alibaba.nacos.api.naming.pojo.Instance;
|
|
||||||
import com.netflix.loadbalancer.Server;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author xiaojing
|
|
||||||
* @author pbting
|
|
||||||
*/
|
|
||||||
public class NacosServer extends Server {
|
|
||||||
|
|
||||||
private final MetaInfo metaInfo;
|
|
||||||
|
|
||||||
private final Instance instance;
|
|
||||||
|
|
||||||
private final Map<String, String> metadata;
|
|
||||||
|
|
||||||
public NacosServer(final Instance instance) {
|
|
||||||
super(instance.getIp(), instance.getPort());
|
|
||||||
this.instance = instance;
|
|
||||||
this.metaInfo = new MetaInfo() {
|
|
||||||
@Override
|
|
||||||
public String getAppName() {
|
|
||||||
return instance.getServiceName();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getServerGroup() {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getServiceIdForDiscovery() {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getInstanceId() {
|
|
||||||
return instance.getInstanceId();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
this.metadata = instance.getMetadata();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public MetaInfo getMetaInfo() {
|
|
||||||
return metaInfo;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Instance getInstance() {
|
|
||||||
return instance;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Map<String, String> getMetadata() {
|
|
||||||
return metadata;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,47 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2013-2018 the original author or authors.
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* https://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.alibaba.cloud.nacos.ribbon;
|
|
||||||
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
import com.netflix.loadbalancer.Server;
|
|
||||||
|
|
||||||
import org.springframework.cloud.netflix.ribbon.DefaultServerIntrospector;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author xiaojing
|
|
||||||
*/
|
|
||||||
public class NacosServerIntrospector extends DefaultServerIntrospector {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Map<String, String> getMetadata(Server server) {
|
|
||||||
if (server instanceof NacosServer) {
|
|
||||||
return ((NacosServer) server).getMetadata();
|
|
||||||
}
|
|
||||||
return super.getMetadata(server);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isSecure(Server server) {
|
|
||||||
if (server instanceof NacosServer) {
|
|
||||||
return Boolean.valueOf(((NacosServer) server).getMetadata().get("secure"));
|
|
||||||
}
|
|
||||||
|
|
||||||
return super.isSecure(server);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,87 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2013-2018 the original author or authors.
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* https://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.alibaba.cloud.nacos.ribbon;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
|
|
||||||
import com.alibaba.nacos.api.naming.pojo.Instance;
|
|
||||||
import com.alibaba.nacos.client.naming.utils.CollectionUtils;
|
|
||||||
import com.netflix.client.config.IClientConfig;
|
|
||||||
import com.netflix.loadbalancer.AbstractServerList;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author xiaojing
|
|
||||||
* @author renhaojun
|
|
||||||
*/
|
|
||||||
public class NacosServerList extends AbstractServerList<NacosServer> {
|
|
||||||
|
|
||||||
private NacosDiscoveryProperties discoveryProperties;
|
|
||||||
|
|
||||||
private String serviceId;
|
|
||||||
|
|
||||||
public NacosServerList(NacosDiscoveryProperties discoveryProperties) {
|
|
||||||
this.discoveryProperties = discoveryProperties;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<NacosServer> getInitialListOfServers() {
|
|
||||||
return getServers();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<NacosServer> getUpdatedListOfServers() {
|
|
||||||
return getServers();
|
|
||||||
}
|
|
||||||
|
|
||||||
private List<NacosServer> getServers() {
|
|
||||||
try {
|
|
||||||
String group = discoveryProperties.getGroup();
|
|
||||||
List<Instance> instances = discoveryProperties.namingServiceInstance()
|
|
||||||
.selectInstances(serviceId, group, true);
|
|
||||||
return instancesToServerList(instances);
|
|
||||||
}
|
|
||||||
catch (Exception e) {
|
|
||||||
throw new IllegalStateException(
|
|
||||||
"Can not get service instances from nacos, serviceId=" + serviceId,
|
|
||||||
e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private List<NacosServer> instancesToServerList(List<Instance> instances) {
|
|
||||||
List<NacosServer> result = new ArrayList<>();
|
|
||||||
if (CollectionUtils.isEmpty(instances)) {
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
for (Instance instance : instances) {
|
|
||||||
result.add(new NacosServer(instance));
|
|
||||||
}
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getServiceId() {
|
|
||||||
return serviceId;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void initWithNiwsConfig(IClientConfig iClientConfig) {
|
|
||||||
this.serviceId = iClientConfig.getClientName();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,42 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2013-2018 the original author or authors.
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* https://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.alibaba.cloud.nacos.ribbon;
|
|
||||||
|
|
||||||
import com.alibaba.cloud.nacos.ConditionalOnNacosDiscoveryEnabled;
|
|
||||||
|
|
||||||
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
|
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
|
|
||||||
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
|
||||||
import org.springframework.cloud.netflix.ribbon.RibbonAutoConfiguration;
|
|
||||||
import org.springframework.cloud.netflix.ribbon.RibbonClients;
|
|
||||||
import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
|
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* {@link org.springframework.boot.autoconfigure.EnableAutoConfiguration
|
|
||||||
* Auto-configuration} that sets up Ribbon for Nacos.
|
|
||||||
*/
|
|
||||||
@Configuration(proxyBeanMethods = false)
|
|
||||||
@EnableConfigurationProperties
|
|
||||||
@ConditionalOnBean(SpringClientFactory.class)
|
|
||||||
@ConditionalOnRibbonNacos
|
|
||||||
@ConditionalOnNacosDiscoveryEnabled
|
|
||||||
@AutoConfigureAfter(RibbonAutoConfiguration.class)
|
|
||||||
@RibbonClients(defaultConfiguration = NacosRibbonClientConfiguration.class)
|
|
||||||
public class RibbonNacosAutoConfiguration {
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,78 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2013-2018 the original author or authors.
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* https://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.alibaba.cloud.nacos.ribbon;
|
|
||||||
|
|
||||||
import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientConfiguration;
|
|
||||||
import com.netflix.client.config.DefaultClientConfigImpl;
|
|
||||||
import com.netflix.client.config.IClientConfig;
|
|
||||||
import org.junit.Test;
|
|
||||||
|
|
||||||
import org.springframework.boot.autoconfigure.AutoConfigurations;
|
|
||||||
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
|
|
||||||
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
|
|
||||||
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
|
|
||||||
import org.springframework.cloud.client.loadbalancer.LoadBalanced;
|
|
||||||
import org.springframework.context.annotation.Bean;
|
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
import org.springframework.web.client.RestTemplate;
|
|
||||||
|
|
||||||
import static org.assertj.core.api.Assertions.assertThat;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author xiaojing
|
|
||||||
*/
|
|
||||||
public class NacosRibbonClientConfigurationTests {
|
|
||||||
|
|
||||||
private WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()
|
|
||||||
.withConfiguration(AutoConfigurations.of(NacosRibbonTestConfiguration.class,
|
|
||||||
NacosRibbonClientConfiguration.class,
|
|
||||||
NacosDiscoveryClientConfiguration.class,
|
|
||||||
RibbonNacosAutoConfiguration.class))
|
|
||||||
.withPropertyValues("spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848")
|
|
||||||
.withPropertyValues("spring.cloud.nacos.discovery.port=18080")
|
|
||||||
.withPropertyValues("spring.cloud.nacos.discovery.service=myapp");
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testProperties() {
|
|
||||||
|
|
||||||
this.contextRunner.run(context -> {
|
|
||||||
NacosServerList serverList = context.getBean(NacosServerList.class);
|
|
||||||
assertThat(serverList.getServiceId()).isEqualTo("myapp");
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@Configuration
|
|
||||||
@EnableAutoConfiguration
|
|
||||||
@EnableDiscoveryClient
|
|
||||||
static class NacosRibbonTestConfiguration {
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
IClientConfig iClientConfig() {
|
|
||||||
DefaultClientConfigImpl config = new DefaultClientConfigImpl();
|
|
||||||
config.setClientName("myapp");
|
|
||||||
return config;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
@LoadBalanced
|
|
||||||
RestTemplate restTemplate() {
|
|
||||||
return new RestTemplate();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,81 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2013-2017 the original author or authors.
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* https://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.alibaba.cloud.nacos.ribbon;
|
|
||||||
|
|
||||||
import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientConfiguration;
|
|
||||||
import com.netflix.loadbalancer.ConfigurationBasedServerList;
|
|
||||||
import com.netflix.loadbalancer.Server;
|
|
||||||
import com.netflix.loadbalancer.ZoneAwareLoadBalancer;
|
|
||||||
import org.junit.Test;
|
|
||||||
import org.junit.runner.RunWith;
|
|
||||||
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
|
|
||||||
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
|
|
||||||
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
|
|
||||||
import org.springframework.boot.test.context.SpringBootTest;
|
|
||||||
import org.springframework.cloud.commons.util.UtilAutoConfiguration;
|
|
||||||
import org.springframework.cloud.netflix.archaius.ArchaiusAutoConfiguration;
|
|
||||||
import org.springframework.cloud.netflix.ribbon.RibbonClients;
|
|
||||||
import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
|
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
import org.springframework.test.context.junit4.SpringRunner;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author liujunjie
|
|
||||||
*/
|
|
||||||
@RunWith(SpringRunner.class)
|
|
||||||
@SpringBootTest(classes = NacosRibbonClientPropertyOverrideTests.TestConfiguration.class,
|
|
||||||
properties = { "spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848",
|
|
||||||
"spring.cloud.nacos.discovery.port=18080",
|
|
||||||
"spring.cloud.nacos.discovery.service=remoteApp",
|
|
||||||
"localApp.ribbon.NIWSServerListClassName="
|
|
||||||
+ "com.netflix.loadbalancer.ConfigurationBasedServerList",
|
|
||||||
"localApp.ribbon.listOfServers=127.0.0.1:19090",
|
|
||||||
"localApp.ribbon.ServerListRefreshInterval=15000" })
|
|
||||||
public class NacosRibbonClientPropertyOverrideTests {
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private SpringClientFactory factory;
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void serverListOverridesToTest() {
|
|
||||||
ConfigurationBasedServerList.class
|
|
||||||
.cast(getLoadBalancer("localApp").getServerListImpl());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void serverListRemoteTest() {
|
|
||||||
NacosServerList.class.cast(getLoadBalancer("remoteApp").getServerListImpl());
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
|
||||||
private ZoneAwareLoadBalancer<Server> getLoadBalancer(String name) {
|
|
||||||
return (ZoneAwareLoadBalancer<Server>) this.factory.getLoadBalancer(name);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Configuration
|
|
||||||
@RibbonClients
|
|
||||||
@EnableAutoConfiguration
|
|
||||||
@ImportAutoConfiguration({ UtilAutoConfiguration.class,
|
|
||||||
PropertyPlaceholderAutoConfiguration.class, ArchaiusAutoConfiguration.class,
|
|
||||||
RibbonNacosAutoConfiguration.class, NacosDiscoveryClientConfiguration.class })
|
|
||||||
protected static class TestConfiguration {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,165 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2013-2018 the original author or authors.
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* https://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.alibaba.cloud.nacos.ribbon;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
|
|
||||||
import com.alibaba.cloud.nacos.test.NacosMockTest;
|
|
||||||
import com.alibaba.nacos.api.naming.NamingService;
|
|
||||||
import com.alibaba.nacos.api.naming.pojo.Instance;
|
|
||||||
import com.netflix.client.config.IClientConfig;
|
|
||||||
import org.junit.Test;
|
|
||||||
|
|
||||||
import static org.assertj.core.api.Assertions.assertThat;
|
|
||||||
import static org.mockito.ArgumentMatchers.anyString;
|
|
||||||
import static org.mockito.ArgumentMatchers.eq;
|
|
||||||
import static org.mockito.Mockito.mock;
|
|
||||||
import static org.mockito.Mockito.when;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author xiaojing
|
|
||||||
*/
|
|
||||||
|
|
||||||
public class NacosServerListTests {
|
|
||||||
|
|
||||||
@Test
|
|
||||||
@SuppressWarnings("unchecked")
|
|
||||||
public void testEmptyInstancesReturnsEmptyList() throws Exception {
|
|
||||||
NacosDiscoveryProperties nacosDiscoveryProperties = mock(
|
|
||||||
NacosDiscoveryProperties.class);
|
|
||||||
|
|
||||||
NamingService namingService = mock(NamingService.class);
|
|
||||||
|
|
||||||
when(nacosDiscoveryProperties.namingServiceInstance()).thenReturn(namingService);
|
|
||||||
when(namingService.selectInstances(anyString(), eq("DEFAULT"), eq(true)))
|
|
||||||
.thenReturn(null);
|
|
||||||
|
|
||||||
NacosServerList serverList = new NacosServerList(nacosDiscoveryProperties);
|
|
||||||
List<NacosServer> servers = serverList.getInitialListOfServers();
|
|
||||||
assertThat(servers).isEmpty();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
@SuppressWarnings("unchecked")
|
|
||||||
public void testGetServers() throws Exception {
|
|
||||||
|
|
||||||
ArrayList<Instance> instances = new ArrayList<>();
|
|
||||||
instances.add(NacosMockTest.serviceInstance("test-service", false,
|
|
||||||
Collections.emptyMap()));
|
|
||||||
|
|
||||||
NacosDiscoveryProperties nacosDiscoveryProperties = mock(
|
|
||||||
NacosDiscoveryProperties.class);
|
|
||||||
|
|
||||||
NamingService namingService = mock(NamingService.class);
|
|
||||||
|
|
||||||
when(nacosDiscoveryProperties.namingServiceInstance()).thenReturn(namingService);
|
|
||||||
when(nacosDiscoveryProperties.getGroup()).thenReturn("DEFAULT");
|
|
||||||
when(nacosDiscoveryProperties.getGroup()).thenReturn("DEFAULT");
|
|
||||||
when(namingService.selectInstances(eq("test-service"), eq("DEFAULT"), eq(true)))
|
|
||||||
.thenReturn(instances);
|
|
||||||
|
|
||||||
IClientConfig clientConfig = mock(IClientConfig.class);
|
|
||||||
when(clientConfig.getClientName()).thenReturn("test-service");
|
|
||||||
NacosServerList serverList = new NacosServerList(nacosDiscoveryProperties);
|
|
||||||
serverList.initWithNiwsConfig(clientConfig);
|
|
||||||
List<NacosServer> servers = serverList.getInitialListOfServers();
|
|
||||||
assertThat(servers).hasSize(1);
|
|
||||||
|
|
||||||
servers = serverList.getUpdatedListOfServers();
|
|
||||||
assertThat(servers).hasSize(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
@SuppressWarnings("unchecked")
|
|
||||||
public void testGetServersWithInstanceStatus() throws Exception {
|
|
||||||
ArrayList<Instance> instances = new ArrayList<>();
|
|
||||||
|
|
||||||
HashMap<String, String> map1 = new HashMap<>();
|
|
||||||
map1.put("instanceNum", "1");
|
|
||||||
HashMap<String, String> map2 = new HashMap<>();
|
|
||||||
map2.put("instanceNum", "2");
|
|
||||||
instances.add(NacosMockTest.serviceInstance("test-service", false, map1));
|
|
||||||
instances.add(NacosMockTest.serviceInstance("test-service", true, map2));
|
|
||||||
|
|
||||||
NacosDiscoveryProperties nacosDiscoveryProperties = mock(
|
|
||||||
NacosDiscoveryProperties.class);
|
|
||||||
|
|
||||||
NamingService namingService = mock(NamingService.class);
|
|
||||||
|
|
||||||
when(nacosDiscoveryProperties.namingServiceInstance()).thenReturn(namingService);
|
|
||||||
when(nacosDiscoveryProperties.getGroup()).thenReturn("DEFAULT");
|
|
||||||
when(namingService.selectInstances(eq("test-service"), eq("DEFAULT"), eq(true)))
|
|
||||||
.thenReturn(instances.stream().filter(Instance::isHealthy)
|
|
||||||
.collect(Collectors.toList()));
|
|
||||||
|
|
||||||
IClientConfig clientConfig = mock(IClientConfig.class);
|
|
||||||
when(clientConfig.getClientName()).thenReturn("test-service");
|
|
||||||
NacosServerList serverList = new NacosServerList(nacosDiscoveryProperties);
|
|
||||||
serverList.initWithNiwsConfig(clientConfig);
|
|
||||||
List<NacosServer> servers = serverList.getInitialListOfServers();
|
|
||||||
assertThat(servers).hasSize(1);
|
|
||||||
|
|
||||||
NacosServer nacosServer = servers.get(0);
|
|
||||||
|
|
||||||
assertThat(nacosServer.getMetaInfo().getInstanceId())
|
|
||||||
.isEqualTo(instances.get(1).getInstanceId());
|
|
||||||
assertThat(nacosServer.getMetadata()).isEqualTo(map2);
|
|
||||||
assertThat(nacosServer.getInstance().isHealthy()).isEqualTo(true);
|
|
||||||
assertThat(nacosServer.getInstance().getServiceName()).isEqualTo("test-service");
|
|
||||||
assertThat(nacosServer.getInstance().getMetadata().get("instanceNum"))
|
|
||||||
.isEqualTo("2");
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testUpdateServers() throws Exception {
|
|
||||||
ArrayList<Instance> instances = new ArrayList<>();
|
|
||||||
|
|
||||||
HashMap<String, String> map = new HashMap<>();
|
|
||||||
map.put("instanceNum", "1");
|
|
||||||
instances.add(NacosMockTest.serviceInstance("test-service", true, map));
|
|
||||||
|
|
||||||
NacosDiscoveryProperties nacosDiscoveryProperties = mock(
|
|
||||||
NacosDiscoveryProperties.class);
|
|
||||||
|
|
||||||
NamingService namingService = mock(NamingService.class);
|
|
||||||
|
|
||||||
when(nacosDiscoveryProperties.namingServiceInstance()).thenReturn(namingService);
|
|
||||||
when(nacosDiscoveryProperties.getGroup()).thenReturn("DEFAULT");
|
|
||||||
when(namingService.selectInstances(eq("test-service"), eq("DEFAULT"), eq(true)))
|
|
||||||
.thenReturn(instances.stream().filter(Instance::isHealthy)
|
|
||||||
.collect(Collectors.toList()));
|
|
||||||
|
|
||||||
IClientConfig clientConfig = mock(IClientConfig.class);
|
|
||||||
when(clientConfig.getClientName()).thenReturn("test-service");
|
|
||||||
NacosServerList serverList = new NacosServerList(nacosDiscoveryProperties);
|
|
||||||
serverList.initWithNiwsConfig(clientConfig);
|
|
||||||
|
|
||||||
List<NacosServer> servers = serverList.getUpdatedListOfServers();
|
|
||||||
assertThat(servers).hasSize(1);
|
|
||||||
|
|
||||||
assertThat(servers.get(0).getInstance().isHealthy()).isEqualTo(true);
|
|
||||||
assertThat(servers.get(0).getInstance().getMetadata().get("instanceNum"))
|
|
||||||
.isEqualTo("1");
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,38 +1,38 @@
|
|||||||
/*
|
///*
|
||||||
* Copyright 2013-2018 the original author or authors.
|
// * Copyright 2013-2018 the original author or authors.
|
||||||
*
|
// *
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
// * Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
// * you may not use this file except in compliance with the License.
|
||||||
* You may obtain a copy of the License at
|
// * You may obtain a copy of the License at
|
||||||
*
|
// *
|
||||||
* https://www.apache.org/licenses/LICENSE-2.0
|
// * https://www.apache.org/licenses/LICENSE-2.0
|
||||||
*
|
// *
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
// * Unless required by applicable law or agreed to in writing, software
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
// * distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
* See the License for the specific language governing permissions and
|
// * See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
// * limitations under the License.
|
||||||
*/
|
// */
|
||||||
|
//
|
||||||
package com.alibaba.cloud.seata.feign;
|
//package com.alibaba.cloud.seata.feign;
|
||||||
|
//
|
||||||
import feign.Feign;
|
//import feign.Feign;
|
||||||
import feign.Retryer;
|
//import feign.Retryer;
|
||||||
import feign.hystrix.HystrixFeign;
|
//import feign.hystrix.HystrixFeign;
|
||||||
|
//
|
||||||
import org.springframework.beans.factory.BeanFactory;
|
//import org.springframework.beans.factory.BeanFactory;
|
||||||
|
//
|
||||||
/**
|
///**
|
||||||
* @author xiaojing
|
// * @author xiaojing
|
||||||
*/
|
// */
|
||||||
final class SeataHystrixFeignBuilder {
|
//final class SeataHystrixFeignBuilder {
|
||||||
|
//
|
||||||
private SeataHystrixFeignBuilder() {
|
// private SeataHystrixFeignBuilder() {
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
static Feign.Builder builder(BeanFactory beanFactory) {
|
// static Feign.Builder builder(BeanFactory beanFactory) {
|
||||||
return HystrixFeign.builder().retryer(Retryer.NEVER_RETRY)
|
// return HystrixFeign.builder().retryer(Retryer.NEVER_RETRY)
|
||||||
.client(new SeataFeignClient(beanFactory));
|
// .client(new SeataFeignClient(beanFactory));
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
}
|
//}
|
||||||
|
|||||||
@ -1,48 +1,45 @@
|
|||||||
/*
|
///*
|
||||||
* Copyright 2013-2018 the original author or authors.
|
// * Copyright 2013-2018 the original author or authors.
|
||||||
*
|
// *
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
// * Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
// * you may not use this file except in compliance with the License.
|
||||||
* You may obtain a copy of the License at
|
// * You may obtain a copy of the License at
|
||||||
*
|
// *
|
||||||
* https://www.apache.org/licenses/LICENSE-2.0
|
// * https://www.apache.org/licenses/LICENSE-2.0
|
||||||
*
|
// *
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
// * Unless required by applicable law or agreed to in writing, software
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
// * distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
* See the License for the specific language governing permissions and
|
// * See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
// * limitations under the License.
|
||||||
*/
|
// */
|
||||||
|
//
|
||||||
package com.alibaba.cloud.seata.feign;
|
//package com.alibaba.cloud.seata.feign;
|
||||||
|
//
|
||||||
import java.io.IOException;
|
//import java.io.IOException;
|
||||||
|
//
|
||||||
import feign.Client;
|
//import feign.Client;
|
||||||
import feign.Request;
|
//import feign.Request;
|
||||||
import feign.Response;
|
//import feign.Response;
|
||||||
|
//
|
||||||
import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
|
//
|
||||||
import org.springframework.cloud.openfeign.ribbon.CachingSpringLoadBalancerFactory;
|
///**
|
||||||
import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
|
// * @author xiaojing
|
||||||
|
// * @author yuhuangbin
|
||||||
/**
|
// */
|
||||||
* @author xiaojing
|
//public class SeataLoadBalancerFeignClient extends LoadBalancerFeignClient {
|
||||||
* @author yuhuangbin
|
//
|
||||||
*/
|
// SeataLoadBalancerFeignClient(Client delegate,
|
||||||
public class SeataLoadBalancerFeignClient extends LoadBalancerFeignClient {
|
// CachingSpringLoadBalancerFactory lbClientFactory,
|
||||||
|
// SpringClientFactory clientFactory,
|
||||||
SeataLoadBalancerFeignClient(Client delegate,
|
// SeataFeignObjectWrapper seataFeignObjectWrapper) {
|
||||||
CachingSpringLoadBalancerFactory lbClientFactory,
|
// super((Client) seataFeignObjectWrapper.wrap(delegate), lbClientFactory,
|
||||||
SpringClientFactory clientFactory,
|
// clientFactory);
|
||||||
SeataFeignObjectWrapper seataFeignObjectWrapper) {
|
// }
|
||||||
super((Client) seataFeignObjectWrapper.wrap(delegate), lbClientFactory,
|
//
|
||||||
clientFactory);
|
// @Override
|
||||||
}
|
// public Response execute(Request request, Request.Options options) throws IOException {
|
||||||
|
// return super.execute(request, options);
|
||||||
@Override
|
// }
|
||||||
public Response execute(Request request, Request.Options options) throws IOException {
|
//
|
||||||
return super.execute(request, options);
|
//}
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|||||||
@ -1,37 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2013-2018 the original author or authors.
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* https://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.alibaba.cloud.seata.feign.hystrix;
|
|
||||||
|
|
||||||
import com.netflix.hystrix.HystrixCommand;
|
|
||||||
|
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
|
||||||
import org.springframework.context.annotation.Bean;
|
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author xiaojing
|
|
||||||
*/
|
|
||||||
@Configuration(proxyBeanMethods = false)
|
|
||||||
@ConditionalOnClass(HystrixCommand.class)
|
|
||||||
public class SeataHystrixAutoConfiguration {
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
SeataHystrixConcurrencyStrategy seataHystrixConcurrencyStrategy() {
|
|
||||||
return new SeataHystrixConcurrencyStrategy();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,175 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2013-2018 the original author or authors.
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* https://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.alibaba.cloud.seata.feign.hystrix;
|
|
||||||
|
|
||||||
import java.util.concurrent.BlockingQueue;
|
|
||||||
import java.util.concurrent.Callable;
|
|
||||||
import java.util.concurrent.ThreadPoolExecutor;
|
|
||||||
import java.util.concurrent.TimeUnit;
|
|
||||||
|
|
||||||
import com.netflix.hystrix.HystrixThreadPoolKey;
|
|
||||||
import com.netflix.hystrix.HystrixThreadPoolProperties;
|
|
||||||
import com.netflix.hystrix.strategy.HystrixPlugins;
|
|
||||||
import com.netflix.hystrix.strategy.concurrency.HystrixConcurrencyStrategy;
|
|
||||||
import com.netflix.hystrix.strategy.concurrency.HystrixRequestVariable;
|
|
||||||
import com.netflix.hystrix.strategy.concurrency.HystrixRequestVariableLifecycle;
|
|
||||||
import com.netflix.hystrix.strategy.eventnotifier.HystrixEventNotifier;
|
|
||||||
import com.netflix.hystrix.strategy.executionhook.HystrixCommandExecutionHook;
|
|
||||||
import com.netflix.hystrix.strategy.metrics.HystrixMetricsPublisher;
|
|
||||||
import com.netflix.hystrix.strategy.properties.HystrixPropertiesStrategy;
|
|
||||||
import com.netflix.hystrix.strategy.properties.HystrixProperty;
|
|
||||||
import io.seata.core.context.RootContext;
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
|
|
||||||
import org.springframework.util.StringUtils;
|
|
||||||
import org.springframework.web.context.request.RequestAttributes;
|
|
||||||
import org.springframework.web.context.request.RequestContextHolder;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author xiaojing
|
|
||||||
*/
|
|
||||||
public class SeataHystrixConcurrencyStrategy extends HystrixConcurrencyStrategy {
|
|
||||||
|
|
||||||
private final Logger logger = LoggerFactory
|
|
||||||
.getLogger(SeataHystrixConcurrencyStrategy.class);
|
|
||||||
|
|
||||||
private HystrixConcurrencyStrategy delegate;
|
|
||||||
|
|
||||||
public SeataHystrixConcurrencyStrategy() {
|
|
||||||
try {
|
|
||||||
this.delegate = HystrixPlugins.getInstance().getConcurrencyStrategy();
|
|
||||||
if (this.delegate instanceof SeataHystrixConcurrencyStrategy) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
HystrixCommandExecutionHook commandExecutionHook = HystrixPlugins
|
|
||||||
.getInstance().getCommandExecutionHook();
|
|
||||||
HystrixEventNotifier eventNotifier = HystrixPlugins.getInstance()
|
|
||||||
.getEventNotifier();
|
|
||||||
HystrixMetricsPublisher metricsPublisher = HystrixPlugins.getInstance()
|
|
||||||
.getMetricsPublisher();
|
|
||||||
HystrixPropertiesStrategy propertiesStrategy = HystrixPlugins.getInstance()
|
|
||||||
.getPropertiesStrategy();
|
|
||||||
logCurrentStateOfHystrixPlugins(eventNotifier, metricsPublisher,
|
|
||||||
propertiesStrategy);
|
|
||||||
HystrixPlugins.reset();
|
|
||||||
HystrixPlugins.getInstance().registerConcurrencyStrategy(this);
|
|
||||||
HystrixPlugins.getInstance()
|
|
||||||
.registerCommandExecutionHook(commandExecutionHook);
|
|
||||||
HystrixPlugins.getInstance().registerEventNotifier(eventNotifier);
|
|
||||||
HystrixPlugins.getInstance().registerMetricsPublisher(metricsPublisher);
|
|
||||||
HystrixPlugins.getInstance().registerPropertiesStrategy(propertiesStrategy);
|
|
||||||
}
|
|
||||||
catch (Exception ex) {
|
|
||||||
logger.error("Failed to register Seata Hystrix Concurrency Strategy", ex);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void logCurrentStateOfHystrixPlugins(HystrixEventNotifier eventNotifier,
|
|
||||||
HystrixMetricsPublisher metricsPublisher,
|
|
||||||
HystrixPropertiesStrategy propertiesStrategy) {
|
|
||||||
if (logger.isDebugEnabled()) {
|
|
||||||
logger.debug("Current Hystrix plugins configuration is ["
|
|
||||||
+ "concurrencyStrategy [" + this.delegate + "]," + "eventNotifier ["
|
|
||||||
+ eventNotifier + "]," + "metricPublisher [" + metricsPublisher + "],"
|
|
||||||
+ "propertiesStrategy [" + propertiesStrategy + "]," + "]");
|
|
||||||
logger.debug("Registering Seata Hystrix Concurrency Strategy.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ThreadPoolExecutor getThreadPool(HystrixThreadPoolKey threadPoolKey,
|
|
||||||
HystrixProperty<Integer> corePoolSize,
|
|
||||||
HystrixProperty<Integer> maximumPoolSize,
|
|
||||||
HystrixProperty<Integer> keepAliveTime, TimeUnit unit,
|
|
||||||
BlockingQueue<Runnable> workQueue) {
|
|
||||||
return this.delegate.getThreadPool(threadPoolKey, corePoolSize, maximumPoolSize,
|
|
||||||
keepAliveTime, unit, workQueue);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ThreadPoolExecutor getThreadPool(HystrixThreadPoolKey threadPoolKey,
|
|
||||||
HystrixThreadPoolProperties threadPoolProperties) {
|
|
||||||
return this.delegate.getThreadPool(threadPoolKey, threadPoolProperties);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public BlockingQueue<Runnable> getBlockingQueue(int maxQueueSize) {
|
|
||||||
return this.delegate.getBlockingQueue(maxQueueSize);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public <T> HystrixRequestVariable<T> getRequestVariable(
|
|
||||||
HystrixRequestVariableLifecycle<T> rv) {
|
|
||||||
return this.delegate.getRequestVariable(rv);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public <K> Callable<K> wrapCallable(Callable<K> c) {
|
|
||||||
if (c instanceof SeataContextCallable) {
|
|
||||||
return c;
|
|
||||||
}
|
|
||||||
|
|
||||||
Callable<K> wrappedCallable;
|
|
||||||
if (this.delegate != null) {
|
|
||||||
wrappedCallable = this.delegate.wrapCallable(c);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
wrappedCallable = c;
|
|
||||||
}
|
|
||||||
if (wrappedCallable instanceof SeataContextCallable) {
|
|
||||||
return wrappedCallable;
|
|
||||||
}
|
|
||||||
|
|
||||||
return new SeataContextCallable<>(wrappedCallable,
|
|
||||||
RequestContextHolder.getRequestAttributes());
|
|
||||||
}
|
|
||||||
|
|
||||||
private static class SeataContextCallable<K> implements Callable<K> {
|
|
||||||
|
|
||||||
private final Callable<K> actual;
|
|
||||||
|
|
||||||
private final String xid;
|
|
||||||
|
|
||||||
private final RequestAttributes requestAttributes;
|
|
||||||
|
|
||||||
SeataContextCallable(Callable<K> actual, RequestAttributes requestAttribute) {
|
|
||||||
this.actual = actual;
|
|
||||||
this.requestAttributes = requestAttribute;
|
|
||||||
this.xid = RootContext.getXID();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public K call() throws Exception {
|
|
||||||
try {
|
|
||||||
RequestContextHolder.setRequestAttributes(requestAttributes);
|
|
||||||
if (!StringUtils.isEmpty(xid)) {
|
|
||||||
RootContext.bind(xid);
|
|
||||||
}
|
|
||||||
return actual.call();
|
|
||||||
}
|
|
||||||
finally {
|
|
||||||
if (!StringUtils.isEmpty(xid)) {
|
|
||||||
RootContext.unbind();
|
|
||||||
}
|
|
||||||
RequestContextHolder.resetRequestAttributes();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,6 +1,5 @@
|
|||||||
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
|
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
|
||||||
com.alibaba.cloud.seata.rest.SeataRestTemplateAutoConfiguration,\
|
com.alibaba.cloud.seata.rest.SeataRestTemplateAutoConfiguration,\
|
||||||
com.alibaba.cloud.seata.web.SeataHandlerInterceptorConfiguration,\
|
com.alibaba.cloud.seata.web.SeataHandlerInterceptorConfiguration,\
|
||||||
com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration,\
|
com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration
|
||||||
com.alibaba.cloud.seata.feign.hystrix.SeataHystrixAutoConfiguration
|
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue