JCLOUDS-40 unasync Fallback.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/a164c071 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/a164c071 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/a164c071 Branch: refs/heads/master Commit: a164c071a903c6cd31da7b0d2cc33c2997f8a677 Parents: 66b7bd1 Author: Adrian Cole <[email protected]> Authored: Mon Oct 6 13:35:44 2014 -0700 Committer: Adrian Cole <[email protected]> Committed: Mon Oct 6 16:04:02 2014 -0700 ---------------------------------------------------------------------- .../v2/fallbacks/EmptyFloatingIPsFallback.java | 15 ++++----------- .../neutron/v2/fallbacks/EmptyNetworksFallback.java | 15 ++++----------- .../neutron/v2/fallbacks/EmptyPortsFallback.java | 15 ++++----------- .../neutron/v2/fallbacks/EmptyRoutersFallback.java | 15 ++++----------- .../neutron/v2/fallbacks/EmptyRulesFallback.java | 7 ------- .../v2/fallbacks/EmptySecurityGroupsFallback.java | 15 ++++----------- .../neutron/v2/fallbacks/EmptySubnetsFallback.java | 15 ++++----------- .../lbaas/v1/EmptyHealthMonitorsFallback.java | 8 -------- .../v2/fallbacks/lbaas/v1/EmptyMembersFallback.java | 8 -------- .../v2/fallbacks/lbaas/v1/EmptyPoolsFallback.java | 8 -------- .../v2/fallbacks/lbaas/v1/EmptyVIPsFallback.java | 8 -------- 11 files changed, 24 insertions(+), 105 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/a164c071/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyFloatingIPsFallback.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyFloatingIPsFallback.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyFloatingIPsFallback.java index b9b03c4..ede9046 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyFloatingIPsFallback.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyFloatingIPsFallback.java @@ -17,23 +17,16 @@ package org.jclouds.openstack.neutron.v2.fallbacks; -import com.google.common.util.concurrent.ListenableFuture; -import org.jclouds.Fallback; -import org.jclouds.openstack.neutron.v2.domain.FloatingIPs; -import org.jclouds.rest.ResourceNotFoundException; - import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Throwables.propagate; -import static com.google.common.util.concurrent.Futures.immediateFuture; import static org.jclouds.http.HttpUtils.contains404; import static org.jclouds.util.Throwables2.getFirstThrowableOfType; -public class EmptyFloatingIPsFallback implements Fallback<FloatingIPs> { - - public ListenableFuture<FloatingIPs> create(Throwable t) throws Exception { - return immediateFuture(createOrPropagate(t)); - } +import org.jclouds.Fallback; +import org.jclouds.openstack.neutron.v2.domain.FloatingIPs; +import org.jclouds.rest.ResourceNotFoundException; +public class EmptyFloatingIPsFallback implements Fallback<FloatingIPs> { @Override public FloatingIPs createOrPropagate(Throwable t) throws Exception { if ((getFirstThrowableOfType(checkNotNull(t, "throwable"), ResourceNotFoundException.class) != null) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a164c071/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyNetworksFallback.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyNetworksFallback.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyNetworksFallback.java index 3a859a9..8410afb 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyNetworksFallback.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyNetworksFallback.java @@ -17,23 +17,16 @@ package org.jclouds.openstack.neutron.v2.fallbacks; -import com.google.common.util.concurrent.ListenableFuture; -import org.jclouds.Fallback; -import org.jclouds.openstack.neutron.v2.domain.Networks; -import org.jclouds.rest.ResourceNotFoundException; - import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Throwables.propagate; -import static com.google.common.util.concurrent.Futures.immediateFuture; import static org.jclouds.http.HttpUtils.contains404; import static org.jclouds.util.Throwables2.getFirstThrowableOfType; -public class EmptyNetworksFallback implements Fallback<Networks> { - - public ListenableFuture<Networks> create(Throwable t) throws Exception { - return immediateFuture(createOrPropagate(t)); - } +import org.jclouds.Fallback; +import org.jclouds.openstack.neutron.v2.domain.Networks; +import org.jclouds.rest.ResourceNotFoundException; +public class EmptyNetworksFallback implements Fallback<Networks> { @Override public Networks createOrPropagate(Throwable t) throws Exception { if ((getFirstThrowableOfType(checkNotNull(t, "throwable"), ResourceNotFoundException.class) != null) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a164c071/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyPortsFallback.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyPortsFallback.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyPortsFallback.java index 2ca5c84..ac2e0db 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyPortsFallback.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyPortsFallback.java @@ -17,23 +17,16 @@ package org.jclouds.openstack.neutron.v2.fallbacks; -import com.google.common.util.concurrent.ListenableFuture; -import org.jclouds.Fallback; -import org.jclouds.openstack.neutron.v2.domain.Ports; -import org.jclouds.rest.ResourceNotFoundException; - import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Throwables.propagate; -import static com.google.common.util.concurrent.Futures.immediateFuture; import static org.jclouds.http.HttpUtils.contains404; import static org.jclouds.util.Throwables2.getFirstThrowableOfType; -public class EmptyPortsFallback implements Fallback<Ports> { - - public ListenableFuture<Ports> create(Throwable t) throws Exception { - return immediateFuture(createOrPropagate(t)); - } +import org.jclouds.Fallback; +import org.jclouds.openstack.neutron.v2.domain.Ports; +import org.jclouds.rest.ResourceNotFoundException; +public class EmptyPortsFallback implements Fallback<Ports> { @Override public Ports createOrPropagate(Throwable t) throws Exception { if ((getFirstThrowableOfType(checkNotNull(t, "throwable"), ResourceNotFoundException.class) != null) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a164c071/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyRoutersFallback.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyRoutersFallback.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyRoutersFallback.java index 7019510..8b74be2 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyRoutersFallback.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyRoutersFallback.java @@ -17,23 +17,16 @@ package org.jclouds.openstack.neutron.v2.fallbacks; -import com.google.common.util.concurrent.ListenableFuture; -import org.jclouds.Fallback; -import org.jclouds.openstack.neutron.v2.domain.Routers; -import org.jclouds.rest.ResourceNotFoundException; - import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Throwables.propagate; -import static com.google.common.util.concurrent.Futures.immediateFuture; import static org.jclouds.http.HttpUtils.contains404; import static org.jclouds.util.Throwables2.getFirstThrowableOfType; -public class EmptyRoutersFallback implements Fallback<Routers> { - - public ListenableFuture<Routers> create(Throwable t) throws Exception { - return immediateFuture(createOrPropagate(t)); - } +import org.jclouds.Fallback; +import org.jclouds.openstack.neutron.v2.domain.Routers; +import org.jclouds.rest.ResourceNotFoundException; +public class EmptyRoutersFallback implements Fallback<Routers> { @Override public Routers createOrPropagate(Throwable t) throws Exception { if ((getFirstThrowableOfType(checkNotNull(t, "throwable"), ResourceNotFoundException.class) != null) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a164c071/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyRulesFallback.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyRulesFallback.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyRulesFallback.java index a559f4f..4556f74 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyRulesFallback.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyRulesFallback.java @@ -19,21 +19,14 @@ package org.jclouds.openstack.neutron.v2.fallbacks; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Throwables.propagate; -import static com.google.common.util.concurrent.Futures.immediateFuture; import static org.jclouds.http.HttpUtils.contains404; import static org.jclouds.util.Throwables2.getFirstThrowableOfType; import org.jclouds.Fallback; import org.jclouds.openstack.neutron.v2.domain.Rules; import org.jclouds.rest.ResourceNotFoundException; -import com.google.common.util.concurrent.ListenableFuture; public class EmptyRulesFallback implements Fallback<Rules> { - - public ListenableFuture<Rules> create(Throwable t) throws Exception { - return immediateFuture(createOrPropagate(t)); - } - @Override public Rules createOrPropagate(Throwable t) throws Exception { if ((getFirstThrowableOfType(checkNotNull(t, "throwable"), ResourceNotFoundException.class) != null) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a164c071/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptySecurityGroupsFallback.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptySecurityGroupsFallback.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptySecurityGroupsFallback.java index 5343c3f..70a3e37 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptySecurityGroupsFallback.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptySecurityGroupsFallback.java @@ -17,23 +17,16 @@ package org.jclouds.openstack.neutron.v2.fallbacks; -import com.google.common.util.concurrent.ListenableFuture; -import org.jclouds.Fallback; -import org.jclouds.openstack.neutron.v2.domain.SecurityGroups; -import org.jclouds.rest.ResourceNotFoundException; - import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Throwables.propagate; -import static com.google.common.util.concurrent.Futures.immediateFuture; import static org.jclouds.http.HttpUtils.contains404; import static org.jclouds.util.Throwables2.getFirstThrowableOfType; -public class EmptySecurityGroupsFallback implements Fallback<SecurityGroups> { - - public ListenableFuture<SecurityGroups> create(Throwable t) throws Exception { - return immediateFuture(createOrPropagate(t)); - } +import org.jclouds.Fallback; +import org.jclouds.openstack.neutron.v2.domain.SecurityGroups; +import org.jclouds.rest.ResourceNotFoundException; +public class EmptySecurityGroupsFallback implements Fallback<SecurityGroups> { @Override public SecurityGroups createOrPropagate(Throwable t) throws Exception { if ((getFirstThrowableOfType(checkNotNull(t, "throwable"), ResourceNotFoundException.class) != null) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a164c071/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptySubnetsFallback.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptySubnetsFallback.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptySubnetsFallback.java index 6f86023..8f7a94a 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptySubnetsFallback.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptySubnetsFallback.java @@ -17,23 +17,16 @@ package org.jclouds.openstack.neutron.v2.fallbacks; -import com.google.common.util.concurrent.ListenableFuture; -import org.jclouds.Fallback; -import org.jclouds.openstack.neutron.v2.domain.Subnets; -import org.jclouds.rest.ResourceNotFoundException; - import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Throwables.propagate; -import static com.google.common.util.concurrent.Futures.immediateFuture; import static org.jclouds.http.HttpUtils.contains404; import static org.jclouds.util.Throwables2.getFirstThrowableOfType; -public class EmptySubnetsFallback implements Fallback<Subnets> { - - public ListenableFuture<Subnets> create(Throwable t) throws Exception { - return immediateFuture(createOrPropagate(t)); - } +import org.jclouds.Fallback; +import org.jclouds.openstack.neutron.v2.domain.Subnets; +import org.jclouds.rest.ResourceNotFoundException; +public class EmptySubnetsFallback implements Fallback<Subnets> { @Override public Subnets createOrPropagate(Throwable t) throws Exception { if ((getFirstThrowableOfType(checkNotNull(t, "throwable"), ResourceNotFoundException.class) != null) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a164c071/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/lbaas/v1/EmptyHealthMonitorsFallback.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/lbaas/v1/EmptyHealthMonitorsFallback.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/lbaas/v1/EmptyHealthMonitorsFallback.java index f298a9c..8364fba 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/lbaas/v1/EmptyHealthMonitorsFallback.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/lbaas/v1/EmptyHealthMonitorsFallback.java @@ -19,7 +19,6 @@ package org.jclouds.openstack.neutron.v2.fallbacks.lbaas.v1; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Throwables.propagate; -import static com.google.common.util.concurrent.Futures.immediateFuture; import static org.jclouds.http.HttpUtils.contains404; import static org.jclouds.util.Throwables2.getFirstThrowableOfType; @@ -27,14 +26,7 @@ import org.jclouds.Fallback; import org.jclouds.openstack.neutron.v2.domain.lbaas.v1.HealthMonitors; import org.jclouds.rest.ResourceNotFoundException; -import com.google.common.util.concurrent.ListenableFuture; - public class EmptyHealthMonitorsFallback implements Fallback<HealthMonitors> { - - public ListenableFuture<HealthMonitors> create(Throwable t) throws Exception { - return immediateFuture(createOrPropagate(t)); - } - @Override public HealthMonitors createOrPropagate(Throwable t) throws Exception { if ((getFirstThrowableOfType(checkNotNull(t, "throwable"), ResourceNotFoundException.class) != null) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a164c071/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/lbaas/v1/EmptyMembersFallback.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/lbaas/v1/EmptyMembersFallback.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/lbaas/v1/EmptyMembersFallback.java index 1cbc38f..9cb8084 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/lbaas/v1/EmptyMembersFallback.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/lbaas/v1/EmptyMembersFallback.java @@ -19,7 +19,6 @@ package org.jclouds.openstack.neutron.v2.fallbacks.lbaas.v1; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Throwables.propagate; -import static com.google.common.util.concurrent.Futures.immediateFuture; import static org.jclouds.http.HttpUtils.contains404; import static org.jclouds.util.Throwables2.getFirstThrowableOfType; @@ -27,14 +26,7 @@ import org.jclouds.Fallback; import org.jclouds.openstack.neutron.v2.domain.lbaas.v1.Members; import org.jclouds.rest.ResourceNotFoundException; -import com.google.common.util.concurrent.ListenableFuture; - public class EmptyMembersFallback implements Fallback<Members> { - - public ListenableFuture<Members> create(Throwable t) throws Exception { - return immediateFuture(createOrPropagate(t)); - } - @Override public Members createOrPropagate(Throwable t) throws Exception { if ((getFirstThrowableOfType(checkNotNull(t, "throwable"), ResourceNotFoundException.class) != null) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a164c071/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/lbaas/v1/EmptyPoolsFallback.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/lbaas/v1/EmptyPoolsFallback.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/lbaas/v1/EmptyPoolsFallback.java index 8035c6f..0c2ce99 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/lbaas/v1/EmptyPoolsFallback.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/lbaas/v1/EmptyPoolsFallback.java @@ -19,7 +19,6 @@ package org.jclouds.openstack.neutron.v2.fallbacks.lbaas.v1; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Throwables.propagate; -import static com.google.common.util.concurrent.Futures.immediateFuture; import static org.jclouds.http.HttpUtils.contains404; import static org.jclouds.util.Throwables2.getFirstThrowableOfType; @@ -27,14 +26,7 @@ import org.jclouds.Fallback; import org.jclouds.openstack.neutron.v2.domain.lbaas.v1.Pools; import org.jclouds.rest.ResourceNotFoundException; -import com.google.common.util.concurrent.ListenableFuture; - public class EmptyPoolsFallback implements Fallback<Pools> { - - public ListenableFuture<Pools> create(Throwable t) throws Exception { - return immediateFuture(createOrPropagate(t)); - } - @Override public Pools createOrPropagate(Throwable t) throws Exception { if ((getFirstThrowableOfType(checkNotNull(t, "throwable"), ResourceNotFoundException.class) != null) http://git-wip-us.apache.org/repos/asf/jclouds/blob/a164c071/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/lbaas/v1/EmptyVIPsFallback.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/lbaas/v1/EmptyVIPsFallback.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/lbaas/v1/EmptyVIPsFallback.java index df3aa90..4dfae2d 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/lbaas/v1/EmptyVIPsFallback.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/lbaas/v1/EmptyVIPsFallback.java @@ -19,7 +19,6 @@ package org.jclouds.openstack.neutron.v2.fallbacks.lbaas.v1; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Throwables.propagate; -import static com.google.common.util.concurrent.Futures.immediateFuture; import static org.jclouds.http.HttpUtils.contains404; import static org.jclouds.util.Throwables2.getFirstThrowableOfType; @@ -27,14 +26,7 @@ import org.jclouds.Fallback; import org.jclouds.openstack.neutron.v2.domain.lbaas.v1.VIPs; import org.jclouds.rest.ResourceNotFoundException; -import com.google.common.util.concurrent.ListenableFuture; - public class EmptyVIPsFallback implements Fallback<VIPs> { - - public ListenableFuture<VIPs> create(Throwable t) throws Exception { - return immediateFuture(createOrPropagate(t)); - } - @Override public VIPs createOrPropagate(Throwable t) throws Exception { if ((getFirstThrowableOfType(checkNotNull(t, "throwable"), ResourceNotFoundException.class) != null)
