diff --git a/atmos/src/test/java/org/jclouds/atmosonline/saas/AtmosStorageAsyncClientTest.java b/atmos/src/test/java/org/jclouds/atmosonline/saas/AtmosStorageAsyncClientTest.java index 1636d957d5..d30356c52c 100644 --- a/atmos/src/test/java/org/jclouds/atmosonline/saas/AtmosStorageAsyncClientTest.java +++ b/atmos/src/test/java/org/jclouds/atmosonline/saas/AtmosStorageAsyncClientTest.java @@ -49,7 +49,7 @@ import org.jclouds.http.options.GetOptions; import org.jclouds.rest.ConfiguresRestClient; import org.jclouds.rest.RestClientTest; import org.jclouds.rest.RestContextFactory; -import org.jclouds.rest.RestContextFactory.ContextSpec; +import org.jclouds.rest.RestContextSpec; import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404; import org.jclouds.rest.functions.ReturnVoidOnNotFoundOr404; import org.jclouds.rest.internal.RestAnnotationProcessor; @@ -270,7 +270,7 @@ public class AtmosStorageAsyncClientTest extends RestClientTest createContextSpec() { + public RestContextSpec createContextSpec() { return new RestContextFactory().createContextSpec("atmosonline", "identity", "credential", new Properties()); } diff --git a/atmos/src/test/java/org/jclouds/atmosonline/saas/blobstore/AtmosBlobRequestSignerTest.java b/atmos/src/test/java/org/jclouds/atmosonline/saas/blobstore/AtmosBlobRequestSignerTest.java index b7672ebdda..91fa367e17 100644 --- a/atmos/src/test/java/org/jclouds/atmosonline/saas/blobstore/AtmosBlobRequestSignerTest.java +++ b/atmos/src/test/java/org/jclouds/atmosonline/saas/blobstore/AtmosBlobRequestSignerTest.java @@ -36,7 +36,7 @@ import org.jclouds.http.RequiresHttp; import org.jclouds.rest.ConfiguresRestClient; import org.jclouds.rest.RestClientTest; import org.jclouds.rest.RestContextFactory; -import org.jclouds.rest.RestContextFactory.ContextSpec; +import org.jclouds.rest.RestContextSpec; import org.jclouds.rest.internal.RestAnnotationProcessor; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -139,7 +139,7 @@ public class AtmosBlobRequestSignerTest extends RestClientTest createContextSpec() { + public RestContextSpec createContextSpec() { return new RestContextFactory().createContextSpec("atmosonline", "identity", "credential", new Properties()); } diff --git a/aws/core/src/test/java/org/jclouds/aws/cloudwatch/CloudWatchAsyncClientTest.java b/aws/core/src/test/java/org/jclouds/aws/cloudwatch/CloudWatchAsyncClientTest.java index aaf574f03a..9c3b11b049 100644 --- a/aws/core/src/test/java/org/jclouds/aws/cloudwatch/CloudWatchAsyncClientTest.java +++ b/aws/core/src/test/java/org/jclouds/aws/cloudwatch/CloudWatchAsyncClientTest.java @@ -39,7 +39,7 @@ import org.jclouds.http.functions.ParseSax; import org.jclouds.rest.ConfiguresRestClient; import org.jclouds.rest.RestClientTest; import org.jclouds.rest.RestContextFactory; -import org.jclouds.rest.RestContextFactory.ContextSpec; +import org.jclouds.rest.RestContextSpec; import org.jclouds.rest.internal.RestAnnotationProcessor; import org.testng.annotations.Test; @@ -101,7 +101,7 @@ public class CloudWatchAsyncClientTest extends RestClientTest createContextSpec() { + public RestContextSpec createContextSpec() { return new RestContextFactory().createContextSpec("cloudwatch", "identity", "credential", new Properties()); } diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/services/BaseEC2AsyncClientTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/services/BaseEC2AsyncClientTest.java index 0a540be06e..da56c739a6 100644 --- a/aws/core/src/test/java/org/jclouds/aws/ec2/services/BaseEC2AsyncClientTest.java +++ b/aws/core/src/test/java/org/jclouds/aws/ec2/services/BaseEC2AsyncClientTest.java @@ -40,7 +40,7 @@ import org.jclouds.http.RequiresHttp; import org.jclouds.rest.ConfiguresRestClient; import org.jclouds.rest.RestClientTest; import org.jclouds.rest.RestContextFactory; -import org.jclouds.rest.RestContextFactory.ContextSpec; +import org.jclouds.rest.RestContextSpec; import org.testng.annotations.BeforeTest; import com.google.common.collect.ImmutableMap; @@ -102,7 +102,7 @@ public abstract class BaseEC2AsyncClientTest extends RestClientTest { } @Override - public ContextSpec createContextSpec() { + public RestContextSpec createContextSpec() { return new RestContextFactory().createContextSpec("ec2", "identity", "credential", new Properties()); } diff --git a/aws/core/src/test/java/org/jclouds/aws/elb/ELBAsyncClientTest.java b/aws/core/src/test/java/org/jclouds/aws/elb/ELBAsyncClientTest.java index 1cbbc69023..7626f036da 100644 --- a/aws/core/src/test/java/org/jclouds/aws/elb/ELBAsyncClientTest.java +++ b/aws/core/src/test/java/org/jclouds/aws/elb/ELBAsyncClientTest.java @@ -38,7 +38,7 @@ import org.jclouds.http.functions.ParseSax; import org.jclouds.rest.ConfiguresRestClient; import org.jclouds.rest.RestClientTest; import org.jclouds.rest.RestContextFactory; -import org.jclouds.rest.RestContextFactory.ContextSpec; +import org.jclouds.rest.RestContextSpec; import org.jclouds.rest.internal.RestAnnotationProcessor; import org.testng.annotations.Test; @@ -103,7 +103,7 @@ public class ELBAsyncClientTest extends RestClientTest { } @Override - public ContextSpec createContextSpec() { + public RestContextSpec createContextSpec() { return new RestContextFactory().createContextSpec("elb", "identity", "credential", new Properties()); } diff --git a/aws/core/src/test/java/org/jclouds/aws/s3/BaseS3AsyncClientTest.java b/aws/core/src/test/java/org/jclouds/aws/s3/BaseS3AsyncClientTest.java index e65f33c1e7..dc921fe0c4 100644 --- a/aws/core/src/test/java/org/jclouds/aws/s3/BaseS3AsyncClientTest.java +++ b/aws/core/src/test/java/org/jclouds/aws/s3/BaseS3AsyncClientTest.java @@ -29,7 +29,7 @@ import org.jclouds.aws.s3.filters.RequestAuthorizeSignature; import org.jclouds.http.HttpRequest; import org.jclouds.rest.RestClientTest; import org.jclouds.rest.RestContextFactory; -import org.jclouds.rest.RestContextFactory.ContextSpec; +import org.jclouds.rest.RestContextSpec; import org.jclouds.rest.internal.RestAnnotationProcessor; import org.testng.annotations.BeforeClass; @@ -65,7 +65,7 @@ public abstract class BaseS3AsyncClientTest extends RestClientTest createContextSpec() { + public RestContextSpec createContextSpec() { return new RestContextFactory().createContextSpec("s3", "identity", "credential", new Properties()); } diff --git a/aws/core/src/test/java/org/jclouds/aws/s3/blobstore/S3BlobRequestSignerTest.java b/aws/core/src/test/java/org/jclouds/aws/s3/blobstore/S3BlobRequestSignerTest.java index 4e696ba94f..93ef1a7b3a 100644 --- a/aws/core/src/test/java/org/jclouds/aws/s3/blobstore/S3BlobRequestSignerTest.java +++ b/aws/core/src/test/java/org/jclouds/aws/s3/blobstore/S3BlobRequestSignerTest.java @@ -36,7 +36,7 @@ import org.jclouds.io.payloads.PhantomPayload; import org.jclouds.rest.ConfiguresRestClient; import org.jclouds.rest.RestClientTest; import org.jclouds.rest.RestContextFactory; -import org.jclouds.rest.RestContextFactory.ContextSpec; +import org.jclouds.rest.RestContextSpec; import org.jclouds.rest.internal.RestAnnotationProcessor; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -135,7 +135,7 @@ public class S3BlobRequestSignerTest extends RestClientTest { } @Override - public ContextSpec createContextSpec() { + public RestContextSpec createContextSpec() { return new RestContextFactory().createContextSpec("s3", "identity", "credential", new Properties()); } diff --git a/aws/core/src/test/java/org/jclouds/aws/sqs/SQSAsyncClientTest.java b/aws/core/src/test/java/org/jclouds/aws/sqs/SQSAsyncClientTest.java index f80023e868..0db2cac132 100644 --- a/aws/core/src/test/java/org/jclouds/aws/sqs/SQSAsyncClientTest.java +++ b/aws/core/src/test/java/org/jclouds/aws/sqs/SQSAsyncClientTest.java @@ -44,7 +44,7 @@ import org.jclouds.http.RequiresHttp; import org.jclouds.rest.ConfiguresRestClient; import org.jclouds.rest.RestClientTest; import org.jclouds.rest.RestContextFactory; -import org.jclouds.rest.RestContextFactory.ContextSpec; +import org.jclouds.rest.RestContextSpec; import org.jclouds.rest.internal.RestAnnotationProcessor; import org.testng.annotations.Test; @@ -170,7 +170,7 @@ public class SQSAsyncClientTest extends RestClientTest { } @Override - public ContextSpec createContextSpec() { + public RestContextSpec createContextSpec() { return new RestContextFactory().createContextSpec("sqs", "identity", "credential", new Properties()); } diff --git a/azure/src/test/java/org/jclouds/azure/storage/blob/AzureBlobAsyncClientTest.java b/azure/src/test/java/org/jclouds/azure/storage/blob/AzureBlobAsyncClientTest.java index 742c5b9eeb..f708935c90 100644 --- a/azure/src/test/java/org/jclouds/azure/storage/blob/AzureBlobAsyncClientTest.java +++ b/azure/src/test/java/org/jclouds/azure/storage/blob/AzureBlobAsyncClientTest.java @@ -47,7 +47,7 @@ import org.jclouds.http.functions.ReturnTrueOn404; import org.jclouds.http.options.GetOptions; import org.jclouds.rest.RestClientTest; import org.jclouds.rest.RestContextFactory; -import org.jclouds.rest.RestContextFactory.ContextSpec; +import org.jclouds.rest.RestContextSpec; import org.jclouds.rest.functions.ReturnVoidOnNotFoundOr404; import org.jclouds.rest.internal.RestAnnotationProcessor; import org.testng.annotations.Test; @@ -277,7 +277,7 @@ public class AzureBlobAsyncClientTest extends RestClientTest createContextSpec() { + public RestContextSpec createContextSpec() { return new RestContextFactory().createContextSpec("azureblob", "identity", "credential", new Properties()); } } diff --git a/azure/src/test/java/org/jclouds/azure/storage/blob/blobstore/AzureBlobRequestSignerTest.java b/azure/src/test/java/org/jclouds/azure/storage/blob/blobstore/AzureBlobRequestSignerTest.java index b8c724cc57..1fb4a52b13 100644 --- a/azure/src/test/java/org/jclouds/azure/storage/blob/blobstore/AzureBlobRequestSignerTest.java +++ b/azure/src/test/java/org/jclouds/azure/storage/blob/blobstore/AzureBlobRequestSignerTest.java @@ -35,7 +35,7 @@ import org.jclouds.http.RequiresHttp; import org.jclouds.rest.ConfiguresRestClient; import org.jclouds.rest.RestClientTest; import org.jclouds.rest.RestContextFactory; -import org.jclouds.rest.RestContextFactory.ContextSpec; +import org.jclouds.rest.RestContextSpec; import org.jclouds.rest.internal.RestAnnotationProcessor; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -133,7 +133,7 @@ public class AzureBlobRequestSignerTest extends RestClientTest createContextSpec() { + public RestContextSpec createContextSpec() { return new RestContextFactory().createContextSpec("azureblob", "identity", "credential", new Properties()); } diff --git a/azure/src/test/java/org/jclouds/azure/storage/queue/AzureQueueAsyncClientTest.java b/azure/src/test/java/org/jclouds/azure/storage/queue/AzureQueueAsyncClientTest.java index 8e4e993b2f..e396735aad 100644 --- a/azure/src/test/java/org/jclouds/azure/storage/queue/AzureQueueAsyncClientTest.java +++ b/azure/src/test/java/org/jclouds/azure/storage/queue/AzureQueueAsyncClientTest.java @@ -42,7 +42,7 @@ import org.jclouds.http.functions.ReleasePayloadAndReturn; import org.jclouds.http.functions.ReturnTrueIf2xx; import org.jclouds.rest.RestClientTest; import org.jclouds.rest.RestContextFactory; -import org.jclouds.rest.RestContextFactory.ContextSpec; +import org.jclouds.rest.RestContextSpec; import org.jclouds.rest.internal.RestAnnotationProcessor; import org.testng.annotations.Test; @@ -233,7 +233,7 @@ public class AzureQueueAsyncClientTest extends RestClientTest createContextSpec() { + public RestContextSpec createContextSpec() { return new RestContextFactory().createContextSpec("azurequeue", "identity", "credential", new Properties()); } diff --git a/blobstore/src/main/java/org/jclouds/blobstore/BlobStoreContextBuilder.java b/blobstore/src/main/java/org/jclouds/blobstore/BlobStoreContextBuilder.java index 132681b0e8..1f5e7bc084 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/BlobStoreContextBuilder.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/BlobStoreContextBuilder.java @@ -41,7 +41,6 @@ public abstract class BlobStoreContextBuilder extends RestContextBuilder syncClientType, Class asyncClientType, Properties properties) { super(syncClientType, asyncClientType, properties); - } public BlobStoreContext buildBlobStoreContext() { diff --git a/blobstore/src/main/java/org/jclouds/blobstore/BlobStoreContextFactory.java b/blobstore/src/main/java/org/jclouds/blobstore/BlobStoreContextFactory.java index dbd43361a2..ffbb4b4ddd 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/BlobStoreContextFactory.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/BlobStoreContextFactory.java @@ -27,7 +27,7 @@ import java.util.Properties; import javax.annotation.Nullable; import org.jclouds.rest.RestContextFactory; -import org.jclouds.rest.RestContextFactory.ContextSpec; +import org.jclouds.rest.RestContextSpec; import com.google.inject.Module; @@ -124,18 +124,18 @@ public class BlobStoreContextFactory { } /** - * @see RestContextFactory#createContextBuilder(ContextSpec) + * @see RestContextFactory#createContextBuilder(RestContextSpec) */ - public BlobStoreContext createContext(ContextSpec contextSpec) { + public BlobStoreContext createContext(RestContextSpec contextSpec) { BlobStoreContextBuilder builder = BlobStoreContextBuilder.class.cast(createContextBuilder(contextSpec)); return buildContextUnwrappingExceptions(builder); } /** - * @see RestContextFactory#createContextBuilder(ContextSpec, Properties) + * @see RestContextFactory#createContextBuilder(RestContextSpec, Properties) */ - public BlobStoreContext createContext(ContextSpec contextSpec, Properties overrides) { + public BlobStoreContext createContext(RestContextSpec contextSpec, Properties overrides) { BlobStoreContextBuilder builder = BlobStoreContextBuilder.class.cast(createContextBuilder(contextSpec, overrides)); return buildContextUnwrappingExceptions(builder); diff --git a/blobstore/src/test/java/org/jclouds/blobstore/TransientBlobRequestSignerTest.java b/blobstore/src/test/java/org/jclouds/blobstore/TransientBlobRequestSignerTest.java index aa85d627c8..940b52f1c6 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/TransientBlobRequestSignerTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/TransientBlobRequestSignerTest.java @@ -30,7 +30,7 @@ import org.jclouds.http.HttpRequest; import org.jclouds.io.payloads.PhantomPayload; import org.jclouds.rest.RestClientTest; import org.jclouds.rest.RestContextFactory; -import org.jclouds.rest.RestContextFactory.ContextSpec; +import org.jclouds.rest.RestContextSpec; import org.jclouds.rest.internal.RestAnnotationProcessor; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -97,7 +97,7 @@ public class TransientBlobRequestSignerTest extends RestClientTest createContextSpec() { + public RestContextSpec createContextSpec() { return new RestContextFactory().createContextSpec("transient", "identity", "credential", new Properties()); } diff --git a/compute/src/main/clojure/org/jclouds/modules.clj b/compute/src/main/clojure/org/jclouds/modules.clj index 6e0f14e958..b8e1c3ba9a 100644 --- a/compute/src/main/clojure/org/jclouds/modules.clj +++ b/compute/src/main/clojure/org/jclouds/modules.clj @@ -22,8 +22,9 @@ (:import [org.jclouds.ssh SshClient ExecResponse] com.google.inject.Module + com.google.common.collect.ImmutableSet org.jclouds.net.IPSocket - [org.jclouds.compute ComputeService ComputeServiceContextFactory] + [org.jclouds.compute ComputeService ComputeServiceContextFactory StandaloneComputeServiceContextSpec] [java.util Set Map] [org.jclouds.compute.domain NodeMetadata Template] [com.google.common.base Supplier Predicate] @@ -52,8 +53,11 @@ (^void rebootNode [this ^String id] ())))) -(defn compute-context [module] - (ComputeServiceContextFactory/createStandaloneContext module)) +(defn compute-context [^RestContextSpec spec] + (.createContext (ComputeServiceContextFactory.) spec)) + +(^RestContextSpec defn context-spec [^StandaloneComputeServiceContextModule module] + (StandaloneComputeServiceContextSpec. "servermanager", "http://host", "1", "identity", "credential", module, (ImmutableSet/of))) (defrecord NodeListComputeService [node-list] diff --git a/compute/src/main/java/org/jclouds/compute/ComputeServiceContextFactory.java b/compute/src/main/java/org/jclouds/compute/ComputeServiceContextFactory.java index e447eab61d..61280f4d14 100644 --- a/compute/src/main/java/org/jclouds/compute/ComputeServiceContextFactory.java +++ b/compute/src/main/java/org/jclouds/compute/ComputeServiceContextFactory.java @@ -26,12 +26,9 @@ import java.util.Properties; import javax.annotation.Nullable; -import org.jclouds.PropertiesBuilder; -import org.jclouds.compute.config.StandaloneComputeServiceContextModule; import org.jclouds.rest.RestContextFactory; -import org.jclouds.rest.RestContextFactory.ContextSpec; +import org.jclouds.rest.RestContextSpec; -import com.google.common.collect.ImmutableSet; import com.google.inject.Module; /** @@ -126,9 +123,9 @@ public class ComputeServiceContextFactory { } /** - * @see RestContextFactory#createContextBuilder(ContextSpec) + * @see RestContextFactory#createContextBuilder(RestContextSpec) */ - public ComputeServiceContext createContext(ContextSpec contextSpec) { + public ComputeServiceContext createContext(RestContextSpec contextSpec) { ComputeServiceContextBuilder builder = ComputeServiceContextBuilder.class .cast(createContextBuilder(contextSpec)); return buildContextUnwrappingExceptions(builder); @@ -136,26 +133,22 @@ public class ComputeServiceContextFactory { } /** - * @see RestContextFactory#createContextBuilder(ContextSpec, Properties) + * @see RestContextFactory#createContextBuilder(RestContextSpec, Properties) */ - public ComputeServiceContext createContext(ContextSpec contextSpec, Properties overrides) { + public ComputeServiceContext createContext(RestContextSpec contextSpec, Properties overrides) { ComputeServiceContextBuilder builder = ComputeServiceContextBuilder.class.cast(createContextBuilder( contextSpec, overrides)); return buildContextUnwrappingExceptions(builder); } - public static ComputeServiceContext createStandaloneContext( - StandaloneComputeServiceContextModule contextModule) { - return createStandaloneContext(contextModule, ImmutableSet. of()); + /** + * @see RestContextFactory#createContextBuilder(RestContextSpec, Iterable, Properties) + */ + public ComputeServiceContext createContext(RestContextSpec contextSpec, Iterable modules, + Properties overrides) { + ComputeServiceContextBuilder builder = ComputeServiceContextBuilder.class.cast(createContextBuilder( + contextSpec, modules, overrides)); + return buildContextUnwrappingExceptions(builder); } - @SuppressWarnings("unchecked") - public static ComputeServiceContext createStandaloneContext( - StandaloneComputeServiceContextModule contextModule, Iterable modules) { - return new ComputeServiceContextFactory().createContext(RestContextFactory - . contextSpec("standalone", "standalone", "1", "standalone", null, - (Class) null, (Class) null, PropertiesBuilder.class, - (Class) StandaloneComputeServiceContextBuilder.class, - ImmutableSet. builder().add(contextModule).addAll(modules).build())); - } } \ No newline at end of file diff --git a/compute/src/main/java/org/jclouds/compute/StandaloneComputeServiceContextSpec.java b/compute/src/main/java/org/jclouds/compute/StandaloneComputeServiceContextSpec.java new file mode 100644 index 0000000000..0dc354a0e2 --- /dev/null +++ b/compute/src/main/java/org/jclouds/compute/StandaloneComputeServiceContextSpec.java @@ -0,0 +1,43 @@ +/** + * + * Copyright (C) 2010 Cloud Conscious, LLC. + * + * ==================================================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ==================================================================== + */ + +package org.jclouds.compute; + +import org.jclouds.PropertiesBuilder; +import org.jclouds.compute.config.StandaloneComputeServiceContextModule; +import org.jclouds.rest.RestContextSpec; + +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Iterables; +import com.google.inject.Module; + +/** + * @author Adrian Cole + */ +public class StandaloneComputeServiceContextSpec extends RestContextSpec { + + @SuppressWarnings({ "unchecked", "rawtypes" }) + public StandaloneComputeServiceContextSpec(String provider, String endpoint, String apiVersion, String identity, + String credential, StandaloneComputeServiceContextModule contextModule, Iterable modules) { + super(provider, endpoint, apiVersion, identity, credential, ComputeService.class, ComputeService.class, + PropertiesBuilder.class, (Class) StandaloneComputeServiceContextBuilder.class, Iterables.concat( + ImmutableSet.of(contextModule), modules)); + } + +} \ No newline at end of file diff --git a/compute/src/test/java/org/jclouds/compute/ComputeServiceContextFactoryTest.java b/compute/src/test/java/org/jclouds/compute/ComputeServiceContextFactoryTest.java index ece9c9916a..c3a72d6917 100644 --- a/compute/src/test/java/org/jclouds/compute/ComputeServiceContextFactoryTest.java +++ b/compute/src/test/java/org/jclouds/compute/ComputeServiceContextFactoryTest.java @@ -19,9 +19,16 @@ package org.jclouds.compute; +import org.jclouds.compute.domain.Hardware; +import org.jclouds.compute.domain.Image; +import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.compute.stub.config.StubComputeServiceContextModule; +import org.jclouds.domain.Location; import org.testng.annotations.Test; +import com.google.common.collect.ImmutableSet; +import com.google.inject.Module; + /** * * @author Adrian Cole @@ -32,9 +39,11 @@ public class ComputeServiceContextFactoryTest { @Test public void testStandalone() { - ComputeServiceContext context = ComputeServiceContextFactory - .createStandaloneContext(new StubComputeServiceContextModule()); + ComputeServiceContext context = new ComputeServiceContextFactory() + .createContext(new StandaloneComputeServiceContextSpec("stub", + "stub", "1", "identity", "credential", new StubComputeServiceContextModule(), ImmutableSet + . of())); + context.getComputeService().listNodes(); } - } diff --git a/core/src/main/java/org/jclouds/rest/RestContextFactory.java b/core/src/main/java/org/jclouds/rest/RestContextFactory.java index b1f2134f9c..37aca2af06 100644 --- a/core/src/main/java/org/jclouds/rest/RestContextFactory.java +++ b/core/src/main/java/org/jclouds/rest/RestContextFactory.java @@ -19,7 +19,6 @@ package org.jclouds.rest; -import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Throwables.propagate; import static com.google.common.collect.Iterables.concat; @@ -73,143 +72,24 @@ import com.google.inject.Module; */ public class RestContextFactory { - public static ContextSpec contextSpec(String provider, String endpoint, String apiVersion, - String identity, String credential, Class sync, Class async, - Class propertiesBuilderClass, Class> contextBuilderClass, - Iterable modules) { - return new ContextSpec(provider, endpoint, apiVersion, identity, credential, sync, async, - propertiesBuilderClass, contextBuilderClass, modules); + public static RestContextSpec contextSpec(String provider, String endpoint, String apiVersion, + String identity, String credential, Class sync, Class async, + Class propertiesBuilderClass, Class> contextBuilderClass, + Iterable modules) { + return new RestContextSpec(provider, endpoint, apiVersion, identity, credential, sync, async, + propertiesBuilderClass, contextBuilderClass, modules); } - public static ContextSpec contextSpec(String provider, String endpoint, String apiVersion, - String identity, String credential, Class sync, Class async) { - return new ContextSpec(provider, endpoint, apiVersion, identity, credential, sync, async); + public static RestContextSpec contextSpec(String provider, String endpoint, String apiVersion, + String identity, String credential, Class sync, Class async) { + return new RestContextSpec(provider, endpoint, apiVersion, identity, credential, sync, async); } @SuppressWarnings("unchecked") - public static ContextSpec contextSpec(String provider, String endpoint, String apiVersion, - String identity, String credential, Class sync, Class async, Iterable modules) { - return new ContextSpec(provider, endpoint, apiVersion, identity, credential, sync, async, - PropertiesBuilder.class, (Class) RestContextBuilder.class, modules); - } - - public static class ContextSpec { - final String provider; - final String endpoint; - final String apiVersion; - final String identity; - final String credential; - final Class sync; - final Class async; - final Class propertiesBuilderClass; - final Class> contextBuilderClass; - final Iterable modules; - - ContextSpec(String provider, String endpoint, String apiVersion, String identity, String credential, - Class sync, Class async, Class propertiesBuilderClass, - Class> contextBuilderClass, Iterable modules) { - this.provider = checkNotNull(provider, "provider"); - this.endpoint = endpoint; - this.apiVersion = apiVersion; - this.identity = identity; - this.credential = credential; - this.sync = sync; - this.async = async; - checkArgument(RestContextBuilder.class.isAssignableFrom(contextBuilderClass), contextBuilderClass.getName() - + " is not a subclass of " + RestContextBuilder.class.getName()); - checkArgument(PropertiesBuilder.class.isAssignableFrom(propertiesBuilderClass), propertiesBuilderClass - .getName() - + " is not a subclass of " + PropertiesBuilder.class.getName()); - this.propertiesBuilderClass = propertiesBuilderClass; - this.contextBuilderClass = contextBuilderClass; - this.modules = modules; - } - - @SuppressWarnings("unchecked") - public ContextSpec(String provider, String endpoint, String apiVersion, String identity, String credential, - Class sync, Class async) { - this(provider, endpoint, apiVersion, identity, credential, sync, async, PropertiesBuilder.class, - (Class) RestContextBuilder.class, EMPTY_LIST); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((apiVersion == null) ? 0 : apiVersion.hashCode()); - result = prime * result + ((async == null) ? 0 : async.hashCode()); - result = prime * result + ((contextBuilderClass == null) ? 0 : contextBuilderClass.hashCode()); - result = prime * result + ((credential == null) ? 0 : credential.hashCode()); - result = prime * result + ((endpoint == null) ? 0 : endpoint.hashCode()); - result = prime * result + ((identity == null) ? 0 : identity.hashCode()); - result = prime * result + ((propertiesBuilderClass == null) ? 0 : propertiesBuilderClass.hashCode()); - result = prime * result + ((provider == null) ? 0 : provider.hashCode()); - result = prime * result + ((sync == null) ? 0 : sync.hashCode()); - return result; - } - - @Override - public String toString() { - return "[provider=" + provider + ", endpoint=" + endpoint + ", apiVersion=" + apiVersion + ", identity=" - + identity + "]"; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - ContextSpec other = (ContextSpec) obj; - if (apiVersion == null) { - if (other.apiVersion != null) - return false; - } else if (!apiVersion.equals(other.apiVersion)) - return false; - if (async == null) { - if (other.async != null) - return false; - } else if (!async.equals(other.async)) - return false; - if (contextBuilderClass == null) { - if (other.contextBuilderClass != null) - return false; - } else if (!contextBuilderClass.equals(other.contextBuilderClass)) - return false; - if (credential == null) { - if (other.credential != null) - return false; - } else if (!credential.equals(other.credential)) - return false; - if (endpoint == null) { - if (other.endpoint != null) - return false; - } else if (!endpoint.equals(other.endpoint)) - return false; - if (identity == null) { - if (other.identity != null) - return false; - } else if (!identity.equals(other.identity)) - return false; - if (propertiesBuilderClass == null) { - if (other.propertiesBuilderClass != null) - return false; - } else if (!propertiesBuilderClass.equals(other.propertiesBuilderClass)) - return false; - if (provider == null) { - if (other.provider != null) - return false; - } else if (!provider.equals(other.provider)) - return false; - if (sync == null) { - if (other.sync != null) - return false; - } else if (!sync.equals(other.sync)) - return false; - return true; - } + public static RestContextSpec contextSpec(String provider, String endpoint, String apiVersion, + String identity, String credential, Class sync, Class async, Iterable modules) { + return new RestContextSpec(provider, endpoint, apiVersion, identity, credential, sync, async, + PropertiesBuilder.class, (Class) RestContextBuilder.class, modules); } private final static Properties NO_PROPERTIES = new Properties(); @@ -300,9 +180,9 @@ public class RestContextFactory { /** * - * Identity will be found by searching {@code jclouds.identity} failing that {@code - * provider.identity} where provider corresponds to the parameter. Same pattern is used for - * credential ({@code jclouds.credential} failing that {@code provider.credential}). + * Identity will be found by searching {@code jclouds.identity} failing that + * {@code provider.identity} where provider corresponds to the parameter. Same pattern is used + * for credential ({@code jclouds.credential} failing that {@code provider.credential}). * * @param * Type of the provider specific client @@ -318,18 +198,18 @@ public class RestContextFactory { * properties to pass to the context. */ public RestContextBuilder createContextBuilder(String provider, Iterable wiring, - Properties overrides) { + Properties overrides) { return createContextBuilder(provider, null, null, wiring, overrides); } @SuppressWarnings("unchecked") public RestContextBuilder createContextBuilder(String provider, @Nullable String identity, - @Nullable String credential, Properties properties) { + @Nullable String credential, Properties properties) { return createContextBuilder(provider, identity, credential, EMPTY_LIST, properties); } public RestContextBuilder createContextBuilder(String provider, @Nullable String identity, - @Nullable String credential, Iterable wiring) { + @Nullable String credential, Iterable wiring) { return createContextBuilder(provider, identity, credential, wiring, NO_PROPERTIES); } @@ -349,13 +229,13 @@ public class RestContextFactory { * @return initialized context ready for use */ public RestContextBuilder createContextBuilder(String providerName, @Nullable String identity, - @Nullable String credential, Iterable wiring, Properties _overrides) { + @Nullable String credential, Iterable wiring, Properties _overrides) { checkNotNull(wiring, "wiring"); - ContextSpec contextSpec = createContextSpec(providerName, identity, credential, wiring, _overrides); + RestContextSpec contextSpec = createContextSpec(providerName, identity, credential, wiring, _overrides); return createContextBuilder(contextSpec, _overrides); } - public static Properties toProperties(ContextSpec contextSpec) { + public static Properties toProperties(RestContextSpec contextSpec) { checkNotNull(contextSpec, "contextSpec"); Properties props = new Properties(); @@ -368,37 +248,37 @@ public class RestContextFactory { if (contextSpec.sync != null) { props.setProperty(contextSpec.provider + ".sync", contextSpec.sync.getName()); props.setProperty(contextSpec.provider + ".async", checkNotNull(contextSpec.async, "contextSpec.async") - .getName()); + .getName()); } else { - props.setProperty(contextSpec.provider + ".contextbuilder", checkNotNull(contextSpec.contextBuilderClass, - "contextSpec.contextBuilderClass").getName()); + props.setProperty(contextSpec.provider + ".contextbuilder", + checkNotNull(contextSpec.contextBuilderClass, "contextSpec.contextBuilderClass").getName()); - props.setProperty(contextSpec.provider + ".propertiesbuilder", checkNotNull( - contextSpec.propertiesBuilderClass, "contextSpec.propertiesBuilderClass").getName()); + props.setProperty(contextSpec.provider + ".propertiesbuilder", + checkNotNull(contextSpec.propertiesBuilderClass, "contextSpec.propertiesBuilderClass").getName()); } if (size(contextSpec.modules) > 0) { - props.setProperty(contextSpec.provider + ".modules", Joiner.on(',').join( - transform(contextSpec.modules, new Function() { + props.setProperty(contextSpec.provider + ".modules", + Joiner.on(',').join(transform(contextSpec.modules, new Function() { - @Override - public String apply(Module from) { - return from.getClass().getName(); - } + @Override + public String apply(Module from) { + return from.getClass().getName(); + } - }))); + }))); } return props; } @SuppressWarnings("unchecked") - public ContextSpec createContextSpec(String providerName, String identity, String credential, - Properties _overrides) { + public RestContextSpec createContextSpec(String providerName, String identity, String credential, + Properties _overrides) { return createContextSpec(providerName, identity, credential, EMPTY_LIST, _overrides); } @SuppressWarnings("unchecked") - public ContextSpec createContextSpec(String providerName, String identity, String credential, - Iterable wiring, Properties _overrides) { + public RestContextSpec createContextSpec(String providerName, String identity, String credential, + Iterable wiring, Properties _overrides) { checkNotNull(providerName, "providerName"); checkNotNull(_overrides, "overrides"); @@ -409,8 +289,8 @@ public class RestContextFactory { String endpoint = props.getProperty(providerName + ".endpoint", null); String apiVersion = props.getProperty(providerName + ".apiversion", null); identity = props.getProperty(providerName + ".identity", props.getProperty("jclouds.identity", identity)); - credential = loadCredentialOrDefault(props, providerName + ".credential", loadCredentialOrDefault(props, - "jclouds.credential", credential)); + credential = loadCredentialOrDefault(props, providerName + ".credential", + loadCredentialOrDefault(props, "jclouds.credential", credential)); String syncClassName = props.getProperty(providerName + ".sync", null); String asyncClassName = props.getProperty(providerName + ".async", null); Iterable modules = concat(modulesForProviderInProperties(providerName, props), wiring); @@ -429,8 +309,8 @@ public class RestContextFactory { assert false : "exception should have propogated " + e; return null; } - ContextSpec contextSpec = new ContextSpec(providerName, endpoint, apiVersion, identity, credential, - sync, async, propertiesBuilderClass, contextBuilderClass, modules); + RestContextSpec contextSpec = new RestContextSpec(providerName, endpoint, apiVersion, identity, + credential, sync, async, propertiesBuilderClass, contextBuilderClass, modules); return contextSpec; } @@ -440,7 +320,7 @@ public class RestContextFactory { else if (properties.containsKey(property + ".resource")) try { return toStringAndClose(RestContextFactory.class.getResourceAsStream(properties.getProperty(property - + ".resource"))); + + ".resource"))); } catch (IOException e) { throw new RuntimeException("error reading resource: " + properties.getProperty(property + ".resource")); } @@ -454,26 +334,26 @@ public class RestContextFactory { return credential; } - public static RestContextBuilder createContextBuilder(ContextSpec contextSpec) { + public static RestContextBuilder createContextBuilder(RestContextSpec contextSpec) { return createContextBuilder(contextSpec, NO_PROPERTIES); } @SuppressWarnings("unchecked") - public static RestContextBuilder createContextBuilder(ContextSpec contextSpec, - Properties overrides) { + public static RestContextBuilder createContextBuilder(RestContextSpec contextSpec, + Properties overrides) { return createContextBuilder(contextSpec, EMPTY_LIST, overrides); } - public static RestContextBuilder createContextBuilder(ContextSpec contextSpec, - Iterable modules) { + public static RestContextBuilder createContextBuilder(RestContextSpec contextSpec, + Iterable modules) { return createContextBuilder(contextSpec, modules, NO_PROPERTIES); } - public static RestContextBuilder createContextBuilder(ContextSpec contextSpec, - Iterable modules, Properties overrides) { + public static RestContextBuilder createContextBuilder(RestContextSpec contextSpec, + Iterable modules, Properties overrides) { try { PropertiesBuilder builder = contextSpec.propertiesBuilderClass.getConstructor(Properties.class).newInstance( - overrides); + overrides); builder.provider(contextSpec.provider); if (contextSpec.apiVersion != null) @@ -484,7 +364,7 @@ public class RestContextFactory { builder.endpoint(contextSpec.endpoint); RestContextBuilder contextBuilder = initContextBuilder(contextSpec.contextBuilderClass, - contextSpec.sync, contextSpec.async, builder.build()); + contextSpec.sync, contextSpec.async, builder.build()); contextBuilder.withModules(concat(modules, contextSpec.modules)); @@ -522,7 +402,7 @@ public class RestContextFactory { * @see RestContextFactory#createContextBuilder(String, Iterable) */ public RestContext createContext(String provider, Iterable wiring, - Properties overrides) { + Properties overrides) { RestContextBuilder builder = createContextBuilder(provider, wiring, overrides); return buildContextUnwrappingExceptions(builder); } @@ -531,7 +411,7 @@ public class RestContextFactory { * @see RestContextFactory#createContextBuilder(String, String,String, Properties) */ public RestContext createContext(String provider, @Nullable String identity, - @Nullable String credential, Properties properties) { + @Nullable String credential, Properties properties) { RestContextBuilder builder = createContextBuilder(provider, identity, credential, properties); return buildContextUnwrappingExceptions(builder); } @@ -540,7 +420,7 @@ public class RestContextFactory { * @see RestContextFactory#createContextBuilder(String, String,String, Iterable) */ public RestContext createContext(String provider, @Nullable String identity, - @Nullable String credential, Iterable wiring) { + @Nullable String credential, Iterable wiring) { RestContextBuilder builder = createContextBuilder(provider, identity, credential, wiring); return buildContextUnwrappingExceptions(builder); } @@ -549,40 +429,40 @@ public class RestContextFactory { * @see RestContextFactory#createContextBuilder(String, String,String, Iterable, Properties) */ public RestContext createContext(String provider, @Nullable String identity, - @Nullable String credential, Iterable wiring, Properties overrides) { + @Nullable String credential, Iterable wiring, Properties overrides) { RestContextBuilder builder = createContextBuilder(provider, identity, credential, wiring, overrides); return buildContextUnwrappingExceptions(builder); } /** - * @see RestContextFactory#createContextBuilder(ContextSpec) + * @see RestContextFactory#createContextBuilder(RestContextSpec) */ - public static RestContext createContext(ContextSpec contextSpec) { + public static RestContext createContext(RestContextSpec contextSpec) { RestContextBuilder builder = createContextBuilder(contextSpec); return buildContextUnwrappingExceptions(builder); } /** - * @see RestContextFactory#createContextBuilder(ContextSpec, Properties) + * @see RestContextFactory#createContextBuilder(RestContextSpec, Properties) */ - public static RestContext createContext(ContextSpec contextSpec, Properties overrides) { + public static RestContext createContext(RestContextSpec contextSpec, Properties overrides) { RestContextBuilder builder = createContextBuilder(contextSpec, overrides); return buildContextUnwrappingExceptions(builder); } /** - * @see RestContextFactory#createContextBuilder(ContextSpec, Iterable) + * @see RestContextFactory#createContextBuilder(RestContextSpec, Iterable) */ - public static RestContext createContext(ContextSpec contextSpec, Iterable modules) { + public static RestContext createContext(RestContextSpec contextSpec, Iterable modules) { RestContextBuilder builder = createContextBuilder(contextSpec, modules); return buildContextUnwrappingExceptions(builder); } /** - * @see RestContextFactory#createContextBuilder(ContextSpec, Iterable, Properties) + * @see RestContextFactory#createContextBuilder(RestContextSpec, Iterable, Properties) */ - public static RestContext createContext(ContextSpec contextSpec, Iterable modules, - Properties overrides) { + public static RestContext createContext(RestContextSpec contextSpec, Iterable modules, + Properties overrides) { RestContextBuilder builder = createContextBuilder(contextSpec, modules, overrides); return buildContextUnwrappingExceptions(builder); } diff --git a/core/src/main/java/org/jclouds/rest/RestContextSpec.java b/core/src/main/java/org/jclouds/rest/RestContextSpec.java new file mode 100644 index 0000000000..8d4f42b37b --- /dev/null +++ b/core/src/main/java/org/jclouds/rest/RestContextSpec.java @@ -0,0 +1,106 @@ +/** + * + * Copyright (C) 2010 Cloud Conscious, LLC. + * + * ==================================================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ==================================================================== + */ + +package org.jclouds.rest; + +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkNotNull; +import static java.util.Collections.EMPTY_LIST; + +import org.jclouds.PropertiesBuilder; + +import com.google.common.base.Objects; +import com.google.common.collect.ImmutableList; +import com.google.inject.Module; + +/** + * @author Adrian Cole + */ +public class RestContextSpec { + protected final String provider; + protected final String endpoint; + protected final String apiVersion; + protected final String identity; + protected final String credential; + protected final Class sync; + protected final Class async; + protected final Class propertiesBuilderClass; + protected final Class> contextBuilderClass; + protected final Iterable modules; + + public RestContextSpec(String provider, String endpoint, String apiVersion, String identity, String credential, + Class sync, Class async, Class propertiesBuilderClass, + Class> contextBuilderClass, Iterable modules) { + this.provider = checkNotNull(provider, "provider"); + this.endpoint = endpoint; + this.apiVersion = apiVersion; + this.identity = identity; + this.credential = credential; + this.sync = sync; + this.async = async; + checkArgument(RestContextBuilder.class.isAssignableFrom(contextBuilderClass), contextBuilderClass.getName() + + " is not a subclass of " + RestContextBuilder.class.getName()); + checkArgument(PropertiesBuilder.class.isAssignableFrom(propertiesBuilderClass), propertiesBuilderClass.getName() + + " is not a subclass of " + PropertiesBuilder.class.getName()); + this.propertiesBuilderClass = propertiesBuilderClass; + this.contextBuilderClass = contextBuilderClass; + this.modules = ImmutableList.copyOf(modules); + } + + @SuppressWarnings("unchecked") + public RestContextSpec(String provider, String endpoint, String apiVersion, String identity, String credential, + Class sync, Class async) { + this(provider, endpoint, apiVersion, identity, credential, sync, async, PropertiesBuilder.class, + (Class) RestContextBuilder.class, EMPTY_LIST); + } + + /** + * this uses the inefficient {@link Objects} implementation as the object count will be + * relatively small and therefore efficiency is not a concern. + */ + @Override + public int hashCode() { + return Objects.hashCode(provider, endpoint, apiVersion, identity, credential, sync, async, + propertiesBuilderClass, contextBuilderClass, modules); + } + + /** + * this uses the inefficient {@link Objects} implementation as the object count will be + * relatively small and therefore efficiency is not a concern. + */ + @Override + public boolean equals(Object that) { + if (that == null) + return false; + return Objects.equal(this.toString(), that.toString()); + } + + /** + * this uses the inefficient {@link Objects} implementation as the object count will be + * relatively small and therefore efficiency is not a concern. + */ + @Override + public String toString() { + return Objects.toStringHelper(this).add("provider", provider).add("endpoint", endpoint) + .add("apiVersion", apiVersion).add("identity", identity).add("sync", sync).add("async", async) + .add("propertiesBuilderClass", propertiesBuilderClass).add("contextBuilderClass", contextBuilderClass) + .add("modules", modules).toString(); + } + +} \ No newline at end of file diff --git a/core/src/test/java/org/jclouds/http/BaseJettyTest.java b/core/src/test/java/org/jclouds/http/BaseJettyTest.java index 7f4711c34f..94878ff126 100644 --- a/core/src/test/java/org/jclouds/http/BaseJettyTest.java +++ b/core/src/test/java/org/jclouds/http/BaseJettyTest.java @@ -51,7 +51,7 @@ import org.jclouds.crypto.CryptoStreams; import org.jclouds.io.InputSuppliers; import org.jclouds.rest.RestContext; import org.jclouds.rest.RestContextBuilder; -import org.jclouds.rest.RestContextFactory.ContextSpec; +import org.jclouds.rest.RestContextSpec; import org.mortbay.jetty.Connector; import org.mortbay.jetty.Handler; import org.mortbay.jetty.Request; @@ -264,7 +264,7 @@ public abstract class BaseJettyTest { Properties properties, Module... connectionModules) { properties.setProperty(Constants.PROPERTY_TRUST_ALL_CERTS, "true"); properties.setProperty(Constants.PROPERTY_RELAX_HOSTNAME, "true"); - ContextSpec contextSpec = contextSpec("test", + RestContextSpec contextSpec = contextSpec("test", "http://localhost:" + testPort, "1", "identity", null, IntegrationTestClient.class, IntegrationTestAsyncClient.class, ImmutableSet. copyOf(connectionModules)); return createContextBuilder(contextSpec, properties); diff --git a/core/src/test/java/org/jclouds/rest/InputParamValidatorTest.java b/core/src/test/java/org/jclouds/rest/InputParamValidatorTest.java index e6b8dd57d6..327e80d89a 100644 --- a/core/src/test/java/org/jclouds/rest/InputParamValidatorTest.java +++ b/core/src/test/java/org/jclouds/rest/InputParamValidatorTest.java @@ -33,7 +33,6 @@ import org.jclouds.concurrent.Timeout; import org.jclouds.http.IntegrationTestAsyncClient; import org.jclouds.http.IntegrationTestClient; import org.jclouds.predicates.validators.AllLowerCaseValidator; -import org.jclouds.rest.RestContextFactory.ContextSpec; import org.jclouds.rest.annotations.ParamValidators; import org.jclouds.rest.annotations.SkipEncoding; import org.jclouds.rest.internal.RestAnnotationProcessor; @@ -145,7 +144,7 @@ public class InputParamValidatorTest { @BeforeClass void setupFactory() { - ContextSpec contextSpec = contextSpec("test", + RestContextSpec contextSpec = contextSpec("test", "http://localhost:9999", "1", "userFoo", null, IntegrationTestClient.class, IntegrationTestAsyncClient.class); diff --git a/core/src/test/java/org/jclouds/rest/RestClientTest.java b/core/src/test/java/org/jclouds/rest/RestClientTest.java index 58392dbfc9..44f22d9beb 100644 --- a/core/src/test/java/org/jclouds/rest/RestClientTest.java +++ b/core/src/test/java/org/jclouds/rest/RestClientTest.java @@ -27,7 +27,6 @@ import java.util.Properties; import org.jclouds.http.HttpRequest; import org.jclouds.http.functions.ParseSax; import org.jclouds.logging.config.NullLoggingModule; -import org.jclouds.rest.RestContextFactory.ContextSpec; import org.jclouds.rest.internal.RestAnnotationProcessor; import org.testng.annotations.BeforeClass; @@ -45,7 +44,7 @@ public abstract class RestClientTest extends BaseRestClientTest { protected abstract void checkFilters(HttpRequest request); - abstract public ContextSpec createContextSpec(); + abstract public RestContextSpec createContextSpec(); protected Module createModule() { return new Module() { @@ -60,7 +59,7 @@ public abstract class RestClientTest extends BaseRestClientTest { @BeforeClass protected void setupFactory() throws IOException { - ContextSpec contextSpec = createContextSpec(); + RestContextSpec contextSpec = createContextSpec(); injector = createContextBuilder(contextSpec, ImmutableSet.of(new MockModule(), new NullLoggingModule(), createModule()), getProperties()).buildInjector(); diff --git a/core/src/test/java/org/jclouds/rest/RestContextFactoryTest.java b/core/src/test/java/org/jclouds/rest/RestContextFactoryTest.java index 179f7ea596..63d71a4a78 100644 --- a/core/src/test/java/org/jclouds/rest/RestContextFactoryTest.java +++ b/core/src/test/java/org/jclouds/rest/RestContextFactoryTest.java @@ -34,7 +34,6 @@ import org.jclouds.PropertiesBuilder; import org.jclouds.http.IntegrationTestAsyncClient; import org.jclouds.http.IntegrationTestClient; import org.jclouds.http.RequiresHttp; -import org.jclouds.rest.RestContextFactory.ContextSpec; import org.jclouds.rest.config.RestClientModule; import org.testng.annotations.Test; @@ -54,14 +53,14 @@ public class RestContextFactoryTest { private static final String provider = "test"; public void testBuilder() { - ContextSpec contextSpec = contextSpec(provider, + RestContextSpec contextSpec = contextSpec(provider, "http://localhost", "1", "dummy", null, IntegrationTestClient.class, IntegrationTestAsyncClient.class); createContextBuilder(contextSpec); } public void testBuilderProperties() { - ContextSpec contextSpec = contextSpec(provider, + RestContextSpec contextSpec = contextSpec(provider, "http://localhost", "1", "dummy", null, IntegrationTestClient.class, IntegrationTestAsyncClient.class); Properties props = RestContextFactory.toProperties(contextSpec); @@ -79,7 +78,7 @@ public class RestContextFactoryTest { } public void testBuilderPropertiesWithCredential() { - ContextSpec contextSpec = contextSpec(provider, + RestContextSpec contextSpec = contextSpec(provider, "http://localhost", "1", "dummy", "credential", IntegrationTestClient.class, IntegrationTestAsyncClient.class); @@ -99,7 +98,7 @@ public class RestContextFactoryTest { @SuppressWarnings("unchecked") public void testBuilderPropertiesWithContextBuilder() { - ContextSpec contextSpec = contextSpec(provider, + RestContextSpec contextSpec = contextSpec(provider, "http://localhost", "1", "dummy", null, (Class) null, (Class) null, PropertiesBuilder.class, (Class) IntegrationTestContextBuilder.class, Collections.EMPTY_LIST); @@ -119,7 +118,7 @@ public class RestContextFactoryTest { @SuppressWarnings("unchecked") public void testBuilderPropertiesWithModule() { - ContextSpec contextSpec = contextSpec(provider, + RestContextSpec contextSpec = contextSpec(provider, "http://localhost", "1", "dummy", null, (Class) null, (Class) null, PropertiesBuilder.class, (Class) IntegrationTestContextBuilder.class, Collections. singleton(new A())); @@ -139,7 +138,7 @@ public class RestContextFactoryTest { @SuppressWarnings("unchecked") public void testBuilderPropertiesWithModules() { - ContextSpec contextSpec = contextSpec(provider, + RestContextSpec contextSpec = contextSpec(provider, "http://localhost", "1", "dummy", null, (Class) null, (Class) null, PropertiesBuilder.class, (Class) IntegrationTestContextBuilder.class, Arrays. asList(new A(), new B())); @@ -174,9 +173,9 @@ public class RestContextFactoryTest { @SuppressWarnings("hiding") @Override - public ContextSpec createContextSpec(String providerName, String identity, String credential, + public RestContextSpec createContextSpec(String providerName, String identity, String credential, Iterable wiring, Properties _overrides) { - ContextSpec spec = super.createContextSpec(providerName, identity, credential, wiring, _overrides); + RestContextSpec spec = super.createContextSpec(providerName, identity, credential, wiring, _overrides); assertEquals(spec.identity, "foo"); assertEquals(spec.credential, "bar"); assertEquals(Iterables.size(spec.modules), 2); @@ -206,9 +205,9 @@ public class RestContextFactoryTest { @SuppressWarnings("hiding") @Override - public ContextSpec createContextSpec(String providerName, String identity, String credential, + public RestContextSpec createContextSpec(String providerName, String identity, String credential, Iterable wiring, Properties _overrides) { - ContextSpec spec = super.createContextSpec(providerName, identity, credential, wiring, _overrides); + RestContextSpec spec = super.createContextSpec(providerName, identity, credential, wiring, _overrides); assertEquals(spec.identity, "foo"); assertEquals(spec.credential, "bar"); assertEquals(Iterables.size(spec.modules), 2); @@ -240,7 +239,7 @@ public class RestContextFactoryTest { @Test(expectedExceptions = IllegalArgumentException.class) public void testBuilderPropertiesWithWrongConfig() { @SuppressWarnings("unused") - ContextSpec contextSpec = contextSpec(provider, + RestContextSpec contextSpec = contextSpec(provider, "http://localhost", "1", "dummy", null, (Class) null, (Class) null, (Class) IntegrationTestContextBuilder.class, (Class) PropertiesBuilder.class, Collections.EMPTY_LIST); } diff --git a/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java b/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java index 6b942b1dc5..7b2d4fa9f0 100755 --- a/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java +++ b/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java @@ -108,7 +108,7 @@ import org.jclouds.logging.config.NullLoggingModule; import org.jclouds.rest.BaseRestClientTest; import org.jclouds.rest.ConfiguresRestClient; import org.jclouds.rest.InvocationContext; -import org.jclouds.rest.RestContextFactory.ContextSpec; +import org.jclouds.rest.RestContextSpec; import org.jclouds.rest.annotations.BinderParam; import org.jclouds.rest.annotations.Delegate; import org.jclouds.rest.annotations.Endpoint; @@ -278,7 +278,7 @@ public class RestAnnotationProcessorTest extends BaseRestClientTest { private Injector injectorForClient() { - ContextSpec contextSpec = contextSpec("test", "http://localhost:9999", "1", "userfoo", null, + RestContextSpec contextSpec = contextSpec("test", "http://localhost:9999", "1", "userfoo", null, Caller.class, AsyncCaller.class, ImmutableSet. of(new MockModule(), new NullLoggingModule(), new CallerCalleeModule())); @@ -2081,7 +2081,7 @@ public class RestAnnotationProcessorTest extends BaseRestClientTest { @BeforeClass void setupFactory() { - ContextSpec contextSpec = contextSpec("test", "http://localhost:9999", "1", "userfoo", null, + RestContextSpec contextSpec = contextSpec("test", "http://localhost:9999", "1", "userfoo", null, String.class, Integer.class, ImmutableSet. of(new MockModule(), new NullLoggingModule(), new AbstractModule() { diff --git a/gogrid/src/test/java/org/jclouds/gogrid/services/BaseGoGridAsyncClientTest.java b/gogrid/src/test/java/org/jclouds/gogrid/services/BaseGoGridAsyncClientTest.java index 3a22535321..a1df9e142b 100644 --- a/gogrid/src/test/java/org/jclouds/gogrid/services/BaseGoGridAsyncClientTest.java +++ b/gogrid/src/test/java/org/jclouds/gogrid/services/BaseGoGridAsyncClientTest.java @@ -31,7 +31,7 @@ import org.jclouds.http.RequiresHttp; import org.jclouds.rest.ConfiguresRestClient; import org.jclouds.rest.RestClientTest; import org.jclouds.rest.RestContextFactory; -import org.jclouds.rest.RestContextFactory.ContextSpec; +import org.jclouds.rest.RestContextSpec; import com.google.common.base.Supplier; import com.google.inject.Module; @@ -67,7 +67,7 @@ public abstract class BaseGoGridAsyncClientTest extends RestClientTest { } @Override - public ContextSpec createContextSpec() { + public RestContextSpec createContextSpec() { return new RestContextFactory().createContextSpec("gogrid", "foo", "bar", new Properties()); } diff --git a/rackspace/src/test/java/org/jclouds/rackspace/RackspaceAuthAsyncClientTest.java b/rackspace/src/test/java/org/jclouds/rackspace/RackspaceAuthAsyncClientTest.java index 1142ed9e21..b1ab128f4b 100755 --- a/rackspace/src/test/java/org/jclouds/rackspace/RackspaceAuthAsyncClientTest.java +++ b/rackspace/src/test/java/org/jclouds/rackspace/RackspaceAuthAsyncClientTest.java @@ -30,7 +30,7 @@ import org.jclouds.http.HttpRequest; import org.jclouds.rackspace.RackspaceAuthAsyncClient.AuthenticationResponse; import org.jclouds.rackspace.functions.ParseAuthenticationResponseFromHeaders; import org.jclouds.rest.RestClientTest; -import org.jclouds.rest.RestContextFactory.ContextSpec; +import org.jclouds.rest.RestContextSpec; import org.jclouds.rest.functions.MapHttp4xxCodesToExceptions; import org.jclouds.rest.internal.RestAnnotationProcessor; import org.testng.annotations.Test; @@ -60,7 +60,7 @@ public class RackspaceAuthAsyncClientTest extends RestClientTest createContextSpec() { + public RestContextSpec createContextSpec() { return contextSpec("test", "http://localhost:8080", "1", "identity", "credential", RackspaceAuthClient.class, RackspaceAuthAsyncClient.class); } diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/CloudFilesBlobRequestSignerTest.java b/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/CloudFilesBlobRequestSignerTest.java index 6ff04d956b..704853ce62 100644 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/CloudFilesBlobRequestSignerTest.java +++ b/rackspace/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/CloudFilesBlobRequestSignerTest.java @@ -33,7 +33,7 @@ import org.jclouds.rackspace.cloudfiles.config.CloudFilesRestClientModule; import org.jclouds.rackspace.cloudservers.TestRackspaceAuthenticationRestClientModule; import org.jclouds.rest.RestClientTest; import org.jclouds.rest.RestContextFactory; -import org.jclouds.rest.RestContextFactory.ContextSpec; +import org.jclouds.rest.RestContextSpec; import org.jclouds.rest.internal.RestAnnotationProcessor; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -110,7 +110,7 @@ public class CloudFilesBlobRequestSignerTest extends RestClientTest createContextSpec() { + public RestContextSpec createContextSpec() { return new RestContextFactory().createContextSpec("cloudfiles", "identity", "credential", new Properties()); } diff --git a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/CloudServersAsyncClientTest.java b/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/CloudServersAsyncClientTest.java index 6659eec176..03776e66d5 100755 --- a/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/CloudServersAsyncClientTest.java +++ b/rackspace/src/test/java/org/jclouds/rackspace/cloudservers/CloudServersAsyncClientTest.java @@ -54,7 +54,7 @@ import org.jclouds.rackspace.filters.AddTimestampQuery; import org.jclouds.rackspace.filters.AuthenticateRequest; import org.jclouds.rest.RestClientTest; 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.ReturnEmptySetOnNotFoundOr404; import org.jclouds.rest.functions.ReturnFalseOnNotFoundOr404; @@ -863,7 +863,7 @@ public class CloudServersAsyncClientTest extends RestClientTest createContextSpec() { + public RestContextSpec createContextSpec() { return new RestContextFactory().createContextSpec("cloudservers", "user", "password", new Properties()); } diff --git a/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/RimuHostingAsyncClientTest.java b/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/RimuHostingAsyncClientTest.java index 558a986ee9..919e2fe870 100644 --- a/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/RimuHostingAsyncClientTest.java +++ b/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/RimuHostingAsyncClientTest.java @@ -29,7 +29,7 @@ import org.jclouds.http.HttpRequest; import org.jclouds.http.functions.UnwrapOnlyJsonValue; import org.jclouds.rest.RestClientTest; import org.jclouds.rest.RestContextFactory; -import org.jclouds.rest.RestContextFactory.ContextSpec; +import org.jclouds.rest.RestContextSpec; import org.jclouds.rest.internal.GeneratedHttpRequest; import org.jclouds.rest.internal.RestAnnotationProcessor; import org.jclouds.rimuhosting.miro.binder.CreateServerOptions; @@ -80,7 +80,7 @@ public class RimuHostingAsyncClientTest extends RestClientTest createContextSpec() { + public RestContextSpec createContextSpec() { return new RestContextFactory().createContextSpec("rimuhosting", "apikey", "null", new Properties()); } } diff --git a/sandbox/libvirt/README.txt b/sandbox/libvirt/README.txt new file mode 100644 index 0000000000..a6c9289a57 --- /dev/null +++ b/sandbox/libvirt/README.txt @@ -0,0 +1,2 @@ +install libvirt on your os + * if os/x, see http://github.com/justinclift/libvirt diff --git a/sandbox/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtComputeServiceContextBuilderTest.java b/sandbox/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtComputeServiceContextBuilderTest.java index dba6e22333..e9c1ad1606 100644 --- a/sandbox/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtComputeServiceContextBuilderTest.java +++ b/sandbox/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtComputeServiceContextBuilderTest.java @@ -1,5 +1,6 @@ package org.jclouds.libvirt.compute; +import static org.easymock.classextension.EasyMock.createMock; import static org.testng.Assert.assertNotNull; import java.net.URI; @@ -7,7 +8,7 @@ import java.util.Properties; import org.jclouds.compute.ComputeServiceContext; import org.jclouds.compute.ComputeServiceContextFactory; -import org.jclouds.compute.config.StandaloneComputeServiceContextModule; +import org.jclouds.compute.StandaloneComputeServiceContextSpec; import org.jclouds.libvirt.Datacenter; import org.jclouds.libvirt.Hardware; import org.jclouds.libvirt.Image; @@ -17,6 +18,9 @@ import org.libvirt.Domain; import org.libvirt.LibvirtException; import org.testng.annotations.Test; +import com.google.common.collect.ImmutableSet; +import com.google.inject.Module; + /** * * @author Adrian Cole @@ -24,39 +28,26 @@ import org.testng.annotations.Test; */ @Test(groups = "unit") public class LibvirtComputeServiceContextBuilderTest { -// -// @Test -// public void testCreateContextModule() { -// assertNotNull(new LibvirtComputeServiceContextBuilder(new Properties()).createContextModule()); -// } -// -// @Test -// public void testCanBuildDirectly() { -// ComputeServiceContext context = new LibvirtComputeServiceContextBuilder(new Properties()) { -// -// @Override -// public StandaloneComputeServiceContextModule createContextModule() { -// return new StubLibvirtComputeServiceContextModule(); -// } -// -// }.buildComputeServiceContext(); -// context.close(); -// } -// -// @Test -// public void testCanBuildWithComputeService() { -// ComputeServiceContext context = ComputeServiceContextFactory -// .createStandaloneContext(new StubLibvirtComputeServiceContextModule()); -// context.close(); -// -// } + + @Test + public void testCreateContextModule() { + assertNotNull(new LibvirtComputeServiceContextBuilder(new Properties()).createContextModule()); + } + + @Test + public void testCanBuildWithComputeService() { + ComputeServiceContext context = new ComputeServiceContextFactory() + .createContext(new StandaloneComputeServiceContextSpec("libvirt", + "stub", "1", "identity", "credential", new StubLibvirtComputeServiceContextModule(), ImmutableSet + . of())); + context.close(); + } private static class StubLibvirtComputeServiceContextModule extends LibvirtComputeServiceContextModule { @Override protected Connect createConnection(URI endpoint, String identity, String credential) throws LibvirtException { - // TODO replace with mock - return null; + return createMock(Connect.class); } } diff --git a/skeletons/standalone-compute/src/test/java/org/jclouds/servermanager/compute/ServerManagerComputeServiceContextBuilderTest.java b/skeletons/standalone-compute/src/test/java/org/jclouds/servermanager/compute/ServerManagerComputeServiceContextBuilderTest.java index 5c45742b6c..2538a36a72 100644 --- a/skeletons/standalone-compute/src/test/java/org/jclouds/servermanager/compute/ServerManagerComputeServiceContextBuilderTest.java +++ b/skeletons/standalone-compute/src/test/java/org/jclouds/servermanager/compute/ServerManagerComputeServiceContextBuilderTest.java @@ -6,8 +6,16 @@ import java.util.Properties; import org.jclouds.compute.ComputeServiceContext; import org.jclouds.compute.ComputeServiceContextFactory; +import org.jclouds.compute.StandaloneComputeServiceContextSpec; +import org.jclouds.servermanager.Datacenter; +import org.jclouds.servermanager.Hardware; +import org.jclouds.servermanager.Image; +import org.jclouds.servermanager.Server; import org.testng.annotations.Test; +import com.google.common.collect.ImmutableSet; +import com.google.inject.Module; + /** * * @author Adrian Cole @@ -30,8 +38,11 @@ public class ServerManagerComputeServiceContextBuilderTest { @Test public void testCanBuildWithComputeService() { - ComputeServiceContext context = ComputeServiceContextFactory - .createStandaloneContext(ServerManagerComputeServiceContextBuilder.createContextModule()); + ComputeServiceContext context = new ComputeServiceContextFactory() + .createContext(new StandaloneComputeServiceContextSpec( + "servermanager", "http://host", "1", "identity", "credential", + ServerManagerComputeServiceContextBuilder.createContextModule(), ImmutableSet. of())); + context.close(); } diff --git a/slicehost/src/test/java/org/jclouds/slicehost/SlicehostAsyncClientTest.java b/slicehost/src/test/java/org/jclouds/slicehost/SlicehostAsyncClientTest.java index c86d980d2e..51cfb064c5 100644 --- a/slicehost/src/test/java/org/jclouds/slicehost/SlicehostAsyncClientTest.java +++ b/slicehost/src/test/java/org/jclouds/slicehost/SlicehostAsyncClientTest.java @@ -30,7 +30,7 @@ import org.jclouds.http.functions.ParseSax; import org.jclouds.http.functions.ReleasePayloadAndReturn; import org.jclouds.rest.RestClientTest; import org.jclouds.rest.RestContextFactory; -import org.jclouds.rest.RestContextFactory.ContextSpec; +import org.jclouds.rest.RestContextSpec; import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404; import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404; import org.jclouds.rest.internal.RestAnnotationProcessor; @@ -252,7 +252,7 @@ public class SlicehostAsyncClientTest extends RestClientTest createContextSpec() { + public RestContextSpec createContextSpec() { return new RestContextFactory().createContextSpec("slicehost", "apikey", null, new Properties()); } diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudAsyncClientTest.java b/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudAsyncClientTest.java index 494bfdb857..a5b1707481 100644 --- a/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudAsyncClientTest.java +++ b/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudAsyncClientTest.java @@ -45,7 +45,7 @@ import org.jclouds.http.functions.ReturnInputStream; import org.jclouds.rest.ConfiguresRestClient; import org.jclouds.rest.RestClientTest; 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.ReturnNullOnNotFoundOr404; import org.jclouds.rest.functions.ReturnVoidOnNotFoundOr404; @@ -809,7 +809,7 @@ public class VCloudAsyncClientTest extends RestClientTest { } @Override - public ContextSpec createContextSpec() { + public RestContextSpec createContextSpec() { Properties overrides = new Properties(); overrides.setProperty("vcloud.endpoint", "https://vcenterprise.bluelock.com/api/v1.0"); return new RestContextFactory().createContextSpec("vcloud", "identity", "credential", overrides); diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudExpressAsyncClientTest.java b/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudExpressAsyncClientTest.java index 1236cb64e1..783427decb 100644 --- a/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudExpressAsyncClientTest.java +++ b/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudExpressAsyncClientTest.java @@ -43,7 +43,7 @@ import org.jclouds.http.functions.ReleasePayloadAndReturn; import org.jclouds.rest.ConfiguresRestClient; import org.jclouds.rest.RestClientTest; import org.jclouds.rest.RestContextFactory; -import org.jclouds.rest.RestContextFactory.ContextSpec; +import org.jclouds.rest.RestContextSpec; import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404; import org.jclouds.rest.functions.ReturnVoidOnNotFoundOr404; import org.jclouds.rest.internal.RestAnnotationProcessor; @@ -637,7 +637,7 @@ public class VCloudExpressAsyncClientTest extends RestClientTest createContextSpec() { + public RestContextSpec createContextSpec() { Properties overrides = new Properties(); overrides.setProperty("vcloudexpress.endpoint", "https://vcloud.safesecureweb.com/api/v0.8"); return new RestContextFactory().createContextSpec("vcloudexpress", "identity", "credential", overrides); diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudLoginAsyncClientTest.java b/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudLoginAsyncClientTest.java index 61dc5ece55..be429290f6 100755 --- a/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudLoginAsyncClientTest.java +++ b/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudLoginAsyncClientTest.java @@ -33,7 +33,7 @@ import org.jclouds.concurrent.Timeout; import org.jclouds.http.HttpRequest; import org.jclouds.http.filters.BasicAuthentication; import org.jclouds.rest.RestClientTest; -import org.jclouds.rest.RestContextFactory.ContextSpec; +import org.jclouds.rest.RestContextSpec; import org.jclouds.rest.annotations.Provider; import org.jclouds.rest.internal.RestAnnotationProcessor; import org.jclouds.vcloud.domain.VCloudSession; @@ -109,7 +109,7 @@ public class VCloudLoginAsyncClientTest extends RestClientTest createContextSpec() { + public RestContextSpec createContextSpec() { return contextSpec("test", "http://localhost:8080/login", "1", "identity", "credential", VCloudLoginClient.class, VCloudExpressLoginAsyncClient.class); } diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudVersionsAsyncClientTest.java b/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudVersionsAsyncClientTest.java index 4f190d5f46..c81a834d3d 100644 --- a/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudVersionsAsyncClientTest.java +++ b/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudVersionsAsyncClientTest.java @@ -32,7 +32,7 @@ import org.jclouds.concurrent.Timeout; import org.jclouds.http.HttpRequest; import org.jclouds.http.functions.ParseSax; import org.jclouds.rest.RestClientTest; -import org.jclouds.rest.RestContextFactory.ContextSpec; +import org.jclouds.rest.RestContextSpec; import org.jclouds.rest.internal.RestAnnotationProcessor; import org.jclouds.vcloud.xml.SupportedVersionsHandler; import org.testng.annotations.Test; @@ -82,7 +82,7 @@ public class VCloudVersionsAsyncClientTest extends RestClientTest createContextSpec() { + public RestContextSpec createContextSpec() { return contextSpec("test", "http://localhost:8080", "1", "identity", "credential", VCloudVersionsClient.class, VCloudVersionsAsyncClient.class); } diff --git a/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/TerremarkECloudAsyncClientTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/TerremarkECloudAsyncClientTest.java index 167f28a44e..3aadb4eea9 100644 --- a/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/TerremarkECloudAsyncClientTest.java +++ b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/TerremarkECloudAsyncClientTest.java @@ -42,7 +42,7 @@ import org.jclouds.rest.ConfiguresRestClient; import org.jclouds.rest.ResourceNotFoundException; import org.jclouds.rest.RestClientTest; import org.jclouds.rest.RestContextFactory; -import org.jclouds.rest.RestContextFactory.ContextSpec; +import org.jclouds.rest.RestContextSpec; import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404; import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404; import org.jclouds.rest.functions.ReturnVoidOnNotFoundOr404; @@ -493,7 +493,7 @@ public class TerremarkECloudAsyncClientTest extends RestClientTest createContextSpec() { + public RestContextSpec createContextSpec() { return new RestContextFactory().createContextSpec("trmk-vcloudexpress", "identity", "credential", new Properties()); } diff --git a/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/TerremarkVCloudExpressAsyncClientTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/TerremarkVCloudExpressAsyncClientTest.java index 06e58b4632..6adc67405b 100644 --- a/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/TerremarkVCloudExpressAsyncClientTest.java +++ b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/TerremarkVCloudExpressAsyncClientTest.java @@ -42,7 +42,7 @@ import org.jclouds.rest.ConfiguresRestClient; import org.jclouds.rest.ResourceNotFoundException; import org.jclouds.rest.RestClientTest; import org.jclouds.rest.RestContextFactory; -import org.jclouds.rest.RestContextFactory.ContextSpec; +import org.jclouds.rest.RestContextSpec; import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404; import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404; import org.jclouds.rest.functions.ReturnVoidOnNotFoundOr404; @@ -595,7 +595,7 @@ public class TerremarkVCloudExpressAsyncClientTest extends RestClientTest createContextSpec() { + public RestContextSpec createContextSpec() { return new RestContextFactory().createContextSpec("trmk-vcloudexpress", "identity", "credential", new Properties()); }