From 54e6a80ca9c840b016ca7979f893f18469878733 Mon Sep 17 00:00:00 2001 From: Thomas Darimont Date: Fri, 29 Nov 2013 11:08:28 +0100 Subject: [PATCH] DATAMONGO-804 - Fix default annotation attribute value for repositoryImplementationPostfix(). Changed repositoryImplementationPostfix() in EnableMongoRepositories to "Impl" to be consistent with other EnableXXXRepositories annotations. Note that this change is of rather documenting nature, as the defaulting of the configuration is applied in DefaultRepositoryConfiguration.getImplementationPostfix() in Spring Data Commons. Original pull request: #99. --- .../config/EnableMongoRepositories.java | 2 +- .../data/mongodb/repository/User.java | 11 +++- .../custom/CustomMongoRepository.java | 29 +++++++++ .../custom/CustomMongoRepositoryImpl.java | 39 ++++++++++++ .../CustomRepositoryImplementationTests.java | 62 +++++++++++++++++++ 5 files changed, 140 insertions(+), 3 deletions(-) create mode 100644 spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomMongoRepository.java create mode 100644 spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomMongoRepositoryImpl.java create mode 100644 spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomRepositoryImplementationTests.java diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/EnableMongoRepositories.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/EnableMongoRepositories.java index dc0fbb91c..6edfafdec 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/EnableMongoRepositories.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/EnableMongoRepositories.java @@ -80,7 +80,7 @@ public @interface EnableMongoRepositories { * * @return */ - String repositoryImplementationPostfix() default ""; + String repositoryImplementationPostfix() default "Impl"; /** * Configures the location of where to find the Spring Data named queries properties file. Will default to diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/User.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/User.java index a0ae8aa39..0ee842617 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/User.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/User.java @@ -21,7 +21,14 @@ import org.springframework.data.mongodb.core.mapping.Document; @Document public class User { - @Id - String id; + @Id String id; String username; + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } } diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomMongoRepository.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomMongoRepository.java new file mode 100644 index 000000000..19a45b93a --- /dev/null +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomMongoRepository.java @@ -0,0 +1,29 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.data.mongodb.repository.custom; + +import java.util.List; + +import org.springframework.data.mongodb.repository.User; +import org.springframework.data.repository.Repository; + +/** + * @author Thomas Darimont + */ +public interface CustomMongoRepository extends Repository { + + List findByUsernameCustom(String username); +} diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomMongoRepositoryImpl.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomMongoRepositoryImpl.java new file mode 100644 index 000000000..9adfb7701 --- /dev/null +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomMongoRepositoryImpl.java @@ -0,0 +1,39 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.data.mongodb.repository.custom; + +import java.util.Arrays; +import java.util.List; + +import org.springframework.data.mongodb.repository.User; + +/** + * @author Thomas Darimont + */ +public class CustomMongoRepositoryImpl implements CustomMongoRepository { + + /* + * (non-Javadoc) + * @see org.springframework.data.mongodb.repository.custom.CustomMongoRepository#findByFullName() + */ + @Override + public List findByUsernameCustom(String username) { + + User user = new User(); + user.setUsername(username); + return Arrays.asList(user); + } +} diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomRepositoryImplementationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomRepositoryImplementationTests.java new file mode 100644 index 000000000..d375bd0e1 --- /dev/null +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomRepositoryImplementationTests.java @@ -0,0 +1,62 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.data.mongodb.repository.custom; + +import static org.hamcrest.CoreMatchers.*; +import static org.junit.Assert.*; + +import java.util.List; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.ImportResource; +import org.springframework.data.mongodb.repository.User; +import org.springframework.data.mongodb.repository.config.EnableMongoRepositories; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +/** + * Integration tests for custom Repository implementations. + * + * @author Thomas Darimont + */ +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration +public class CustomRepositoryImplementationTests { + + @Configuration + @EnableMongoRepositories + @ImportResource("classpath:infrastructure.xml") + static class Config {} + + @Autowired CustomMongoRepository customMongoRepository; + + /** + * @see DATAMONGO-804 + */ + @Test + public void shouldExecuteMethodOnCustomRepositoryImplementation() { + + String username = "bubu"; + List users = customMongoRepository.findByUsernameCustom(username); + + assertThat(users.size(), is(1)); + assertThat(users.get(0), is(notNullValue())); + assertThat(users.get(0).getUsername(), is(username)); + } +}