From 7fdd0ed5165d5b6dc838960ab3872540bb1b7554 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Mon, 20 Mar 2023 15:24:19 +0100 Subject: Remove duplicated method --- .../java/com/yahoo/vespa/config/server/ApplicationRepository.java | 2 +- .../yahoo/vespa/config/server/application/TenantApplications.java | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) (limited to 'configserver/src') diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java index 969b6a8201f..9fb9f8ba9f6 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java @@ -992,7 +992,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye public ApplicationId getApplicationIdForHostname(String hostname) { Optional applicationId = tenantRepository.getAllTenantNames().stream() - .map(tenantName -> tenantRepository.getTenant(tenantName).getApplicationRepo().getApplicationIdForHostName(hostname)) + .map(tenantName -> tenantRepository.getTenant(tenantName).getApplicationRepo().resolveApplicationId(hostname)) .filter(Objects::nonNull) .findFirst(); return applicationId.orElse(null); diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java index 09a687657c6..88e3134ccad 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java @@ -401,11 +401,6 @@ public class TenantApplications implements RequestHandler, HostValidator { hostRegistry.verifyHosts(applicationId, newHosts); } - // TODO: Duplicate of resolveApplicationId() above - public ApplicationId getApplicationIdForHostName(String hostname) { - return hostRegistry.getApplicationId(hostname); - } - public TenantFileSystemDirs getTenantFileSystemDirs() { return tenantFileSystemDirs; } public CompletionWaiter createRemoveApplicationWaiter(ApplicationId applicationId) { -- cgit v1.2.3