pull/898/head
flystar32 7 years ago
parent a9886e518c
commit 42088b4e88

@ -17,7 +17,6 @@
package org.springframework.cloud.alibaba.nacos.ribbon;
import com.netflix.client.config.IClientConfig;
import com.netflix.loadbalancer.Server;
import com.netflix.loadbalancer.ServerList;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
@ -33,7 +32,7 @@ public class NacosRibbonClientConfiguration {
@Bean
@ConditionalOnMissingBean
public ServerList<Server> ribbonServerList(IClientConfig config) {
public ServerList<?> ribbonServerList(IClientConfig config) {
NacosServerList serverList = new NacosServerList(config.getClientName());
return serverList;
}

@ -0,0 +1,73 @@
/*
* Copyright (C) 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
*
* http://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 org.springframework.cloud.alibaba.nacos.ribbon;
import java.util.Map;
import com.alibaba.nacos.api.naming.pojo.Instance;
import com.netflix.loadbalancer.Server;
/**
* @author xiaojing
*/
public class NacosServer extends Server {
private final MetaInfo metaInfo;
private final Instance instance;
private final Map<String, String> metadata;
public NacosServer(Instance instance) {
super(instance.getIp(), instance.getPort());
this.instance = instance;
this.metaInfo = new MetaInfo() {
@Override
public String getAppName() {
return instance.getService().getName();
}
@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;
}
}

@ -16,8 +16,8 @@
package org.springframework.cloud.alibaba.nacos.ribbon;
import com.netflix.loadbalancer.Server;
import com.netflix.loadbalancer.ServerList;
import com.netflix.client.config.IClientConfig;
import com.netflix.loadbalancer.AbstractServerList;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.alibaba.nacos.registry.NacosRegistration;
@ -29,58 +29,51 @@ import com.alibaba.nacos.api.naming.pojo.Instance;
/**
* @author xiaojing
*/
public class NacosServerList implements ServerList<Server> {
public class NacosServerList extends AbstractServerList<NacosServer> {
@Autowired
private NacosRegistration registration;
private String service;
private String serviceId;
public NacosServerList() {
}
public NacosServerList(String service) {
this.service = service;
public NacosServerList(String serviceId) {
this.serviceId = serviceId;
}
@Override
public List<Server> getInitialListOfServers() {
public List<NacosServer> getInitialListOfServers() {
try {
List<Instance> instances = registration.getNacosNamingService().selectInstances(service,true);
return hostsToServerList(instances);
List<Instance> instances = registration.getNacosNamingService().selectInstances(serviceId,true);
return instancesToServerList(instances);
}
catch (Exception e) {
throw new IllegalStateException("Can not get nacos hosts, service=" + service, e);
throw new IllegalStateException("Can not get service instances from nacos, serviceId=" + serviceId, e);
}
}
@Override
public List<Server> getUpdatedListOfServers() {
public List<NacosServer> getUpdatedListOfServers() {
return getInitialListOfServers();
}
private Server hostToServer(Instance instance) {
Server server = new Server(instance.getIp(), instance.getPort());
return server;
}
private List<Server> hostsToServerList(List<Instance> instances) {
List<Server> result = new ArrayList<Server>(instances.size());
private List<NacosServer> instancesToServerList(List<Instance> instances) {
List<NacosServer> result = new ArrayList<>(instances.size());
for (Instance instance : instances) {
if (instance.isHealthy()) {
result.add(hostToServer(instance));
result.add(new NacosServer(instance));
}
}
return result;
}
public String getService() {
return service;
public String getServiceId() {
return serviceId;
}
public void setService(String service) {
this.service = service;
@Override
public void initWithNiwsConfig(IClientConfig iClientConfig) {
this.serviceId = iClientConfig.getClientName();
}
}

@ -15,7 +15,7 @@ import org.springframework.web.client.RestTemplate;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Created by yizhan on 2018/9/14.
* @author xiaojing
*/
public class NacosRibbonClientConfigurationTests {
@ -36,7 +36,7 @@ public class NacosRibbonClientConfigurationTests {
this.contextRunner.run(context -> {
NacosServerList serverList = context.getBean(NacosServerList.class);
assertThat(serverList.getService()).isEqualTo("myapp");
assertThat(serverList.getServiceId()).isEqualTo("myapp");
});
}

Loading…
Cancel
Save