diff --git a/spring-data-solr/pom.xml b/spring-data-solr/pom.xml
index bd48a53d06..6724c56add 100644
--- a/spring-data-solr/pom.xml
+++ b/spring-data-solr/pom.xml
@@ -1,69 +1,107 @@
-
- 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
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
- ${maven-surefire-plugin.version}
-
-
- **/*IntegrationTest.java
-
-
-
-
-
-
+ 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
+
+
+
+
+
+
+ maven-compiler-plugin
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+ ${maven-surefire-plugin.version}
+
+
+ **/*IntegrationTest.java
+ **/*LiveTest.java
+
+
+
+
+
+
+
+
+ integration
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+
+ integration-test
+
+ test
+
+
+
+ **/*LiveTest.java
+
+
+ **/*IntegrationTest.java
+
+
+
+
+
+
+ json
+
+
+
+
+
+
+
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 7cd0890718..466af54191 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
@@ -14,11 +14,6 @@ public class Product {
@Indexed(name = "name", type = "string")
private String name;
- @Indexed(name = "category", type = "string")
- private String category;
-
- @Indexed(name = "description", type = "string")
- private String description;
public String getId() {
return id;
@@ -36,20 +31,4 @@ public class Product {
this.name = name;
}
- public String getCategory() {
- return category;
- }
-
- public void setCategory(String category) {
- this.category = category;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
}
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 01ec1fb909..d016e46f52 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("name:*?0* OR category:*?0* OR description:*?0*")
- public Page findByCustomQuery(String searchTerm, Pageable pageable);
+ @Query("name:*?0* OR description:*?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/main/resources/solr-named-queries.properties b/spring-data-solr/src/main/resources/solr-named-queries.properties
index cec59cbebd..ed3f9a534a 100644
--- a/spring-data-solr/src/main/resources/solr-named-queries.properties
+++ b/spring-data-solr/src/main/resources/solr-named-queries.properties
@@ -1 +1 @@
-Product.findByNamedQuery=name:*?0* OR category:*?0* OR description:*?0*
\ No newline at end of file
+Product.findByNamedQuery=name:*?0* OR description:*?0*
\ No newline at end of file
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 74d94ef91c..815a188c06 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
@@ -35,8 +35,6 @@ public class ProductRepositoryIntegrationTest {
final Product product = new Product();
product.setId("P000089998");
product.setName("Desk");
- product.setCategory("Furniture");
- product.setDescription("New Desk");
productRepository.save(product);
final Product retrievedProduct = productRepository.findOne(product.getId());
assertEquals(product.getId(), retrievedProduct.getId());
@@ -47,15 +45,14 @@ public class ProductRepositoryIntegrationTest {
final Product product = new Product();
product.setId("P0001");
product.setName("T-Shirt");
- product.setCategory("Kitchen");
- product.setDescription("New T-Shirt");
+
productRepository.save(product);
- product.setCategory("Clothes");
+ product.setName("Shirt");
productRepository.save(product);
final Product retrievedProduct = productRepository.findOne(product.getId());
- assertEquals(product.getCategory(), retrievedProduct.getCategory());
+ assertEquals(product.getName(), retrievedProduct.getName());
}
@Test
@@ -63,8 +60,6 @@ public class ProductRepositoryIntegrationTest {
final Product product = new Product();
product.setId("P0001");
product.setName("Desk");
- product.setCategory("Furniture");
- product.setDescription("New Desk");
productRepository.save(product);
productRepository.delete(product);
@@ -79,8 +74,6 @@ public class ProductRepositoryIntegrationTest {
Product phone = new Product();
phone.setId("P0001");
phone.setName("Phone");
- phone.setCategory("Electronics");
- phone.setDescription("New Phone");
productRepository.save(phone);
List retrievedProducts = productRepository.findByName("Phone");
@@ -89,26 +82,20 @@ public class ProductRepositoryIntegrationTest {
@Test
public void whenSearchingProductsByQuery_thenAllMatchingProductsShouldAvialble() throws Exception {
- final Product phone = new Product();
- phone.setId("P0001");
- phone.setName("Smart Phone");
- phone.setCategory("Electronics");
- phone.setDescription("New Item");
- productRepository.save(phone);
-
- final Product phoneCover = new Product();
- phoneCover.setId("P0002");
- phoneCover.setName("Cover");
- phoneCover.setCategory("Phone");
- phoneCover.setDescription("New Product");
- productRepository.save(phoneCover);
-
- final Product wirelessCharger = new Product();
- wirelessCharger.setId("P0003");
- wirelessCharger.setName("Charging Cable");
- wirelessCharger.setCategory("Cable");
- wirelessCharger.setDescription("Wireless Charger for Phone");
- productRepository.save(wirelessCharger);
+ 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 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());
@@ -119,22 +106,16 @@ public class ProductRepositoryIntegrationTest {
final Product phone = new Product();
phone.setId("P0001");
phone.setName("Smart Phone");
- phone.setCategory("Electronics");
- phone.setDescription("New Item");
productRepository.save(phone);
final Product phoneCover = new Product();
phoneCover.setId("P0002");
- phoneCover.setName("Cover");
- phoneCover.setCategory("Phone");
- phoneCover.setDescription("New Product");
+ phoneCover.setName("Phone Cover");
productRepository.save(phoneCover);
final Product wirelessCharger = new Product();
wirelessCharger.setId("P0003");
- wirelessCharger.setName("Charging Cable");
- wirelessCharger.setCategory("Cable");
- wirelessCharger.setDescription("Wireless Charger for Phone");
+ wirelessCharger.setName("Phone Charging Cable");
productRepository.save(wirelessCharger);
Page result = productRepository.findByNamedQuery("one", new PageRequest(0, 10));