Commit 7e4ba422 authored by zoltar1993's avatar zoltar1993 Committed by Jason Song

configservice : 消除 ServiceController.java 中的重复代码 (#1925)

parent 92e811f7
...@@ -25,18 +25,7 @@ public class ServiceController { ...@@ -25,18 +25,7 @@ public class ServiceController {
@RequestMapping("/meta") @RequestMapping("/meta")
public List<ServiceDTO> getMetaService() { public List<ServiceDTO> getMetaService() {
List<InstanceInfo> instances = discoveryService.getMetaServiceInstances(); List<InstanceInfo> instances = discoveryService.getMetaServiceInstances();
List<ServiceDTO> result = instances.stream().map(new Function<InstanceInfo, ServiceDTO>() { List<ServiceDTO> result = instances.stream().map(InstanceInfo_To_ServiceDTO_Func).collect(Collectors.toList());
@Override
public ServiceDTO apply(InstanceInfo instance) {
ServiceDTO service = new ServiceDTO();
service.setAppName(instance.getAppName());
service.setInstanceId(instance.getInstanceId());
service.setHomepageUrl(instance.getHomePageUrl());
return service;
}
}).collect(Collectors.toList());
return result; return result;
} }
...@@ -45,36 +34,26 @@ public class ServiceController { ...@@ -45,36 +34,26 @@ public class ServiceController {
@RequestParam(value = "appId", defaultValue = "") String appId, @RequestParam(value = "appId", defaultValue = "") String appId,
@RequestParam(value = "ip", required = false) String clientIp) { @RequestParam(value = "ip", required = false) String clientIp) {
List<InstanceInfo> instances = discoveryService.getConfigServiceInstances(); List<InstanceInfo> instances = discoveryService.getConfigServiceInstances();
List<ServiceDTO> result = instances.stream().map(new Function<InstanceInfo, ServiceDTO>() { List<ServiceDTO> result = instances.stream().map(InstanceInfo_To_ServiceDTO_Func).collect(Collectors.toList());
@Override
public ServiceDTO apply(InstanceInfo instance) {
ServiceDTO service = new ServiceDTO();
service.setAppName(instance.getAppName());
service.setInstanceId(instance.getInstanceId());
service.setHomepageUrl(instance.getHomePageUrl());
return service;
}
}).collect(Collectors.toList());
return result; return result;
} }
@RequestMapping("/admin") @RequestMapping("/admin")
public List<ServiceDTO> getAdminService() { public List<ServiceDTO> getAdminService() {
List<InstanceInfo> instances = discoveryService.getAdminServiceInstances(); List<InstanceInfo> instances = discoveryService.getAdminServiceInstances();
List<ServiceDTO> result = instances.stream().map(new Function<InstanceInfo, ServiceDTO>() { List<ServiceDTO> result = instances.stream().map(InstanceInfo_To_ServiceDTO_Func).collect(Collectors.toList());
return result;
}
private static Function<InstanceInfo, ServiceDTO> InstanceInfo_To_ServiceDTO_Func = new Function<InstanceInfo, ServiceDTO>() {
@Override @Override
public ServiceDTO apply(InstanceInfo instance) { public ServiceDTO apply(InstanceInfo instance) {
ServiceDTO service = new ServiceDTO(); ServiceDTO service = new ServiceDTO();
service.setAppName(instance.getAppName()); service.setAppName(instance.getAppName());
service.setInstanceId(instance.getInstanceId()); service.setInstanceId(instance.getInstanceId());
service.setHomepageUrl(instance.getHomePageUrl()); service.setHomepageUrl(instance.getHomePageUrl());
return service; return service;
} }
};
}).collect(Collectors.toList());
return result;
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment