removed all compile warnings in core except json package

This commit is contained in:
Adrian Cole 2013-01-19 20:37:45 -08:00
parent 823f20f7aa
commit 58a986997b
15 changed files with 222 additions and 215 deletions

View File

@ -19,12 +19,14 @@
package org.jclouds.reflect; package org.jclouds.reflect;
import static com.google.common.base.Objects.equal; import static com.google.common.base.Objects.equal;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import java.util.List; import java.util.List;
import com.google.common.annotations.Beta; import com.google.common.annotations.Beta;
import com.google.common.base.Objects; import com.google.common.base.Objects;
import com.google.common.collect.ImmutableList;
import com.google.common.reflect.Invokable; import com.google.common.reflect.Invokable;
/** /**
@ -43,6 +45,19 @@ public final class Invocation {
return new Invocation(invokable, args); return new Invocation(invokable, args);
} }
/**
* invocation without arguments.
*
* @throws IllegalArgumentException
* if in invokable requires arguments
*/
public static Invocation create(Invokable<?, ?> invokable) {
checkArgument(
invokable.getParameters().size() == 0 || (invokable.getParameters().size() == 1 && invokable.isVarArgs()),
"please specify arguments to %s", invokable);
return create(invokable, ImmutableList.of());
}
private final Invokable<?, ?> invokable; private final Invokable<?, ?> invokable;
private final List<Object> args; private final List<Object> args;

View File

