From 2901dc2cebc773962098ffd6abc50ca8b48fecb2 Mon Sep 17 00:00:00 2001 From: peng-yongsheng <8082209@qq.com> Date: Mon, 30 Oct 2017 09:39:36 +0800 Subject: [PATCH] Change the method name. --- .../collector/jetty/manager/service/JettyManagerService.java | 2 +- .../jetty/manager/service/JettyManagerServiceImpl.java | 2 +- .../apm/collector/naming/jetty/NamingModuleJettyProvider.java | 2 +- .../apm/collector/ui/jetty/UIModuleJettyProvider.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/src/main/java/org/skywalking/apm/collector/jetty/manager/service/JettyManagerService.java b/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/src/main/java/org/skywalking/apm/collector/jetty/manager/service/JettyManagerService.java index b1dc608b6..a2609363f 100644 --- a/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/src/main/java/org/skywalking/apm/collector/jetty/manager/service/JettyManagerService.java +++ b/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/src/main/java/org/skywalking/apm/collector/jetty/manager/service/JettyManagerService.java @@ -25,5 +25,5 @@ import org.skywalking.apm.collector.server.Server; * @author peng-yongsheng */ public interface JettyManagerService extends Service { - Server getElseCreateServer(String host, int port, String contextPath); + Server getOrCreateIfAbsent(String host, int port, String contextPath); } diff --git a/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/src/main/java/org/skywalking/apm/collector/jetty/manager/service/JettyManagerServiceImpl.java b/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/src/main/java/org/skywalking/apm/collector/jetty/manager/service/JettyManagerServiceImpl.java index e6807d9be..e97634895 100644 --- a/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/src/main/java/org/skywalking/apm/collector/jetty/manager/service/JettyManagerServiceImpl.java +++ b/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/src/main/java/org/skywalking/apm/collector/jetty/manager/service/JettyManagerServiceImpl.java @@ -38,7 +38,7 @@ public class JettyManagerServiceImpl implements JettyManagerService { this.servers = servers; } - @Override public Server getElseCreateServer(String host, int port, String contextPath) { + @Override public Server getOrCreateIfAbsent(String host, int port, String contextPath) { String id = host + String.valueOf(port); if (servers.containsKey(id)) { return servers.get(id); diff --git a/apm-collector/apm-collector-naming/collector-naming-jetty-provider/src/main/java/org/skywalking/apm/collector/naming/jetty/NamingModuleJettyProvider.java b/apm-collector/apm-collector-naming/collector-naming-jetty-provider/src/main/java/org/skywalking/apm/collector/naming/jetty/NamingModuleJettyProvider.java index 7d2be4f79..eeb8e1726 100644 --- a/apm-collector/apm-collector-naming/collector-naming-jetty-provider/src/main/java/org/skywalking/apm/collector/naming/jetty/NamingModuleJettyProvider.java +++ b/apm-collector/apm-collector-naming/collector-naming-jetty-provider/src/main/java/org/skywalking/apm/collector/naming/jetty/NamingModuleJettyProvider.java @@ -63,7 +63,7 @@ public class NamingModuleJettyProvider extends ModuleProvider { try { JettyManagerService managerService = getManager().find(JettyManagerModule.NAME).getService(JettyManagerService.class); - Server jettyServer = managerService.getElseCreateServer(host, port, contextPath); + Server jettyServer = managerService.getOrCreateIfAbsent(host, port, contextPath); handlers.forEach(jettyServer::addHandler); } catch (ModuleNotFoundException e) { throw new ServiceNotProvidedException(e.getMessage()); diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/UIModuleJettyProvider.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/UIModuleJettyProvider.java index 7ec1c23bb..e6d7e15a2 100644 --- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/UIModuleJettyProvider.java +++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/UIModuleJettyProvider.java @@ -63,7 +63,7 @@ public class UIModuleJettyProvider extends ModuleProvider { String contextPath = config.getProperty(CONTEXT_PATH); try { JettyManagerService managerService = getManager().find(JettyManagerModule.NAME).getService(JettyManagerService.class); - Server jettyServer = managerService.getElseCreateServer(host, port, contextPath); + Server jettyServer = managerService.getOrCreateIfAbsent(host, port, contextPath); jettyServer.addHandler(new ApplicationsGetHandler()); ModuleRegisterService moduleRegisterService = getManager().find(ClusterModule.NAME).getService(ModuleRegisterService.class);