Merge pull request #9294 from vespa-engine/hmusum/remove-method

Remove method that has no use anymore

4 files changed, 7 insertions, 40 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 bea087f6ae9..3f2e2e4d36c 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
@@ -12,7 +12,6 @@ import com.yahoo.config.application.api.ApplicationMetaData;
 import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.config.model.api.HostInfo;
 import com.yahoo.config.model.api.ServiceInfo;
-import com.yahoo.config.model.api.container.ContainerServiceType;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.HostFilter;
@@ -54,7 +53,6 @@ import com.yahoo.vespa.config.server.session.SilentDeployLogger;
 import com.yahoo.vespa.config.server.tenant.Rotations;
 import com.yahoo.vespa.config.server.tenant.Tenant;
 import com.yahoo.vespa.config.server.tenant.TenantRepository;
-import com.yahoo.vespa.curator.Lock;
 import com.yahoo.vespa.orchestrator.Orchestrator;
 
 import java.io.File;
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 348e8f1cafc..1f301f06714 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
@@ -45,21 +45,19 @@ public class TenantApplications {
             Executors.newCachedThreadPool(ThreadFactoryFactory.getDaemonThreadFactory(TenantApplications.class.getName()));
     private final Curator.DirectoryCache directoryCache;
     private final ReloadHandler reloadHandler;
-    private final TenantName tenant;
 
-    private TenantApplications(Curator curator, Path applicationsPath, ReloadHandler reloadHandler, TenantName tenant) {
+    private TenantApplications(Curator curator, Path applicationsPath, ReloadHandler reloadHandler) {
         this.curator = curator;
         this.applicationsPath = applicationsPath;
         curator.create(applicationsPath);
         this.reloadHandler = reloadHandler;
-        this.tenant = tenant;
         this.directoryCache = curator.createDirectoryCache(applicationsPath.getAbsolute(), false, false, pathChildrenExecutor);
         this.directoryCache.start();
         this.directoryCache.addListener(this::childEvent);
     }
 
     public static TenantApplications create(Curator curator, ReloadHandler reloadHandler, TenantName tenant) {
-        return new TenantApplications(curator, TenantRepository.getApplicationsPath(tenant), reloadHandler, tenant);
+        return new TenantApplications(curator, TenantRepository.getApplicationsPath(tenant), reloadHandler);
     }
 
     /**
@@ -69,32 +67,14 @@ public class TenantApplications {
      */
     public List<ApplicationId> activeApplications() {
         return curator.getChildren(applicationsPath).stream()
-                      .filter(this::isValid)
                       .sorted()
                       .map(ApplicationId::fromSerializedForm)
                       .filter(id -> activeSessionOf(id).isPresent())
                       .collect(Collectors.toUnmodifiableList());
     }
 
-    private boolean isValid(String appNode) { // TODO jvenstad: Remove after it has run once everywhere.
-        try {
-            ApplicationId.fromSerializedForm(appNode);
-            return true;
-        } catch (IllegalArgumentException __) {
-            log.log(LogLevel.INFO, TenantRepository.logPre(tenant) + "Unable to parse application id from '" +
-                    appNode + "'; deleting it as it shouldn't be here.");
-            try {
-                curator.delete(applicationsPath.append(appNode));
-            }
-            catch (Exception e) {
-                log.log(LogLevel.WARNING, TenantRepository.logPre(tenant) + "Failed to clean up stray node '" + appNode + "'!", e);
-            }
-            return false;
-        }
-    }
-
     /** Returns the id of the currently active session for the given application, if any. Throws on unknown applications. */
-    public OptionalLong activeSessionOf(ApplicationId id) {
+    private OptionalLong activeSessionOf(ApplicationId id) {
         String data = curator.getData(applicationPath(id)).map(Utf8::toString)
                              .orElseThrow(() -> new IllegalArgumentException("Unknown application '" + id + "'."));
         return data.isEmpty() ? OptionalLong.empty() : OptionalLong.of(Long.parseLong(data));
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantBuilder.java
index 943ae6248fc..1b37984abcc 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantBuilder.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantBuilder.java
@@ -7,7 +7,6 @@ import com.yahoo.config.provision.TenantName;
 import com.yahoo.vespa.config.server.rpc.ConfigResponseFactory;
 import com.yahoo.vespa.config.server.GlobalComponentRegistry;
 import com.yahoo.vespa.config.server.host.HostValidator;
-import com.yahoo.vespa.config.server.ReloadHandler;
 import com.yahoo.vespa.config.server.RequestHandler;
 import com.yahoo.vespa.config.server.application.TenantApplications;
 import com.yahoo.vespa.config.server.deploy.TenantFileSystemDirs;
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java
index 69c88dc0275..ac7ff1e85c5 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java
@@ -47,18 +47,8 @@ public class TenantApplicationsTest {
         assertThat(repo.requireActiveSessionOf(applications.get(1)), is(3L));
     }
 
-    @Test
-    public void require_that_invalid_entries_are_skipped() throws Exception {
-        writeApplicationData(createApplicationId("foo"), 3L);
-        writeApplicationData("invalid", 3L);
-        TenantApplications repo = createZKAppRepo();
-        List<ApplicationId> applications = repo.activeApplications();
-        assertThat(applications.size(), is(1));
-        assertThat(applications.get(0).application().value(), is("foo"));
-    }
-
     @Test(expected = IllegalArgumentException.class)
-    public void require_that_requesting_session_for_unknown_application_throws_exception() throws Exception {
+    public void require_that_requesting_session_for_unknown_application_throws_exception() {
         TenantApplications repo = createZKAppRepo();
         repo.requireActiveSessionOf(createApplicationId("nonexistent"));
     }
@@ -80,15 +70,15 @@ public class TenantApplicationsTest {
         repo.createApplication(myapp);
         repo.createPutTransaction(myapp, 3l).commit();
         String path = TenantRepository.getApplicationsPath(tenantName).append(myapp.serializedForm()).getAbsolute();
-        assertTrue(curatorFramework.checkExists().forPath(path) != null);
+        assertNotNull(curatorFramework.checkExists().forPath(path));
         assertThat(Utf8.toString(curatorFramework.getData().forPath(path)), is("3"));
         repo.createPutTransaction(myapp, 5l).commit();
-        assertTrue(curatorFramework.checkExists().forPath(path) != null);
+        assertNotNull(curatorFramework.checkExists().forPath(path));
         assertThat(Utf8.toString(curatorFramework.getData().forPath(path)), is("5"));
     }
 
     @Test
-    public void require_that_application_ids_can_be_deleted() throws Exception {
+    public void require_that_application_ids_can_be_deleted() {
         TenantApplications repo = createZKAppRepo();
         ApplicationId id1 = createApplicationId("myapp");
         ApplicationId id2 = createApplicationId("myapp2");