summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2020-06-24 10:38:04 +0200
committerHarald Musum <musum@verizonmedia.com>2020-06-24 10:38:04 +0200
commit8b347ed7f98088f902430738152d90396a7d190e (patch)
tree6640c98cf1374046cd0bf02b81ddf867311ddede
parent43c926d71227997373e52652b9de3a4b6e537d72 (diff)
Remove redundant method
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java5
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java3
2 files changed, 2 insertions, 6 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java
index 2c9d9bf239c..03849e64595 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java
@@ -316,11 +316,6 @@ public class TenantRepository {
tenant.close();
}
- // For unit testing
- String tenantZkPath(TenantName tenant) {
- return getTenantPath(tenant).getAbsolute();
- }
-
/**
* A helper to format a log preamble for messages with a tenant and app id
* @param app the app
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java
index 104b94b274f..9cb9772cc9c 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java
@@ -186,7 +186,8 @@ public class TenantRepositoryTest {
}
private void assertZooKeeperTenantPathExists(TenantName tenantName) throws Exception {
- assertNotNull(globalComponentRegistry.getCurator().framework().checkExists().forPath(tenantRepository.tenantZkPath(tenantName)));
+ assertNotNull(globalComponentRegistry.getCurator().framework()
+ .checkExists().forPath(TenantRepository.getTenantPath(tenantName).getAbsolute()));
}
private GlobalComponentRegistry createComponentRegistry(boolean throwIfBootstrappingTenantRepoFails) throws IOException {