From 389a3d8c4468f2bb2e23ef6feb607c42f7ee774b Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Mon, 6 Oct 2014 13:35:44 -0700 Subject: [PATCH] JCLOUDS-40 unasync Fallback. --- .../marconi/v1/fallbacks/EmptyQueuesFallback.java | 15 ++++----------- .../v2/fallbacks/EmptyFloatingIPsFallback.java | 15 ++++----------- .../v2/fallbacks/EmptyNetworksFallback.java | 15 ++++----------- .../neutron/v2/fallbacks/EmptyPortsFallback.java | 15 ++++----------- .../v2/fallbacks/EmptyRoutersFallback.java | 15 ++++----------- .../neutron/v2/fallbacks/EmptyRulesFallback.java | 7 ------- .../v2/fallbacks/EmptySecurityGroupsFallback.java | 15 ++++----------- .../v2/fallbacks/EmptySubnetsFallback.java | 15 ++++----------- .../lbaas/v1/EmptyHealthMonitorsFallback.java | 8 -------- .../fallbacks/lbaas/v1/EmptyMembersFallback.java | 8 -------- .../v2/fallbacks/lbaas/v1/EmptyPoolsFallback.java | 8 -------- .../v2/fallbacks/lbaas/v1/EmptyVIPsFallback.java | 8 -------- 12 files changed, 28 insertions(+), 116 deletions(-) diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/fallbacks/EmptyQueuesFallback.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/fallbacks/EmptyQueuesFallback.java index a3ac019..810e934 100644 --- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/fallbacks/EmptyQueuesFallback.java +++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/fallbacks/EmptyQueuesFallback.java @@ -17,23 +17,16 @@ package org.jclouds.openstack.marconi.v1.fallbacks; -import com.google.common.util.concurrent.ListenableFuture; -import org.jclouds.Fallback; -import org.jclouds.openstack.marconi.v1.domain.Queues; -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 EmptyQueuesFallback implements Fallback { - - public ListenableFuture create(Throwable t) throws Exception { - return immediateFuture(createOrPropagate(t)); - } +import org.jclouds.Fallback; +import org.jclouds.openstack.marconi.v1.domain.Queues; +import org.jclouds.rest.ResourceNotFoundException; +public class EmptyQueuesFallback implements Fallback { @Override public Queues createOrPropagate(Throwable t) throws Exception { if ((getFirstThrowableOfType(checkNotNull(t, "throwable"), ResourceNotFoundException.class) != null) diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyFloatingIPsFallback.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyFloatingIPsFallback.java index b9b03c4..ede9046 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyFloatingIPsFallback.java +++ b/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 { - - public ListenableFuture 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 { @Override public FloatingIPs createOrPropagate(Throwable t) throws Exception { if ((getFirstThrowableOfType(checkNotNull(t, "throwable"), ResourceNotFoundException.class) != null) diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyNetworksFallback.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyNetworksFallback.java index 3a859a9..8410afb 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyNetworksFallback.java +++ b/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 { - - public ListenableFuture 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 { @Override public Networks createOrPropagate(Throwable t) throws Exception { if ((getFirstThrowableOfType(checkNotNull(t, "throwable"), ResourceNotFoundException.class) != null) diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyPortsFallback.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyPortsFallback.java index 2ca5c84..ac2e0db 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyPortsFallback.java +++ b/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 { - - public ListenableFuture 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 { @Override public Ports createOrPropagate(Throwable t) throws Exception { if ((getFirstThrowableOfType(checkNotNull(t, "throwable"), ResourceNotFoundException.class) != null) diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyRoutersFallback.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyRoutersFallback.java index 7019510..8b74be2 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyRoutersFallback.java +++ b/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 { - - public ListenableFuture 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 { @Override public Routers createOrPropagate(Throwable t) throws Exception { if ((getFirstThrowableOfType(checkNotNull(t, "throwable"), ResourceNotFoundException.class) != null) diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyRulesFallback.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyRulesFallback.java index a559f4f..4556f74 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyRulesFallback.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptyRulesFallback.java @@ -19,21 +19,14 @@ 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 { - - public ListenableFuture 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) diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptySecurityGroupsFallback.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptySecurityGroupsFallback.java index 5343c3f..70a3e37 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptySecurityGroupsFallback.java +++ b/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 { - - public ListenableFuture 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 { @Override public SecurityGroups createOrPropagate(Throwable t) throws Exception { if ((getFirstThrowableOfType(checkNotNull(t, "throwable"), ResourceNotFoundException.class) != null) diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptySubnetsFallback.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptySubnetsFallback.java index 6f86023..8f7a94a 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/EmptySubnetsFallback.java +++ b/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 { - - public ListenableFuture 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 { @Override public Subnets createOrPropagate(Throwable t) throws Exception { if ((getFirstThrowableOfType(checkNotNull(t, "throwable"), ResourceNotFoundException.class) != null) diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/lbaas/v1/EmptyHealthMonitorsFallback.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/lbaas/v1/EmptyHealthMonitorsFallback.java index f298a9c..8364fba 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/lbaas/v1/EmptyHealthMonitorsFallback.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/lbaas/v1/EmptyHealthMonitorsFallback.java @@ -19,7 +19,6 @@ 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.openstack.neutron.v2.domain.lbaas.v1.HealthMonitors; import org.jclouds.rest.ResourceNotFoundException; -import com.google.common.util.concurrent.ListenableFuture; - public class EmptyHealthMonitorsFallback implements Fallback { - - public ListenableFuture 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) diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/lbaas/v1/EmptyMembersFallback.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/lbaas/v1/EmptyMembersFallback.java index 1cbc38f..9cb8084 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/lbaas/v1/EmptyMembersFallback.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/lbaas/v1/EmptyMembersFallback.java @@ -19,7 +19,6 @@ 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.openstack.neutron.v2.domain.lbaas.v1.Members; import org.jclouds.rest.ResourceNotFoundException; -import com.google.common.util.concurrent.ListenableFuture; - public class EmptyMembersFallback implements Fallback { - - public ListenableFuture 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) diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/lbaas/v1/EmptyPoolsFallback.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/lbaas/v1/EmptyPoolsFallback.java index 8035c6f..0c2ce99 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/lbaas/v1/EmptyPoolsFallback.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/lbaas/v1/EmptyPoolsFallback.java @@ -19,7 +19,6 @@ 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.openstack.neutron.v2.domain.lbaas.v1.Pools; import org.jclouds.rest.ResourceNotFoundException; -import com.google.common.util.concurrent.ListenableFuture; - public class EmptyPoolsFallback implements Fallback { - - public ListenableFuture 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) diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/lbaas/v1/EmptyVIPsFallback.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/lbaas/v1/EmptyVIPsFallback.java index df3aa90..4dfae2d 100644 --- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/lbaas/v1/EmptyVIPsFallback.java +++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/fallbacks/lbaas/v1/EmptyVIPsFallback.java @@ -19,7 +19,6 @@ 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.openstack.neutron.v2.domain.lbaas.v1.VIPs; import org.jclouds.rest.ResourceNotFoundException; -import com.google.common.util.concurrent.ListenableFuture; - public class EmptyVIPsFallback implements Fallback { - - public ListenableFuture 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)