root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Refine Class serializability check for actual Graal compatibility 

Issue: SPR-16992
This commit is contained in:
Juergen Hoeller 2018-07-02 22:32:29 +02:00
parent 6bcf6ffb06
commit 06f9fb9aeb
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
spring-core/src/main/java/org/springframework/core/SerializableTypeWrapper.java
View File

@ -31,7 +31,6 @@ import java.lang.reflect.TypeVariable;
import java.lang.reflect.WildcardType; import java.lang.reflect.WildcardType;
import org.springframework.lang.Nullable; import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
import org.springframework.util.ConcurrentReferenceHashMap; import org.springframework.util.ConcurrentReferenceHashMap;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.util.ReflectionUtils; import org.springframework.util.ReflectionUtils;
@ -61,14 +60,6 @@ final class SerializableTypeWrapper {
private static final Class<?>[] SUPPORTED_SERIALIZABLE_TYPES = { private static final Class<?>[] SUPPORTED_SERIALIZABLE_TYPES = {
GenericArrayType.class, ParameterizedType.class, TypeVariable.class, WildcardType.class}; GenericArrayType.class, ParameterizedType.class, TypeVariable.class, WildcardType.class};
/**
* Let's test whether java.lang.Class itself is serializable...
* Otherwise we can skip our serializable type wrapping to begin with.
* This will be {@code true} on regular JVMs but {@code false} on GraalVM.
* @since 5.1
*/
private static final boolean javaLangClassSerializable = Serializable.class.isAssignableFrom(Class.class);
static final ConcurrentReferenceHashMap<Type, Type> cache = new ConcurrentReferenceHashMap<>(256); static final ConcurrentReferenceHashMap<Type, Type> cache = new ConcurrentReferenceHashMap<>(256);
@ -81,7 +72,6 @@ final class SerializableTypeWrapper {
*/ */
@Nullable @Nullable
public static Type forField(Field field) { public static Type forField(Field field) {
Assert.notNull(field, "Field must not be null");
return forTypeProvider(new FieldTypeProvider(field)); return forTypeProvider(new FieldTypeProvider(field));
} }
@ -149,21 +139,25 @@ final class SerializableTypeWrapper {
* environment, this delegate will simply return the original {@code Type} as-is. * environment, this delegate will simply return the original {@code Type} as-is.
*/ */
@Nullable @Nullable
static Type forTypeProvider(final TypeProvider provider) { static Type forTypeProvider(TypeProvider provider) {
Assert.notNull(provider, "TypeProvider must not be null");
Type providedType = provider.getType(); Type providedType = provider.getType();
if (providedType == null) { if (providedType == null || providedType instanceof Serializable) {
return null; // No serializable type wrapping necessary (e.g. for java.lang.Class)
}
if (!javaLangClassSerializable || providedType instanceof Serializable) {
return providedType; return providedType;
} }
if (!Serializable.class.isAssignableFrom(Class.class)) {
// Let's skip any wrapping attempts if types are generally not serializable in
// the current runtime environment (even java.lang.Class itself, e.g. on Graal)
return providedType;
}
// Obtain a serializable type proxy for the given provider...
Type cached = cache.get(providedType); Type cached = cache.get(providedType);
if (cached != null) { if (cached != null) {
return cached; return cached;
} }
for (Class<?> type : SUPPORTED_SERIALIZABLE_TYPES) { for (Class<?> type : SUPPORTED_SERIALIZABLE_TYPES) {
if (type.isAssignableFrom(providedType.getClass())) { if (type.isInstance(providedType)) {
ClassLoader classLoader = provider.getClass().getClassLoader(); ClassLoader classLoader = provider.getClass().getClassLoader();
Class<?>[] interfaces = new Class<?>[] {type, SerializableTypeProxy.class, Serializable.class}; Class<?>[] interfaces = new Class<?>[] {type, SerializableTypeProxy.class, Serializable.class};
InvocationHandler handler = new TypeProxyInvocationHandler(provider); InvocationHandler handler = new TypeProxyInvocationHandler(provider);