DATAKV-86 - Move configuration infrastructure for Map-based repositories.

We removed the EnableKeyValueRepositories in favor of store specific implementations. In this case EnableMapRepositories.

The configuration now defaults a KeyValueTemplate with a MapKeyValueAdapter but allows overriding the template in a bean named keyValueTemplate.
This commit is contained in:
Christoph Strobl
2014-11-28 15:10:35 +01:00
committed by Oliver Gierke
parent 4f37a7ecc3
commit ff1338a99c
8 changed files with 206 additions and 231 deletions

View File

@@ -36,7 +36,6 @@ import org.springframework.data.keyvalue.Person;
import org.springframework.data.keyvalue.core.KeyValueTemplate;
import org.springframework.data.keyvalue.repository.KeyValueRepository;
import org.springframework.data.keyvalue.repository.support.KeyValueRepositoryFactory;
import org.springframework.data.map.MapKeyValueAdapter;
import org.springframework.data.repository.CrudRepository;
/**

View File

@@ -0,0 +1,85 @@
/*
* Copyright 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.
* 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.map.repository.config;
import static org.hamcrest.core.IsNull.*;
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.data.annotation.Id;
import org.springframework.data.repository.CrudRepository;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
/**
* Integration tests for {@link MapRepositoriesRegistrar} with complete defaulting.
*
* @author Christoph Strobl
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration
public class MapRepositoryRegistrarWithFullDefaultingIntegrationTests {
@Configuration
@EnableMapRepositories(considerNestedRepositories = true)
static class Config {
}
@Autowired PersonRepository repo;
/**
* @see DATAKV-86
*/
@Test
public void shouldEnableMapRepositoryCorrectly() {
assertThat(repo, notNullValue());
}
static class Person {
@Id String id;
String firstname;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getFirstname() {
return firstname;
}
public void setFirstname(String firstname) {
this.firstname = firstname;
}
}
static interface PersonRepository extends CrudRepository<Person, String> {
List<Person> findByFirstname(String firstname);
}
}

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.keyvalue.repository.config;
package org.springframework.data.map.repository.config;
import static org.hamcrest.core.IsNull.*;
import static org.junit.Assert.*;
@@ -34,14 +34,16 @@ import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
/**
* Integration tests for {@link MapRepositoriesRegistrar} with complete defaulting.
*
* @author Christoph Strobl
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration
public class KeyValueRepositoryRegistrarIntegrationTests {
public class MapRepositoryRegistrarWithTemplateDefinitionIntegrationTests {
@Configuration
@EnableKeyValueRepositories(considerNestedRepositories = true)
@EnableMapRepositories(considerNestedRepositories = true)
static class Config {
@Bean
@@ -56,7 +58,7 @@ public class KeyValueRepositoryRegistrarIntegrationTests {
* @see DATACMNS-525
*/
@Test
public void shouldEnableKeyValueRepositoryCorrectly() {
public void shouldEnableMapRepositoryCorrectly() {
assertThat(repo, notNullValue());
}
@@ -86,7 +88,5 @@ public class KeyValueRepositoryRegistrarIntegrationTests {
static interface PersonRepository extends CrudRepository<Person, String> {
List<Person> findByFirstname(String firstname);
}
}