Merge branch 'Cobertura'

pom.xml

@@ -66,6 +66,8 @@
 
 		<mysql.version>5.1.22</mysql.version>
 
+		<cobertura.version>2.7</cobertura.version>
+
 	</properties>
 
 	<dependencies>
@@ -442,8 +444,39 @@
 					<path>/petclinic</path>
 				</configuration>
 			</plugin>
+			 <plugin>
+		        <groupId>org.codehaus.mojo</groupId>
+		        <artifactId>cobertura-maven-plugin</artifactId>
+				<version>${cobertura.version}</version>
+		        <configuration>
+		        </configuration>
+		        <executions>
+		          <execution>
+		            <goals>
+		              <goal>clean</goal>
+		              <goal>check</goal>
+		            </goals>
+		          </execution>
+		        </executions>
+         </plugin>
 		</plugins>
 	</build>
+		<reporting>
+		<plugins>
+		 
+			<!--  integrate maven-cobertura-plugin to project site  -->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>cobertura-maven-plugin</artifactId>
+				<version>${cobertura.version}</version>
+				<configuration>
+					<formats>
+						<format>html</format>
+					</formats>
+				</configuration>
+			</plugin>
+		</plugins>
+	</reporting>
 
 	<url>demopetclinic</url>
 </project>

src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcOwnerRepositoryImpl.java

@@ -122,6 +122,7 @@ public class JdbcOwnerRepositoryImpl implements OwnerRepository {
         );
         for (JdbcPet pet : pets) {
             owner.addPet(pet);
+            // Pet types have not been loaded at this stage. They are loaded separately
             pet.setType(EntityUtils.getById(getPetTypes(), PetType.class, pet.getTypeId()));
             List<Visit> visits = this.visitRepository.findByPetId(pet.getId());
             for (Visit visit : visits) {

src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPet.java

@@ -19,7 +19,7 @@ import org.springframework.samples.petclinic.model.Pet;
 
 /**
  * Subclass of Pet that carries temporary id properties which are only relevant for a JDBC implementation of the
- * ClinicService.
+ * PetRepository.
  *
  * @author Juergen Hoeller
  */

src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java

@@ -8,8 +8,6 @@ import java.util.Set;
 import javax.validation.ConstraintViolation;
 import javax.validation.Validator;
 
-import org.assertj.core.api.Assertions;
-import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
@@ -40,7 +38,7 @@ public class ValidatorTests {
         Validator validator = createValidator();
         Set<ConstraintViolation<Person>> constraintViolations = validator.validate(person);
 
-        Assert.assertEquals(1, constraintViolations.size());
+        assertThat(constraintViolations.size()).isEqualTo(1);
         ConstraintViolation<Person> violation =  constraintViolations.iterator().next();
         assertThat(violation.getPropertyPath().toString()).isEqualTo("firstName");
         assertThat(violation.getMessage()).isEqualTo("may not be empty");