Repository: jclouds-karaf Updated Branches: refs/heads/master b1152f3dc -> d858d8a72
Align interfaces with the new ComputeService predicates Project: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/commit/d858d8a7 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/tree/d858d8a7 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/diff/d858d8a7 Branch: refs/heads/master Commit: d858d8a720be531bd864d535a0bbafb71a628090 Parents: b1152f3 Author: Ignasi Barrera <[email protected]> Authored: Fri Sep 23 11:34:04 2016 +0200 Committer: Ignasi Barrera <[email protected]> Committed: Fri Sep 23 11:34:04 2016 +0200 ---------------------------------------------------------------------- .../karaf/core/ComputeServiceEventProxy.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/d858d8a7/core/src/main/java/org/jclouds/karaf/core/ComputeServiceEventProxy.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/karaf/core/ComputeServiceEventProxy.java b/core/src/main/java/org/jclouds/karaf/core/ComputeServiceEventProxy.java index 1330f74..0689355 100644 --- a/core/src/main/java/org/jclouds/karaf/core/ComputeServiceEventProxy.java +++ b/core/src/main/java/org/jclouds/karaf/core/ComputeServiceEventProxy.java @@ -149,7 +149,7 @@ public class ComputeServiceEventProxy implements ComputeService { * {@link org.jclouds.compute.domain.NodeMetadata} objects. */ @Override - public Set<? extends NodeMetadata> listNodesByIds(Iterable<String> ids) { + public Set<? extends ComputeMetadata> listNodesByIds(Iterable<String> ids) { return computeService.listNodesByIds(ids); } @@ -275,7 +275,7 @@ public class ComputeServiceEventProxy implements ComputeService { * if no nodes matched the predicate specified */ @Override - public Set<? extends NodeMetadata> resumeNodesMatching(Predicate<NodeMetadata> filter) { + public Set<? extends NodeMetadata> resumeNodesMatching(Predicate<? super NodeMetadata> filter) { return computeService.resumeNodesMatching(filter); } @@ -309,7 +309,7 @@ public class ComputeServiceEventProxy implements ComputeService { * if no nodes matched the predicate specified */ @Override - public Set<? extends NodeMetadata> suspendNodesMatching(Predicate<NodeMetadata> filter) { + public Set<? extends NodeMetadata> suspendNodesMatching(Predicate<? super NodeMetadata> filter) { return computeService.suspendNodesMatching(filter); } @@ -344,7 +344,7 @@ public class ComputeServiceEventProxy implements ComputeService { * @return list of nodes destroyed */ @Override - public Set<? extends NodeMetadata> destroyNodesMatching(Predicate<NodeMetadata> filter) { + public Set<? extends NodeMetadata> destroyNodesMatching(Predicate<? super NodeMetadata> filter) { Set<? extends NodeMetadata> metadata = computeService.destroyNodesMatching(filter); try { for (NodeListener listener : getNodeListeners()) { @@ -376,7 +376,7 @@ public class ComputeServiceEventProxy implements ComputeService { * if no nodes matched the predicate specified */ @Override - public Set<? extends NodeMetadata> rebootNodesMatching(Predicate<NodeMetadata> filter) { + public Set<? extends NodeMetadata> rebootNodesMatching(Predicate<? super NodeMetadata> filter) { return computeService.rebootNodesMatching(filter); } @@ -395,7 +395,7 @@ public class ComputeServiceEventProxy implements ComputeService { * @param filter how to select the nodes you are interested in details on. */ @Override - public Set<? extends NodeMetadata> listNodesDetailsMatching(Predicate<ComputeMetadata> filter) { + public Set<? extends NodeMetadata> listNodesDetailsMatching(Predicate<? super NodeMetadata> filter) { return computeService.listNodesDetailsMatching(filter); } @@ -403,7 +403,7 @@ public class ComputeServiceEventProxy implements ComputeService { * @see org.jclouds.compute.ComputeService#runScriptOnNodesMatching(com.google.common.base.Predicate, org.jclouds.scriptbuilder.domain.Statement, org.jclouds.compute.options.RunScriptOptions) */ @Override - public Map<? extends NodeMetadata, ExecResponse> runScriptOnNodesMatching(Predicate<NodeMetadata> filter, String runScript) throws RunScriptOnNodesException { + public Map<? extends NodeMetadata, ExecResponse> runScriptOnNodesMatching(Predicate<? super NodeMetadata> filter, String runScript) throws RunScriptOnNodesException { return computeService.runScriptOnNodesMatching(filter, runScript); } @@ -411,7 +411,7 @@ public class ComputeServiceEventProxy implements ComputeService { * @see org.jclouds.compute.ComputeService#runScriptOnNodesMatching(com.google.common.base.Predicate, org.jclouds.scriptbuilder.domain.Statement, org.jclouds.compute.options.RunScriptOptions) */ @Override - public Map<? extends NodeMetadata, ExecResponse> runScriptOnNodesMatching(Predicate<NodeMetadata> filter, Statement runScript) throws RunScriptOnNodesException { + public Map<? extends NodeMetadata, ExecResponse> runScriptOnNodesMatching(Predicate<? super NodeMetadata> filter, Statement runScript) throws RunScriptOnNodesException { return computeService.runScriptOnNodesMatching(filter, runScript); } @@ -419,7 +419,7 @@ public class ComputeServiceEventProxy implements ComputeService { * @see org.jclouds.compute.ComputeService#runScriptOnNodesMatching(com.google.common.base.Predicate, org.jclouds.scriptbuilder.domain.Statement, org.jclouds.compute.options.RunScriptOptions) */ @Override - public Map<? extends NodeMetadata, ExecResponse> runScriptOnNodesMatching(Predicate<NodeMetadata> filter, String runScript, RunScriptOptions options) throws RunScriptOnNodesException { + public Map<? extends NodeMetadata, ExecResponse> runScriptOnNodesMatching(Predicate<? super NodeMetadata> filter, String runScript, RunScriptOptions options) throws RunScriptOnNodesException { return computeService.runScriptOnNodesMatching(filter, runScript, options); } @@ -438,7 +438,7 @@ public class ComputeServiceEventProxy implements ComputeService { * @see org.jclouds.scriptbuilder.domain.Statements */ @Override - public Map<? extends NodeMetadata, ExecResponse> runScriptOnNodesMatching(Predicate<NodeMetadata> filter, Statement runScript, RunScriptOptions options) throws RunScriptOnNodesException { + public Map<? extends NodeMetadata, ExecResponse> runScriptOnNodesMatching(Predicate<? super NodeMetadata> filter, Statement runScript, RunScriptOptions options) throws RunScriptOnNodesException { return computeService.runScriptOnNodesMatching(filter, runScript, options); }
