Simplify now that tenant curator is simpler

1 files changed, 1 insertions, 14 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java
index e274fc2fe87..3b6317efa52 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java
@@ -58,20 +58,7 @@ public class TenantController {
             Instant start = controller.clock().instant();
             int count = 0;
             for (TenantName name : curator.readTenantNames()) {
-                try (Lock lock = lock(name)) {
-                    // Get while holding lock so that we know we're operating on a current version
-                    Optional<Tenant> optionalTenant = get(name);
-                    if (!optionalTenant.isPresent()) continue; // Deleted while updating, skip
-
-                    Tenant tenant = optionalTenant.get();
-                    if (tenant instanceof AthenzTenant) {
-                        curator.writeTenant((AthenzTenant) tenant);
-                    } else if (tenant instanceof UserTenant) {
-                        curator.writeTenant((UserTenant) tenant);
-                    } else {
-                        throw new IllegalArgumentException("Unknown tenant type: " + tenant.getClass().getSimpleName());
-                    }
-                }
+                lockIfPresent(name, LockedTenant.class, this::store);
                 count++;
             }
             log.log(Level.INFO, String.format("Wrote %d tenants in %s", count,