Replace timeout- with io-exception

2 files changed, 3 insertions, 4 deletions

diff --git a/flags/src/main/java/com/yahoo/vespa/flags/FileFlagSource.java b/flags/src/main/java/com/yahoo/vespa/flags/FileFlagSource.java
index f13a122b156..93413c74fa9 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/FileFlagSource.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/FileFlagSource.java
@@ -1,10 +1,9 @@
 // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.flags;
 
-import com.google.common.util.concurrent.UncheckedTimeoutException;
-
 import javax.inject.Inject;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
@@ -52,7 +51,7 @@ public class FileFlagSource implements FlagSource {
         } catch (NoSuchFileException e) {
             return Optional.empty();
         } catch (IOException e) {
-            throw new UncheckedTimeoutException(e);
+            throw new UncheckedIOException(e);
         }
     }
 
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/JacksonFlag.java b/flags/src/main/java/com/yahoo/vespa/flags/JacksonFlag.java
index 99add358e75..7d23b90dd8a 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/JacksonFlag.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/JacksonFlag.java
@@ -14,7 +14,7 @@ public class JacksonFlag<T> implements Flag {
     private final static ObjectMapper mapper = new ObjectMapper();
 
     private final FlagId id;
-    private final Class<T> jacksonClass;
+    private final Class<? extends T> jacksonClass;
     private final T defaultValue;
     private final FlagSource source;