Deprecate Spring Data Solr support

Closes gh-24942
This commit is contained in:
Stephane Nicoll
2021-01-20 13:53:38 +01:00
parent 28ed3355bd
commit 10b4cb8cb5
9 changed files with 11 additions and 3 deletions

View File

@@ -19,6 +19,7 @@ package org.springframework.boot.autoconfigure.data.alt.solr;
import org.springframework.boot.autoconfigure.data.solr.city.City;
import org.springframework.data.repository.Repository;
@Deprecated
public interface CitySolrRepository extends Repository<City, String> {
}

View File

@@ -23,9 +23,9 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.autoconfigure.TestAutoConfigurationPackage;
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
import org.springframework.boot.autoconfigure.data.alt.elasticsearch.CityElasticsearchDbRepository;
import org.springframework.boot.autoconfigure.data.alt.jpa.CityJpaRepository;
import org.springframework.boot.autoconfigure.data.alt.mongo.CityMongoDbRepository;
import org.springframework.boot.autoconfigure.data.alt.solr.CitySolrRepository;
import org.springframework.boot.autoconfigure.data.jpa.city.City;
import org.springframework.boot.autoconfigure.data.jpa.city.CityRepository;
import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration;
@@ -162,7 +162,7 @@ class JpaRepositoriesAutoConfigurationTests {
@EnableJpaRepositories(
basePackageClasses = org.springframework.boot.autoconfigure.data.alt.jpa.CityJpaRepository.class,
excludeFilters = { @Filter(type = FilterType.ASSIGNABLE_TYPE, value = CityMongoDbRepository.class),
@Filter(type = FilterType.ASSIGNABLE_TYPE, value = CitySolrRepository.class) })
@Filter(type = FilterType.ASSIGNABLE_TYPE, value = CityElasticsearchDbRepository.class) })
@TestAutoConfigurationPackage(City.class)
static class CustomConfiguration {

View File

@@ -42,6 +42,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
* @author Christoph Strobl
* @author Oliver Gierke
*/
@Deprecated
class SolrRepositoriesAutoConfigurationTests {
private AnnotationConfigApplicationContext context;

View File

@@ -24,6 +24,7 @@ import org.springframework.data.solr.core.mapping.SolrDocument;
* @author Christoph Strobl
*/
@SolrDocument(collection = "collection1")
@Deprecated
public class City {
@Id

View File

@@ -20,6 +20,7 @@ import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.repository.Repository;
@Deprecated
public interface CityRepository extends Repository<City, String> {
Page<City> findByNameStartingWith(String name, Pageable page);