From d735a9fa211129b16872aacf11f03bc2d709fde7 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Fri, 10 Oct 2014 17:54:48 -0700 Subject: [PATCH] JCLOUDS-40 clear remaining references to Async. --- .../atmos/blobstore/AtmosBlobStore.java | 4 +- .../jclouds/ec2/domain/ImageAttribute.java | 8 -- .../org/jclouds/ec2/domain/InstanceState.java | 8 -- .../org/jclouds/ec2/domain/InstanceType.java | 8 -- core/src/main/clojure/org/jclouds/core.clj | 5 +- core/src/main/java/org/jclouds/View.java | 2 +- .../java/org/jclouds/apis/ApiMetadata.java | 2 +- .../java/org/jclouds/rest/RestContext.java | 57 ------------ .../jclouds/rest/config/InvocationConfig.java | 2 +- .../config/ReadAnnotationsAndProperties.java | 6 +- .../internal/InvokeAndCallGetOnFutures.java | 87 ------------------- .../rest/internal/RestContextImpl.java | 69 --------------- .../ReadAnnotationsAndPropertiesTest.java | 16 +--- ...aphicallyAtOrAfterSinceApiVersionTest.java | 22 ++--- ...CommandExecutorServiceIntegrationTest.java | 24 +---- .../org/jclouds/aws/s3/AWSS3ClientTest.java | 2 +- .../features/EmailAccountApiExpectTest.java | 2 +- .../features/DatacenterApiExpectTest.java | 5 +- .../SoftwareDescriptionApiExpectTest.java | 5 +- 19 files changed, 29 insertions(+), 305 deletions(-) delete mode 100644 core/src/main/java/org/jclouds/rest/RestContext.java delete mode 100644 core/src/main/java/org/jclouds/rest/internal/InvokeAndCallGetOnFutures.java delete mode 100644 core/src/main/java/org/jclouds/rest/internal/RestContextImpl.java diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosBlobStore.java b/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosBlobStore.java index 0a1be34b0b..fd6b2bcec4 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosBlobStore.java +++ b/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosBlobStore.java @@ -97,8 +97,8 @@ public class AtmosBlobStore extends BaseBlobStore { } /** - * This implementation invokes {@link AtmosAsyncClient#deletePath} followed by - * {@link AtmosAsyncClient#pathExists} until it is true. + * This implementation invokes {@link AtmosClient#deletePath} followed by + * {@link AtmosClient#pathExists} until it is true. */ protected boolean deleteAndVerifyContainerGone(final String container) { sync.deletePath(container + "/"); diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/ImageAttribute.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/ImageAttribute.java index cf1e7d48fb..f951e6637e 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/ImageAttribute.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/ImageAttribute.java @@ -16,14 +16,6 @@ */ package org.jclouds.ec2.domain; -/** - * - * An attribute of an AMI. - * - * @see EC2AsyncClient#modifyImageAttribute - * @see EC2AsyncClient#resetImageAttribute - * @see EC2AsyncClient#describeImageAttribute - */ public enum ImageAttribute { /** diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/InstanceState.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/InstanceState.java index 2a38809481..4718bb8c14 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/InstanceState.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/InstanceState.java @@ -20,14 +20,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.base.CaseFormat; -/** - * - * The current state of the instance.. - * - * @see EC2AsyncClient#describeInstances - * @see EC2AsyncClient#runInstances - * @see EC2AsyncClient#terminateInstances - */ public enum InstanceState { /** diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/InstanceType.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/InstanceType.java index 32fcec537b..e97955e770 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/InstanceType.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/InstanceType.java @@ -16,14 +16,6 @@ */ package org.jclouds.ec2.domain; -/** - * - * The type of the instance. Description accurate as of 8-15-2009 release. - * - * @see EC2AsyncClient#describeInstances - * @see EC2AsyncClient#runInstances - * @see EC2AsyncClient#terminateInstances - */ public class InstanceType { /** diff --git a/core/src/main/clojure/org/jclouds/core.clj b/core/src/main/clojure/org/jclouds/core.clj index 7c5970a813..766f14295e 100644 --- a/core/src/main/clojure/org/jclouds/core.clj +++ b/core/src/main/clojure/org/jclouds/core.clj @@ -31,11 +31,10 @@ :sshj 'org.jclouds.sshj.config.SshjSshClientModule :enterprise 'org.jclouds.enterprise.config.EnterpriseConfigurationModule :apachehc 'org.jclouds.http.apachehc.config.ApacheHCHttpCommandExecutorServiceModule - :ning 'org.jclouds.http.ning.config.NingHttpCommandExecutorServiceModule + :okhttp 'org.jclouds.http.okhttp.config.OkHttpCommandExecutorServiceModule :bouncycastle 'org.jclouds.encryption.bouncycastle.config.BouncyCastleCryptoModule :joda 'org.jclouds.date.joda.config.JodaDateServiceModule - :gae 'org.jclouds.gae.config.GoogleAppEngineConfigurationModule - :gae-async 'org.jclouds.gae.config.AsyncGoogleAppEngineConfigurationModule}) + :gae 'org.jclouds.gae.config.GoogleAppEngineConfigurationModule}) (defn- instantiate [sym] (let [loader (.getContextClassLoader (Thread/currentThread))] diff --git a/core/src/main/java/org/jclouds/View.java b/core/src/main/java/org/jclouds/View.java index 01f9bff254..ca71556337 100644 --- a/core/src/main/java/org/jclouds/View.java +++ b/core/src/main/java/org/jclouds/View.java @@ -45,7 +45,7 @@ public interface View { * * ex. * 
-    * RestContext backendApi = computeContext.unwrap(NovaApiMetadata.CONTEXT_TOKEN);
+    * ApiContext backendApi = computeContext.unwrap(new TypeToken>(){});
     *
* @param type * the type of the context to be returned. The backend context must diff --git a/core/src/main/java/org/jclouds/apis/ApiMetadata.java b/core/src/main/java/org/jclouds/apis/ApiMetadata.java index 6d09a9fb29..96595abbca 100644 --- a/core/src/main/java/org/jclouds/apis/ApiMetadata.java +++ b/core/src/main/java/org/jclouds/apis/ApiMetadata.java @@ -256,7 +256,7 @@ public interface ApiMetadata { URI getDocumentation(); /** - * @return the primary context of this api, for example {@code RestContext} + * @return the primary context of this api, for example {@code ApiContext} */ TypeToken getContext(); diff --git a/core/src/main/java/org/jclouds/rest/RestContext.java b/core/src/main/java/org/jclouds/rest/RestContext.java deleted file mode 100644 index 3971bfc5b4..0000000000 --- a/core/src/main/java/org/jclouds/rest/RestContext.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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 org.jclouds.Context; -import org.jclouds.rest.internal.RestContextImpl; - -import com.google.inject.ImplementedBy; - -/** - * Represents an authenticated context to the cloud. - * - *

Note

Please issue {@link #close()} when you are finished with this context in order to - * release resources. - * - * - * - * @deprecated please use {@link org.jclouds.ContextBuilder#buildApi()} as - * async interface will be removed in jclouds 1.7. - */ -@Deprecated -@ImplementedBy(RestContextImpl.class) -public interface RestContext extends Context { - - /** - * low-level api to the cloud. Threadsafe implementations will return a singleton. - * - * @return a connection to the cloud where all methods return {@link Future}s - * @deprecated please use {@link org.jclouds.ContextBuilder#buildApi()} as - * async interface will be removed in jclouds 1.7. - */ - @Deprecated - A getAsyncApi(); - - /** - * reflects a tuned connection to the cloud which calls {@link #getAsyncApi()} with predetermined - * timeouts. - * - * @return a connection to the cloud where all methods block - */ - S getApi(); - -} diff --git a/core/src/main/java/org/jclouds/rest/config/InvocationConfig.java b/core/src/main/java/org/jclouds/rest/config/InvocationConfig.java index b2149bd0ce..fa552edc9b 100644 --- a/core/src/main/java/org/jclouds/rest/config/InvocationConfig.java +++ b/core/src/main/java/org/jclouds/rest/config/InvocationConfig.java @@ -44,7 +44,7 @@ public interface InvocationConfig { String getCommandName(Invocation invocation); /** - * fallback used for Sync or Async commands. + * fallback used for commands when exceptions are encountered. */ Fallback getFallback(Invocation invocation); } diff --git a/core/src/main/java/org/jclouds/rest/config/ReadAnnotationsAndProperties.java b/core/src/main/java/org/jclouds/rest/config/ReadAnnotationsAndProperties.java index 9779cbb8d0..8115406b26 100644 --- a/core/src/main/java/org/jclouds/rest/config/ReadAnnotationsAndProperties.java +++ b/core/src/main/java/org/jclouds/rest/config/ReadAnnotationsAndProperties.java @@ -65,8 +65,7 @@ public class ReadAnnotationsAndProperties implements InvocationConfig { timeoutMillis = timeoutMillis.or(defaultMillis); } else { // TODO: remove old logic once Named annotations are on all methods - String className = invoked.getOwnerType().getRawType().getSimpleName().replace("AsyncClient", "Client") - .replace("AsyncApi", "Api"); + String className = invoked.getOwnerType().getRawType().getSimpleName(); timeoutMillis = timeoutMillis.or(fromNullable(timeouts.get(className))).or(defaultMillis); } if (timeoutMillis.isPresent()) @@ -81,8 +80,7 @@ public class ReadAnnotationsAndProperties implements InvocationConfig { return invoked.getAnnotation(Named.class).value(); } else { // TODO: remove old logic once Named annotations are on all methods - String className = invoked.getOwnerType().getRawType().getSimpleName().replace("AsyncClient", "Client") - .replace("AsyncApi", "Api"); + String className = invoked.getOwnerType().getRawType().getSimpleName(); return className + "." + invoked.getName(); } } diff --git a/core/src/main/java/org/jclouds/rest/internal/InvokeAndCallGetOnFutures.java b/core/src/main/java/org/jclouds/rest/internal/InvokeAndCallGetOnFutures.java deleted file mode 100644 index 8e4acdd967..0000000000 --- a/core/src/main/java/org/jclouds/rest/internal/InvokeAndCallGetOnFutures.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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.internal; - -import static com.google.common.base.Throwables.propagate; -import static com.google.common.util.concurrent.Futures.getUnchecked; - -import java.lang.reflect.InvocationTargetException; - -import javax.annotation.Resource; -import javax.inject.Inject; - -import org.jclouds.logging.Logger; -import org.jclouds.reflect.Invocation; - -import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Function; -import com.google.common.reflect.Invokable; -import com.google.common.util.concurrent.ListenableFuture; - -/** - * - * @deprecated will be removed in jclouds 1.7, as async interfaces are no longer supported. - */ -@Deprecated -public final class InvokeAndCallGetOnFutures implements Function { - - @Resource - private Logger logger = Logger.NULL; - - private final Function sync2async; - private final R receiver; - - /** - * @param receiver - * will have any methods that return {@link ListenableFuture} unwrapped. - * @return blocking invocation handler - */ - @Inject - @VisibleForTesting - InvokeAndCallGetOnFutures(Function sync2async, R receiver) { - this.sync2async = sync2async; - this.receiver = receiver; - } - - @SuppressWarnings("unchecked") - @Override - public Object apply(Invocation in) { - @SuppressWarnings("rawtypes") - Invokable target = sync2async.apply(in).getInvokable(); - Object returnVal; - try { - returnVal = target.invoke(receiver, in.getArgs().toArray()); - } catch (InvocationTargetException e) { - throw propagate(e.getCause()); - } catch (IllegalAccessException e) { - throw new Error("Method became inaccessible: " + toString(), e); - } - if (!isFuture(target)) - return returnVal; - return getUnchecked(ListenableFuture.class.cast(returnVal)); - } - - private boolean isFuture(Invokable target) { - return target.getReturnType().getRawType().isAssignableFrom(ListenableFuture.class); - } - - @Override - public String toString() { - return String.format("InvokeAndCallGetOnFutures(%s)", receiver); - } - -} diff --git a/core/src/main/java/org/jclouds/rest/internal/RestContextImpl.java b/core/src/main/java/org/jclouds/rest/internal/RestContextImpl.java deleted file mode 100644 index 48c8d6e8a5..0000000000 --- a/core/src/main/java/org/jclouds/rest/internal/RestContextImpl.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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.internal; - -import static com.google.common.base.Preconditions.checkNotNull; - -import javax.inject.Inject; - -import org.jclouds.annotations.Name; -import org.jclouds.domain.Credentials; -import org.jclouds.internal.ContextImpl; -import org.jclouds.lifecycle.Closer; -import org.jclouds.location.Provider; -import org.jclouds.providers.ProviderMetadata; -import org.jclouds.rest.RestContext; -import org.jclouds.rest.Utils; - -import com.google.common.base.Supplier; -import com.google.inject.Injector; -import com.google.inject.Key; -import com.google.inject.Singleton; -import com.google.inject.TypeLiteral; - -/** - * @deprecated please use {@link org.jclouds.ContextBuilder#buildApi()} as - * async interface will be removed in jclouds 1.7. - */ -@Deprecated -@Singleton -public class RestContextImpl extends ContextImpl implements RestContext { - - private final A asyncApi; - private final S syncApi; - - @Inject - protected RestContextImpl(@Name String name, ProviderMetadata providerMetadata, - @Provider Supplier creds, Utils utils, Closer closer, Injector injector, TypeLiteral syncApi, - TypeLiteral asyncApi) { - super(name, providerMetadata, creds, utils, closer); - checkNotNull(injector, "injector"); - this.asyncApi = injector.getInstance(Key.get(checkNotNull(asyncApi, "asyncApi"))); - this.syncApi = injector.getInstance(Key.get(checkNotNull(syncApi, "syncApi"))); - } - - @Override - public A getAsyncApi() { - return asyncApi; - } - - @Override - public S getApi() { - return syncApi; - } - -} diff --git a/core/src/test/java/org/jclouds/rest/config/ReadAnnotationsAndPropertiesTest.java b/core/src/test/java/org/jclouds/rest/config/ReadAnnotationsAndPropertiesTest.java index 67744493ef..f764680e51 100644 --- a/core/src/test/java/org/jclouds/rest/config/ReadAnnotationsAndPropertiesTest.java +++ b/core/src/test/java/org/jclouds/rest/config/ReadAnnotationsAndPropertiesTest.java @@ -34,7 +34,6 @@ import org.testng.annotations.Test; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; -import com.google.common.util.concurrent.ListenableFuture; import com.google.inject.AbstractModule; import com.google.inject.Guice; import com.google.inject.Injector; @@ -46,15 +45,9 @@ public class ReadAnnotationsAndPropertiesTest { public interface ThingApi { HttpResponse get(); - HttpResponse namedGet(); - } - - public interface ThingAsyncApi { - ListenableFuture get(); - @Named("ns:get") @Fallback(FalseOnNotFoundOr404.class) - ListenableFuture namedGet(); + HttpResponse namedGet(); } private Invocation asyncGet; @@ -63,14 +56,13 @@ public class ReadAnnotationsAndPropertiesTest { @BeforeClass void setupInvocations() throws SecurityException, NoSuchMethodException { - asyncGet = Invocation.create(method(ThingAsyncApi.class, "get"), ImmutableList.of()); - asyncNamedGet = Invocation.create(method(ThingAsyncApi.class, "namedGet"), ImmutableList.of()); + asyncGet = Invocation.create(method(ThingApi.class, "get"), ImmutableList.of()); + asyncNamedGet = Invocation.create(method(ThingApi.class, "namedGet"), ImmutableList.of()); defaultFallback = new NullOnNotFoundOr404(); } /** - * this functionality will be removed once Named annotations are on all async - * classes. + * this functionality will be removed once Named annotations are on all classes. */ public void testInvocationsSetDefaultTimeoutOnAsyncMethods() throws Exception { final Properties props = new Properties(); diff --git a/core/src/test/java/org/jclouds/rest/functions/PresentWhenApiVersionLexicographicallyAtOrAfterSinceApiVersionTest.java b/core/src/test/java/org/jclouds/rest/functions/PresentWhenApiVersionLexicographicallyAtOrAfterSinceApiVersionTest.java index 927e259dcb..96d2e1eb45 100644 --- a/core/src/test/java/org/jclouds/rest/functions/PresentWhenApiVersionLexicographicallyAtOrAfterSinceApiVersionTest.java +++ b/core/src/test/java/org/jclouds/rest/functions/PresentWhenApiVersionLexicographicallyAtOrAfterSinceApiVersionTest.java @@ -43,30 +43,30 @@ import com.google.common.collect.ImmutableList; public class PresentWhenApiVersionLexicographicallyAtOrAfterSinceApiVersionTest { // feature present in base api - interface KeyPairAsyncApi { + interface KeyPairApi { } @SinceApiVersion("2010-08-31") - interface TagAsyncApi { + interface TagApi { } @SinceApiVersion("2011-01-01") - interface VpcAsyncApi { + interface VpcApi { } - interface EC2AsyncApi { + interface EC2Api { @Delegate - Optional getTagApiForRegion(String region); + Optional getTagApiForRegion(String region); @Delegate - Optional getKeyPairApiForRegion(String region); + Optional getKeyPairApiForRegion(String region); @Delegate - Optional getVpcApiForRegion(String region); + Optional getVpcApiForRegion(String region); } @@ -148,21 +148,21 @@ public class PresentWhenApiVersionLexicographicallyAtOrAfterSinceApiVersionTest } InvocationSuccess getFloatingIPApi() { - return getApi("Tag", TagAsyncApi.class); + return getApi("Tag", TagApi.class); } InvocationSuccess getKeyPairApi() { - return getApi("KeyPair", KeyPairAsyncApi.class); + return getApi("KeyPair", KeyPairApi.class); } InvocationSuccess getVpcApi() { - return getApi("Vpc", VpcAsyncApi.class); + return getApi("Vpc", VpcApi.class); } InvocationSuccess getApi(String name, Class target) { try { return InvocationSuccess.create( - Invocation.create(method(EC2AsyncApi.class, "get" + name + "ApiForRegion", String.class), + Invocation.create(method(EC2Api.class, "get" + name + "ApiForRegion", String.class), ImmutableList. of("region")), "present"); } catch (Exception e) { throw propagate(e); diff --git a/drivers/gae/src/test/java/org/jclouds/gae/GaeHttpCommandExecutorServiceIntegrationTest.java b/drivers/gae/src/test/java/org/jclouds/gae/GaeHttpCommandExecutorServiceIntegrationTest.java index d7e30bf000..c68451f29c 100644 --- a/drivers/gae/src/test/java/org/jclouds/gae/GaeHttpCommandExecutorServiceIntegrationTest.java +++ b/drivers/gae/src/test/java/org/jclouds/gae/GaeHttpCommandExecutorServiceIntegrationTest.java @@ -19,19 +19,14 @@ package org.jclouds.gae; import java.io.IOException; import java.util.Properties; -import org.jclouds.concurrent.SingleThreaded; -import org.jclouds.concurrent.config.ConfiguresExecutorService; import org.jclouds.gae.config.GoogleAppEngineConfigurationModule; import org.jclouds.http.BaseHttpCommandExecutorServiceIntegrationTest; -import org.jclouds.http.HttpCommandExecutorService; -import org.jclouds.http.config.ConfiguresHttpCommandExecutorService; import org.testng.SkipException; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import com.google.appengine.tools.development.testing.LocalServiceTestHelper; import com.google.appengine.tools.development.testing.LocalURLFetchServiceTestConfig; -import com.google.inject.Injector; import com.google.inject.Module; /** @@ -69,27 +64,10 @@ public class GaeHttpCommandExecutorServiceIntegrationTest extends BaseHttpComman protected Module createConnectionModule() { setupApiProxy(); - return new AsyncGoogleAppEngineConfigurationModule(); - } - - @ConfiguresHttpCommandExecutorService - @ConfiguresExecutorService - @SingleThreaded - public class AsyncGoogleAppEngineConfigurationModule extends GoogleAppEngineConfigurationModule { - - public AsyncGoogleAppEngineConfigurationModule() { - super(); - } - - protected HttpCommandExecutorService providerHttpCommandExecutorService(Injector injector) { - return injector.getInstance(GaeHttpCommandExecutorService.class); - } - + return new GoogleAppEngineConfigurationModule(); } @Override protected void addOverrideProperties(Properties props) { - } - } diff --git a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/AWSS3ClientTest.java b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/AWSS3ClientTest.java index 783cc43a42..c68b7634f0 100644 --- a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/AWSS3ClientTest.java +++ b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/AWSS3ClientTest.java @@ -77,7 +77,7 @@ public class AWSS3ClientTest extends S3ClientTest { @Override public void testCopyObjectInvalidName() throws ArrayIndexOutOfBoundsException, SecurityException, IllegalArgumentException, NoSuchMethodException, IOException { - // For AWS S3, S3AsyncClientTest#testCopyObjectInvalidName() will not throw an exception + // For AWS S3, S3ClientTest#testCopyObjectInvalidName() will not throw an exception Invokable method = method(AWSS3Client.class, "copyObject", String.class, String.class, String.class, String.class, CopyObjectOptions[].class); diff --git a/providers/glesys/src/test/java/org/jclouds/glesys/features/EmailAccountApiExpectTest.java b/providers/glesys/src/test/java/org/jclouds/glesys/features/EmailAccountApiExpectTest.java index db7d5748ea..de39e030be 100644 --- a/providers/glesys/src/test/java/org/jclouds/glesys/features/EmailAccountApiExpectTest.java +++ b/providers/glesys/src/test/java/org/jclouds/glesys/features/EmailAccountApiExpectTest.java @@ -44,7 +44,7 @@ import com.google.common.collect.Iterables; /** * Tests annotation parsing of {@code EmailAccountApi} */ -@Test(groups = "unit", testName = "EmailAccountAsyncApiTest") +@Test(groups = "unit", testName = "EmailAccountApiExpectTest") public class EmailAccountApiExpectTest extends BaseGleSYSApiExpectTest { public void testListWhenResponseIs2xx() throws Exception { diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/features/DatacenterApiExpectTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/DatacenterApiExpectTest.java index 2317a3ac57..7a7cfadd07 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/features/DatacenterApiExpectTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/DatacenterApiExpectTest.java @@ -28,10 +28,7 @@ import org.testng.annotations.Test; import com.google.common.collect.Iterables; -/** - * Tests annotation parsing of {@code DatacenterAsyncClient} - */ -@Test(groups = "unit") +@Test(groups = "unit", testName = "DatacenterApiExpectTest") public class DatacenterApiExpectTest extends BaseSoftLayerApiExpectTest { public void testListDatacentersWhenResponseIs2xx() { diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/features/SoftwareDescriptionApiExpectTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/SoftwareDescriptionApiExpectTest.java index c8286c27d5..524d703ff3 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/features/SoftwareDescriptionApiExpectTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/SoftwareDescriptionApiExpectTest.java @@ -26,10 +26,7 @@ import org.testng.annotations.Test; import com.google.common.collect.Iterables; -/** - * Tests annotation parsing of {@code DatacenterAsyncClient} - */ -@Test(groups = "unit") +@Test(groups = "unit", testName = "SoftwareDescriptionApiExpectTest") public class SoftwareDescriptionApiExpectTest extends BaseSoftLayerApiExpectTest { public void testGetAllObjectsWhenResponseIs2xx() {