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

DATACMNS-1375 - AnnotationRepositoryMetadata now exposes the offending repository name.

Browse Source
This commit is contained in:
Oliver Gierke
2018-08-16 14:06:01 +02:00
parent 22a6870d5c
commit 14c2b5b766
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/springframework/data/repository/core/support/AnnotationRepositoryMetadata.java
View File

@@ -28,7 +28,7 @@ import org.springframework.util.Assert;
*/
public class AnnotationRepositoryMetadata extends AbstractRepositoryMetadata {
private static final String NO_ANNOTATION_FOUND = String.format("Interface must be annotated with @%s!",
private static final String NO_ANNOTATION_FOUND = String.format("Interface %%s must be annotated with @%s!",
RepositoryDefinition.class.getName());
private final Class<?> idType;
@@ -43,7 +43,9 @@ public class AnnotationRepositoryMetadata extends AbstractRepositoryMetadata {
public AnnotationRepositoryMetadata(Class<?> repositoryInterface) {
super(repositoryInterface);
Assert.isTrue(repositoryInterface.isAnnotationPresent(RepositoryDefinition.class), NO_ANNOTATION_FOUND);
Assert.isTrue(repositoryInterface.isAnnotationPresent(RepositoryDefinition.class),
String.format(NO_ANNOTATION_FOUND, repositoryInterface.getName()));
this.idType = resolveIdType(repositoryInterface);
this.domainType = resolveDomainType(repositoryInterface);

6
src/test/java/org/springframework/data/repository/core/support/AnnotationRepositoryMetadataUnitTests.java
View File

@@ -37,10 +37,12 @@ public class AnnotationRepositoryMetadataUnitTests {
assertThat(metadata.getIdType()).isEqualTo(Integer.class);
}
@Test(expected = IllegalArgumentException.class)
@Test // DATACMNS-37, DATACMNS-1375
public void preventsUnannotatedInterface() {
new AnnotationRepositoryMetadata(UnannotatedRepository.class);
assertThatExceptionOfType(IllegalArgumentException.class) //
.isThrownBy(() -> new AnnotationRepositoryMetadata(UnannotatedRepository.class)) //
.withMessageContaining(UnannotatedRepository.class.getName());
}
@SuppressWarnings("unused")