Updated Branches: refs/heads/master a4097894a -> 0f5908541
JCLOUDS-368: Remove methods which are not exposed to public and hence not used. Project: http://git-wip-us.apache.org/repos/asf/jclouds-chef/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-chef/commit/0f590854 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-chef/tree/0f590854 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-chef/diff/0f590854 Branch: refs/heads/master Commit: 0f590854134fab3d1f23607bd7d211ce40e0c89b Parents: a409789 Author: Noorul Islam K M <[email protected]> Authored: Fri Nov 1 08:20:37 2013 +0530 Committer: Andrew Phillips <[email protected]> Committed: Wed Nov 6 18:03:18 2013 -0500 ---------------------------------------------------------------------- .../org/jclouds/chef/strategy/ListClients.java | 10 ------ .../chef/strategy/ListCookbookVersions.java | 10 ------ .../jclouds/chef/strategy/ListEnvironments.java | 9 ----- .../org/jclouds/chef/strategy/ListNodes.java | 10 ------ .../chef/strategy/ListNodesInEnvironment.java | 10 ------ .../CleanupStaleNodesAndClientsImpl.java | 37 ++++++++++---------- .../chef/strategy/internal/ListClientsImpl.java | 21 +---------- .../internal/ListCookbookVersionsImpl.java | 24 ++----------- .../strategy/internal/ListEnvironmentsImpl.java | 21 +---------- .../chef/strategy/internal/ListNodesImpl.java | 21 +---------- .../internal/ListNodesInEnvironmentImpl.java | 21 +---------- .../internal/ListNodesImplLiveTest.java | 20 ----------- .../ListNodesInEnvironmentImplLiveTest.java | 20 ----------- 13 files changed, 24 insertions(+), 210 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/0f590854/core/src/main/java/org/jclouds/chef/strategy/ListClients.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/chef/strategy/ListClients.java b/core/src/main/java/org/jclouds/chef/strategy/ListClients.java index 18b7c13..5d6b8a0 100644 --- a/core/src/main/java/org/jclouds/chef/strategy/ListClients.java +++ b/core/src/main/java/org/jclouds/chef/strategy/ListClients.java @@ -19,13 +19,11 @@ package org.jclouds.chef.strategy; import org.jclouds.chef.domain.Client; import org.jclouds.chef.strategy.internal.ListClientsImpl; -import com.google.common.base.Predicate; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.inject.ImplementedBy; /** * - * * @author Adrian Cole */ @ImplementedBy(ListClientsImpl.class) @@ -33,13 +31,5 @@ public interface ListClients { Iterable<? extends Client> execute(); - Iterable<? extends Client> execute(Predicate<String> clientNameSelector); - - Iterable<? extends Client> execute(Iterable<String> toGet); - Iterable<? extends Client> execute(ListeningExecutorService executor); - - Iterable<? extends Client> execute(ListeningExecutorService executor, Predicate<String> clientNameSelector); - - Iterable<? extends Client> execute(ListeningExecutorService executor, Iterable<String> toGet); } http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/0f590854/core/src/main/java/org/jclouds/chef/strategy/ListCookbookVersions.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/chef/strategy/ListCookbookVersions.java b/core/src/main/java/org/jclouds/chef/strategy/ListCookbookVersions.java index 5987de0..01bcd33 100644 --- a/core/src/main/java/org/jclouds/chef/strategy/ListCookbookVersions.java +++ b/core/src/main/java/org/jclouds/chef/strategy/ListCookbookVersions.java @@ -19,13 +19,11 @@ package org.jclouds.chef.strategy; import org.jclouds.chef.domain.CookbookVersion; import org.jclouds.chef.strategy.internal.ListCookbookVersionsImpl; -import com.google.common.base.Predicate; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.inject.ImplementedBy; /** * - * * @author Adrian Cole */ @ImplementedBy(ListCookbookVersionsImpl.class) @@ -33,13 +31,5 @@ public interface ListCookbookVersions { Iterable<? extends CookbookVersion> execute(); - Iterable<? extends CookbookVersion> execute(Predicate<String> cookbookNameSelector); - - Iterable<? extends CookbookVersion> execute(Iterable<String> cookbookNames); - Iterable<? extends CookbookVersion> execute(ListeningExecutorService executor); - - Iterable<? extends CookbookVersion> execute(ListeningExecutorService executor, Predicate<String> cookbookNameSelector); - - Iterable<? extends CookbookVersion> execute(ListeningExecutorService executor, Iterable<String> cookbookNames); } http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/0f590854/core/src/main/java/org/jclouds/chef/strategy/ListEnvironments.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/chef/strategy/ListEnvironments.java b/core/src/main/java/org/jclouds/chef/strategy/ListEnvironments.java index 6dc4aa3..3e5b11f 100644 --- a/core/src/main/java/org/jclouds/chef/strategy/ListEnvironments.java +++ b/core/src/main/java/org/jclouds/chef/strategy/ListEnvironments.java @@ -19,7 +19,6 @@ package org.jclouds.chef.strategy; import org.jclouds.chef.domain.Environment; import org.jclouds.chef.strategy.internal.ListEnvironmentsImpl; -import com.google.common.base.Predicate; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.inject.ImplementedBy; @@ -28,13 +27,5 @@ public interface ListEnvironments { Iterable<? extends Environment> execute(); - Iterable<? extends Environment> execute(Predicate<String> environmentNameSelector); - - Iterable<? extends Environment> execute(Iterable<String> toGet); - Iterable<? extends Environment> execute(ListeningExecutorService executor); - - Iterable<? extends Environment> execute(ListeningExecutorService executor, Predicate<String> environmentNameSelector); - - Iterable<? extends Environment> execute(ListeningExecutorService executor, Iterable<String> toGet); } http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/0f590854/core/src/main/java/org/jclouds/chef/strategy/ListNodes.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/chef/strategy/ListNodes.java b/core/src/main/java/org/jclouds/chef/strategy/ListNodes.java index 8790456..92b451b 100644 --- a/core/src/main/java/org/jclouds/chef/strategy/ListNodes.java +++ b/core/src/main/java/org/jclouds/chef/strategy/ListNodes.java @@ -19,13 +19,11 @@ package org.jclouds.chef.strategy; import org.jclouds.chef.domain.Node; import org.jclouds.chef.strategy.internal.ListNodesImpl; -import com.google.common.base.Predicate; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.inject.ImplementedBy; /** * - * * @author Adrian Cole */ @ImplementedBy(ListNodesImpl.class) @@ -33,13 +31,5 @@ public interface ListNodes { Iterable<? extends Node> execute(); - Iterable<? extends Node> execute(Predicate<String> nodeNameSelector); - - Iterable<? extends Node> execute(Iterable<String> toGet); - Iterable<? extends Node> execute(ListeningExecutorService executor); - - Iterable<? extends Node> execute(ListeningExecutorService executor, Predicate<String> nodeNameSelector); - - Iterable<? extends Node> execute(ListeningExecutorService executor, Iterable<String> toGet); } http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/0f590854/core/src/main/java/org/jclouds/chef/strategy/ListNodesInEnvironment.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/chef/strategy/ListNodesInEnvironment.java b/core/src/main/java/org/jclouds/chef/strategy/ListNodesInEnvironment.java index 9f6b324..6308747 100644 --- a/core/src/main/java/org/jclouds/chef/strategy/ListNodesInEnvironment.java +++ b/core/src/main/java/org/jclouds/chef/strategy/ListNodesInEnvironment.java @@ -19,13 +19,11 @@ package org.jclouds.chef.strategy; import org.jclouds.chef.domain.Node; import org.jclouds.chef.strategy.internal.ListNodesInEnvironmentImpl; -import com.google.common.base.Predicate; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.inject.ImplementedBy; /** * - * * @author Noorul Islam K M */ @ImplementedBy(ListNodesInEnvironmentImpl.class) @@ -33,13 +31,5 @@ public interface ListNodesInEnvironment { Iterable<? extends Node> execute(String environmentName); - Iterable<? extends Node> execute(String environmentName, Predicate<String> nodeNameSelector); - - Iterable<? extends Node> execute(String environmentName, Iterable<String> toGet); - Iterable<? extends Node> execute(ListeningExecutorService executor, String environmentName); - - Iterable<? extends Node> execute(ListeningExecutorService executor, String environmentName, Predicate<String> nodeNameSelector); - - Iterable<? extends Node> execute(ListeningExecutorService executor, String environmentName, Iterable<String> toGet); } http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/0f590854/core/src/main/java/org/jclouds/chef/strategy/internal/CleanupStaleNodesAndClientsImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/chef/strategy/internal/CleanupStaleNodesAndClientsImpl.java b/core/src/main/java/org/jclouds/chef/strategy/internal/CleanupStaleNodesAndClientsImpl.java index a3ef7c2..a9dbaa8 100644 --- a/core/src/main/java/org/jclouds/chef/strategy/internal/CleanupStaleNodesAndClientsImpl.java +++ b/core/src/main/java/org/jclouds/chef/strategy/internal/CleanupStaleNodesAndClientsImpl.java @@ -72,25 +72,24 @@ public class CleanupStaleNodesAndClientsImpl implements CleanupStaleNodesAndClie final Calendar expired = Calendar.getInstance(); expired.setTime(new Date()); expired.add(Calendar.SECOND, -secondsStale); - Iterable<? extends Node> staleNodes = filter(nodeLister.execute(new Predicate<String>() { - - @Override - public boolean apply(String input) { - return input.startsWith(prefix); - } - - }), and(notNull(), new Predicate<Node>() { - @Override - public boolean apply(Node input) { - JsonBall dateLong = input.getAutomaticAttributes().get("ohai_time"); - if (dateLong == null) - return true; - Calendar nodeUpdate = Calendar.getInstance(); - nodeUpdate.setTime(fromOhaiTime(dateLong)); - return expired.after(nodeUpdate); - } - - })); + Iterable<? extends Node> staleNodes = filter( + nodeLister.execute(), and(notNull(), new Predicate<Node>() { + @Override + public boolean apply(Node input) { + return input.getName().startsWith(prefix); + } + }, + new Predicate<Node>() { + @Override + public boolean apply(Node input) { + JsonBall dateLong = input.getAutomaticAttributes().get("ohai_time"); + if (dateLong == null) + return true; + Calendar nodeUpdate = Calendar.getInstance(); + nodeUpdate.setTime(fromOhaiTime(dateLong)); + return expired.after(nodeUpdate); + } + })); Iterable<String> nodeNames = transform(staleNodes, new Function<Node, String>() { @Override http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/0f590854/core/src/main/java/org/jclouds/chef/strategy/internal/ListClientsImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/chef/strategy/internal/ListClientsImpl.java b/core/src/main/java/org/jclouds/chef/strategy/internal/ListClientsImpl.java index 70e6a2a..63c2484 100644 --- a/core/src/main/java/org/jclouds/chef/strategy/internal/ListClientsImpl.java +++ b/core/src/main/java/org/jclouds/chef/strategy/internal/ListClientsImpl.java @@ -17,7 +17,6 @@ package org.jclouds.chef.strategy.internal; import static com.google.common.base.Preconditions.checkNotNull; -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; @@ -38,14 +37,12 @@ import org.jclouds.logging.Logger; import com.google.common.base.Function; import com.google.common.base.Joiner; -import com.google.common.base.Predicate; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.inject.Inject; /** * - * * @author Adrian Cole */ @Singleton @@ -69,27 +66,11 @@ public class ListClientsImpl implements ListClients { } @Override - public Iterable<? extends Client> execute(Predicate<String> clientNameSelector) { - return execute(userExecutor, clientNameSelector); - } - - @Override - public Iterable<? extends Client> execute(Iterable<String> toGet) { - return execute(userExecutor, toGet); - } - - @Override public Iterable<? extends Client> execute(ListeningExecutorService executor) { return execute(executor, api.listClients()); } - @Override - public Iterable<? extends Client> execute(ListeningExecutorService executor, Predicate<String> clientNameSelector) { - return execute(executor, filter(api.listClients(), clientNameSelector)); - } - - @Override - public Iterable<? extends Client> execute(final ListeningExecutorService executor, Iterable<String> toGet) { + private Iterable<? extends Client> execute(final ListeningExecutorService executor, Iterable<String> toGet) { ListenableFuture<List<Client>> futures = allAsList(transform(toGet, new Function<String, ListenableFuture<Client>>() { @Override http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/0f590854/core/src/main/java/org/jclouds/chef/strategy/internal/ListCookbookVersionsImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/chef/strategy/internal/ListCookbookVersionsImpl.java b/core/src/main/java/org/jclouds/chef/strategy/internal/ListCookbookVersionsImpl.java index 3bf77a6..cdd71c4 100644 --- a/core/src/main/java/org/jclouds/chef/strategy/internal/ListCookbookVersionsImpl.java +++ b/core/src/main/java/org/jclouds/chef/strategy/internal/ListCookbookVersionsImpl.java @@ -18,7 +18,6 @@ package org.jclouds.chef.strategy.internal; import static com.google.common.base.Preconditions.checkNotNull; 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; @@ -39,14 +38,12 @@ import org.jclouds.chef.strategy.ListCookbookVersions; import org.jclouds.logging.Logger; import com.google.common.base.Function; -import com.google.common.base.Predicate; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.inject.Inject; /** * - * * @author Adrian Cole */ @Singleton @@ -70,28 +67,11 @@ public class ListCookbookVersionsImpl implements ListCookbookVersions { } @Override - public Iterable<? extends CookbookVersion> execute(Predicate<String> cookbookNameSelector) { - return execute(userExecutor, cookbookNameSelector); - } - - @Override - public Iterable<? extends CookbookVersion> execute(Iterable<String> toGet) { - return execute(userExecutor, toGet); - } - - @Override public Iterable<? extends CookbookVersion> execute(ListeningExecutorService executor) { return execute(executor, api.listCookbooks()); } - @Override - public Iterable<? extends CookbookVersion> execute(ListeningExecutorService executor, - Predicate<String> cookbookNameSelector) { - return execute(executor, filter(api.listCookbooks(), cookbookNameSelector)); - } - - @Override - public Iterable<? extends CookbookVersion> execute(final ListeningExecutorService executor, + private Iterable<? extends CookbookVersion> execute(final ListeningExecutorService executor, Iterable<String> cookbookNames) { return concat(transform(cookbookNames, new Function<String, Iterable<? extends CookbookVersion>>() { @@ -112,7 +92,7 @@ public class ListCookbookVersionsImpl implements ListCookbookVersions { } })); - logger.trace(String.format("getting versions of cookbook: " + cookbook)); + logger.trace(String.format("getting versions of cookbook: %s", cookbook)); return getUnchecked(futures); } })); http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/0f590854/core/src/main/java/org/jclouds/chef/strategy/internal/ListEnvironmentsImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/chef/strategy/internal/ListEnvironmentsImpl.java b/core/src/main/java/org/jclouds/chef/strategy/internal/ListEnvironmentsImpl.java index 6429b72..9b79de2 100644 --- a/core/src/main/java/org/jclouds/chef/strategy/internal/ListEnvironmentsImpl.java +++ b/core/src/main/java/org/jclouds/chef/strategy/internal/ListEnvironmentsImpl.java @@ -17,7 +17,6 @@ package org.jclouds.chef.strategy.internal; import static com.google.common.base.Preconditions.checkNotNull; -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; @@ -38,7 +37,6 @@ import org.jclouds.logging.Logger; import com.google.common.base.Function; import com.google.common.base.Joiner; -import com.google.common.base.Predicate; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.inject.Inject; @@ -64,28 +62,11 @@ public class ListEnvironmentsImpl implements ListEnvironments { } @Override - public Iterable<? extends Environment> execute(Predicate<String> environmentNameSelector) { - return execute(userExecutor, environmentNameSelector); - } - - @Override - public Iterable<? extends Environment> execute(Iterable<String> toGet) { - return execute(userExecutor, toGet); - } - - @Override public Iterable<? extends Environment> execute(ListeningExecutorService executor) { return execute(executor, api.listEnvironments()); } - @Override - public Iterable<? extends Environment> execute(ListeningExecutorService executor, - Predicate<String> environmentNameSelector) { - return execute(executor, filter(api.listEnvironments(), environmentNameSelector)); - } - - @Override - public Iterable<? extends Environment> execute(final ListeningExecutorService executor, Iterable<String> toGet) { + private Iterable<? extends Environment> execute(final ListeningExecutorService executor, Iterable<String> toGet) { ListenableFuture<List<Environment>> futures = allAsList(transform(toGet, new Function<String, ListenableFuture<Environment>>() { @Override http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/0f590854/core/src/main/java/org/jclouds/chef/strategy/internal/ListNodesImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/chef/strategy/internal/ListNodesImpl.java b/core/src/main/java/org/jclouds/chef/strategy/internal/ListNodesImpl.java index 7547f6b..3af264b 100644 --- a/core/src/main/java/org/jclouds/chef/strategy/internal/ListNodesImpl.java +++ b/core/src/main/java/org/jclouds/chef/strategy/internal/ListNodesImpl.java @@ -17,7 +17,6 @@ package org.jclouds.chef.strategy.internal; import static com.google.common.base.Preconditions.checkNotNull; -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; @@ -38,14 +37,12 @@ import org.jclouds.logging.Logger; import com.google.common.base.Function; import com.google.common.base.Joiner; -import com.google.common.base.Predicate; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.inject.Inject; /** * - * * @author Adrian Cole */ @Singleton @@ -69,27 +66,11 @@ public class ListNodesImpl implements ListNodes { } @Override - public Iterable<? extends Node> execute(Predicate<String> nodeNameSelector) { - return execute(userExecutor, nodeNameSelector); - } - - @Override - public Iterable<? extends Node> execute(Iterable<String> toGet) { - return execute(userExecutor, toGet); - } - - @Override public Iterable<? extends Node> execute(ListeningExecutorService executor) { return execute(executor, api.listNodes()); } - @Override - public Iterable<? extends Node> execute(ListeningExecutorService executor, Predicate<String> nodeNameSelector) { - return execute(executor, filter(api.listNodes(), nodeNameSelector)); - } - - @Override - public Iterable<? extends Node> execute(final ListeningExecutorService executor, Iterable<String> toGet) { + private Iterable<? extends Node> execute(final ListeningExecutorService executor, Iterable<String> toGet) { ListenableFuture<List<Node>> futures = allAsList(transform(toGet, new Function<String, ListenableFuture<Node>>() { @Override public ListenableFuture<Node> apply(final String input) { http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/0f590854/core/src/main/java/org/jclouds/chef/strategy/internal/ListNodesInEnvironmentImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/chef/strategy/internal/ListNodesInEnvironmentImpl.java b/core/src/main/java/org/jclouds/chef/strategy/internal/ListNodesInEnvironmentImpl.java index c430b95..a2b2244 100644 --- a/core/src/main/java/org/jclouds/chef/strategy/internal/ListNodesInEnvironmentImpl.java +++ b/core/src/main/java/org/jclouds/chef/strategy/internal/ListNodesInEnvironmentImpl.java @@ -17,7 +17,6 @@ package org.jclouds.chef.strategy.internal; import static com.google.common.base.Preconditions.checkNotNull; -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; @@ -38,14 +37,12 @@ import org.jclouds.logging.Logger; import com.google.common.base.Function; import com.google.common.base.Joiner; -import com.google.common.base.Predicate; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.inject.Inject; /** * - * * @author Noorul Islam K M */ @Singleton @@ -69,27 +66,11 @@ public class ListNodesInEnvironmentImpl implements ListNodesInEnvironment { } @Override - public Iterable<? extends Node> execute(String environmentName, Predicate<String> nodeNameSelector) { - return execute(userExecutor, environmentName, nodeNameSelector); - } - - @Override - public Iterable<? extends Node> execute(String environmentName, Iterable<String> toGet) { - return execute(userExecutor, environmentName, toGet); - } - - @Override public Iterable<? extends Node> execute(ListeningExecutorService executor, String environmentName) { return execute(executor, environmentName, api.listNodesInEnvironment(environmentName)); } - @Override - public Iterable<? extends Node> execute(ListeningExecutorService executor, String environmentName, Predicate<String> nodeNameSelector) { - return execute(executor, environmentName, filter(api.listNodesInEnvironment(environmentName), nodeNameSelector)); - } - - @Override - public Iterable<? extends Node> execute(final ListeningExecutorService executor, String environmentName, Iterable<String> toGet) { + private Iterable<? extends Node> execute(final ListeningExecutorService executor, String environmentName, Iterable<String> toGet) { ListenableFuture<List<Node>> futures = allAsList(transform(toGet, new Function<String, ListenableFuture<Node>>() { @Override public ListenableFuture<Node> apply(final String input) { http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/0f590854/core/src/test/java/org/jclouds/chef/strategy/internal/ListNodesImplLiveTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/jclouds/chef/strategy/internal/ListNodesImplLiveTest.java b/core/src/test/java/org/jclouds/chef/strategy/internal/ListNodesImplLiveTest.java index 80b9678..f4c7ed1 100644 --- a/core/src/test/java/org/jclouds/chef/strategy/internal/ListNodesImplLiveTest.java +++ b/core/src/test/java/org/jclouds/chef/strategy/internal/ListNodesImplLiveTest.java @@ -17,7 +17,6 @@ package org.jclouds.chef.strategy.internal; import static com.google.common.collect.Iterables.size; -import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; import org.jclouds.chef.ChefApi; @@ -25,7 +24,6 @@ import org.jclouds.chef.internal.BaseChefLiveTest; import org.testng.annotations.AfterClass; import org.testng.annotations.Test; -import com.google.common.base.Predicate; import com.google.common.collect.ImmutableSet; /** @@ -60,22 +58,4 @@ public class ListNodesImplLiveTest extends BaseChefLiveTest<ChefApi> { public void testExecute() { assertTrue(size(strategy.execute()) > 0, "Expected one or more elements"); } - - @Test - public void testExecutePredicateOfString() { - assertEquals(size(strategy.execute(new Predicate<String>() { - - @Override - public boolean apply(String input) { - return input.startsWith(prefix); - } - - })), 2); - } - - @Test - public void testExecuteIterableOfString() { - assertEquals(size(strategy.execute(ImmutableSet.of(prefix, prefix + 1))), 2); - } - } http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/0f590854/core/src/test/java/org/jclouds/chef/strategy/internal/ListNodesInEnvironmentImplLiveTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/jclouds/chef/strategy/internal/ListNodesInEnvironmentImplLiveTest.java b/core/src/test/java/org/jclouds/chef/strategy/internal/ListNodesInEnvironmentImplLiveTest.java index 0d19c12..25863d9 100644 --- a/core/src/test/java/org/jclouds/chef/strategy/internal/ListNodesInEnvironmentImplLiveTest.java +++ b/core/src/test/java/org/jclouds/chef/strategy/internal/ListNodesInEnvironmentImplLiveTest.java @@ -17,7 +17,6 @@ package org.jclouds.chef.strategy.internal; import static com.google.common.collect.Iterables.size; -import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; import org.jclouds.chef.ChefApi; @@ -25,7 +24,6 @@ import org.jclouds.chef.internal.BaseChefLiveTest; import org.testng.annotations.AfterClass; import org.testng.annotations.Test; -import com.google.common.base.Predicate; import com.google.common.collect.ImmutableSet; /** @@ -60,22 +58,4 @@ public class ListNodesInEnvironmentImplLiveTest extends BaseChefLiveTest<ChefApi public void testExecute() { assertTrue(size(strategy.execute("_default")) > 0, "Expected one or more elements"); } - - @Test - public void testExecutePredicateOfString() { - assertEquals(size(strategy.execute("_default", new Predicate<String>() { - - @Override - public boolean apply(String input) { - return input.startsWith(prefix); - } - - })), 2); - } - - @Test - public void testExecuteIterableOfString() { - assertEquals(size(strategy.execute("_default", ImmutableSet.of(prefix, prefix + 1))), 2); - } - }
