diff --git a/spring-data-solr/pom.xml b/spring-data-solr/pom.xml index 6724c56add..ea9b282f66 100644 --- a/spring-data-solr/pom.xml +++ b/spring-data-solr/pom.xml @@ -1,55 +1,55 @@ - - 4.0.0 - com.baeldung - spring-data-solr - 0.0.1-SNAPSHOT - jar - spring-data-solr - - - - UTF-8 - 4.2.5.RELEASE - 2.19.1 - 2.0.4.RELEASE - - - - - org.springframework - spring-core - ${spring.version} - - - org.springframework.data - spring-data-solr - ${spring-data-solr} - - - org.springframework - spring-context - ${spring.version} - - - log4j - log4j - 1.2.16 - - - junit - junit - 4.12 - test - - - org.springframework - spring-test - ${spring.version} - test - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + 4.0.0 + com.baeldung + spring-data-solr + 0.0.1-SNAPSHOT + jar + spring-data-solr + + + + UTF-8 + 4.2.5.RELEASE + 2.19.1 + 2.0.4.RELEASE + + + + + org.springframework + spring-core + ${spring.version} + + + org.springframework.data + spring-data-solr + ${spring-data-solr} + + + org.springframework + spring-context + ${spring.version} + + + log4j + log4j + 1.2.16 + + + junit + junit + 4.12 + test + + + org.springframework + spring-test + ${spring.version} + test + + diff --git a/spring-data-solr/src/main/java/com/baeldung/spring/data/solr/config/SolrConfig.java b/spring-data-solr/src/main/java/com/baeldung/spring/data/solr/config/SolrConfig.java index 73f5b36d45..1fe1e5468b 100644 --- a/spring-data-solr/src/main/java/com/baeldung/spring/data/solr/config/SolrConfig.java +++ b/spring-data-solr/src/main/java/com/baeldung/spring/data/solr/config/SolrConfig.java @@ -13,13 +13,13 @@ import org.springframework.data.solr.repository.config.EnableSolrRepositories; @ComponentScan public class SolrConfig { - @Bean - public SolrClient solrClient() { - return new HttpSolrClient("http://localhost:8983/solr"); - } + @Bean + public SolrClient solrClient() { + return new HttpSolrClient("http://localhost:8983/solr"); + } - @Bean - public SolrTemplate solrTemplate(SolrClient client) throws Exception { - return new SolrTemplate(client); - } + @Bean + public SolrTemplate solrTemplate(SolrClient client) throws Exception { + return new SolrTemplate(client); + } } diff --git a/spring-data-solr/src/main/java/com/baeldung/spring/data/solr/model/Product.java b/spring-data-solr/src/main/java/com/baeldung/spring/data/solr/model/Product.java index 466af54191..5286f53309 100644 --- a/spring-data-solr/src/main/java/com/baeldung/spring/data/solr/model/Product.java +++ b/spring-data-solr/src/main/java/com/baeldung/spring/data/solr/model/Product.java @@ -6,29 +6,28 @@ import org.springframework.data.solr.core.mapping.SolrDocument; @SolrDocument(solrCoreName = "product") public class Product { - + @Id @Indexed(name = "id", type = "string") private String id; - + @Indexed(name = "name", type = "string") private String name; - - + public String getId() { return id; } - + public void setId(String id) { this.id = id; } - + public String getName() { return name; } - + public void setName(String name) { this.name = name; } - + } diff --git a/spring-data-solr/src/main/java/com/baeldung/spring/data/solr/repository/ProductRepository.java b/spring-data-solr/src/main/java/com/baeldung/spring/data/solr/repository/ProductRepository.java index 0ab1418a1d..5649cd7888 100644 --- a/spring-data-solr/src/main/java/com/baeldung/spring/data/solr/repository/ProductRepository.java +++ b/spring-data-solr/src/main/java/com/baeldung/spring/data/solr/repository/ProductRepository.java @@ -11,12 +11,12 @@ import com.baeldung.spring.data.solr.model.Product; public interface ProductRepository extends SolrCrudRepository { - public List findByName(String name); + public List findByName(String name); - @Query("id:*?0* OR name:*?0*") - public Page findByCustomQuery(String searchTerm, Pageable pageable); + @Query("id:*?0* OR name:*?0*") + public Page findByCustomQuery(String searchTerm, Pageable pageable); - @Query(name = "Product.findByNamedQuery") - public Page findByNamedQuery(String searchTerm, Pageable pageable); + @Query(name = "Product.findByNamedQuery") + public Page findByNamedQuery(String searchTerm, Pageable pageable); } diff --git a/spring-data-solr/src/test/java/com/baeldung/spring/data/solr/repo/ProductRepositoryIntegrationTest.java b/spring-data-solr/src/test/java/com/baeldung/spring/data/solr/repo/ProductRepositoryIntegrationTest.java index 1335e82392..a3765a74ec 100644 --- a/spring-data-solr/src/test/java/com/baeldung/spring/data/solr/repo/ProductRepositoryIntegrationTest.java +++ b/spring-data-solr/src/test/java/com/baeldung/spring/data/solr/repo/ProductRepositoryIntegrationTest.java @@ -22,104 +22,104 @@ import com.baeldung.spring.data.solr.repository.ProductRepository; @ContextConfiguration(classes = SolrConfig.class) public class ProductRepositoryIntegrationTest { - @Autowired - private ProductRepository productRepository; + @Autowired + private ProductRepository productRepository; - @Before - public void clearSolrData() { - productRepository.deleteAll(); - } + @Before + public void clearSolrData() { + productRepository.deleteAll(); + } - @Test - public void whenSavingProduct_thenAvailableOnRetrieval() throws Exception { - final Product product = new Product(); - product.setId("P000089998"); - product.setName("Desk"); - productRepository.save(product); - final Product retrievedProduct = productRepository.findOne(product.getId()); - assertEquals(product.getId(), retrievedProduct.getId()); - } + @Test + public void whenSavingProduct_thenAvailableOnRetrieval() throws Exception { + final Product product = new Product(); + product.setId("P000089998"); + product.setName("Desk"); + productRepository.save(product); + final Product retrievedProduct = productRepository.findOne(product.getId()); + assertEquals(product.getId(), retrievedProduct.getId()); + } - @Test - public void whenUpdatingProduct_thenChangeAvailableOnRetrieval() throws Exception { - final Product product = new Product(); - product.setId("P0001"); - product.setName("T-Shirt"); + @Test + public void whenUpdatingProduct_thenChangeAvailableOnRetrieval() throws Exception { + final Product product = new Product(); + product.setId("P0001"); + product.setName("T-Shirt"); - productRepository.save(product); + productRepository.save(product); - product.setName("Shirt"); - productRepository.save(product); + product.setName("Shirt"); + productRepository.save(product); - final Product retrievedProduct = productRepository.findOne(product.getId()); - assertEquals(product.getName(), retrievedProduct.getName()); - } + final Product retrievedProduct = productRepository.findOne(product.getId()); + assertEquals(product.getName(), retrievedProduct.getName()); + } - @Test - public void whenDeletingProduct_thenNotAvailableOnRetrieval() throws Exception { - final Product product = new Product(); - product.setId("P0001"); - product.setName("Desk"); - productRepository.save(product); + @Test + public void whenDeletingProduct_thenNotAvailableOnRetrieval() throws Exception { + final Product product = new Product(); + product.setId("P0001"); + product.setName("Desk"); + productRepository.save(product); - productRepository.delete(product); + productRepository.delete(product); - Product retrievedProduct = productRepository.findOne(product.getId()); - assertNull(retrievedProduct); + Product retrievedProduct = productRepository.findOne(product.getId()); + assertNull(retrievedProduct); - } + } - @Test - public void whenFindByName_thenAvailableOnRetrieval() throws Exception { - Product phone = new Product(); - phone.setId("P0001"); - phone.setName("Phone"); - productRepository.save(phone); + @Test + public void whenFindByName_thenAvailableOnRetrieval() throws Exception { + Product phone = new Product(); + phone.setId("P0001"); + phone.setName("Phone"); + productRepository.save(phone); - List retrievedProducts = productRepository.findByName("Phone"); - assertEquals(phone.getId(), retrievedProducts.get(0).getId()); - } + List retrievedProducts = productRepository.findByName("Phone"); + assertEquals(phone.getId(), retrievedProducts.get(0).getId()); + } - @Test - public void whenSearchingProductsByQuery_thenAllMatchingProductsShouldAvialble() throws Exception { - final Product phone = new Product(); - phone.setId("P0001"); - phone.setName("Smart Phone"); - productRepository.save(phone); + @Test + public void whenSearchingProductsByQuery_thenAllMatchingProductsShouldAvialble() throws Exception { + final Product phone = new Product(); + phone.setId("P0001"); + phone.setName("Smart Phone"); + productRepository.save(phone); - final Product phoneCover = new Product(); - phoneCover.setId("P0002"); - phoneCover.setName("Phone Cover"); - productRepository.save(phoneCover); + final Product phoneCover = new Product(); + phoneCover.setId("P0002"); + phoneCover.setName("Phone Cover"); + productRepository.save(phoneCover); - final Product wirelessCharger = new Product(); - wirelessCharger.setId("P0003"); - wirelessCharger.setName("Phone Charging Cable"); - productRepository.save(wirelessCharger); + final Product wirelessCharger = new Product(); + wirelessCharger.setId("P0003"); + wirelessCharger.setName("Phone Charging Cable"); + productRepository.save(wirelessCharger); - Page result = productRepository.findByCustomQuery("Phone", new PageRequest(0, 10)); - assertEquals(3, result.getNumberOfElements()); - } + Page result = productRepository.findByCustomQuery("Phone", new PageRequest(0, 10)); + assertEquals(3, result.getNumberOfElements()); + } - @Test - public void whenSearchingProductsByNamedQuery_thenAllMatchingProductsShouldAvialble() throws Exception { - final Product phone = new Product(); - phone.setId("P0001"); - phone.setName("Smart Phone"); - productRepository.save(phone); + @Test + public void whenSearchingProductsByNamedQuery_thenAllMatchingProductsShouldAvialble() throws Exception { + final Product phone = new Product(); + phone.setId("P0001"); + phone.setName("Smart Phone"); + productRepository.save(phone); - final Product phoneCover = new Product(); - phoneCover.setId("P0002"); - phoneCover.setName("Phone Cover"); - productRepository.save(phoneCover); + final Product phoneCover = new Product(); + phoneCover.setId("P0002"); + phoneCover.setName("Phone Cover"); + productRepository.save(phoneCover); - final Product wirelessCharger = new Product(); - wirelessCharger.setId("P0003"); - wirelessCharger.setName("Phone Charging Cable"); - productRepository.save(wirelessCharger); + final Product wirelessCharger = new Product(); + wirelessCharger.setId("P0003"); + wirelessCharger.setName("Phone Charging Cable"); + productRepository.save(wirelessCharger); - Page result = productRepository.findByNamedQuery("one", new PageRequest(0, 10)); - assertEquals(3, result.getNumberOfElements()); - } + Page result = productRepository.findByNamedQuery("one", new PageRequest(0, 10)); + assertEquals(3, result.getNumberOfElements()); + } }