Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updated to latest jclouds snapshot

This commit is contained in:
Adrian Cole 2010-10-25 21:07:58 -05:00
parent b24b0aa87c
commit d0e842ed6e
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apis/chef/src/main/java/org/jclouds/chef/ChefContextFactory.java
View File

@ -28,7 +28,7 @@ import javax.annotation.Nullable;
import org.jclouds.rest.RestContextBuilder; import org.jclouds.rest.RestContextBuilder;
import org.jclouds.rest.RestContextFactory; import org.jclouds.rest.RestContextFactory;
import org.jclouds.rest.RestContextFactory.ContextSpec; import org.jclouds.rest.RestContextSpec;
import com.google.inject.Module; import com.google.inject.Module;
@ -163,7 +163,7 @@ public class ChefContextFactory {
/** /**
* @see RestContextFactory#createContextBuilder(ContextSpec) * @see RestContextFactory#createContextBuilder(ContextSpec)
*/ */
public <S, A> ChefContext createContext(ContextSpec<S, A> contextSpec) { public <S, A> ChefContext createContext(RestContextSpec<S, A> contextSpec) {
RestContextBuilder<?, ?> builder = RestContextBuilder.class.cast(createContextBuilder(contextSpec)); RestContextBuilder<?, ?> builder = RestContextBuilder.class.cast(createContextBuilder(contextSpec));
return buildContextUnwrappingExceptions(builder); return buildContextUnwrappingExceptions(builder);
@ -172,7 +172,7 @@ public class ChefContextFactory {
/** /**
* @see RestContextFactory#createContextBuilder(ContextSpec, Properties) * @see RestContextFactory#createContextBuilder(ContextSpec, Properties)
*/ */
public <S, A> ChefContext createContext(ContextSpec<S, A> contextSpec, Properties overrides) { public <S, A> ChefContext createContext(RestContextSpec<S, A> contextSpec, Properties overrides) {
RestContextBuilder<?, ?> builder = RestContextBuilder.class.cast(createContextBuilder(contextSpec, overrides)); RestContextBuilder<?, ?> builder = RestContextBuilder.class.cast(createContextBuilder(contextSpec, overrides));
return buildContextUnwrappingExceptions(builder); return buildContextUnwrappingExceptions(builder);
} }

10
apis/chef/src/main/java/org/jclouds/chef/internal/ChefContextImpl.java
View File

@ -20,6 +20,7 @@
package org.jclouds.chef.internal; package org.jclouds.chef.internal;
import java.net.URI; import java.net.URI;
import java.util.Map;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
@ -28,6 +29,7 @@ import org.jclouds.chef.ChefAsyncClient;
import org.jclouds.chef.ChefClient; import org.jclouds.chef.ChefClient;
import org.jclouds.chef.ChefContext; import org.jclouds.chef.ChefContext;
import org.jclouds.chef.ChefService; import org.jclouds.chef.ChefService;
import org.jclouds.domain.Credentials;
import org.jclouds.lifecycle.Closer; import org.jclouds.lifecycle.Closer;
import org.jclouds.rest.Utils; import org.jclouds.rest.Utils;
import org.jclouds.rest.annotations.ApiVersion; import org.jclouds.rest.annotations.ApiVersion;
@ -46,10 +48,10 @@ public class ChefContextImpl extends RestContextImpl<ChefClient, ChefAsyncClient
private final ChefService chefService; private final ChefService chefService;
@Inject @Inject
protected ChefContextImpl(Closer closer, Utils utils, Injector injector, TypeLiteral<ChefClient> syncApi, protected ChefContextImpl(Closer closer, Map<String, Credentials> credentialStore, Utils utils, Injector injector,
TypeLiteral<ChefAsyncClient> asyncApi, @Provider URI endpoint, @Provider String provider, TypeLiteral<ChefClient> syncApi, TypeLiteral<ChefAsyncClient> asyncApi, @Provider URI endpoint,
@Identity String identity, @ApiVersion String apiVersion, ChefService chefService) { @Provider String provider, @Identity String identity, @ApiVersion String apiVersion, ChefService chefService) {
super(closer, utils, injector, syncApi, asyncApi, endpoint, provider, identity, apiVersion); super(closer, credentialStore, utils, injector, syncApi, asyncApi, endpoint, provider, identity, apiVersion);
this.chefService = chefService; this.chefService = chefService;
} }

4
apis/chef/src/test/java/org/jclouds/chef/ChefAsyncClientTest.java
View File

@ -48,7 +48,7 @@ import org.jclouds.http.functions.ReturnTrueIf2xx;
import org.jclouds.rest.ConfiguresRestClient; import org.jclouds.rest.ConfiguresRestClient;
import org.jclouds.rest.RestClientTest; import org.jclouds.rest.RestClientTest;
import org.jclouds.rest.RestContextFactory; import org.jclouds.rest.RestContextFactory;
import org.jclouds.rest.RestContextFactory.ContextSpec; import org.jclouds.rest.RestContextSpec;
import org.jclouds.rest.functions.MapHttp4xxCodesToExceptions; import org.jclouds.rest.functions.MapHttp4xxCodesToExceptions;
import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404; import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404;
import org.jclouds.rest.functions.ReturnFalseOnNotFoundOr404; import org.jclouds.rest.functions.ReturnFalseOnNotFoundOr404;
@ -738,7 +738,7 @@ public class ChefAsyncClientTest extends RestClientTest<ChefAsyncClient> {
} }
@Override @Override
public ContextSpec<ChefClient, ChefAsyncClient> createContextSpec() { public RestContextSpec<ChefClient, ChefAsyncClient> createContextSpec() {
return new RestContextFactory().createContextSpec("chef", "user", SignedHeaderAuthTest.PRIVATE_KEY, return new RestContextFactory().createContextSpec("chef", "user", SignedHeaderAuthTest.PRIVATE_KEY,
new Properties()); new Properties());
} }