Spring/spring-data-examples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#297 - Upgraded samples for Spring Data for Apache Solr to Kay.

Browse Source 
Adapt to API changes in SolrOperations.
This commit is contained in:
Christoph Strobl
2017-05-05 13:50:03 +02:00
committed by Oliver Gierke
parent d319758bef
commit 5fcec44ec6
14 changed files with 44 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
solr/example/src/main/java/example/springdata/solr/product/Product.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2015 the original author or authors.
* Copyright 2014-2017 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.
@@ -28,14 +28,14 @@ import org.springframework.data.solr.repository.Score;
/**
* Document representing a {@link Product} and its attributes matching the fields defined in the <a
* href="http://localhost:8983/solr/collection1/schema">example solr schema</a>.
* href="http://localhost:8983/solr/techproducts/schema">example solr schema</a>.
*
* @author Christoph Strobl
* @author Oliver Gierke
*/
@Value
@Builder
@SolrDocument(solrCoreName = "collection1")
@SolrDocument(collection = "techproducts")
public class Product {
private @Id String id;

2
solr/example/src/main/java/example/springdata/solr/product/ProductRepository.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2015 the original author or authors.
* Copyright 2014-2017 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.

2
solr/example/src/main/java/example/springdata/solr/product/ProductRepositoryCustom.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2015 the original author or authors.
* Copyright 2014-2017 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.

4
solr/example/src/main/java/example/springdata/solr/product/ProductRepositoryImpl.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2015 the original author or authors.
* Copyright 2014-2017 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.
@@ -39,6 +39,6 @@ class ProductRepositoryImpl implements ProductRepositoryCustom {
public Cursor<Product> findAllUsingCursor() {
// NOTE: Using Cursor requires to sort by an unique field
return solrTemplate.queryForCursor(new SimpleQuery("*:*").addSort(new Sort("id")), Product.class);
return solrTemplate.queryForCursor("techproducts", new SimpleQuery("*:*").addSort(Sort.by("id")), Product.class);
}
}

17
solr/example/src/test/java/example/springdata/solr/AdvancedSolrRepositoryTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2016 the original author or authors.
* Copyright 2014-2017 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.
@@ -15,7 +15,7 @@
*/
package example.springdata.solr;
import static org.hamcrest.core.IsNull.*;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
import static org.springframework.data.solr.core.query.Criteria.*;
import static org.springframework.data.solr.core.query.ExistsFunction.*;
@@ -24,7 +24,9 @@ import example.springdata.solr.product.Product;
import example.springdata.solr.product.ProductRepository;
import example.springdata.solr.test.util.RequiresSolrServer;
import java.time.Duration;
import java.util.Arrays;
import java.util.Optional;
import org.junit.ClassRule;
import org.junit.Test;
@@ -45,6 +47,7 @@ import org.springframework.test.context.junit4.SpringRunner;
/**
* @author Christoph Strobl
* @author Oliver Gierke
* @author Mark Paluch
*/
@RunWith(SpringRunner.class)
@SpringBootTest
@@ -104,7 +107,7 @@ public class AdvancedSolrRepositoryTests {
Query query = new SimpleQuery(where(exists("popularity"))).addProjectionOnFields("*", "score");
operations.queryForPage(query, Product.class).forEach(System.out::println);
operations.queryForPage("techproducts", query, Product.class).forEach(System.out::println);
}
/**
@@ -118,16 +121,16 @@ public class AdvancedSolrRepositoryTests {
Query query = new SimpleQuery(where("id").is(xbox.getId()));
// add document but delay commit for 3 seconds
operations.saveBean(xbox, 3000);
operations.saveBean("techproducts", xbox, Duration.ofSeconds(3));
// document will not be returned hence not yet committed to the index
assertThat(operations.queryForObject(query, Product.class), nullValue());
assertThat(operations.queryForObject("techproducts", query, Product.class), is(Optional.empty()));
// realtime-get fetches uncommitted document
assertThat(operations.getById(xbox.getId(), Product.class), notNullValue());
assertThat(operations.getById("techproducts", xbox.getId(), Product.class), notNullValue());
// wait a little so that changes get committed to the index - normal query will now be able to find the document.
Thread.sleep(3010);
assertThat(operations.queryForObject(query, Product.class), notNullValue());
assertThat(operations.queryForObject("techproducts", query, Product.class).isPresent(), is(true));
}
}

4
solr/example/src/test/java/example/springdata/solr/SolrTestConfiguration.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2016 the original author or authors.
* Copyright 2014-2017 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.
@@ -39,7 +39,7 @@ public class SolrTestConfiguration {
@Autowired CrudRepository<Product, String> repo;
public @Bean SolrTemplate solrTemplate() {
return new SolrTemplate(new HttpSolrClient("http://localhost:8983/solr"), "collection1");
return new SolrTemplate(new HttpSolrClient.Builder().withBaseSolrUrl("http://localhost:8983/solr").build());
}
/**