Remove Guava use in standalone use of application preprocessor

4 files changed, 15 insertions, 15 deletions

diff --git a/config-application-package/pom.xml b/config-application-package/pom.xml
index d280af8dc28..7f49e9fb8b6 100644
--- a/config-application-package/pom.xml
+++ b/config-application-package/pom.xml
@@ -92,11 +92,6 @@
             <artifactId>jackson-databind</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
@@ -121,7 +116,6 @@
                 <configuration>
                     <compilerArgs>
                         <arg>-Xlint:all</arg>
-                        <arg>-Xlint:-try</arg>
                         <arg>-Werror</arg>
                     </compilerArgs>
                 </configuration>
diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/Bundle.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/Bundle.java
index 8f2026afc66..b7e80a6abe8 100644
--- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/Bundle.java
+++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/Bundle.java
@@ -1,16 +1,14 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.model.application.provider;
 
-import com.google.common.base.Charsets;
 import com.yahoo.collections.Tuple2;
-import com.yahoo.config.codegen.CNode;
 import com.yahoo.vespa.config.util.ConfigUtils;
 
 import java.io.*;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipException;
@@ -171,7 +169,7 @@ public class Bundle {
                 return new StringReader("");
             }
             try {
-                return new InputStreamReader(bundle.jarFile.getInputStream(zipEntry), Charsets.UTF_8);
+                return new InputStreamReader(bundle.jarFile.getInputStream(zipEntry), StandardCharsets.UTF_8);
             }  catch (IOException e) {
                 throw new IllegalArgumentException("IOException", e);
             }
diff --git a/config-application-package/src/test/java/com/yahoo/config/application/ConfigDefinitionDirTest.java b/config-application-package/src/test/java/com/yahoo/config/application/ConfigDefinitionDirTest.java
index ada517c9a5c..5d0766229e4 100644
--- a/config-application-package/src/test/java/com/yahoo/config/application/ConfigDefinitionDirTest.java
+++ b/config-application-package/src/test/java/com/yahoo/config/application/ConfigDefinitionDirTest.java
@@ -1,10 +1,11 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.application;
 
-import com.google.common.io.Files;
 import com.yahoo.config.model.application.provider.Bundle;
 import com.yahoo.io.IOUtils;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 
 import java.io.File;
 import java.io.IOException;
@@ -23,9 +24,12 @@ public class ConfigDefinitionDirTest {
     private static final String bundleFileName = "com.yahoo.searcher1.jar";
     private static final File bundleFile = new File("src/test/resources/defdircomponent/" + bundleFileName);
 
+    @Rule
+    public TemporaryFolder temporaryFolder = new TemporaryFolder();
+
     @Test
     public void require_that_defs_are_added() throws IOException {
-        File defDir = Files.createTempDir();
+        File defDir = temporaryFolder.newFolder();
         ConfigDefinitionDir dir = new ConfigDefinitionDir(defDir);
         Bundle bundle = new Bundle(new JarFile(bundleFile), bundleFile);
         assertThat(defDir.listFiles().length, is(0));
@@ -36,7 +40,7 @@ public class ConfigDefinitionDirTest {
 
     @Test
     public void require_that_conflicting_defs_are_not_added() throws IOException {
-        File defDir = Files.createTempDir();
+        File defDir = temporaryFolder.newFolder();
         IOUtils.writeFile(new File(defDir, "foo.def"), "alreadyexists", false);
         ConfigDefinitionDir dir = new ConfigDefinitionDir(defDir);
         Bundle bundle = new Bundle(new JarFile(bundleFile), bundleFile);
diff --git a/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationFileTest.java b/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationFileTest.java
index ac207de7231..b1c0d78b299 100644
--- a/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationFileTest.java
+++ b/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationFileTest.java
@@ -1,10 +1,11 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.model.application.provider;
 
-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 org.junit.Rule;
+import org.junit.rules.TemporaryFolder;
 
 import java.io.File;
 
@@ -14,9 +15,12 @@ import java.io.File;
  */
 public class FilesApplicationFileTest extends ApplicationFileTest {
 
+    @Rule
+    public TemporaryFolder temporaryFolder = new TemporaryFolder();
+
     @Override
     public ApplicationFile getApplicationFile(Path path) throws Exception {
-        File tmp = Files.createTempDir();
+        File tmp = temporaryFolder.newFolder();
         writeAppTo(tmp);
         return new FilesApplicationFile(path, new File(tmp, path.getRelative()));
     }