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

Prefer ImmutableMap for SyncProxy maps

This commit is contained in:
Andrew Gaul 2012-05-15 15:07:10 -07:00 committed by Adrian Cole
parent 64dce4c154
commit cd48729f65
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/src/main/java/org/jclouds/concurrent/internal/SyncProxy.java
View File

@ -42,8 +42,8 @@ import org.jclouds.util.Throwables2;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.base.Optional; import com.google.common.base.Optional;
import com.google.common.cache.LoadingCache; import com.google.common.cache.LoadingCache;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableFuture;
import com.google.inject.ProvisionException; import com.google.inject.ProvisionException;
@ -82,16 +82,17 @@ public class SyncProxy implements InvocationHandler {
this.delegateMap = delegateMap; this.delegateMap = delegateMap;
this.delegate = async; this.delegate = async;
this.declaring = declaring; this.declaring = declaring;
this.sync2Async = sync2Async; this.sync2Async = ImmutableMap.copyOf(sync2Async);
if (!declaring.isAnnotationPresent(Timeout.class)) { if (!declaring.isAnnotationPresent(Timeout.class)) {
throw new IllegalArgumentException(String.format("type %s does not specify a default @Timeout", declaring)); throw new IllegalArgumentException(String.format("type %s does not specify a default @Timeout", declaring));
} }
Timeout typeTimeout = declaring.getAnnotation(Timeout.class); Timeout typeTimeout = declaring.getAnnotation(Timeout.class);
long typeNanos = convertToNanos(typeTimeout); long typeNanos = convertToNanos(typeTimeout);
methodMap = Maps.newHashMap(); ImmutableMap.Builder<Method, Method> methodMapBuilder = ImmutableMap.builder();
syncMethodMap = Maps.newHashMap(); ImmutableMap.Builder<Method, Method> syncMethodMapBuilder = ImmutableMap.builder();
timeoutMap = Maps.newHashMap(); ImmutableMap.Builder<Method, Long> timeoutMapBuilder = ImmutableMap.builder();
for (Method method : declaring.getMethods()) { for (Method method : declaring.getMethods()) {
if (!objectMethods.contains(method)) { if (!objectMethods.contains(method)) {
Method delegatedMethod = delegate.getClass().getMethod(method.getName(), method.getParameterTypes()); Method delegatedMethod = delegate.getClass().getMethod(method.getName(), method.getParameterTypes());
@ -99,13 +100,17 @@ public class SyncProxy implements InvocationHandler {
throw new IllegalArgumentException(String.format( throw new IllegalArgumentException(String.format(
"method %s has different typed exceptions than delegated method %s", method, delegatedMethod)); "method %s has different typed exceptions than delegated method %s", method, delegatedMethod));
if (delegatedMethod.getReturnType().isAssignableFrom(ListenableFuture.class)) { if (delegatedMethod.getReturnType().isAssignableFrom(ListenableFuture.class)) {
timeoutMap.put(method, getTimeout(method, typeNanos, timeouts)); timeoutMapBuilder.put(method, getTimeout(method, typeNanos, timeouts));
methodMap.put(method, delegatedMethod); methodMapBuilder.put(method, delegatedMethod);
} else { } else {
syncMethodMap.put(method, delegatedMethod); syncMethodMapBuilder.put(method, delegatedMethod);
} }
} }
} }
methodMap = methodMapBuilder.build();
syncMethodMap = syncMethodMapBuilder.build();
timeoutMap = timeoutMapBuilder.build();
} }
public Class<?> getDeclaring() { public Class<?> getDeclaring() {