diff options
author | Harald Musum <musum@yahoo-inc.com> | 2016-06-23 14:35:01 +0200 |
---|---|---|
committer | Harald Musum <musum@yahoo-inc.com> | 2016-06-23 14:35:01 +0200 |
commit | 28ba52c80f8f6489a2769bb67090658e4f8601f9 (patch) | |
tree | 4e91c8ceb9539f332e1cb1111fde8811b25c8744 /config-application-package/src/main/java/com | |
parent | 9cdabbcdd2f081f961d32cc2d62f26f6894e5f4b (diff) |
Remove Guava use in standalone use of application preprocessor
Diffstat (limited to 'config-application-package/src/main/java/com')
-rw-r--r-- | config-application-package/src/main/java/com/yahoo/config/model/application/provider/Bundle.java | 6 |
1 files changed, 2 insertions, 4 deletions
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); } |