summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Musum <musum@yahooinc.com>2023-03-20 15:24:19 +0100
committerHarald Musum <musum@yahooinc.com>2023-03-20 15:24:19 +0100
commit7fdd0ed5165d5b6dc838960ab3872540bb1b7554 (patch)
tree3768ef0cb207db100f699d087e57c28d0da6ee07
parent30dcb2dfffe023b818633a4c38ee5f6f73d889b9 (diff)
Remove duplicated method
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java2
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java5
2 files changed, 1 insertions, 6 deletions
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> 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) {