Repository: jclouds-chef Updated Branches: refs/heads/master b5c38a936 -> 78fd4b136
Replace InputSupplierMap with Map<K, ByteSource> A future version of Guava will remove InputSupplier. Project: http://git-wip-us.apache.org/repos/asf/jclouds-chef/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-chef/commit/78fd4b13 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-chef/tree/78fd4b13 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-chef/diff/78fd4b13 Branch: refs/heads/master Commit: 78fd4b136d6a6bdcc13903d029a5f6121a7d6d6a Parents: b5c38a9 Author: Andrew Gaul <[email protected]> Authored: Sat May 17 00:46:56 2014 -0700 Committer: Andrew Gaul <[email protected]> Committed: Sat May 17 00:46:56 2014 -0700 ---------------------------------------------------------------------- .../BaseComputeServiceIntegratedChefClientLiveTest.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/78fd4b13/compute/src/test/java/org/jclouds/chef/compute/internal/BaseComputeServiceIntegratedChefClientLiveTest.java ---------------------------------------------------------------------- diff --git a/compute/src/test/java/org/jclouds/chef/compute/internal/BaseComputeServiceIntegratedChefClientLiveTest.java b/compute/src/test/java/org/jclouds/chef/compute/internal/BaseComputeServiceIntegratedChefClientLiveTest.java index 4c87592..be08473 100644 --- a/compute/src/test/java/org/jclouds/chef/compute/internal/BaseComputeServiceIntegratedChefClientLiveTest.java +++ b/compute/src/test/java/org/jclouds/chef/compute/internal/BaseComputeServiceIntegratedChefClientLiveTest.java @@ -30,7 +30,6 @@ import org.jclouds.compute.ComputeServiceContext; import org.jclouds.compute.domain.TemplateBuilderSpec; import org.jclouds.domain.LoginCredentials; import org.jclouds.domain.LoginCredentials.Builder; -import org.jclouds.io.CopyInputStreamInputSupplierMap; import org.jclouds.rest.config.CredentialStoreModule; import org.jclouds.sshj.config.SshjSshClientModule; import org.testng.annotations.AfterClass; @@ -38,6 +37,7 @@ import org.testng.annotations.AfterClass; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; +import com.google.common.io.ByteSource; import com.google.common.io.Closeables; import com.google.common.io.InputSupplier; import com.google.inject.Module; @@ -51,8 +51,7 @@ public abstract class BaseComputeServiceIntegratedChefClientLiveTest extends Bas protected LoginCredentials loginCredentials = LoginCredentials.builder().user("root").build(); // isolate tests from each other, as default credentialStore is static - protected Module credentialStoreModule = new CredentialStoreModule(new CopyInputStreamInputSupplierMap( - new ConcurrentHashMap<String, InputSupplier<InputStream>>())); + protected Module credentialStoreModule = new CredentialStoreModule(new ConcurrentHashMap<String, ByteSource>()); private String computeProvider;
