From 3db6ee4c270d55b3e42623cf2a023f1ef4042a26 Mon Sep 17 00:00:00 2001 From: Ignasi Barrera Date: Thu, 25 Apr 2013 16:42:28 +0200 Subject: [PATCH] Use Futures.getUnchecked to get strategy results --- .../internal/DeleteAllClientsInListImpl.java | 15 +++------------ .../internal/DeleteAllNodesInListImpl.java | 15 +++------------ .../chef/strategy/internal/ListClientsImpl.java | 15 +++------------ .../internal/ListCookbookVersionsImpl.java | 15 +++------------ .../strategy/internal/ListEnvironmentsImpl.java | 14 +++----------- .../chef/strategy/internal/ListNodesImpl.java | 15 +++------------ 6 files changed, 18 insertions(+), 71 deletions(-) diff --git a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/DeleteAllClientsInListImpl.java b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/DeleteAllClientsInListImpl.java index ad1e18dbc2..b6e71a179a 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/DeleteAllClientsInListImpl.java +++ b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/DeleteAllClientsInListImpl.java @@ -19,13 +19,12 @@ package org.jclouds.chef.strategy.internal; import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.base.Throwables.propagate; import static com.google.common.collect.Iterables.transform; import static com.google.common.util.concurrent.Futures.allAsList; +import static com.google.common.util.concurrent.Futures.getUnchecked; import java.util.List; import java.util.concurrent.Callable; -import java.util.concurrent.TimeUnit; import javax.annotation.Resource; import javax.inject.Named; @@ -59,10 +58,6 @@ public class DeleteAllClientsInListImpl implements DeleteAllClientsInList { @Named(ChefProperties.CHEF_LOGGER) protected Logger logger = Logger.NULL; - @Inject(optional = true) - @Named(Constants.PROPERTY_REQUEST_TIMEOUT) - protected Long maxTime; - @Inject DeleteAllClientsInListImpl(@Named(Constants.PROPERTY_USER_THREADS) ListeningExecutorService userExecutor, ChefApi api) { this.userExecutor = checkNotNull(userExecutor, "userExecuor"); @@ -89,11 +84,7 @@ public class DeleteAllClientsInListImpl implements DeleteAllClientsInList { } })); - try { - logger.trace(String.format("deleting clients: %s", Joiner.on(',').join(names))); - futures.get(maxTime, TimeUnit.MILLISECONDS); - } catch (Exception e) { - throw propagate(e); - } + logger.trace(String.format("deleting clients: %s", Joiner.on(',').join(names))); + getUnchecked(futures); } } diff --git a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/DeleteAllNodesInListImpl.java b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/DeleteAllNodesInListImpl.java index cc586dfa81..82ce9f34c7 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/DeleteAllNodesInListImpl.java +++ b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/DeleteAllNodesInListImpl.java @@ -19,13 +19,12 @@ package org.jclouds.chef.strategy.internal; import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.base.Throwables.propagate; import static com.google.common.collect.Iterables.transform; import static com.google.common.util.concurrent.Futures.allAsList; +import static com.google.common.util.concurrent.Futures.getUnchecked; import java.util.List; import java.util.concurrent.Callable; -import java.util.concurrent.TimeUnit; import javax.annotation.Resource; import javax.inject.Named; @@ -58,10 +57,6 @@ public class DeleteAllNodesInListImpl implements DeleteAllNodesInList { @Named(ChefProperties.CHEF_LOGGER) protected Logger logger = Logger.NULL; - @Inject(optional = true) - @Named(Constants.PROPERTY_REQUEST_TIMEOUT) - protected Long maxTime; - @Inject DeleteAllNodesInListImpl(@Named(Constants.PROPERTY_USER_THREADS) ListeningExecutorService userExecutor, ChefApi api) { this.userExecutor = checkNotNull(userExecutor, "userExecuor"); @@ -87,11 +82,7 @@ public class DeleteAllNodesInListImpl implements DeleteAllNodesInList { } })); - try { - logger.trace(String.format("deleting nodes: %s", Joiner.on(',').join(names))); - futures.get(maxTime, TimeUnit.MILLISECONDS); - } catch (Exception e) { - throw propagate(e); - } + logger.trace(String.format("deleting nodes: %s", Joiner.on(',').join(names))); + getUnchecked(futures); } } diff --git a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListClientsImpl.java b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListClientsImpl.java index e24a209f6b..0673d3c1e2 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListClientsImpl.java +++ b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListClientsImpl.java @@ -19,14 +19,13 @@ package org.jclouds.chef.strategy.internal; import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.base.Throwables.propagate; import static com.google.common.collect.Iterables.filter; import static com.google.common.collect.Iterables.transform; import static com.google.common.util.concurrent.Futures.allAsList; +import static com.google.common.util.concurrent.Futures.getUnchecked; import java.util.List; import java.util.concurrent.Callable; -import java.util.concurrent.TimeUnit; import javax.annotation.Resource; import javax.inject.Named; @@ -60,10 +59,6 @@ public class ListClientsImpl implements ListClients { @Named(ChefProperties.CHEF_LOGGER) protected Logger logger = Logger.NULL; - @Inject(optional = true) - @Named(Constants.PROPERTY_REQUEST_TIMEOUT) - protected Long maxTime; - @Inject ListClientsImpl(@Named(Constants.PROPERTY_USER_THREADS) ListeningExecutorService userExecutor, ChefApi api) { this.userExecutor = checkNotNull(userExecutor, "userExecuor"); @@ -110,12 +105,8 @@ public class ListClientsImpl implements ListClients { } })); - try { - logger.trace(String.format("getting clients: %s", Joiner.on(',').join(toGet))); - return futures.get(maxTime, TimeUnit.MILLISECONDS); - } catch (Exception e) { - throw propagate(e); - } + logger.trace(String.format("getting clients: %s", Joiner.on(',').join(toGet))); + return getUnchecked(futures); } } diff --git a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListCookbookVersionsImpl.java b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListCookbookVersionsImpl.java index 71dfee84de..33e95fa869 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListCookbookVersionsImpl.java +++ b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListCookbookVersionsImpl.java @@ -19,16 +19,15 @@ package org.jclouds.chef.strategy.internal; import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.base.Throwables.propagate; import static com.google.common.collect.Iterables.concat; import static com.google.common.collect.Iterables.filter; import static com.google.common.collect.Iterables.transform; import static com.google.common.util.concurrent.Futures.allAsList; +import static com.google.common.util.concurrent.Futures.getUnchecked; import java.util.List; import java.util.Set; import java.util.concurrent.Callable; -import java.util.concurrent.TimeUnit; import javax.annotation.Resource; import javax.inject.Named; @@ -61,10 +60,6 @@ public class ListCookbookVersionsImpl implements ListCookbookVersions { @Named(ChefProperties.CHEF_LOGGER) protected Logger logger = Logger.NULL; - @Inject(optional = true) - @Named(Constants.PROPERTY_REQUEST_TIMEOUT) - protected Long maxTime; - @Inject ListCookbookVersionsImpl(@Named(Constants.PROPERTY_USER_THREADS) ListeningExecutorService userExecutor, ChefApi api) { this.userExecutor = checkNotNull(userExecutor, "userExecuor"); @@ -119,12 +114,8 @@ public class ListCookbookVersionsImpl implements ListCookbookVersions { } })); - try { - logger.trace(String.format("getting versions of cookbook: " + cookbook)); - return futures.get(maxTime, TimeUnit.MILLISECONDS); - } catch (Exception e) { - throw propagate(e); - } + logger.trace(String.format("getting versions of cookbook: " + cookbook)); + return getUnchecked(futures); } })); } diff --git a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListEnvironmentsImpl.java b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListEnvironmentsImpl.java index 0d45a8809e..86cf3bbbb7 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListEnvironmentsImpl.java +++ b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListEnvironmentsImpl.java @@ -19,14 +19,13 @@ package org.jclouds.chef.strategy.internal; import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.base.Throwables.propagate; import static com.google.common.collect.Iterables.filter; import static com.google.common.collect.Iterables.transform; import static com.google.common.util.concurrent.Futures.allAsList; +import static com.google.common.util.concurrent.Futures.getUnchecked; import java.util.List; import java.util.concurrent.Callable; -import java.util.concurrent.TimeUnit; import javax.annotation.Resource; import javax.inject.Named; @@ -54,9 +53,6 @@ public class ListEnvironmentsImpl implements ListEnvironments { @Resource @Named(ChefProperties.CHEF_LOGGER) protected Logger logger = Logger.NULL; - @Inject(optional = true) - @Named(Constants.PROPERTY_REQUEST_TIMEOUT) - protected Long maxTime; @Inject ListEnvironmentsImpl(@Named(Constants.PROPERTY_USER_THREADS) ListeningExecutorService userExecutor, ChefApi api) { @@ -105,11 +101,7 @@ public class ListEnvironmentsImpl implements ListEnvironments { } })); - try { - logger.trace(String.format("deleting environments: %s", Joiner.on(',').join(toGet))); - return futures.get(maxTime, TimeUnit.MILLISECONDS); - } catch (Exception e) { - throw propagate(e); - } + logger.trace(String.format("deleting environments: %s", Joiner.on(',').join(toGet))); + return getUnchecked(futures); } } diff --git a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListNodesImpl.java b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListNodesImpl.java index 23a5f249bf..bb2a6fe66c 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListNodesImpl.java +++ b/apis/chef/src/main/java/org/jclouds/chef/strategy/internal/ListNodesImpl.java @@ -19,14 +19,13 @@ package org.jclouds.chef.strategy.internal; import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.base.Throwables.propagate; import static com.google.common.collect.Iterables.filter; import static com.google.common.collect.Iterables.transform; import static com.google.common.util.concurrent.Futures.allAsList; +import static com.google.common.util.concurrent.Futures.getUnchecked; import java.util.List; import java.util.concurrent.Callable; -import java.util.concurrent.TimeUnit; import javax.annotation.Resource; import javax.inject.Named; @@ -60,10 +59,6 @@ public class ListNodesImpl implements ListNodes { @Named(ChefProperties.CHEF_LOGGER) protected Logger logger = Logger.NULL; - @Inject(optional = true) - @Named(Constants.PROPERTY_REQUEST_TIMEOUT) - protected Long maxTime; - @Inject ListNodesImpl(@Named(Constants.PROPERTY_USER_THREADS) ListeningExecutorService userExecutor, ChefApi api) { this.userExecutor = checkNotNull(userExecutor, "userExecuor"); @@ -109,12 +104,8 @@ public class ListNodesImpl implements ListNodes { } })); - try { - logger.trace(String.format("getting nodes: %s", Joiner.on(',').join(toGet))); - return futures.get(maxTime, TimeUnit.MILLISECONDS); - } catch (Exception e) { - throw propagate(e); - } + logger.trace(String.format("getting nodes: %s", Joiner.on(',').join(toGet))); + return getUnchecked(futures); } }