Remove calls to deprecated Throwables.propagate() method
Change-Id: Id48a8f1d4fb02560cfb77108f554556a3cad9b16
diff --git a/core/api/src/main/java/org/onosproject/net/config/BaseConfig.java b/core/api/src/main/java/org/onosproject/net/config/BaseConfig.java
index 0098c43..86687c5 100644
--- a/core/api/src/main/java/org/onosproject/net/config/BaseConfig.java
+++ b/core/api/src/main/java/org/onosproject/net/config/BaseConfig.java
@@ -15,18 +15,17 @@
*/
package org.onosproject.net.config;
-import static org.slf4j.LoggerFactory.getLogger;
-
-import java.io.IOException;
-
+import com.fasterxml.jackson.databind.ObjectMapper;
import org.onlab.osgi.DefaultServiceDirectory;
import org.onlab.osgi.ServiceDirectory;
import org.onosproject.codec.CodecContext;
import org.onosproject.codec.CodecService;
import org.onosproject.codec.JsonCodec;
import org.slf4j.Logger;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Throwables;
+
+import java.io.IOException;
+
+import static org.slf4j.LoggerFactory.getLogger;
/**
* {@link Config} with access to {@link CodecService}.
@@ -69,7 +68,7 @@
return decode(mapper().readTree(json), entityClass);
} catch (IOException e) {
log.error("Exception caught.", e);
- throw Throwables.propagate(e);
+ throw new IllegalArgumentException(e);
}
}
diff --git a/core/api/src/main/java/org/onosproject/store/primitives/DefaultAtomicCounterMap.java b/core/api/src/main/java/org/onosproject/store/primitives/DefaultAtomicCounterMap.java
index 7fdc2df..b79effc 100644
--- a/core/api/src/main/java/org/onosproject/store/primitives/DefaultAtomicCounterMap.java
+++ b/core/api/src/main/java/org/onosproject/store/primitives/DefaultAtomicCounterMap.java
@@ -126,7 +126,7 @@
} catch (TimeoutException e) {
throw new ConsistentMapException.Timeout(name());
} catch (ExecutionException e) {
- Throwables.propagateIfPossible(e.getCause());
+ Throwables.throwIfUnchecked(e.getCause());
throw new ConsistentMapException(e.getCause());
}
}
diff --git a/core/api/src/main/java/org/onosproject/store/primitives/DefaultConsistentMap.java b/core/api/src/main/java/org/onosproject/store/primitives/DefaultConsistentMap.java
index b22bb7d..1bc62b3 100644
--- a/core/api/src/main/java/org/onosproject/store/primitives/DefaultConsistentMap.java
+++ b/core/api/src/main/java/org/onosproject/store/primitives/DefaultConsistentMap.java
@@ -232,7 +232,7 @@
} catch (TimeoutException e) {
throw new ConsistentMapException.Timeout(name());
} catch (ExecutionException e) {
- Throwables.propagateIfPossible(e.getCause());
+ Throwables.throwIfUnchecked(e.getCause());
throw new ConsistentMapException(e.getCause());
}
}
diff --git a/core/api/src/main/java/org/onosproject/store/primitives/DefaultConsistentMultimap.java b/core/api/src/main/java/org/onosproject/store/primitives/DefaultConsistentMultimap.java
index 1230e7a..8725c61 100644
--- a/core/api/src/main/java/org/onosproject/store/primitives/DefaultConsistentMultimap.java
+++ b/core/api/src/main/java/org/onosproject/store/primitives/DefaultConsistentMultimap.java
@@ -165,7 +165,7 @@
} catch (TimeoutException e) {
throw new ConsistentMapException.Timeout();
} catch (ExecutionException e) {
- Throwables.propagateIfPossible(e.getCause());
+ Throwables.throwIfUnchecked(e.getCause());
throw new ConsistentMapException(e.getCause());
}
}
diff --git a/core/api/src/main/java/org/onosproject/store/primitives/DefaultConsistentTreeMap.java b/core/api/src/main/java/org/onosproject/store/primitives/DefaultConsistentTreeMap.java
index 30a8d67..c9dd5df 100644
--- a/core/api/src/main/java/org/onosproject/store/primitives/DefaultConsistentTreeMap.java
+++ b/core/api/src/main/java/org/onosproject/store/primitives/DefaultConsistentTreeMap.java
@@ -17,12 +17,11 @@
package org.onosproject.store.primitives;
import com.google.common.base.Throwables;
-
-import org.onosproject.store.service.ConsistentMapException;
import org.onosproject.store.service.AsyncConsistentTreeMap;
+import org.onosproject.store.service.ConsistentMapException;
+import org.onosproject.store.service.ConsistentTreeMap;
import org.onosproject.store.service.MapEventListener;
import org.onosproject.store.service.Synchronous;
-import org.onosproject.store.service.ConsistentTreeMap;
import org.onosproject.store.service.Versioned;
import java.util.Collection;
@@ -63,7 +62,7 @@
Thread.currentThread().interrupt();
throw new ConsistentMapException.Interrupted();
} catch (ExecutionException e) {
- Throwables.propagateIfPossible(e.getCause());
+ Throwables.throwIfUnchecked(e.getCause());
throw new ConsistentMapException(e.getCause());
} catch (TimeoutException e) {
throw new ConsistentMapException.Timeout();
diff --git a/core/api/src/main/java/org/onosproject/store/primitives/DefaultDocumentTree.java b/core/api/src/main/java/org/onosproject/store/primitives/DefaultDocumentTree.java
index 42142cc..ae2f640 100644
--- a/core/api/src/main/java/org/onosproject/store/primitives/DefaultDocumentTree.java
+++ b/core/api/src/main/java/org/onosproject/store/primitives/DefaultDocumentTree.java
@@ -119,7 +119,7 @@
} catch (TimeoutException e) {
throw new DocumentException.Timeout(name());
} catch (ExecutionException e) {
- Throwables.propagateIfPossible(e.getCause());
+ Throwables.throwIfUnchecked(e.getCause());
throw new ConsistentMapException(e.getCause());
}
}