From b99508fbf9e5f02aa35a1ff3c92b0c34d6bdedf4 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Tue, 22 Oct 2013 14:23:04 +0200 Subject: [PATCH] DATAJPA-416 - Polishing. Refer to the JPA ticket instead of the DATACMNS one. Use Repository instead of JpaRepository in test cases. Some code formatting. Original pull request: #46. --- .../AllowNestedRepositoriesRepositoryConfigTests.java | 4 ++-- .../config/NestedRepositoriesJavaConfigTests.java | 2 +- .../jpa/repository/sample/ClassWithNestedRepository.java | 7 ++++--- .../namespace-nested-repositories-application-context.xml | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/test/java/org/springframework/data/jpa/repository/config/AllowNestedRepositoriesRepositoryConfigTests.java b/src/test/java/org/springframework/data/jpa/repository/config/AllowNestedRepositoriesRepositoryConfigTests.java index b56367fa0..532ca81e1 100644 --- a/src/test/java/org/springframework/data/jpa/repository/config/AllowNestedRepositoriesRepositoryConfigTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/config/AllowNestedRepositoriesRepositoryConfigTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2008-2013 the original author or authors. + * Copyright 2013 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. @@ -27,6 +27,7 @@ import org.springframework.test.context.ContextConfiguration; * Integration test for repository name-space configuration with nested repositories. * * @author Thomas Darimont + * @author Oliver Gierke */ @ContextConfiguration(locations = "classpath:config/namespace-nested-repositories-application-context.xml") public class AllowNestedRepositoriesRepositoryConfigTests extends AbstractRepositoryConfigTests { @@ -38,7 +39,6 @@ public class AllowNestedRepositoriesRepositoryConfigTests extends AbstractReposi */ @Test public void shouldFindNestedRepository() { - assertThat(fooRepository, is(notNullValue())); } } diff --git a/src/test/java/org/springframework/data/jpa/repository/config/NestedRepositoriesJavaConfigTests.java b/src/test/java/org/springframework/data/jpa/repository/config/NestedRepositoriesJavaConfigTests.java index 01d309ab9..3290fc7ea 100644 --- a/src/test/java/org/springframework/data/jpa/repository/config/NestedRepositoriesJavaConfigTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/config/NestedRepositoriesJavaConfigTests.java @@ -33,6 +33,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; * Integration test for the combination of JavaConfig and an {@link Repositories} wrapper. * * @author Thomas Darimont + * @author Oliver Gierke */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration @@ -50,7 +51,6 @@ public class NestedRepositoriesJavaConfigTests { */ @Test public void shouldSupportNestedRepositories() { - assertThat(nestedUserRepository, is(notNullValue())); } } diff --git a/src/test/java/org/springframework/data/jpa/repository/sample/ClassWithNestedRepository.java b/src/test/java/org/springframework/data/jpa/repository/sample/ClassWithNestedRepository.java index 32136db82..95b9a6960 100644 --- a/src/test/java/org/springframework/data/jpa/repository/sample/ClassWithNestedRepository.java +++ b/src/test/java/org/springframework/data/jpa/repository/sample/ClassWithNestedRepository.java @@ -16,13 +16,14 @@ package org.springframework.data.jpa.repository.sample; import org.springframework.data.jpa.domain.sample.User; -import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.repository.Repository; /** - * @see DATACMNS-90 + * @see DATAJPA-416 * @author Thomas Darimont + * @author Oliver Gierke */ public class ClassWithNestedRepository { - public static interface NestedUserRepository extends JpaRepository {} + public static interface NestedUserRepository extends Repository {} } diff --git a/src/test/resources/config/namespace-nested-repositories-application-context.xml b/src/test/resources/config/namespace-nested-repositories-application-context.xml index c015465f9..962578b76 100644 --- a/src/test/resources/config/namespace-nested-repositories-application-context.xml +++ b/src/test/resources/config/namespace-nested-repositories-application-context.xml @@ -7,6 +7,6 @@ - +