Remove unused methods from Environment

2 files changed, 0 insertions, 83 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/Environment.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/Environment.java
index 416b844b8d0..b860863c08d 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/Environment.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/Environment.java
@@ -11,9 +11,6 @@ import com.yahoo.vespa.hosted.node.admin.task.util.network.IPAddressesImpl;
 
 import java.net.URI;
 import java.nio.file.Path;
-import java.time.Instant;
-import java.time.ZoneOffset;
-import java.time.format.DateTimeFormatter;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
@@ -26,10 +23,6 @@ import java.util.Optional;
  * @author hmusum
  */
 public class Environment {
-    private static final DateTimeFormatter filenameFormatter = DateTimeFormatter
-            .ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSS").withZone(ZoneOffset.UTC);
-    public static final String APPLICATION_STORAGE_CLEANUP_PATH_PREFIX = "cleanup_";
-
     private final ConfigServerInfo configServerInfo;
     private final String environment;
     private final String region;
@@ -117,22 +110,6 @@ public class Environment {
     }
 
     /**
-     * Absolute path in node admin to directory with processed and reported core dumps
-     */
-    public Path pathInNodeAdminToDoneCoredumps() {
-        return pathResolver.getApplicationStoragePathForNodeAdmin().resolve("processed-coredumps");
-    }
-
-    /**
-     * Absolute path in node admin container to the node cleanup directory.
-     */
-    public Path pathInNodeAdminToNodeCleanup(ContainerName containerName) {
-        return pathResolver.getApplicationStoragePathForNodeAdmin()
-                .resolve("archive")
-                .resolve(containerName.asString() + "_" + filenameFormatter.format(Instant.now()));
-    }
-
-    /**
      * Translates an absolute path in node agent container to an absolute path in node admin container.
      * @param containerName name of the node agent container
      * @param pathInNode absolute path in that container
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/util/EnvironmentTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/util/EnvironmentTest.java
deleted file mode 100644
index 893607f1806..00000000000
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/util/EnvironmentTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.hosted.node.admin.util;
-
-import static com.yahoo.vespa.defaults.Defaults.getDefaults;
-import com.yahoo.vespa.hosted.dockerapi.ContainerName;
-import com.yahoo.vespa.hosted.node.admin.component.Environment;
-import com.yahoo.vespa.hosted.node.admin.component.PathResolver;
-import com.yahoo.vespa.hosted.node.admin.config.ConfigServerConfig;
-import com.yahoo.vespa.hosted.node.admin.docker.DockerNetworking;
-import org.junit.Test;
-
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * @author freva
- */
-public class EnvironmentTest {
-    private final Environment environment = new Environment.Builder()
-            .configServerConfig(new ConfigServerConfig(new ConfigServerConfig.Builder()))
-            .region("us-east-1")
-            .environment("prod")
-            .system("main")
-            .cloud("mycloud")
-            .pathResolver(new PathResolver())
-            .dockerNetworking(DockerNetworking.HOST_NETWORK)
-            .build();
-
-    @Test
-    public void testPathInNodeToPathInNodeAdminAndHost() {
-        ContainerName containerName = new ContainerName("docker1-1");
-        assertEquals(
-                "/host/home/docker/container-storage/" + containerName.asString(),
-                environment.pathInNodeAdminFromPathInNode(containerName, Paths.get("/")).toString());
-
-        assertEquals(
-                "/home/docker/container-storage/" + containerName.asString(),
-                environment.pathInHostFromPathInNode(containerName, Paths.get("/")).toString());
-    }
-
-    @Test
-    public void testAbsolutePathInNodeConversion() {
-        String varPath = getDefaults().underVespaHome("var");
-        ContainerName containerName = new ContainerName("docker1-1");
-        String expected = "/host/home/docker/container-storage/" + containerName.asString() + varPath;
-        String[] absolutePathsInContainer = {"/" + varPath, varPath, varPath + "/"};
-
-        for (String pathInContainer : absolutePathsInContainer) {
-            assertEquals(expected, environment.pathInNodeAdminFromPathInNode(containerName, Paths.get(pathInContainer)).toString());
-        }
-    }
-
-    @Test(expected=IllegalArgumentException.class)
-    public void testNonAbsolutePathInNodeConversion() {
-        Path varPath = Paths.get("some/relative/path");
-        environment.pathInNodeAdminFromPathInNode(new ContainerName("container-1"), varPath);
-    }
-}