Spring/spring-data-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACMNS-501 - Work around potential null returned from GenericTypeResolver in Spring 4.

Browse Source 
Spring 4's GenericTypeResolver returns null when trying to resolve type arguments for types that do not fully resolve the generic types.

Related issues: SPR-11763.
This commit is contained in:
Oliver Gierke
2014-05-06 09:45:38 +02:00
parent 38ba51c61b
commit 443da10779
2 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/org/springframework/data/repository/core/support/DefaultRepositoryMetadata.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2011-2013 the original author or authors.
* Copyright 2011-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,12 +15,13 @@
*/
package org.springframework.data.repository.core.support;
import static org.springframework.core.GenericTypeResolver.*;
import java.io.Serializable;
import java.util.List;
import org.springframework.data.repository.Repository;
import org.springframework.data.repository.core.RepositoryMetadata;
import org.springframework.data.util.ClassTypeInformation;
import org.springframework.data.util.TypeInformation;
import org.springframework.util.Assert;
/**
@@ -73,23 +74,25 @@ public class DefaultRepositoryMetadata extends AbstractRepositoryMetadata {
@SuppressWarnings("unchecked")
private Class<? extends Serializable> resolveIdType(Class<?> repositoryInterface) {
Class<?>[] arguments = resolveTypeArguments(repositoryInterface, Repository.class);
TypeInformation<?> information = ClassTypeInformation.from(repositoryInterface);
List<TypeInformation<?>> arguments = information.getSuperTypeInformation(Repository.class).getTypeArguments();
if (arguments == null || arguments[1] == null) {
if (arguments.size() < 2 || arguments.get(1) == null) {
throw new IllegalArgumentException(String.format("Could not resolve id type of %s!", repositoryInterface));
}
return (Class<? extends Serializable>) arguments[1];
return (Class<? extends Serializable>) arguments.get(1).getType();
}
private Class<?> resolveDomainType(Class<?> repositoryInterface) {
Class<?>[] arguments = resolveTypeArguments(repositoryInterface, Repository.class);
TypeInformation<?> information = ClassTypeInformation.from(repositoryInterface);
List<TypeInformation<?>> arguments = information.getSuperTypeInformation(Repository.class).getTypeArguments();
if (arguments == null || arguments[0] == null) {
if (arguments.isEmpty() || arguments.get(0) == null) {
throw new IllegalArgumentException(String.format("Could not resolve domain type of %s!", repositoryInterface));
}
return arguments[0];
return arguments.get(0).getType();
}
}

13
src/test/java/org/springframework/data/repository/core/support/DefaultRepositoryMetadataUnitTests.java
View File

@@ -15,6 +15,7 @@
*/
package org.springframework.data.repository.core.support;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import java.io.Serializable;
@@ -101,6 +102,18 @@ public class DefaultRepositoryMetadataUnitTests {
assertEquals(Long.class, metadata.getIdType());
}
/**
* @see DATACMNS-501
*/
@Test
public void discoversDomainAndIdTypeForIntermediateRepository() {
RepositoryMetadata metadata = new DefaultRepositoryMetadata(IdTypeFixingRepository.class);
assertThat(metadata.getDomainType(), is(typeCompatibleWith(Object.class)));
assertThat(metadata.getIdType(), is(typeCompatibleWith(Long.class)));
}
@SuppressWarnings("unused")
private class User {