@ -26,6 +26,8 @@ package org.jclouds.rest;
*/ */
public class AuthorizationException extends RuntimeException { public class AuthorizationException extends RuntimeException {
private static final long serialVersionUID = 1L;
public AuthorizationException() { public AuthorizationException() {
super(); super();
} }

View File

@ -25,6 +25,8 @@ package org.jclouds.rest;
*/ */
public class InsufficientResourcesException extends RuntimeException { public class InsufficientResourcesException extends RuntimeException {
private static final long serialVersionUID = 1L;
public InsufficientResourcesException() { public InsufficientResourcesException() {
super(); super();
} }

View File

@ -25,6 +25,8 @@ package org.jclouds.rest;
*/ */
public class ResourceNotFoundException extends RuntimeException { public class ResourceNotFoundException extends RuntimeException {
private static final long serialVersionUID = 1L;
public ResourceNotFoundException() { public ResourceNotFoundException() {
super(); super();
} }

View File

@ -27,6 +27,8 @@ import org.jclouds.http.HttpRequest;
*/ */
public class BindException extends RuntimeException { public class BindException extends RuntimeException {
private static final long serialVersionUID = 1L;
private HttpRequest request; private HttpRequest request;
public BindException(final HttpRequest request) { public BindException(final HttpRequest request) {

View File

@ -24,6 +24,7 @@ import static org.testng.Assert.assertEquals;
import javax.inject.Inject; import javax.inject.Inject;
import org.jclouds.Context;
import org.jclouds.domain.Credentials; import org.jclouds.domain.Credentials;
import org.jclouds.http.IntegrationTestAsyncClient; import org.jclouds.http.IntegrationTestAsyncClient;
import org.jclouds.http.IntegrationTestClient; import org.jclouds.http.IntegrationTestClient;
@ -48,7 +49,7 @@ import com.google.inject.Injector;
@Test(groups = "unit", testName = "BindRestContextWithWildcardExtendsExplicitAndRawTypeTest") @Test(groups = "unit", testName = "BindRestContextWithWildcardExtendsExplicitAndRawTypeTest")
public class BindRestContextWithWildcardExtendsExplicitAndRawTypeTest { public class BindRestContextWithWildcardExtendsExplicitAndRawTypeTest {
@SuppressWarnings( { "unused", "unchecked" }) @SuppressWarnings("rawtypes")
private static class ExpectedBindings { private static class ExpectedBindings {
private final RestContext raw; private final RestContext raw;
@ -92,7 +93,7 @@ public class BindRestContextWithWildcardExtendsExplicitAndRawTypeTest {
}); });
} }
@SuppressWarnings( { "unused", "unchecked" }) @SuppressWarnings("rawtypes")
private static class ExpectedBindingsWithWildCardExtends { private static class ExpectedBindingsWithWildCardExtends {
private final RestContext raw; private final RestContext raw;
@ -110,13 +111,13 @@ public class BindRestContextWithWildcardExtendsExplicitAndRawTypeTest {
} }
@SuppressWarnings("unchecked")
@Test @Test
public void testRawExplicitAndWildCardExtends() { public void testRawExplicitAndWildCardExtends() {
ProviderMetadata md = AnonymousProviderMetadata.forClientMappedToAsyncClientOnEndpoint( ProviderMetadata md = AnonymousProviderMetadata.forClientMappedToAsyncClientOnEndpoint(
IntegrationTestClient.class, IntegrationTestAsyncClient.class, "http://localhost"); IntegrationTestClient.class, IntegrationTestAsyncClient.class, "http://localhost");
TypeToken wildCardExtendsType = new TypeToken<RestContext<? extends IntegrationTestClient, ? extends IntegrationTestAsyncClient>>() { TypeToken<? extends Context> wildCardExtendsType = new TypeToken<RestContext<? extends IntegrationTestClient, ? extends IntegrationTestAsyncClient>>() {
private static final long serialVersionUID = 1L;
}; };
md = md.toBuilder().apiMetadata(md.getApiMetadata().toBuilder().context(wildCardExtendsType).build()).build(); md = md.toBuilder().apiMetadata(md.getApiMetadata().toBuilder().context(wildCardExtendsType).build()).build();

View File

@ -30,6 +30,7 @@ import org.jclouds.http.HttpCommand;
import org.jclouds.http.HttpResponse; import org.jclouds.http.HttpResponse;
import org.jclouds.http.IntegrationTestAsyncClient; import org.jclouds.http.IntegrationTestAsyncClient;
import org.jclouds.io.Payloads; import org.jclouds.io.Payloads;
import org.jclouds.reflect.Invocation;
import org.jclouds.rest.internal.RestAnnotationProcessor; import org.jclouds.rest.internal.RestAnnotationProcessor;
import org.testng.annotations.Test; import org.testng.annotations.Test;
@ -127,7 +128,7 @@ public class BackoffLimitedRetryHandlerTest {
private HttpCommand createCommand() throws SecurityException, NoSuchMethodException { private HttpCommand createCommand() throws SecurityException, NoSuchMethodException {
Invokable<IntegrationTestAsyncClient, String> method = method(IntegrationTestAsyncClient.class, "download", String.class); Invokable<IntegrationTestAsyncClient, String> method = method(IntegrationTestAsyncClient.class, "download", String.class);
return new HttpCommand(processor.createRequest(method, ImmutableList.<Object> of("1"))); return new HttpCommand(processor.apply(Invocation.create(method, ImmutableList.<Object> of("1"))));
} }
@Test @Test

View File

@ -71,7 +71,6 @@ public class FilterStringsBoundToInjectorByNameTest {
public void testReturnsJavaNamedString() { public void testReturnsJavaNamedString() {
FilterStringsBoundToInjectorByName fn = Guice.createInjector(new AbstractModule() { FilterStringsBoundToInjectorByName fn = Guice.createInjector(new AbstractModule() {
@SuppressWarnings("unused")
@Named("foo") @Named("foo")
@Provides @Provides
String provideFoo() { String provideFoo() {

View File

@ -85,6 +85,7 @@ public class GsonExperimentsTest {
} }
public class OptionalTypeAdapterFactory implements TypeAdapterFactory { public class OptionalTypeAdapterFactory implements TypeAdapterFactory {
@SuppressWarnings("unchecked")
public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) { public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) {
Type type = typeToken.getType(); Type type = typeToken.getType();
if (typeToken.getRawType() != Optional.class || !(type instanceof ParameterizedType)) { if (typeToken.getRawType() != Optional.class || !(type instanceof ParameterizedType)) {

View File

@ -67,11 +67,8 @@ public class ProvideIso3166CodesByLocationIdViaPropertiesTest {
.<String, Set<String>> of("us-east", ImmutableSet.of("US"), "us-easta", ImmutableSet.of("US-CA"))); .<String, Set<String>> of("us-east", ImmutableSet.of("US"), "us-easta", ImmutableSet.of("US-CA")));
} }
//
private LocationIdToIso3166CodesSupplier createWithValue(final ImmutableMap<String, String> value) { private LocationIdToIso3166CodesSupplier createWithValue(final ImmutableMap<String, String> value) {
LocationIdToIso3166CodesSupplier fn = Guice.createInjector(new AbstractModule() { LocationIdToIso3166CodesSupplier fn = Guice.createInjector(new AbstractModule() {
@SuppressWarnings("unused")
@Provides @Provides
Function<Predicate<String>, Map<String, String>> provide() { Function<Predicate<String>, Map<String, String>> provide() {
return new Function<Predicate<String>, Map<String, String>>() { return new Function<Predicate<String>, Map<String, String>>() {

View File

@ -98,7 +98,6 @@ public class BindLoggersAnnotatedWithResourceTest {
} }
public static class C { public static class C {
@SuppressWarnings("unused")
@Inject @Inject
private Logger logger = Logger.NULL; private Logger logger = Logger.NULL;
} }
@ -111,11 +110,9 @@ public class BindLoggersAnnotatedWithResourceTest {
} }
public static class D { public static class D {
@SuppressWarnings("unused")
@Resource @Resource
private Logger logger = Logger.NULL; private Logger logger = Logger.NULL;
@SuppressWarnings("unused")
@Resource @Resource
private Logger blogger; private Logger blogger;

View File

@ -64,21 +64,21 @@ public class InputParamValidatorTest {
String.class, String.class); String.class, String.class);
Invokable<?, ?> oneParamValidatedMethod = method(InputParamValidatorForm.class, "oneParamValidated", Invokable<?, ?> oneParamValidatedMethod = method(InputParamValidatorForm.class, "oneParamValidated",
String.class, String.class); String.class, String.class);
restAnnotationProcessor.createRequest(allParamsValidatedMethod, ImmutableList.<Object> of("blah", "blah")); restAnnotationProcessor.apply(Invocation.create(allParamsValidatedMethod, ImmutableList.<Object> of("blah", "blah")));
restAnnotationProcessor.createRequest(oneParamValidatedMethod, ImmutableList.<Object> of("blah", "blah")); restAnnotationProcessor.apply(Invocation.create(oneParamValidatedMethod, ImmutableList.<Object> of("blah", "blah")));
try { try {
restAnnotationProcessor.createRequest(allParamsValidatedMethod, ImmutableList.<Object> of("BLAH", "blah")); restAnnotationProcessor.apply(Invocation.create(allParamsValidatedMethod, ImmutableList.<Object> of("BLAH", "blah")));
throw new TestException( throw new TestException(
"AllLowerCaseValidator shouldn't have passed 'BLAH' as a parameter because it's uppercase."); "AllLowerCaseValidator shouldn't have passed 'BLAH' as a parameter because it's uppercase.");
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
// supposed to happen - continue // supposed to happen - continue
} }
restAnnotationProcessor.createRequest(oneParamValidatedMethod, ImmutableList.<Object> of("BLAH", "blah")); restAnnotationProcessor.apply(Invocation.create(oneParamValidatedMethod, ImmutableList.<Object> of("BLAH", "blah")));
try { try {
restAnnotationProcessor.createRequest(oneParamValidatedMethod, ImmutableList.<Object> of("blah", "BLAH")); restAnnotationProcessor.apply(Invocation.create(oneParamValidatedMethod, ImmutableList.<Object> of("blah", "BLAH")));
throw new TestException( throw new TestException(
"AllLowerCaseValidator shouldn't have passed 'BLAH' as the second parameter because it's uppercase."); "AllLowerCaseValidator shouldn't have passed 'BLAH' as the second parameter because it's uppercase.");
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {

View File

@ -127,10 +127,10 @@ public class PresentWhenApiVersionLexicographicallyAtOrAfterSinceApiVersionTest
ImplicitOptionalConverter fn = forApiVersion("2011-07-15"); ImplicitOptionalConverter fn = forApiVersion("2011-07-15");
Stopwatch watch = new Stopwatch().start(); Stopwatch watch = new Stopwatch().start();
fn.apply(keyPairApi); fn.apply(keyPairApi);
long first = watch.stop().elapsedTime(TimeUnit.MICROSECONDS); long first = watch.stop().elapsed(TimeUnit.MICROSECONDS);
watch.reset().start(); watch.reset().start();
fn.apply(keyPairApi); fn.apply(keyPairApi);
long cached = watch.stop().elapsedTime(TimeUnit.MICROSECONDS); long cached = watch.stop().elapsed(TimeUnit.MICROSECONDS);
assertTrue(cached < first, String.format("cached [%s] should be less than initial [%s]", cached, first)); assertTrue(cached < first, String.format("cached [%s] should be less than initial [%s]", cached, first));
Logger.getAnonymousLogger().info( Logger.getAnonymousLogger().info(
"lookup cache saved " + (first - cached) + " microseconds when no annotation present"); "lookup cache saved " + (first - cached) + " microseconds when no annotation present");
@ -141,10 +141,10 @@ public class PresentWhenApiVersionLexicographicallyAtOrAfterSinceApiVersionTest
ImplicitOptionalConverter fn = forApiVersion("2011-07-15"); ImplicitOptionalConverter fn = forApiVersion("2011-07-15");
Stopwatch watch = new Stopwatch().start(); Stopwatch watch = new Stopwatch().start();
fn.apply(floatingIpApi); fn.apply(floatingIpApi);
long first = watch.stop().elapsedTime(TimeUnit.MICROSECONDS); long first = watch.stop().elapsed(TimeUnit.MICROSECONDS);
watch.reset().start(); watch.reset().start();
fn.apply(floatingIpApi); fn.apply(floatingIpApi);
long cached = watch.stop().elapsedTime(TimeUnit.MICROSECONDS); long cached = watch.stop().elapsed(TimeUnit.MICROSECONDS);
assertTrue(cached < first, String.format("cached [%s] should be less than initial [%s]", cached, first)); assertTrue(cached < first, String.format("cached [%s] should be less than initial [%s]", cached, first));
Logger.getAnonymousLogger().info( Logger.getAnonymousLogger().info(
"lookup cache saved " + (first - cached) + " microseconds when annotation present"); "lookup cache saved " + (first - cached) + " microseconds when annotation present");

View File

@ -18,6 +18,7 @@
*/ */
package org.jclouds.util; package org.jclouds.util;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.SECONDS; import static java.util.concurrent.TimeUnit.SECONDS;
import static org.jclouds.util.Predicates2.retry; import static org.jclouds.util.Predicates2.retry;
import static org.testng.Assert.fail; import static org.testng.Assert.fail;
@ -99,7 +100,7 @@ public class Predicates2Test {
} }
}); });
long duration = stopwatch.elapsedMillis(); long duration = stopwatch.elapsed(MILLISECONDS);
assertOrdered(duration, SLOW_BUILD_SERVER_GRACE); assertOrdered(duration, SLOW_BUILD_SERVER_GRACE);
} }
@ -109,7 +110,7 @@ public class Predicates2Test {
Predicate<String> predicate = retry(Predicates.<String> alwaysTrue(), 3, 1, SECONDS); Predicate<String> predicate = retry(Predicates.<String> alwaysTrue(), 3, 1, SECONDS);
stopwatch.start(); stopwatch.start();
predicate.apply(""); predicate.apply("");
long duration = stopwatch.elapsedMillis(); long duration = stopwatch.elapsed(MILLISECONDS);
assertOrdered(duration, SLOW_BUILD_SERVER_GRACE); assertOrdered(duration, SLOW_BUILD_SERVER_GRACE);
} }
@ -120,7 +121,7 @@ public class Predicates2Test {
Predicate<String> predicate = retry(Predicates.<String> alwaysFalse(), 3, 1, SECONDS); Predicate<String> predicate = retry(Predicates.<String> alwaysFalse(), 3, 1, SECONDS);
stopwatch.start(); stopwatch.start();
predicate.apply(""); predicate.apply("");
long duration = stopwatch.elapsedMillis(); long duration = stopwatch.elapsed(MILLISECONDS);
assertOrdered(3000-EARLY_RETURN_GRACE, duration, 3000+SLOW_BUILD_SERVER_GRACE); assertOrdered(3000-EARLY_RETURN_GRACE, duration, 3000+SLOW_BUILD_SERVER_GRACE);
} }
@ -133,7 +134,7 @@ public class Predicates2Test {
stopwatch.start(); stopwatch.start();
predicate.apply(""); predicate.apply("");
long duration = stopwatch.elapsedMillis(); long duration = stopwatch.elapsed(MILLISECONDS);
assertOrdered(2500-EARLY_RETURN_GRACE, duration, 2500+SLOW_BUILD_SERVER_GRACE); assertOrdered(2500-EARLY_RETURN_GRACE, duration, 2500+SLOW_BUILD_SERVER_GRACE);
assertCallTimes(rawPredicate.callTimes, 0, 1000, 1000+1500); assertCallTimes(rawPredicate.callTimes, 0, 1000, 1000+1500);
@ -148,7 +149,7 @@ public class Predicates2Test {
stopwatch.start(); stopwatch.start();
predicate.apply(""); predicate.apply("");
long duration = stopwatch.elapsedMillis(); long duration = stopwatch.elapsed(MILLISECONDS);
assertOrdered(2000-EARLY_RETURN_GRACE, duration, 2000+SLOW_BUILD_SERVER_GRACE); assertOrdered(2000-EARLY_RETURN_GRACE, duration, 2000+SLOW_BUILD_SERVER_GRACE);
assertCallTimes(rawPredicate.callTimes, 0, 1000, 2000); assertCallTimes(rawPredicate.callTimes, 0, 1000, 2000);
@ -167,7 +168,7 @@ public class Predicates2Test {
} }
@Override @Override
public boolean apply(String input) { public boolean apply(String input) {
callTimes.add(stopwatch.elapsedMillis()); callTimes.add(stopwatch.elapsed(MILLISECONDS));
return count++ == succeedOnAttempt; return count++ == succeedOnAttempt;
} }
} }