Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Deprecate Spring Data Solr support

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfiguration.java
View File

@ -40,6 +40,7 @@ import org.springframework.data.solr.repository.support.SolrRepositoryFactoryBea
*
* @author Christoph Strobl
* @author Oliver Gierke
* @deprecated since 2.3.9 as Spring Data Solr is deprecated
* @since 1.1.0
*/
@Configuration(proxyBeanMethods = false)
@ -48,6 +49,7 @@ import org.springframework.data.solr.repository.support.SolrRepositoryFactoryBea
@ConditionalOnProperty(prefix = "spring.data.solr.repositories", name = "enabled", havingValue = "true",
matchIfMissing = true)
@Import(SolrRepositoriesRegistrar.class)
@Deprecated
public class SolrRepositoriesAutoConfiguration {
}

1
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesRegistrar.java
View File

@ -30,6 +30,7 @@ import org.springframework.data.solr.repository.config.SolrRepositoryConfigExten
*
* @author Christoph Strobl
*/
@Deprecated
class SolrRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport {
@Override

1
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/alt/solr/CitySolrRepository.java
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> {
}

4
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesAutoConfigurationTests.java
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 {

1
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfigurationTests.java
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;

1
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/solr/city/City.java
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

1
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/solr/city/CityRepository.java
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);

1
spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc
View File

@ -4494,6 +4494,7 @@ https://lucene.apache.org/solr/[Apache Solr] is a search engine.
Spring Boot offers basic auto-configuration for the Solr 5 client library and the abstractions on top of it provided by https://github.com/spring-projects/spring-data-solr[Spring Data Solr].
There is a `spring-boot-starter-data-solr` "`Starter`" for collecting the dependencies in a convenient way.
NOTE: As of Spring Boot 2.3, support for Spring Data Solr has been deprecated and will be removed in a future release.
[[boot-features-connecting-to-solr]]

2
spring-boot-project/spring-boot-starters/spring-boot-starter-data-solr/build.gradle
View File

@ -2,7 +2,7 @@ plugins {
id "org.springframework.boot.starter"
}
description = "Starter for using the Apache Solr search platform with Spring Data Solr"
description = "Starter for using the Apache Solr search platform with Spring Data Solr. Deprecated since 2.3.9"
dependencies {
api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter"))