diff --git a/apis/byon/src/main/java/org/jclouds/byon/suppliers/SupplyFromProviderURIOrNodesProperty.java b/apis/byon/src/main/java/org/jclouds/byon/suppliers/SupplyFromProviderURIOrNodesProperty.java index 106a7efed8..d6f2df5c0c 100644 --- a/apis/byon/src/main/java/org/jclouds/byon/suppliers/SupplyFromProviderURIOrNodesProperty.java +++ b/apis/byon/src/main/java/org/jclouds/byon/suppliers/SupplyFromProviderURIOrNodesProperty.java @@ -81,9 +81,8 @@ public class SupplyFromProviderURIOrNodesProperty implements Supplier extends AbstractMap { try { return (value != null || toMap.containsKey(key)) ? value.getInput() : null; } catch (IOException e) { - Throwables.propagate(e); - return null; + throw Throwables.propagate(e); } } @@ -80,8 +79,7 @@ public class InputSupplierMap extends AbstractMap { try { return toMap.containsKey(key) ? toMap.remove(key).getInput() : null; } catch (IOException e) { - Throwables.propagate(e); - return null; + throw Throwables.propagate(e); } } @@ -124,8 +122,7 @@ public class InputSupplierMap extends AbstractMap { try { return entry.getValue().getInput(); } catch (IOException e) { - Throwables.propagate(e); - return null; + throw Throwables.propagate(e); } } }; diff --git a/core/src/main/java/org/jclouds/crypto/CryptoStreams.java b/core/src/main/java/org/jclouds/crypto/CryptoStreams.java index 9b650dfc74..59c25a6012 100644 --- a/core/src/main/java/org/jclouds/crypto/CryptoStreams.java +++ b/core/src/main/java/org/jclouds/crypto/CryptoStreams.java @@ -176,8 +176,7 @@ public class CryptoStreams { try { return digest(supplier, MessageDigest.getInstance("SHA1")); } catch (NoSuchAlgorithmException e) { - Throwables.propagate(e); - return null; + throw Throwables.propagate(e); } } @@ -185,8 +184,7 @@ public class CryptoStreams { try { return sha1(ByteStreams.newInputStreamSupplier(in)); } catch (IOException e) { - Throwables.propagate(e); - return null; + throw Throwables.propagate(e); } } @@ -207,8 +205,7 @@ public class CryptoStreams { try { return digest(supplier, MessageDigest.getInstance("MD5")); } catch (NoSuchAlgorithmException e) { - Throwables.propagate(e); - return null; + throw Throwables.propagate(e); } } @@ -216,8 +213,7 @@ public class CryptoStreams { try { return md5(ByteStreams.newInputStreamSupplier(in)); } catch (IOException e) { - Throwables.propagate(e); - return null; + throw Throwables.propagate(e); } } diff --git a/core/src/main/java/org/jclouds/crypto/Pems.java b/core/src/main/java/org/jclouds/crypto/Pems.java index bcde3deb91..ebeadd8304 100644 --- a/core/src/main/java/org/jclouds/crypto/Pems.java +++ b/core/src/main/java/org/jclouds/crypto/Pems.java @@ -169,8 +169,7 @@ public class Pems { try { return privateKeySpec(InputSuppliers.of(pem)); } catch (IOException e) { - Throwables.propagate(e); - return null; + throw Throwables.propagate(e); } } diff --git a/core/src/main/java/org/jclouds/http/config/SSLModule.java b/core/src/main/java/org/jclouds/http/config/SSLModule.java index f530d7571f..df1e5803d2 100644 --- a/core/src/main/java/org/jclouds/http/config/SSLModule.java +++ b/core/src/main/java/org/jclouds/http/config/SSLModule.java @@ -91,8 +91,7 @@ public class SSLModule extends AbstractModule { sc.init(null, new TrustManager[] { trustAllCerts }, new SecureRandom()); return sc; } catch (Exception e) { - Throwables.propagate(e); - return null; + throw Throwables.propagate(e); } } diff --git a/core/src/main/java/org/jclouds/io/Payloads.java b/core/src/main/java/org/jclouds/io/Payloads.java index d305c15a01..ca2a6ed7b0 100644 --- a/core/src/main/java/org/jclouds/io/Payloads.java +++ b/core/src/main/java/org/jclouds/io/Payloads.java @@ -131,8 +131,7 @@ public class Payloads { try { return calculateMD5(payload, MessageDigest.getInstance("MD5")); } catch (NoSuchAlgorithmException e) { - Throwables.propagate(e); - return null; + throw Throwables.propagate(e); } } @@ -160,8 +159,7 @@ public class Payloads { try { return calculateMD5(payloadEnclosing, MessageDigest.getInstance("MD5")); } catch (NoSuchAlgorithmException e) { - Throwables.propagate(e); - return null; + throw Throwables.propagate(e); } } } diff --git a/core/src/main/java/org/jclouds/io/internal/BasePayloadSlicer.java b/core/src/main/java/org/jclouds/io/internal/BasePayloadSlicer.java index 364938ca1f..df04541ef5 100644 --- a/core/src/main/java/org/jclouds/io/internal/BasePayloadSlicer.java +++ b/core/src/main/java/org/jclouds/io/internal/BasePayloadSlicer.java @@ -76,8 +76,7 @@ public class BasePayloadSlicer implements PayloadSlicer { try { return doSlice(new FileInputStream(content), offset, length); } catch (FileNotFoundException e) { - Throwables.propagate(e); - return null; + throw Throwables.propagate(e); } } diff --git a/core/src/main/java/org/jclouds/io/payloads/FilePayload.java b/core/src/main/java/org/jclouds/io/payloads/FilePayload.java index 65be4ffebd..65e461ae8f 100644 --- a/core/src/main/java/org/jclouds/io/payloads/FilePayload.java +++ b/core/src/main/java/org/jclouds/io/payloads/FilePayload.java @@ -47,9 +47,8 @@ public class FilePayload extends BasePayload { try { return new FileInputStream(content); } catch (FileNotFoundException e) { - Throwables.propagate(e); - return null; + throw Throwables.propagate(e); } } -} \ No newline at end of file +} diff --git a/core/src/main/java/org/jclouds/io/payloads/InputStreamSupplierPayload.java b/core/src/main/java/org/jclouds/io/payloads/InputStreamSupplierPayload.java index d700e5f734..29ffe285c2 100644 --- a/core/src/main/java/org/jclouds/io/payloads/InputStreamSupplierPayload.java +++ b/core/src/main/java/org/jclouds/io/payloads/InputStreamSupplierPayload.java @@ -48,8 +48,7 @@ public class InputStreamSupplierPayload extends BasePayload { utils.checkRequestHasRequiredProperties(request); return request; } catch (ExecutionException e) { - Throwables.propagate(e); - return null; + throw Throwables.propagate(e); } } diff --git a/core/src/test/java/org/jclouds/json/BaseParserTest.java b/core/src/test/java/org/jclouds/json/BaseParserTest.java index c65e80172c..27d6828b26 100644 --- a/core/src/test/java/org/jclouds/json/BaseParserTest.java +++ b/core/src/test/java/org/jclouds/json/BaseParserTest.java @@ -58,8 +58,7 @@ public abstract class BaseParserTest { return (Function) RestAnnotationProcessor.getTransformerForMethod(getClass() .getMethod("expected"), i); } catch (Exception e) { - Throwables.propagate(e); - return null; + throw Throwables.propagate(e); } } diff --git a/drivers/gae/src/test/java/org/jclouds/gae/AsyncGaeHttpCommandExecutorServiceIntegrationTest.java b/drivers/gae/src/test/java/org/jclouds/gae/AsyncGaeHttpCommandExecutorServiceIntegrationTest.java index 2971e88031..175863962d 100644 --- a/drivers/gae/src/test/java/org/jclouds/gae/AsyncGaeHttpCommandExecutorServiceIntegrationTest.java +++ b/drivers/gae/src/test/java/org/jclouds/gae/AsyncGaeHttpCommandExecutorServiceIntegrationTest.java @@ -90,8 +90,7 @@ public class AsyncGaeHttpCommandExecutorServiceIntegrationTest extends BaseHttpC try { return Futures.makeListenable(service.fetchAsync(fetch.toURL()), MoreExecutors.sameThreadExecutor()); } catch (MalformedURLException e) { - Throwables.propagate(e); - return null; + throw Throwables.propagate(e); } } diff --git a/labs/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/binders/BaseBindVMSpecToXmlPayload.java b/labs/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/binders/BaseBindVMSpecToXmlPayload.java index f21e4934a8..5aa9d9d60e 100644 --- a/labs/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/binders/BaseBindVMSpecToXmlPayload.java +++ b/labs/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/binders/BaseBindVMSpecToXmlPayload.java @@ -74,8 +74,7 @@ public abstract class BaseBindVMSpecToXmlPayload extends BindToStringPayload outputProperties.put(javax.xml.transform.OutputKeys.OMIT_XML_DECLARATION, "yes"); return rootBuilder.asString(outputProperties); } catch (Exception e) { - Throwables.propagate(e); - return null; + throw Throwables.propagate(e); } } diff --git a/labs/virtualbox/src/main/java/org/jclouds/virtualbox/functions/admin/FileDownloadFromURI.java b/labs/virtualbox/src/main/java/org/jclouds/virtualbox/functions/admin/FileDownloadFromURI.java index 013da783dd..2f25c3c35a 100644 --- a/labs/virtualbox/src/main/java/org/jclouds/virtualbox/functions/admin/FileDownloadFromURI.java +++ b/labs/virtualbox/src/main/java/org/jclouds/virtualbox/functions/admin/FileDownloadFromURI.java @@ -84,8 +84,7 @@ public class FileDownloadFromURI implements Function { return file; } } catch (Exception e) { - Throwables.propagate(e); - return null; + throw Throwables.propagate(e); } } } diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccess.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccess.java index 4c7237e830..273c106c0e 100644 --- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccess.java +++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccess.java @@ -201,8 +201,7 @@ public class AdminAccess implements Statement { grantSudoToAdminUser, authorizeAdminPublicKey, installAdminPrivateKey, resetLoginPassword, cryptFunction); } catch (IOException e) { - Throwables.propagate(e); - return null; + throw Throwables.propagate(e); } } }