Remove Spring Data Solr support
In preparation to the upgrade to Spring Data 2021.0, this commit removes auto-configuration for Spring Data Solr. Closes gh-24939pull/24946/head
Stephane Nicoll
4 years ago
parent
287edfba6e
commit
012a199773
@ -1,53 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2012-2019 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
|
|
||||||
*
|
|
||||||
* https://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.boot.autoconfigure.data.solr;
|
|
||||||
|
|
||||||
import org.apache.solr.client.solrj.SolrClient;
|
|
||||||
|
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
import org.springframework.context.annotation.Import;
|
|
||||||
import org.springframework.data.solr.repository.SolrRepository;
|
|
||||||
import org.springframework.data.solr.repository.config.EnableSolrRepositories;
|
|
||||||
import org.springframework.data.solr.repository.config.SolrRepositoryConfigExtension;
|
|
||||||
import org.springframework.data.solr.repository.support.SolrRepositoryFactoryBean;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Enables auto configuration for Spring Data Solr repositories.
|
|
||||||
* <p>
|
|
||||||
* Activates when there is no bean of type {@link SolrRepositoryFactoryBean} found in
|
|
||||||
* context, and both {@link SolrRepository} and {@link SolrClient} can be found on
|
|
||||||
* classpath.
|
|
||||||
* </p>
|
|
||||||
* If active auto configuration does the same as
|
|
||||||
* {@link EnableSolrRepositories @EnableSolrRepositories} would do.
|
|
||||||
*
|
|
||||||
* @author Christoph Strobl
|
|
||||||
* @author Oliver Gierke
|
|
||||||
* @since 1.1.0
|
|
||||||
*/
|
|
||||||
@Configuration(proxyBeanMethods = false)
|
|
||||||
@ConditionalOnClass({ SolrClient.class, SolrRepository.class })
|
|
||||||
@ConditionalOnMissingBean({ SolrRepositoryFactoryBean.class, SolrRepositoryConfigExtension.class })
|
|
||||||
@ConditionalOnProperty(prefix = "spring.data.solr.repositories", name = "enabled", havingValue = "true",
|
|
||||||
matchIfMissing = true)
|
|
||||||
@Import(SolrRepositoriesRegistrar.class)
|
|
||||||
public class SolrRepositoriesAutoConfiguration {
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,55 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2012-2019 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
|
|
||||||
*
|
|
||||||
* https://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.boot.autoconfigure.data.solr;
|
|
||||||
|
|
||||||
import java.lang.annotation.Annotation;
|
|
||||||
|
|
||||||
import org.springframework.boot.autoconfigure.data.AbstractRepositoryConfigurationSourceSupport;
|
|
||||||
import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
|
|
||||||
import org.springframework.data.repository.config.RepositoryConfigurationExtension;
|
|
||||||
import org.springframework.data.solr.repository.config.EnableSolrRepositories;
|
|
||||||
import org.springframework.data.solr.repository.config.SolrRepositoryConfigExtension;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* {@link ImportBeanDefinitionRegistrar} used to auto-configure Spring Data Solr
|
|
||||||
* repositories.
|
|
||||||
*
|
|
||||||
* @author Christoph Strobl
|
|
||||||
*/
|
|
||||||
class SolrRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected Class<? extends Annotation> getAnnotation() {
|
|
||||||
return EnableSolrRepositories.class;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected Class<?> getConfiguration() {
|
|
||||||
return EnableSolrRepositoriesConfiguration.class;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected RepositoryConfigurationExtension getRepositoryConfigurationExtension() {
|
|
||||||
return new SolrRepositoryConfigExtension();
|
|
||||||
}
|
|
||||||
|
|
||||||
@EnableSolrRepositories
|
|
||||||
private static class EnableSolrRepositoriesConfiguration {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2012-2019 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
|
|
||||||
*
|
|
||||||
* https://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.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Auto-configuration for Spring Data SOLR.
|
|
||||||
*/
|
|
||||||
package org.springframework.boot.autoconfigure.data.solr;
|
|
||||||
@ -1,24 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2012-2019 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
|
|
||||||
*
|
|
||||||
* https://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.boot.autoconfigure.data.alt.solr;
|
|
||||||
|
|
||||||
import org.springframework.boot.autoconfigure.data.solr.city.City;
|
|
||||||
import org.springframework.data.repository.Repository;
|
|
||||||
|
|
||||||
public interface CitySolrRepository extends Repository<City, String> {
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,115 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2012-2019 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
|
|
||||||
*
|
|
||||||
* https://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.boot.autoconfigure.data.solr;
|
|
||||||
|
|
||||||
import org.apache.solr.client.solrj.SolrClient;
|
|
||||||
import org.apache.solr.client.solrj.impl.HttpSolrClient;
|
|
||||||
import org.junit.jupiter.api.AfterEach;
|
|
||||||
import org.junit.jupiter.api.Test;
|
|
||||||
|
|
||||||
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
|
|
||||||
import org.springframework.boot.autoconfigure.TestAutoConfigurationPackage;
|
|
||||||
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
|
|
||||||
import org.springframework.boot.autoconfigure.data.alt.solr.CitySolrRepository;
|
|
||||||
import org.springframework.boot.autoconfigure.data.empty.EmptyDataPackage;
|
|
||||||
import org.springframework.boot.autoconfigure.data.solr.city.City;
|
|
||||||
import org.springframework.boot.autoconfigure.data.solr.city.CityRepository;
|
|
||||||
import org.springframework.boot.autoconfigure.solr.SolrAutoConfiguration;
|
|
||||||
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
|
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
import org.springframework.data.solr.repository.config.EnableSolrRepositories;
|
|
||||||
|
|
||||||
import static org.assertj.core.api.Assertions.assertThat;
|
|
||||||
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Tests for {@link SolrRepositoriesAutoConfiguration}.
|
|
||||||
*
|
|
||||||
* @author Christoph Strobl
|
|
||||||
* @author Oliver Gierke
|
|
||||||
*/
|
|
||||||
class SolrRepositoriesAutoConfigurationTests {
|
|
||||||
|
|
||||||
private AnnotationConfigApplicationContext context;
|
|
||||||
|
|
||||||
@AfterEach
|
|
||||||
void close() {
|
|
||||||
this.context.close();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void testDefaultRepositoryConfiguration() {
|
|
||||||
initContext(TestConfiguration.class);
|
|
||||||
assertThat(this.context.getBean(CityRepository.class)).isNotNull();
|
|
||||||
assertThat(this.context.getBean(SolrClient.class)).isInstanceOf(HttpSolrClient.class);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void testNoRepositoryConfiguration() {
|
|
||||||
initContext(EmptyConfiguration.class);
|
|
||||||
assertThat(this.context.getBean(SolrClient.class)).isInstanceOf(HttpSolrClient.class);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void doesNotTriggerDefaultRepositoryDetectionIfCustomized() {
|
|
||||||
initContext(CustomizedConfiguration.class);
|
|
||||||
assertThat(this.context.getBean(CitySolrRepository.class)).isNotNull();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void autoConfigurationShouldNotKickInEvenIfManualConfigDidNotCreateAnyRepositories() {
|
|
||||||
initContext(SortOfInvalidCustomConfiguration.class);
|
|
||||||
assertThatExceptionOfType(NoSuchBeanDefinitionException.class)
|
|
||||||
.isThrownBy(() -> this.context.getBean(CityRepository.class));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void initContext(Class<?> configClass) {
|
|
||||||
|
|
||||||
this.context = new AnnotationConfigApplicationContext();
|
|
||||||
this.context.register(configClass, SolrAutoConfiguration.class, SolrRepositoriesAutoConfiguration.class,
|
|
||||||
PropertyPlaceholderAutoConfiguration.class);
|
|
||||||
this.context.refresh();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Configuration(proxyBeanMethods = false)
|
|
||||||
@TestAutoConfigurationPackage(City.class)
|
|
||||||
static class TestConfiguration {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Configuration(proxyBeanMethods = false)
|
|
||||||
@TestAutoConfigurationPackage(EmptyDataPackage.class)
|
|
||||||
static class EmptyConfiguration {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Configuration(proxyBeanMethods = false)
|
|
||||||
@TestAutoConfigurationPackage(SolrRepositoriesAutoConfigurationTests.class)
|
|
||||||
@EnableSolrRepositories(basePackageClasses = CitySolrRepository.class)
|
|
||||||
static class CustomizedConfiguration {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Configuration(proxyBeanMethods = false)
|
|
||||||
@TestAutoConfigurationPackage(SolrRepositoriesAutoConfigurationTests.class)
|
|
||||||
// To not find any repositories
|
|
||||||
@EnableSolrRepositories("foo.bar")
|
|
||||||
static class SortOfInvalidCustomConfiguration {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,51 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2012-2019 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
|
|
||||||
*
|
|
||||||
* https://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.boot.autoconfigure.data.solr.city;
|
|
||||||
|
|
||||||
import org.springframework.data.annotation.Id;
|
|
||||||
import org.springframework.data.solr.core.mapping.Indexed;
|
|
||||||
import org.springframework.data.solr.core.mapping.SolrDocument;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author Christoph Strobl
|
|
||||||
*/
|
|
||||||
@SolrDocument(collection = "collection1")
|
|
||||||
public class City {
|
|
||||||
|
|
||||||
@Id
|
|
||||||
private String id;
|
|
||||||
|
|
||||||
@Indexed
|
|
||||||
private String name;
|
|
||||||
|
|
||||||
public String getId() {
|
|
||||||
return this.id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setId(String id) {
|
|
||||||
this.id = id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getName() {
|
|
||||||
return this.name;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setName(String name) {
|
|
||||||
this.name = name;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,27 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2012-2019 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
|
|
||||||
*
|
|
||||||
* https://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.boot.autoconfigure.data.solr.city;
|
|
||||||
|
|
||||||
import org.springframework.data.domain.Page;
|
|
||||||
import org.springframework.data.domain.Pageable;
|
|
||||||
import org.springframework.data.repository.Repository;
|
|
||||||
|
|
||||||
public interface CityRepository extends Repository<City, String> {
|
|
||||||
|
|
||||||
Page<City> findByNameStartingWith(String name, Pageable page);
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
plugins {
|
|
||||||
id "org.springframework.boot.starter"
|
|
||||||
}
|
|
||||||
|
|
||||||
description = "Starter for using the Apache Solr search platform with Spring Data Solr"
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter"))
|
|
||||||
api("org.springframework.data:spring-data-solr") {
|
|
||||||
exclude group: "commons-logging", module: "commons-logging"
|
|
||||||
exclude group: "org.slf4j", module: "jcl-over-slf4j"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
plugins {
|
|
||||||
id "java"
|
|
||||||
id "org.springframework.boot.conventions"
|
|
||||||
}
|
|
||||||
|
|
||||||
description = "Spring Boot Data Solr smoke test"
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-solr"))
|
|
||||||
|
|
||||||
testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
|
|
||||||
}
|
|
||||||
@ -1,100 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2012-2020 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
|
|
||||||
*
|
|
||||||
* https://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 smoketest.data.solr;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import org.apache.solr.client.solrj.beans.Field;
|
|
||||||
|
|
||||||
import org.springframework.data.annotation.Id;
|
|
||||||
import org.springframework.data.solr.core.geo.Point;
|
|
||||||
import org.springframework.data.solr.core.mapping.SolrDocument;
|
|
||||||
|
|
||||||
@SolrDocument(collection = "collection1")
|
|
||||||
public class Product {
|
|
||||||
|
|
||||||
@Id
|
|
||||||
@Field
|
|
||||||
private String id;
|
|
||||||
|
|
||||||
@Field
|
|
||||||
private String name;
|
|
||||||
|
|
||||||
@Field
|
|
||||||
private Double price;
|
|
||||||
|
|
||||||
@Field("cat")
|
|
||||||
private List<String> category;
|
|
||||||
|
|
||||||
@Field("store")
|
|
||||||
private Point location;
|
|
||||||
|
|
||||||
public Product() {
|
|
||||||
}
|
|
||||||
|
|
||||||
public Product(String id, String name) {
|
|
||||||
this.id = id;
|
|
||||||
this.name = name;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getId() {
|
|
||||||
return this.id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setId(String id) {
|
|
||||||
this.id = id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getName() {
|
|
||||||
return this.name;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setName(String name) {
|
|
||||||
this.name = name;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Double getPrice() {
|
|
||||||
return this.price;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setPrice(Double price) {
|
|
||||||
this.price = price;
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<String> getCategory() {
|
|
||||||
return this.category;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setCategory(List<String> category) {
|
|
||||||
this.category = category;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Point getLocation() {
|
|
||||||
return this.location;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setLocation(Point location) {
|
|
||||||
this.location = location;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
return "Product [id=" + this.id + ", name=" + this.name + ", price=" + this.price + ", category="
|
|
||||||
+ this.category + ", location=" + this.location + "]";
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,27 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2012-2019 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
|
|
||||||
*
|
|
||||||
* https://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 smoketest.data.solr;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import org.springframework.data.solr.repository.SolrCrudRepository;
|
|
||||||
|
|
||||||
public interface ProductRepository extends SolrCrudRepository<Product, String> {
|
|
||||||
|
|
||||||
List<Product> findByNameStartingWith(String name);
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,61 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2012-2019 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
|
|
||||||
*
|
|
||||||
* https://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 smoketest.data.solr;
|
|
||||||
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.boot.CommandLineRunner;
|
|
||||||
import org.springframework.boot.SpringApplication;
|
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
|
||||||
|
|
||||||
@SpringBootApplication
|
|
||||||
public class SampleSolrApplication implements CommandLineRunner {
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ProductRepository repository;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void run(String... args) throws Exception {
|
|
||||||
|
|
||||||
this.repository.deleteAll();
|
|
||||||
|
|
||||||
// insert some products
|
|
||||||
this.repository.save(new Product("1", "Nintendo Entertainment System"));
|
|
||||||
this.repository.save(new Product("2", "Sega Megadrive"));
|
|
||||||
this.repository.save(new Product("3", "Sony Playstation"));
|
|
||||||
|
|
||||||
// fetch all
|
|
||||||
System.out.println("Products found by findAll():");
|
|
||||||
System.out.println("----------------------------");
|
|
||||||
for (Product product : this.repository.findAll()) {
|
|
||||||
System.out.println(product);
|
|
||||||
}
|
|
||||||
System.out.println();
|
|
||||||
|
|
||||||
// fetch a single product
|
|
||||||
System.out.println("Products found with findByNameStartingWith('So'):");
|
|
||||||
System.out.println("--------------------------------");
|
|
||||||
for (Product product : this.repository.findByNameStartingWith("So")) {
|
|
||||||
System.out.println(product);
|
|
||||||
}
|
|
||||||
System.out.println();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void main(String[] args) {
|
|
||||||
SpringApplication.run(SampleSolrApplication.class, args);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,55 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2012-2019 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
|
|
||||||
*
|
|
||||||
* https://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 smoketest.data.solr;
|
|
||||||
|
|
||||||
import org.junit.jupiter.api.Test;
|
|
||||||
import org.junit.jupiter.api.extension.ExtendWith;
|
|
||||||
|
|
||||||
import org.springframework.boot.test.system.CapturedOutput;
|
|
||||||
import org.springframework.boot.test.system.OutputCaptureExtension;
|
|
||||||
import org.springframework.core.NestedCheckedException;
|
|
||||||
|
|
||||||
import static org.assertj.core.api.Assertions.assertThat;
|
|
||||||
|
|
||||||
@ExtendWith(OutputCaptureExtension.class)
|
|
||||||
class SampleSolrApplicationTests {
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void testDefaultSettings(CapturedOutput output) throws Exception {
|
|
||||||
try {
|
|
||||||
SampleSolrApplication.main(new String[0]);
|
|
||||||
}
|
|
||||||
catch (IllegalStateException ex) {
|
|
||||||
if (serverNotRunning(ex)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
assertThat(output).contains("name=Sony Playstation");
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressWarnings("serial")
|
|
||||||
private boolean serverNotRunning(IllegalStateException ex) {
|
|
||||||
NestedCheckedException nested = new NestedCheckedException("failed", ex) {
|
|
||||||
};
|
|
||||||
Throwable root = nested.getRootCause();
|
|
||||||
if (root.getMessage().contains("Connection refused")) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue