Extract method

1 files changed, 9 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 13d8908d197..9fd20453bcd 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
@@ -122,7 +122,6 @@ public class TenantRepository {
 
     /**
      * Creates a new tenant repository
-     * 
      */
     @Inject
     public TenantRepository(HostRegistry hostRegistry,
@@ -198,11 +197,8 @@ public class TenantRepository {
 
         curator.framework().getConnectionStateListenable().addListener(this::stateChanged);
 
-        curator.create(tenantsPath);
-        curator.create(locksPath);
-        curator.create(barriersPath);
+        createPaths();
         createSystemTenants(configserverConfig);
-        curator.create(vespaPath);
 
         this.directoryCache = Optional.of(curator.createDirectoryCache(tenantsPath.getAbsolute(), false, false, zkCacheExecutor));
         this.directoryCache.get().addListener(this::childEvent);
@@ -256,10 +252,17 @@ public class TenantRepository {
         return metaData.orElse(new TenantMetaData(tenant.getName(), tenant.getCreatedTime(), tenant.getCreatedTime()));
     }
 
-     private static Set<TenantName> readTenantsFromZooKeeper(Curator curator) {
+    private static Set<TenantName> readTenantsFromZooKeeper(Curator curator) {
         return curator.getChildren(tenantsPath).stream().map(TenantName::from).collect(Collectors.toSet());
     }
 
+    private void createPaths() {
+        curator.create(tenantsPath);
+        curator.create(locksPath);
+        curator.create(barriersPath);
+        curator.create(vespaPath);
+    }
+
     private void bootstrapTenants() {
         // Keep track of tenants created
         Map<TenantName, Future<?>> futures = new HashMap<>();