Merge pull request #13411 from vespa-engine/hmusum/use-java-Files-for-creating-temp-dir

Use java Files class for creating temp dir

7 files changed, 38 insertions, 28 deletions

diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
index f26fa05baf8..ba035ceec59 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
@@ -1,7 +1,6 @@
 // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.config.server;
 
-import com.google.common.io.Files;
 import com.yahoo.cloud.config.ConfigserverConfig;
 import com.yahoo.config.application.api.ApplicationMetaData;
 import com.yahoo.config.model.api.ApplicationRoles;
@@ -118,7 +117,7 @@ public class ApplicationRepositoryTest {
         Tenant tenant = tenantRepository.getTenant(tenantName);
         LocalSession session = tenant.getLocalSessionRepo().getSession(tenant.getApplicationRepo()
                                                                                .requireActiveSessionOf(applicationId()));
-        AllocatedHosts a = session.getAllocatedHosts();
+        session.getAllocatedHosts();
     }
 
     @Test
@@ -306,12 +305,12 @@ public class ApplicationRepositoryTest {
     }
 
     @Test
-    public void testDeletingInactiveSessions() {
+    public void testDeletingInactiveSessions() throws IOException {
         ManualClock clock = new ManualClock(Instant.now());
         ConfigserverConfig configserverConfig =
                 new ConfigserverConfig(new ConfigserverConfig.Builder()
-                                               .configServerDBDir(Files.createTempDir().getAbsolutePath())
-                                               .configDefinitionsDir(Files.createTempDir().getAbsolutePath())
+                                               .configServerDBDir(temporaryFolder.newFolder("serverdb").getAbsolutePath())
+                                               .configDefinitionsDir(temporaryFolder.newFolder("configdefinitions").getAbsolutePath())
                                                .sessionLifetime(60));
         DeployTester tester = new DeployTester(configserverConfig, clock);
         tester.deployApp("src/test/apps/app", clock.instant()); // session 2 (numbering starts at 2)
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/TestComponentRegistry.java b/configserver/src/test/java/com/yahoo/vespa/config/server/TestComponentRegistry.java
index d73dc7c8a35..b3dca7c73f3 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/TestComponentRegistry.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/TestComponentRegistry.java
@@ -1,7 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.config.server;
 
-import com.google.common.io.Files;
 import com.yahoo.cloud.config.ConfigserverConfig;
 import com.yahoo.concurrent.InThreadExecutorService;
 import com.yahoo.concurrent.StripedExecutor;
@@ -29,11 +28,13 @@ import com.yahoo.vespa.flags.FlagSource;
 import com.yahoo.vespa.flags.InMemoryFlagSource;
 import com.yahoo.vespa.model.VespaModelFactory;
 
+import java.nio.file.Files;
 import java.time.Clock;
 import java.util.Collections;
 import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 
+import static com.yahoo.yolean.Exceptions.uncheck;
 
 /**
  * @author Ulf Lilleengen
@@ -101,9 +102,9 @@ public class TestComponentRegistry implements GlobalComponentRegistry {
         private Metrics metrics = Metrics.createTestMetrics();
         private ConfigserverConfig configserverConfig = new ConfigserverConfig(
                 new ConfigserverConfig.Builder()
-                        .configServerDBDir(Files.createTempDir().getAbsolutePath())
-                        .sessionLifetime(5)
-                        .configDefinitionsDir(Files.createTempDir().getAbsolutePath()));
+                        .configServerDBDir(uncheck(() -> Files.createTempDirectory("serverdb")).toString())
+                        .configDefinitionsDir(uncheck(() -> Files.createTempDirectory("configdefinitions")).toString())
+                        .sessionLifetime(5));
         private ConfigDefinitionRepo defRepo = new StaticConfigDefinitionRepo();
         private TenantRequestHandlerTest.MockReloadListener reloadListener = new TenantRequestHandlerTest.MockReloadListener();
         private MockTenantListener tenantListener = new MockTenantListener();
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java
index 06db7018727..b2091d6e537 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java
@@ -1,7 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.config.server.deploy;
 
-import com.google.common.io.Files;
 import com.yahoo.cloud.config.ConfigserverConfig;
 import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.model.ConfigModelRegistry;
@@ -48,6 +47,7 @@ import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.VespaModelFactory;
 
 import java.io.File;
+import java.nio.file.Files;
 import java.time.Clock;
 import java.time.Duration;
 import java.time.Instant;
@@ -59,6 +59,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
+import static com.yahoo.yolean.Exceptions.uncheck;
+
 /**
  * @author bratseth
  */
@@ -78,8 +80,8 @@ public class DeployTester {
     public DeployTester(List<ModelFactory> modelFactories) {
         this(modelFactories,
              new ConfigserverConfig(new ConfigserverConfig.Builder()
-                     .configServerDBDir(Files.createTempDir().getAbsolutePath())
-                     .configDefinitionsDir(Files.createTempDir().getAbsolutePath())),
+                     .configServerDBDir(uncheck(() -> Files.createTempDirectory("serverdb")).toString())
+                     .configDefinitionsDir(uncheck(() -> Files.createTempDirectory("configdefinitions")).toString())),
              Clock.systemUTC());
     }
 
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionHandlerTest.java
index d67f1547ac4..ed4ed1890d7 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionHandlerTest.java
@@ -1,7 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.config.server.http;
 
-import com.google.common.io.Files;
 import com.yahoo.config.application.api.ApplicationFile;
 import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.application.api.DeployLogger;
@@ -18,7 +17,6 @@ import com.yahoo.config.provision.TenantName;
 import com.yahoo.container.jdisc.HttpRequest;
 import com.yahoo.container.jdisc.HttpResponse;
 import com.yahoo.io.IOUtils;
-import java.util.logging.Level;
 import com.yahoo.path.Path;
 import com.yahoo.transaction.NestedTransaction;
 import com.yahoo.transaction.Transaction;
@@ -40,11 +38,15 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.time.Instant;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.logging.Level;
+
+import static com.yahoo.yolean.Exceptions.uncheck;
 
 /**
  * Base class for session handler tests
@@ -112,11 +114,6 @@ public class SessionHandlerTest {
             super(TenantName.defaultName(), id, null, new SessionContext(app, new MockSessionZKClient(app), null, null, new HostRegistry<>(), flagSource));
         }
 
-        public MockSession(long sessionId, ApplicationPackage applicationPackage, Instant createTime) {
-            this(sessionId, applicationPackage);
-            this.createTime = createTime;
-        }
-
         public MockSession(long sessionId, ApplicationPackage applicationPackage, ConfigChangeActions actions) {
             this(sessionId, applicationPackage);
             this.actions = actions;
@@ -203,7 +200,7 @@ public class SessionHandlerTest {
             if (doThrow) {
                 throw new RuntimeException("foo");
             }
-            final File tempDir = Files.createTempDir();
+            File tempDir = uncheck(() -> Files.createTempDirectory("deploy")).toFile();
             try {
                 IOUtils.copyDirectory(applicationDirectory, tempDir);
             } catch (IOException e) {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/LocalSessionTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/LocalSessionTest.java
index 7ce1ec47d0e..e98bf792e8b 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/LocalSessionTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/LocalSessionTest.java
@@ -1,7 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.config.server.session;
 
-import com.google.common.io.Files;
 import com.yahoo.component.Version;
 import com.yahoo.config.application.api.ApplicationFile;
 import com.yahoo.config.model.application.provider.BaseDeployLogger;
@@ -29,10 +28,12 @@ import org.junit.Before;
 import org.junit.Test;
 
 import java.io.File;
+import java.nio.file.Files;
 import java.time.Instant;
 import java.util.Collections;
 import java.util.Optional;
 
+import static com.yahoo.yolean.Exceptions.uncheck;
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThat;
@@ -55,7 +56,8 @@ public class LocalSessionTest {
     public void setupTest() {
         curator = new MockCurator();
         configCurator = ConfigCurator.create(curator);
-        tenantFileSystemDirs = new TenantFileSystemDirs(Files.createTempDir(), TenantName.from("test_tenant"));
+        tenantFileSystemDirs = new TenantFileSystemDirs(uncheck(() -> Files.createTempDirectory("serverdb")).toFile(),
+                                                        TenantName.from("test_tenant"));
     }
 
     @Test
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/RemoteSessionTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/RemoteSessionTest.java
index 99ef1831744..e90f01e98c4 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/RemoteSessionTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/RemoteSessionTest.java
@@ -1,7 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.config.server.session;
 
-import com.google.common.io.Files;
 import com.yahoo.cloud.config.ConfigserverConfig;
 import com.yahoo.component.Version;
 import com.yahoo.config.application.api.ApplicationPackage;
@@ -24,8 +23,11 @@ import com.yahoo.vespa.curator.mock.MockCurator;
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.VespaModelFactory;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 
+import java.io.IOException;
 import java.time.Clock;
 import java.time.Instant;
 import java.time.LocalDate;
@@ -53,6 +55,9 @@ public class RemoteSessionTest {
 
     private Curator curator;
 
+    @Rule
+    public TemporaryFolder temporaryFolder = new TemporaryFolder();
+
     @Before
     public void setupTest() {
         curator = new MockCurator();
@@ -172,9 +177,10 @@ public class RemoteSessionTest {
     }
 
     @Test
-    public void require_that_permanent_app_is_used() {
+    public void require_that_permanent_app_is_used() throws IOException {
         Optional<PermanentApplicationPackage> permanentApp = Optional.of(new PermanentApplicationPackage(
-                new ConfigserverConfig(new ConfigserverConfig.Builder().applicationDirectory(Files.createTempDir().getAbsolutePath()))));
+                new ConfigserverConfig(new ConfigserverConfig.Builder()
+                                               .applicationDirectory(temporaryFolder.newFolder("appdir").getAbsolutePath()))));
         MockModelFactory mockModelFactory = new MockModelFactory();
         try {
             int sessionId = 3;
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationFileTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationFileTest.java
index 0b028b96eab..a73818cda12 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationFileTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationFileTest.java
@@ -1,11 +1,12 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.config.server.zookeeper;
 
-import com.google.common.io.Files;
 import com.yahoo.config.application.api.ApplicationFile;
 import com.yahoo.config.application.api.ApplicationFileTest;
 import com.yahoo.path.Path;
 import com.yahoo.vespa.curator.mock.MockCurator;
+import org.junit.Rule;
+import org.junit.rules.TemporaryFolder;
 
 import java.io.File;
 import java.io.IOException;
@@ -14,10 +15,12 @@ import static org.junit.Assert.assertTrue;
 
 /**
  * @author Ulf Lilleengen
- * @since 5.1
  */
 public class ZKApplicationFileTest extends ApplicationFileTest {
 
+    @Rule
+    public TemporaryFolder temporaryFolder = new TemporaryFolder();
+
     private void feed(ConfigCurator zk, File dirToFeed) {
         assertTrue(dirToFeed.isDirectory());
         String appPath = "/0";
@@ -28,7 +31,7 @@ public class ZKApplicationFileTest extends ApplicationFileTest {
     @Override
     public ApplicationFile getApplicationFile(Path path) throws IOException{
         ConfigCurator configCurator = ConfigCurator.create(new MockCurator());
-        File tmp = Files.createTempDir();
+        File tmp = temporaryFolder.newFolder();
         writeAppTo(tmp);
         feed(configCurator, tmp);
         return new ZKApplicationFile(path, new ZKApplication(configCurator, Path.fromString("/0")));