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

equals on different types

This commit is contained in:
Adrian Cole 2013-01-12 07:49:01 -08:00
parent cd401757fc
commit a7389ac9eb
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
core/src/main/java/org/jclouds/rest/internal/TransformerForRequest.java
View File

@ -111,22 +111,22 @@ public class TransformerForRequest<A> implements Function<GeneratedHttpRequest<A
return transformer; return transformer;
} }
private static final TypeToken<ListenableFuture<Boolean>> futureBooleanLiteral = new TypeToken<ListenableFuture<Boolean>>() { private static final TypeToken<ListenableFuture<Boolean>> futureBooleanToken = new TypeToken<ListenableFuture<Boolean>>() {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
}; };
private static final TypeToken<ListenableFuture<String>> futureStringLiteral = new TypeToken<ListenableFuture<String>>() { private static final TypeToken<ListenableFuture<String>> futureStringToken = new TypeToken<ListenableFuture<String>>() {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
}; };
private static final TypeToken<ListenableFuture<Void>> futureVoidLiteral = new TypeToken<ListenableFuture<Void>>() { private static final TypeToken<ListenableFuture<Void>> futureVoidToken = new TypeToken<ListenableFuture<Void>>() {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
}; };
private static final TypeToken<ListenableFuture<URI>> futureURILiteral = new TypeToken<ListenableFuture<URI>>() { private static final TypeToken<ListenableFuture<URI>> futureURIToken = new TypeToken<ListenableFuture<URI>>() {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
}; };
private static final TypeToken<ListenableFuture<InputStream>> futureInputStreamLiteral = new TypeToken<ListenableFuture<InputStream>>() { private static final TypeToken<ListenableFuture<InputStream>> futureInputStreamToken = new TypeToken<ListenableFuture<InputStream>>() {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
}; };
private static final TypeToken<ListenableFuture<HttpResponse>> futureHttpResponseLiteral = new TypeToken<ListenableFuture<HttpResponse>>() { private static final TypeToken<ListenableFuture<HttpResponse>> futureHttpResponseToken = new TypeToken<ListenableFuture<HttpResponse>>() {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
}; };
@ -136,25 +136,26 @@ public class TransformerForRequest<A> implements Function<GeneratedHttpRequest<A
Invokable<?, ?> invoked = invocation.getInvokable(); Invokable<?, ?> invoked = invocation.getInvokable();
Set<String> acceptHeaders = getAcceptHeaders.apply(invocation); Set<String> acceptHeaders = getAcceptHeaders.apply(invocation);
ResponseParser annotation = invoked.getAnnotation(ResponseParser.class); ResponseParser annotation = invoked.getAnnotation(ResponseParser.class);
Class<?> rawReturnType = invoked.getReturnType().getRawType();
if (annotation == null) { if (annotation == null) {
if (invoked.getReturnType().equals(void.class) || invoked.getReturnType().equals(futureVoidLiteral)) { if (rawReturnType.equals(void.class) || invoked.getReturnType().equals(futureVoidToken)) {
return Key.get(ReleasePayloadAndReturn.class); return Key.get(ReleasePayloadAndReturn.class);
} else if (invoked.getReturnType().equals(boolean.class) || invoked.getReturnType().equals(Boolean.class) } else if (rawReturnType.equals(boolean.class) || rawReturnType.equals(Boolean.class)
|| invoked.getReturnType().equals(futureBooleanLiteral)) { || invoked.getReturnType().equals(futureBooleanToken)) {
return Key.get(ReturnTrueIf2xx.class); return Key.get(ReturnTrueIf2xx.class);
} else if (invoked.getReturnType().equals(InputStream.class) } else if (rawReturnType.equals(InputStream.class)
|| invoked.getReturnType().equals(futureInputStreamLiteral)) { || invoked.getReturnType().equals(futureInputStreamToken)) {
return Key.get(ReturnInputStream.class); return Key.get(ReturnInputStream.class);
} else if (invoked.getReturnType().equals(HttpResponse.class) } else if (rawReturnType.equals(HttpResponse.class)
|| invoked.getReturnType().equals(futureHttpResponseLiteral)) { || invoked.getReturnType().equals(futureHttpResponseToken)) {
return Key.get(Class.class.cast(IdentityFunction.class)); return Key.get(Class.class.cast(IdentityFunction.class));
} else if (acceptHeaders.contains(APPLICATION_JSON)) { } else if (acceptHeaders.contains(APPLICATION_JSON)) {
return getJsonParserKeyForMethod(invoked); return getJsonParserKeyForMethod(invoked);
} else if (acceptHeaders.contains(APPLICATION_XML) || invoked.isAnnotationPresent(JAXBResponseParser.class)) { } else if (acceptHeaders.contains(APPLICATION_XML) || invoked.isAnnotationPresent(JAXBResponseParser.class)) {
return getJAXBParserKeyForMethod(invoked); return getJAXBParserKeyForMethod(invoked);
} else if (invoked.getReturnType().equals(String.class) || invoked.getReturnType().equals(futureStringLiteral)) { } else if (rawReturnType.equals(String.class) || invoked.getReturnType().equals(futureStringToken)) {
return Key.get(ReturnStringIf2xx.class); return Key.get(ReturnStringIf2xx.class);
} else if (invoked.getReturnType().equals(URI.class) || invoked.getReturnType().equals(futureURILiteral)) { } else if (rawReturnType.equals(URI.class) || invoked.getReturnType().equals(futureURIToken)) {
return Key.get(ParseURIFromListOrLocationHeaderIf20x.class); return Key.get(ParseURIFromListOrLocationHeaderIf20x.class);
} else { } else {
throw new IllegalStateException("You must specify a ResponseParser annotation on: " + invoked.toString()); throw new IllegalStateException("You must specify a ResponseParser annotation on: " + invoked.toString());