You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2017/09/13 16:45:08 UTC
[4/5] brooklyn-server git commit: tidy TypeTokens cache and error,
as per PR comments
tidy TypeTokens cache and error, as per PR comments
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/ad3693a9
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/ad3693a9
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/ad3693a9
Branch: refs/heads/master
Commit: ad3693a95038a24aefe36dce3b8da89603c0d58f
Parents: 22acd5d
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Sep 13 17:44:12 2017 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Sep 13 17:44:12 2017 +0100
----------------------------------------------------------------------
.../apache/brooklyn/util/guava/TypeTokens.java | 29 ++++++++++----------
1 file changed, 15 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ad3693a9/utils/common/src/main/java/org/apache/brooklyn/util/guava/TypeTokens.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/guava/TypeTokens.java b/utils/common/src/main/java/org/apache/brooklyn/util/guava/TypeTokens.java
index 657a790..cae90bc 100644
--- a/utils/common/src/main/java/org/apache/brooklyn/util/guava/TypeTokens.java
+++ b/utils/common/src/main/java/org/apache/brooklyn/util/guava/TypeTokens.java
@@ -18,19 +18,24 @@
*/
package org.apache.brooklyn.util.guava;
+import java.util.Map;
+
import javax.annotation.Nullable;
+import com.google.common.collect.ImmutableMap;
import com.google.common.reflect.TypeToken;
public class TypeTokens {
// creating TypeToken is surprisingly expensive so cache these common ones
- public static TypeToken<String> STRING = TypeToken.of(String.class);
- public static TypeToken<Object> OBJECT = TypeToken.of(Object.class);
- public static TypeToken<Integer> INTEGER = TypeToken.of(Integer.class);
- public static TypeToken<Boolean> BOOLEAN = TypeToken.of(Boolean.class);
- public static TypeToken<Double> DOUBLE = TypeToken.of(Double.class);
- public static TypeToken<Long> LONG = TypeToken.of(Long.class);
+ public static final Map<Class<?>, TypeToken<?>> COMMON_TYPE_TOKENS = ImmutableMap.<Class<?>, TypeToken<?>>builder()
+ .put(String.class, TypeToken.of(String.class))
+ .put(Object.class, TypeToken.of(Object.class))
+ .put(Integer.class, TypeToken.of(Integer.class))
+ .put(Boolean.class, TypeToken.of(Boolean.class))
+ .put(Double.class, TypeToken.of(Double.class))
+ .put(Long.class, TypeToken.of(Long.class))
+ .build();
/** returns raw type, if it's raw, else null;
* used e.g. to set only one of the raw type or the type token,
@@ -68,13 +73,9 @@ public class TypeTokens {
public static <T> TypeToken<T> getTypeToken(TypeToken<T> token, Class<? super T> raw) {
if (token!=null) return token;
if (raw!=null) {
- if (String.class.equals(raw)) return (TypeToken<T>) STRING;
- if (Object.class.equals(raw)) return (TypeToken<T>) OBJECT;
- if (Integer.class.equals(raw)) return (TypeToken<T>) INTEGER;
- if (Boolean.class.equals(raw)) return (TypeToken<T>) BOOLEAN;
- if (Double.class.equals(raw)) return (TypeToken<T>) DOUBLE;
- if (Long.class.equals(raw)) return (TypeToken<T>) LONG;
- return TypeToken.of((Class<T>)raw);
+ TypeToken<?> result = COMMON_TYPE_TOKENS.get(raw);
+ if (result==null) result = TypeToken.of((Class<T>)raw);
+ return (TypeToken<T>) result;
}
throw new IllegalStateException("Both indicators of type are null");
}
@@ -96,7 +97,7 @@ public class TypeTokens {
throw new NullPointerException("Type not set (neither class or type token)");
}
if (!type.equals(typeToken.getRawType())) {
- throw new NullPointerException("Invalid types, token is "+typeToken+" (raw "+typeToken.getRawType()+") but class is "+type);
+ throw new IllegalStateException("Invalid types, token is "+typeToken+" (raw "+typeToken.getRawType()+") but class is "+type);
}
}