maven profile changes, model class change

spring-data-solr/pom.xml

@@ -1,69 +1,107 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung</groupId>
-    <artifactId>spring-data-solr</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <packaging>jar</packaging>
-    <name>spring-data-solr</name>
-    
-    
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring.version>4.2.5.RELEASE</spring.version>
-        <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
-        <spring-data-solr>2.0.4.RELEASE</spring-data-solr>
-    </properties>
-    
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-solr</artifactId>
-            <version>${spring-data-solr}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.16</version>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <version>${spring.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
-                <configuration>
-                    <includes>
-                        <include>**/*IntegrationTest.java</include>
-                    </includes>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>com.baeldung</groupId>
+	<artifactId>spring-data-solr</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<packaging>jar</packaging>
+	<name>spring-data-solr</name>
+
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<spring.version>4.2.5.RELEASE</spring.version>
+		<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
+		<spring-data-solr>2.0.4.RELEASE</spring-data-solr>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-core</artifactId>
+			<version>${spring.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.data</groupId>
+			<artifactId>spring-data-solr</artifactId>
+			<version>${spring-data-solr}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+			<version>${spring.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.16</version>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-test</artifactId>
+			<version>${spring.version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>${maven-surefire-plugin.version}</version>
+				<configuration>
+					<excludes>
+						<exclude>**/*IntegrationTest.java</exclude>
+						<exclude>**/*LiveTest.java</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+	<profiles>
+		<profile>
+			<id>integration</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-surefire-plugin</artifactId>
+						<executions>
+							<execution>
+								<phase>integration-test</phase>
+								<goals>
+									<goal>test</goal>
+								</goals>
+								<configuration>
+									<excludes>
+										<exclude>**/*LiveTest.java</exclude>
+									</excludes>
+									<includes>
+										<include>**/*IntegrationTest.java</include>
+									</includes>
+								</configuration>
+							</execution>
+						</executions>
+						<configuration>
+							<systemPropertyVariables>
+								<test.mime>json</test.mime>
+							</systemPropertyVariables>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>

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;
-    }
-    
 }

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<Product, String> {
 
-    public List<Product> findByName(String name);
+	public List<Product> findByName(String name);
 
-    @Query("name:*?0* OR category:*?0* OR description:*?0*")
-    public Page<Product> findByCustomQuery(String searchTerm, Pageable pageable);
+	@Query("name:*?0* OR description:*?0*")
+	public Page<Product> findByCustomQuery(String searchTerm, Pageable pageable);
 
-    @Query(name = "Product.findByNamedQuery")
-    public Page<Product> findByNamedQuery(String searchTerm, Pageable pageable);
+	@Query(name = "Product.findByNamedQuery")
+	public Page<Product> findByNamedQuery(String searchTerm, Pageable pageable);
 
 }

spring-data-solr/src/main/resources/solr-named-queries.properties

@@ -1 +1 @@
-Product.findByNamedQuery=name:*?0* OR category:*?0* OR description:*?0*
+Product.findByNamedQuery=name:*?0* OR description:*?0*

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<Product> 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<Product> 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<Product> result = productRepository.findByNamedQuery("one", new PageRequest(0, 10));