diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000000000000000000000000000000000..de9af4689b5ad9f5919336e80e752e283d574420
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,9 @@
+# top-most EditorConfig file
+root = true
+
+[*.{java,xml}]
+charset = utf-8
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
diff --git a/pom.xml b/pom.xml
index 504e97c359f6b92e5c4c9aa9dc5dfb20c6cfac4c..d4c16ce5bd17824e5b42cf8bddc10b74fd8738e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,406 +1,407 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.springframework.samples</groupId>
- <artifactId>spring-petclinic</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.springframework.samples</groupId>
+ <artifactId>spring-petclinic</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
- <name>petclinic</name>
- <packaging>war</packaging>
+ <name>petclinic</name>
+ <packaging>war</packaging>
- <properties>
+ <properties>
- <!-- Generic properties -->
- <java.version>1.7</java.version>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <!-- Generic properties -->
+ <java.version>1.7</java.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <!-- Spring -->
- <spring-io-platform.version>1.1.3.RELEASE</spring-io-platform.version>
- <spring-data-jdbc.version>1.1.0.RELEASE</spring-data-jdbc.version>
+ <!-- Spring -->
+ <spring-io-platform.version>1.1.3.RELEASE</spring-io-platform.version>
+ <spring-data-jdbc.version>1.1.0.RELEASE</spring-data-jdbc.version>
- <!-- Java EE / Java SE dependencies -->
- <tomcat.version>7.0.59</tomcat.version>
+ <!-- Java EE / Java SE dependencies -->
+ <tomcat.version>7.0.59</tomcat.version>
- <!-- Test -->
- <assertj.version>2.2.0</assertj.version>
-
- <!-- Dates -->
- <jodatime-hibernate.version>1.3</jodatime-hibernate.version>
- <jodatime-jsptags.version>1.1.1</jodatime-jsptags.version>
- <jadira-usertype-core.version>3.2.0.GA</jadira-usertype-core.version>
+ <!-- Test -->
+ <assertj.version>2.2.0</assertj.version>
- <!-- MySql -->
- <mysql-driver.version>5.1.36</mysql-driver.version>
+ <!-- Dates -->
+ <jodatime-hibernate.version>1.3</jodatime-hibernate.version>
+ <jodatime-jsptags.version>1.1.1</jodatime-jsptags.version>
+ <jadira-usertype-core.version>3.2.0.GA</jadira-usertype-core.version>
- <!-- Web dependencies -->
- <webjars-bootstrap.version>2.3.0</webjars-bootstrap.version>
- <webjars-jquery-ui.version>1.10.3</webjars-jquery-ui.version>
- <webjars-jquery.version>2.0.3-1</webjars-jquery.version>
- <dandelion.version>1.0.1</dandelion.version>
+ <!-- MySql -->
+ <mysql-driver.version>5.1.36</mysql-driver.version>
- <cobertura.version>2.7</cobertura.version>
+ <!-- Web dependencies -->
+ <webjars-bootstrap.version>2.3.0</webjars-bootstrap.version>
+ <webjars-jquery-ui.version>1.10.3</webjars-jquery-ui.version>
+ <webjars-jquery.version>2.0.3-1</webjars-jquery.version>
+ <dandelion.version>1.0.1</dandelion.version>
- </properties>
+ <cobertura.version>2.7</cobertura.version>
- <dependencyManagement>
- <!-- Import the maven Spring IO Platform Bill Of Materials (BOM) -->
- <dependencies>
- <dependency>
- <groupId>io.spring.platform</groupId>
- <artifactId>platform-bom</artifactId>
- <version>${spring-io-platform.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
+ </properties>
- <dependencies>
- <dependency>
- <groupId>org.jadira.usertype</groupId>
- <artifactId>usertype.core</artifactId>
- <version>${jadira-usertype-core.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-servlet-api</artifactId>
- <version>${tomcat.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>javax.servlet.jsp-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-jasper-el</artifactId>
- <version>${tomcat.version}</version>
- <scope>provided</scope>
- </dependency>
+ <dependencyManagement>
+ <!-- Import the maven Spring IO Platform Bill Of Materials (BOM) -->
+ <dependencies>
+ <dependency>
+ <groupId>io.spring.platform</groupId>
+ <artifactId>platform-bom</artifactId>
+ <version>${spring-io-platform.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <dependencies>
<dependency>
- <groupId>javax.servlet.jsp.jstl</groupId>
- <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+ <groupId>org.jadira.usertype</groupId>
+ <artifactId>usertype.core</artifactId>
+ <version>${jadira-usertype-core.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.taglibs</groupId>
- <artifactId>taglibs-standard-jstlel</artifactId>
- </dependency>
- <!-- JSon -->
- <dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
+ <version>${tomcat.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>javax.servlet.jsp-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jasper-el</artifactId>
+ <version>${tomcat.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet.jsp.jstl</groupId>
+ <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.taglibs</groupId>
+ <artifactId>taglibs-standard-jstlel</artifactId>
+ </dependency>
+ <!-- JSon -->
+ <dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
<scope>test</scope>
</dependency>
- <!-- SPRING, SPRING, SPRINGITY SPRING -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-jpa</artifactId>
- </dependency>
+ <!-- SPRING, SPRING, SPRINGITY SPRING -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-data-jpa</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.springframework.data</groupId>
- <artifactId>spring-data-jdbc-core</artifactId>
- <version>${spring-data-jdbc.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <!-- because Spring Data usually comes with a slightly older version of Spring -->
- </exclusions>
- </dependency>
+ <dependency>
+ <groupId>org.springframework.data</groupId>
+ <artifactId>spring-data-jdbc-core</artifactId>
+ <version>${spring-data-jdbc.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <!-- because Spring Data usually comes with a slightly older version of Spring -->
+ </exclusions>
+ </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
- </dependency>
- <!-- used for EhCacheCacheManager -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-oxm</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ </dependency>
+ <!-- used for EhCacheCacheManager -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-oxm</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjrt</artifactId>
- </dependency>
- <dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjweaver</artifactId>
- <scope>runtime</scope>
- </dependency>
-
- <!-- Database connection pool
- See here for more details on commons-dbcp versus tomcat-jdbc:
- http://blog.ippon.fr/2013/03/13/improving-the-performance-of-the-spring-petclinic-sample-application-part-3-of-5/
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjweaver</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- Database connection pool
+ See here for more details on commons-dbcp versus tomcat-jdbc:
+ http://blog.ippon.fr/2013/03/13/improving-the-performance-of-the-spring-petclinic-sample-application-part-3-of-5/
-->
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-jdbc</artifactId>
- <scope>runtime</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jdbc</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- Logging with SLF4J & LogBack -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- Date and Time -->
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time-hibernate</artifactId>
+ <version>${jodatime-hibernate.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time-jsptags</artifactId>
+ <version>${jodatime-jsptags.version}</version>
+ </dependency>
- <!-- Logging with SLF4J & LogBack -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <scope>runtime</scope>
- </dependency>
-
- <!-- Date and Time -->
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- </dependency>
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time-hibernate</artifactId>
- <version>${jodatime-hibernate.version}</version>
- </dependency>
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time-jsptags</artifactId>
- <version>${jodatime-jsptags.version}</version>
- </dependency>
+ <!-- Databases - Uses HSQL by default -->
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <scope>runtime</scope>
+ </dependency>
- <!-- Databases - Uses HSQL by default -->
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <scope>runtime</scope>
- </dependency>
+ <!-- For MySql only -->
+ <!--dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>${mysql-driver.version}</version>
+ </dependency-->
- <!-- For MySql only -->
- <!--dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>${mysql-driver.version}</version>
- </dependency-->
+ <!-- HIBERNATE -->
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ </dependency>
- <!-- HIBERNATE -->
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-ehcache</artifactId>
- </dependency>
- <dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <!-- Webjars (static dependencies distributed as JAR files) -->
- <dependency>
- <groupId>org.webjars</groupId>
- <artifactId>bootstrap</artifactId>
- <version>${webjars-bootstrap.version}</version>
- </dependency>
- <dependency>
- <groupId>org.webjars</groupId>
- <artifactId>jquery-ui</artifactId>
- <version>${webjars-jquery-ui.version}</version>
- </dependency>
- <dependency>
- <groupId>org.webjars</groupId>
- <artifactId>jquery</artifactId>
- <version>${webjars-jquery.version}</version>
- </dependency>
-
- <!-- Test Artifacts -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <version>${assertj.version}</version>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-ehcache</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- Webjars (static dependencies distributed as JAR files) -->
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>bootstrap</artifactId>
+ <version>${webjars-bootstrap.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>jquery-ui</artifactId>
+ <version>${webjars-jquery-ui.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>jquery</artifactId>
+ <version>${webjars-jquery.version}</version>
+ </dependency>
+
+ <!-- Test Artifacts -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>${assertj.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Dandelion -->
+ <dependency>
+ <groupId>com.github.dandelion</groupId>
+ <artifactId>datatables-jsp</artifactId>
+ <version>${dandelion.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.github.dandelion</groupId>
+ <artifactId>datatables-export-itext</artifactId>
+ <version>${dandelion.version}</version>
+ </dependency>
+ <!-- temporary fix: below dependency should not be necessary as it is a transitive dependency.
+ For some reason we can't build the app unless it is a first level dependency -->
+ <dependency>
+ <groupId>com.googlecode.json-simple</groupId>
+ <artifactId>json-simple</artifactId>
+ </dependency>
+ </dependencies>
- <!-- Dandelion -->
- <dependency>
- <groupId>com.github.dandelion</groupId>
- <artifactId>datatables-jsp</artifactId>
- <version>${dandelion.version}</version>
- </dependency>
- <dependency>
- <groupId>com.github.dandelion</groupId>
- <artifactId>datatables-export-itext</artifactId>
- <version>${dandelion.version}</version>
- </dependency>
- <!-- temporary fix: below dependency should not be necessary as it is a transitive dependency.
- For some reason we can't build the app unless it is a first level dependency -->
- <dependency>
- <groupId>com.googlecode.json-simple</groupId>
- <artifactId>json-simple</artifactId>
- </dependency>
- </dependencies>
+ <!-- Maven plugin versions are mentioned in order to guarantee the build reproducibility in the long term -->
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <testResources>
+ <testResource>
+ <!-- declared explicitly so Spring config files can be placed next to their corresponding JUnit test class -->
+ <directory>${project.basedir}/src/test/java</directory>
+ </testResource>
+ <testResource>
+ <directory>${project.basedir}/src/test/resources</directory>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.0</version>
+ <configuration>
+ <compilerArguments>
+ <Xlint/>
+ </compilerArguments>
+ <verbose>true</verbose>
+ <source>${java.version}</source>
+ <target>${java.version}</target>
+ <showWarnings>true</showWarnings>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.13</version>
+ <configuration>
+ <includes>
+ <include>**/*Tests.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <warName>petclinic</warName>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.9</version>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ <downloadJavadocs>true</downloadJavadocs>
+ <wtpversion>2.0</wtpversion>
+ <sourceIncludes>
+ <sourceInclude>**/*.*</sourceInclude>
+ </sourceIncludes>
+ <additionalBuildcommands>
+ <buildCommand>
+ <name>org.springframework.ide.eclipse.core.springbuilder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ </buildCommand>
+ </additionalBuildcommands>
+ <additionalProjectnatures>
+ <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+ <projectnature>org.springframework.ide.eclipse.core.springnature</projectnature>
+ <projectnature>org.eclipse.m2e.core.maven2Nature</projectnature>
+ </additionalProjectnatures>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat7-maven-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <server>tomcat-development-server</server>
+ <port>9966</port>
+ <path>/petclinic</path>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>${cobertura.version}</version>
+ <configuration>
+ <check/>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>clean</goal>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <reporting>
+ <plugins>
- <!-- Maven plugin versions are mentioned in order to guarantee the build reproducibility in the long term -->
- <build>
- <defaultGoal>install</defaultGoal>
- <testResources>
- <testResource>
- <!-- declared explicitly so Spring config files can be placed next to their corresponding JUnit test class -->
- <directory>${project.basedir}/src/test/java</directory>
- </testResource>
- <testResource>
- <directory>${project.basedir}/src/test/resources</directory>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
- <configuration>
- <compilerArguments>
- <Xlint />
- </compilerArguments>
- <verbose>true</verbose>
- <source>${java.version}</source>
- <target>${java.version}</target>
- <showWarnings>true</showWarnings>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.13</version>
- <configuration>
- <includes>
- <include>**/*Tests.java</include>
- </includes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <warName>petclinic</warName>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <version>2.9</version>
- <configuration>
- <downloadSources>true</downloadSources>
- <downloadJavadocs>true</downloadJavadocs>
- <wtpversion>2.0</wtpversion>
- <sourceIncludes>
- <sourceInclude>**/*.*</sourceInclude>
- </sourceIncludes>
- <additionalBuildcommands>
- <buildCommand>
- <name>org.springframework.ide.eclipse.core.springbuilder</name>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- </buildCommand>
- </additionalBuildcommands>
- <additionalProjectnatures>
- <projectnature>org.eclipse.jdt.core.javanature</projectnature>
- <projectnature>org.springframework.ide.eclipse.core.springnature</projectnature>
- <projectnature>org.eclipse.m2e.core.maven2Nature</projectnature>
- </additionalProjectnatures>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat7-maven-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <server>tomcat-development-server</server>
- <port>9966</port>
- <path>/petclinic</path>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>${cobertura.version}</version>
- <configuration>
- <check/>
- </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>
- <check/>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
+ <!-- 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>
+ <check/>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
- <url>demopetclinic</url>
+ <url>demopetclinic</url>
</project>
diff --git a/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java b/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java
index 8dfbfe90b4310b667c83b9d38e6e3619970b2218..55b470e1e3eecf54369728983b41c9da46bb6af2 100644
--- a/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java
+++ b/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java
@@ -32,15 +32,14 @@ public class BaseEntity {
@GeneratedValue(strategy = GenerationType.IDENTITY)
protected Integer id;
+ public Integer getId() {
+ return id;
+ }
public void setId(Integer id) {
this.id = id;
}
- public Integer getId() {
- return id;
- }
-
public boolean isNew() {
return (this.id == null);
}
diff --git a/src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java b/src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java
index cb36a6267a88372a99982fe1e6e566415f6e41ca..d66c97ae7489e7243fb2f2173b64e346d687c8e0 100644
--- a/src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java
+++ b/src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java
@@ -32,15 +32,14 @@ public class NamedEntity extends BaseEntity {
@Column(name = "name")
private String name;
+ public String getName() {
+ return this.name;
+ }
public void setName(String name) {
this.name = name;
}
- public String getName() {
- return this.name;
- }
-
@Override
public String toString() {
return this.getName();
diff --git a/src/main/java/org/springframework/samples/petclinic/model/Owner.java b/src/main/java/org/springframework/samples/petclinic/model/Owner.java
index ca7c97ec27175f95446ca827f157860e07a94140..d0158d907a451d417351115ab0e1b886fa485137 100644
--- a/src/main/java/org/springframework/samples/petclinic/model/Owner.java
+++ b/src/main/java/org/springframework/samples/petclinic/model/Owner.java
@@ -85,10 +85,6 @@ public class Owner extends Person {
this.telephone = telephone;
}
- protected void setPetsInternal(Set<Pet> pets) {
- this.pets = pets;
- }
-
protected Set<Pet> getPetsInternal() {
if (this.pets == null) {
this.pets = new HashSet<>();
@@ -96,6 +92,10 @@ public class Owner extends Person {
return this.pets;
}
+ protected void setPetsInternal(Set<Pet> pets) {
+ this.pets = pets;
+ }
+
public List<Pet> getPets() {
List<Pet> sortedPets = new ArrayList<>(getPetsInternal());
PropertyComparator.sort(sortedPets, new MutableSortDefinition("name", true, true));
@@ -141,13 +141,13 @@ public class Owner extends Person {
public String toString() {
return new ToStringCreator(this)
- .append("id", this.getId())
- .append("new", this.isNew())
- .append("lastName", this.getLastName())
- .append("firstName", this.getFirstName())
- .append("address", this.address)
- .append("city", this.city)
- .append("telephone", this.telephone)
- .toString();
+ .append("id", this.getId())
+ .append("new", this.isNew())
+ .append("lastName", this.getLastName())
+ .append("firstName", this.getFirstName())
+ .append("address", this.address)
+ .append("city", this.city)
+ .append("telephone", this.telephone)
+ .toString();
}
}
diff --git a/src/main/java/org/springframework/samples/petclinic/model/Pet.java b/src/main/java/org/springframework/samples/petclinic/model/Pet.java
index 536fe07e69439cbb28edb0529da64a1ecacc2425..09eeb769e2b1144d5a5047c0e7468776eb7ff005 100644
--- a/src/main/java/org/springframework/samples/petclinic/model/Pet.java
+++ b/src/main/java/org/springframework/samples/petclinic/model/Pet.java
@@ -63,33 +63,28 @@ public class Pet extends NamedEntity {
@OneToMany(cascade = CascadeType.ALL, mappedBy = "pet", fetch = FetchType.EAGER)
private Set<Visit> visits;
-
- public void setBirthDate(DateTime birthDate) {
- this.birthDate = birthDate;
- }
-
public DateTime getBirthDate() {
return this.birthDate;
}
- public void setType(PetType type) {
- this.type = type;
+ public void setBirthDate(DateTime birthDate) {
+ this.birthDate = birthDate;
}
public PetType getType() {
return this.type;
}
- protected void setOwner(Owner owner) {
- this.owner = owner;
+ public void setType(PetType type) {
+ this.type = type;
}
public Owner getOwner() {
return this.owner;
}
- protected void setVisitsInternal(Set<Visit> visits) {
- this.visits = visits;
+ protected void setOwner(Owner owner) {
+ this.owner = owner;
}
protected Set<Visit> getVisitsInternal() {
@@ -99,6 +94,10 @@ public class Pet extends NamedEntity {
return this.visits;
}
+ protected void setVisitsInternal(Set<Visit> visits) {
+ this.visits = visits;
+ }
+
public List<Visit> getVisits() {
List<Visit> sortedVisits = new ArrayList<>(getVisitsInternal());
PropertyComparator.sort(sortedVisits, new MutableSortDefinition("date", false, false));
diff --git a/src/main/java/org/springframework/samples/petclinic/model/PetType.java b/src/main/java/org/springframework/samples/petclinic/model/PetType.java
index 99adf75917e3c4c900a88f47bdfea62e6efba541..f60a5cd27a2b195d4fb511fdfd5a4f2806800e7d 100644
--- a/src/main/java/org/springframework/samples/petclinic/model/PetType.java
+++ b/src/main/java/org/springframework/samples/petclinic/model/PetType.java
@@ -20,7 +20,7 @@ import javax.persistence.Table;
/**
* @author Juergen Hoeller
- * Can be Cat, Dog, Hamster...
+ * Can be Cat, Dog, Hamster...
*/
@Entity
@Table(name = "types")
diff --git a/src/main/java/org/springframework/samples/petclinic/model/Vet.java b/src/main/java/org/springframework/samples/petclinic/model/Vet.java
index 61c51878632c8db712220c307f6a390f7f6495d8..d93e14c4665e8dce9344a9e740120303429e31ad 100644
--- a/src/main/java/org/springframework/samples/petclinic/model/Vet.java
+++ b/src/main/java/org/springframework/samples/petclinic/model/Vet.java
@@ -46,14 +46,9 @@ public class Vet extends Person {
@ManyToMany(fetch = FetchType.EAGER)
@JoinTable(name = "vet_specialties", joinColumns = @JoinColumn(name = "vet_id"),
- inverseJoinColumns = @JoinColumn(name = "specialty_id"))
+ inverseJoinColumns = @JoinColumn(name = "specialty_id"))
private Set<Specialty> specialties;
-
- protected void setSpecialtiesInternal(Set<Specialty> specialties) {
- this.specialties = specialties;
- }
-
protected Set<Specialty> getSpecialtiesInternal() {
if (this.specialties == null) {
this.specialties = new HashSet<>();
@@ -61,6 +56,10 @@ public class Vet extends Person {
return this.specialties;
}
+ protected void setSpecialtiesInternal(Set<Specialty> specialties) {
+ this.specialties = specialties;
+ }
+
@XmlElement
public List<Specialty> getSpecialties() {
List<Specialty> sortedSpecs = new ArrayList<>(getSpecialtiesInternal());
diff --git a/src/main/java/org/springframework/samples/petclinic/model/package-info.java b/src/main/java/org/springframework/samples/petclinic/model/package-info.java
index 2723dc9aba4ebb31d4bc4c7954c23ef7d3aaabc5..2730958db9ecd77b9876a7f60ec842d3709a4802 100644
--- a/src/main/java/org/springframework/samples/petclinic/model/package-info.java
+++ b/src/main/java/org/springframework/samples/petclinic/model/package-info.java
@@ -1,8 +1,5 @@
-
/**
- *
* The classes in this package represent PetClinic's business layer.
- *
*/
package org.springframework.samples.petclinic.model;
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/OwnerRepository.java b/src/main/java/org/springframework/samples/petclinic/repository/OwnerRepository.java
index 1318337066da3aa97ff041d76f76c342ec2c2067..a273a1f7f2db615ca7f887a27f115c036833bf31 100644
--- a/src/main/java/org/springframework/samples/petclinic/repository/OwnerRepository.java
+++ b/src/main/java/org/springframework/samples/petclinic/repository/OwnerRepository.java
@@ -53,7 +53,7 @@ public interface OwnerRepository {
*
* @param lastName Value to search for
* @return a <code>Collection</code> of matching <code>Owner</code>s (or an empty <code>Collection</code> if none
- * found)
+ * found)
*/
Collection<Owner> findByLastName(String lastName) throws DataAccessException;
@@ -62,8 +62,7 @@ public interface OwnerRepository {
*
* @param id the id to search for
* @return the <code>Owner</code> if found
- * @throws org.springframework.dao.DataRetrievalFailureException
- * if not found
+ * @throws org.springframework.dao.DataRetrievalFailureException if not found
*/
Owner findById(int id) throws DataAccessException;
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/PetRepository.java b/src/main/java/org/springframework/samples/petclinic/repository/PetRepository.java
index 693b2e5e91ecdbdcc1855517fe9b0e4d944f6773..1770e855503a64a7ff4a24c418ad2b9958eb0fe4 100644
--- a/src/main/java/org/springframework/samples/petclinic/repository/PetRepository.java
+++ b/src/main/java/org/springframework/samples/petclinic/repository/PetRepository.java
@@ -45,8 +45,7 @@ public interface PetRepository {
*
* @param id the id to search for
* @return the <code>Pet</code> if found
- * @throws org.springframework.dao.DataRetrievalFailureException
- * if not found
+ * @throws org.springframework.dao.DataRetrievalFailureException if not found
*/
Pet findById(int id) throws DataAccessException;
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcOwnerRepositoryImpl.java b/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcOwnerRepositoryImpl.java
index 7103dc4708db204fd9381fdca4ca53540f1d3d55..45de1aee0093dfb5ceb6ad9dbc2bca45621b0bcb 100644
--- a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcOwnerRepositoryImpl.java
+++ b/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcOwnerRepositoryImpl.java
@@ -59,8 +59,8 @@ public class JdbcOwnerRepositoryImpl implements OwnerRepository {
public JdbcOwnerRepositoryImpl(DataSource dataSource, NamedParameterJdbcTemplate namedParameterJdbcTemplate) {
this.insertOwner = new SimpleJdbcInsert(dataSource)
- .withTableName("owners")
- .usingGeneratedKeyColumns("id");
+ .withTableName("owners")
+ .usingGeneratedKeyColumns("id");
this.namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(dataSource);
@@ -77,9 +77,9 @@ public class JdbcOwnerRepositoryImpl implements OwnerRepository {
Map<String, Object> params = new HashMap<>();
params.put("lastName", lastName + "%");
List<Owner> owners = this.namedParameterJdbcTemplate.query(
- "SELECT id, first_name, last_name, address, city, telephone FROM owners WHERE last_name like :lastName",
- params,
- BeanPropertyRowMapper.newInstance(Owner.class)
+ "SELECT id, first_name, last_name, address, city, telephone FROM owners WHERE last_name like :lastName",
+ params,
+ BeanPropertyRowMapper.newInstance(Owner.class)
);
loadOwnersPetsAndVisits(owners);
return owners;
@@ -96,9 +96,9 @@ public class JdbcOwnerRepositoryImpl implements OwnerRepository {
Map<String, Object> params = new HashMap<>();
params.put("id", id);
owner = this.namedParameterJdbcTemplate.queryForObject(
- "SELECT id, first_name, last_name, address, city, telephone FROM owners WHERE id= :id",
- params,
- BeanPropertyRowMapper.newInstance(Owner.class)
+ "SELECT id, first_name, last_name, address, city, telephone FROM owners WHERE id= :id",
+ params,
+ BeanPropertyRowMapper.newInstance(Owner.class)
);
} catch (EmptyResultDataAccessException ex) {
throw new ObjectRetrievalFailureException(Owner.class, id);
@@ -111,9 +111,9 @@ public class JdbcOwnerRepositoryImpl implements OwnerRepository {
Map<String, Object> params = new HashMap<>();
params.put("id", owner.getId());
final List<JdbcPet> pets = this.namedParameterJdbcTemplate.query(
- "SELECT pets.id, name, birth_date, type_id, owner_id, visits.id as visit_id, visit_date, description, pet_id FROM pets LEFT OUTER JOIN visits ON pets.id = pet_id WHERE owner_id=:id",
- params,
- new JdbcPetVisitExtractor()
+ "SELECT pets.id, name, birth_date, type_id, owner_id, visits.id as visit_id, visit_date, description, pet_id FROM pets LEFT OUTER JOIN visits ON pets.id = pet_id WHERE owner_id=:id",
+ params,
+ new JdbcPetVisitExtractor()
);
Collection<PetType> petTypes = getPetTypes();
for (JdbcPet pet : pets) {
@@ -130,16 +130,16 @@ public class JdbcOwnerRepositoryImpl implements OwnerRepository {
owner.setId(newKey.intValue());
} else {
this.namedParameterJdbcTemplate.update(
- "UPDATE owners SET first_name=:firstName, last_name=:lastName, address=:address, " +
- "city=:city, telephone=:telephone WHERE id=:id",
- parameterSource);
+ "UPDATE owners SET first_name=:firstName, last_name=:lastName, address=:address, " +
+ "city=:city, telephone=:telephone WHERE id=:id",
+ parameterSource);
}
}
public Collection<PetType> getPetTypes() throws DataAccessException {
return this.namedParameterJdbcTemplate.query(
- "SELECT id, name FROM types ORDER BY name", new HashMap<String, Object>(),
- BeanPropertyRowMapper.newInstance(PetType.class));
+ "SELECT id, name FROM types ORDER BY name", new HashMap<String, Object>(),
+ BeanPropertyRowMapper.newInstance(PetType.class));
}
/**
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPet.java b/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPet.java
index 39ba53b83a84dce998aea18000f73c03456e6620..4c266b93172647b43470d82782537fe672455cc8 100644
--- a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPet.java
+++ b/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPet.java
@@ -29,21 +29,20 @@ class JdbcPet extends Pet {
private int ownerId;
+ public int getTypeId() {
+ return this.typeId;
+ }
public void setTypeId(int typeId) {
this.typeId = typeId;
}
- public int getTypeId() {
- return this.typeId;
+ public int getOwnerId() {
+ return this.ownerId;
}
public void setOwnerId(int ownerId) {
this.ownerId = ownerId;
}
- public int getOwnerId() {
- return this.ownerId;
- }
-
}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetRepositoryImpl.java b/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetRepositoryImpl.java
index e3c02fc93fd8c894efce498e19b6107eec4f0c9b..885c2bc2ff2d57cd1b190ca21401f448d3d2ea66 100644
--- a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetRepositoryImpl.java
+++ b/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetRepositoryImpl.java
@@ -64,8 +64,8 @@ public class JdbcPetRepositoryImpl implements PetRepository {
this.namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(dataSource);
this.insertPet = new SimpleJdbcInsert(dataSource)
- .withTableName("pets")
- .usingGeneratedKeyColumns("id");
+ .withTableName("pets")
+ .usingGeneratedKeyColumns("id");
this.ownerRepository = ownerRepository;
this.visitRepository = visitRepository;
@@ -75,9 +75,9 @@ public class JdbcPetRepositoryImpl implements PetRepository {
public List<PetType> findPetTypes() throws DataAccessException {
Map<String, Object> params = new HashMap<>();
return this.namedParameterJdbcTemplate.query(
- "SELECT id, name FROM types ORDER BY name",
- params,
- BeanPropertyRowMapper.newInstance(PetType.class));
+ "SELECT id, name FROM types ORDER BY name",
+ params,
+ BeanPropertyRowMapper.newInstance(PetType.class));
}
@Override
@@ -87,9 +87,9 @@ public class JdbcPetRepositoryImpl implements PetRepository {
Map<String, Object> params = new HashMap<>();
params.put("id", id);
pet = this.namedParameterJdbcTemplate.queryForObject(
- "SELECT id, name, birth_date, type_id, owner_id FROM pets WHERE id=:id",
- params,
- new JdbcPetRowMapper());
+ "SELECT id, name, birth_date, type_id, owner_id FROM pets WHERE id=:id",
+ params,
+ new JdbcPetRowMapper());
} catch (EmptyResultDataAccessException ex) {
throw new ObjectRetrievalFailureException(Pet.class, id);
}
@@ -108,13 +108,13 @@ public class JdbcPetRepositoryImpl implements PetRepository {
public void save(Pet pet) throws DataAccessException {
if (pet.isNew()) {
Number newKey = this.insertPet.executeAndReturnKey(
- createPetParameterSource(pet));
+ createPetParameterSource(pet));
pet.setId(newKey.intValue());
} else {
this.namedParameterJdbcTemplate.update(
- "UPDATE pets SET name=:name, birth_date=:birth_date, type_id=:type_id, " +
- "owner_id=:owner_id WHERE id=:id",
- createPetParameterSource(pet));
+ "UPDATE pets SET name=:name, birth_date=:birth_date, type_id=:type_id, " +
+ "owner_id=:owner_id WHERE id=:id",
+ createPetParameterSource(pet));
}
}
@@ -123,11 +123,11 @@ public class JdbcPetRepositoryImpl implements PetRepository {
*/
private MapSqlParameterSource createPetParameterSource(Pet pet) {
return new MapSqlParameterSource()
- .addValue("id", pet.getId())
- .addValue("name", pet.getName())
- .addValue("birth_date", pet.getBirthDate().toDate())
- .addValue("type_id", pet.getType().getId())
- .addValue("owner_id", pet.getOwner().getId());
+ .addValue("id", pet.getId())
+ .addValue("name", pet.getName())
+ .addValue("birth_date", pet.getBirthDate().toDate())
+ .addValue("type_id", pet.getType().getId())
+ .addValue("owner_id", pet.getOwner().getId());
}
}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetVisitExtractor.java b/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetVisitExtractor.java
index c40786d937e21973c4bb593afa5021b43f89d5ad..6a4ba62c3e4c0143ec374c6814eb4905889a253c 100644
--- a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetVisitExtractor.java
+++ b/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetVisitExtractor.java
@@ -27,7 +27,7 @@ import java.sql.SQLException;
* {@link OneToManyResultSetExtractor} of Spring Data Core JDBC Extensions.
*/
public class JdbcPetVisitExtractor extends
- OneToManyResultSetExtractor<JdbcPet, Visit, Integer> {
+ OneToManyResultSetExtractor<JdbcPet, Visit, Integer> {
public JdbcPetVisitExtractor() {
super(new JdbcPetRowMapper(), new JdbcVisitRowMapper());
@@ -51,4 +51,4 @@ public class JdbcPetVisitExtractor extends
protected void addChild(JdbcPet root, Visit child) {
root.addVisit(child);
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVetRepositoryImpl.java b/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVetRepositoryImpl.java
index 79db917f9c6cf7416d38f2e5d0ee9532b7b00e17..0231275c1ca4a757b227e7aebe32d89b7676f882 100644
--- a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVetRepositoryImpl.java
+++ b/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVetRepositoryImpl.java
@@ -60,25 +60,25 @@ public class JdbcVetRepositoryImpl implements VetRepository {
List<Vet> vets = new ArrayList<>();
// Retrieve the list of all vets.
vets.addAll(this.jdbcTemplate.query(
- "SELECT id, first_name, last_name FROM vets ORDER BY last_name,first_name",
- BeanPropertyRowMapper.newInstance(Vet.class)));
+ "SELECT id, first_name, last_name FROM vets ORDER BY last_name,first_name",
+ BeanPropertyRowMapper.newInstance(Vet.class)));
// Retrieve the list of all possible specialties.
final List<Specialty> specialties = this.jdbcTemplate.query(
- "SELECT id, name FROM specialties",
- BeanPropertyRowMapper.newInstance(Specialty.class));
+ "SELECT id, name FROM specialties",
+ BeanPropertyRowMapper.newInstance(Specialty.class));
// Build each vet's list of specialties.
for (Vet vet : vets) {
final List<Integer> vetSpecialtiesIds = this.jdbcTemplate.query(
- "SELECT specialty_id FROM vet_specialties WHERE vet_id=?",
- new BeanPropertyRowMapper<Integer>() {
- @Override
- public Integer mapRow(ResultSet rs, int row) throws SQLException {
- return rs.getInt(1);
- }
- },
- vet.getId());
+ "SELECT specialty_id FROM vet_specialties WHERE vet_id=?",
+ new BeanPropertyRowMapper<Integer>() {
+ @Override
+ public Integer mapRow(ResultSet rs, int row) throws SQLException {
+ return rs.getInt(1);
+ }
+ },
+ vet.getId());
for (int specialtyId : vetSpecialtiesIds) {
Specialty specialty = EntityUtils.getById(specialties, Specialty.class, specialtyId);
vet.addSpecialty(specialty);
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRepositoryImpl.java b/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRepositoryImpl.java
index a923b7652bd14d26b55835224e82b793f6932890..330ca1a4c8e4c96946cc25dc0fad2030829f0453 100644
--- a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRepositoryImpl.java
+++ b/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRepositoryImpl.java
@@ -50,8 +50,8 @@ public class JdbcVisitRepositoryImpl implements VisitRepository {
this.jdbcTemplate = new JdbcTemplate(dataSource);
this.insertVisit = new SimpleJdbcInsert(dataSource)
- .withTableName("visits")
- .usingGeneratedKeyColumns("id");
+ .withTableName("visits")
+ .usingGeneratedKeyColumns("id");
}
@@ -59,7 +59,7 @@ public class JdbcVisitRepositoryImpl implements VisitRepository {
public void save(Visit visit) throws DataAccessException {
if (visit.isNew()) {
Number newKey = this.insertVisit.executeAndReturnKey(
- createVisitParameterSource(visit));
+ createVisitParameterSource(visit));
visit.setId(newKey.intValue());
} else {
throw new UnsupportedOperationException("Visit update not supported");
@@ -72,17 +72,17 @@ public class JdbcVisitRepositoryImpl implements VisitRepository {
*/
private MapSqlParameterSource createVisitParameterSource(Visit visit) {
return new MapSqlParameterSource()
- .addValue("id", visit.getId())
- .addValue("visit_date", visit.getDate().toDate())
- .addValue("description", visit.getDescription())
- .addValue("pet_id", visit.getPet().getId());
+ .addValue("id", visit.getId())
+ .addValue("visit_date", visit.getDate().toDate())
+ .addValue("description", visit.getDescription())
+ .addValue("pet_id", visit.getPet().getId());
}
@Override
public List<Visit> findByPetId(Integer petId) {
return this.jdbcTemplate.query(
- "SELECT id as visit_id, visit_date, description FROM visits WHERE pet_id=?",
- new JdbcVisitRowMapper(), petId);
+ "SELECT id as visit_id, visit_date, description FROM visits WHERE pet_id=?",
+ new JdbcVisitRowMapper(), petId);
}
}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/package-info.java b/src/main/java/org/springframework/samples/petclinic/repository/jdbc/package-info.java
index edd0bf8556db17249a465d2a7541dc7b7772b08c..376da279fd44f4839e7528fce7359232a69ac9ca 100644
--- a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/package-info.java
+++ b/src/main/java/org/springframework/samples/petclinic/repository/jdbc/package-info.java
@@ -1,9 +1,6 @@
-
/**
- *
* The classes in this package represent the JDBC implementation
* of PetClinic's persistence layer.
- *
*/
package org.springframework.samples.petclinic.repository.jdbc;
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaOwnerRepositoryImpl.java b/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaOwnerRepositoryImpl.java
index c7398df5ba5f66aef52d4ced953a4396746346bd..3972dd349b627e7543d39c77ae233957843ed4bb 100644
--- a/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaOwnerRepositoryImpl.java
+++ b/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaOwnerRepositoryImpl.java
@@ -43,7 +43,7 @@ public class JpaOwnerRepositoryImpl implements OwnerRepository {
/**
- * Important: in the current version of this method, we load Owners with all their Pets and Visits while
+ * Important: in the current version of this method, we load Owners with all their Pets and Visits while
* we do not need Visits at all and we only need one property from the Pet objects (the 'name' property).
* There are some ways to improve it such as:
* - creating a Ligtweight class (example here: https://community.jboss.org/wiki/LightweightClass)
@@ -70,12 +70,11 @@ public class JpaOwnerRepositoryImpl implements OwnerRepository {
@Override
public void save(Owner owner) {
- if (owner.getId() == null) {
- this.em.persist(owner);
- }
- else {
- this.em.merge(owner);
- }
+ if (owner.getId() == null) {
+ this.em.persist(owner);
+ } else {
+ this.em.merge(owner);
+ }
}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaPetRepositoryImpl.java b/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaPetRepositoryImpl.java
index 84d564da454754d008be973afdc2b5fcede04234..227140d96c1bd1da23857446a88dfd16ff38d327 100644
--- a/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaPetRepositoryImpl.java
+++ b/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaPetRepositoryImpl.java
@@ -53,12 +53,11 @@ public class JpaPetRepositoryImpl implements PetRepository {
@Override
public void save(Pet pet) {
- if (pet.getId() == null) {
- this.em.persist(pet);
- }
- else {
- this.em.merge(pet);
- }
+ if (pet.getId() == null) {
+ this.em.persist(pet);
+ } else {
+ this.em.merge(pet);
+ }
}
}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaVisitRepositoryImpl.java b/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaVisitRepositoryImpl.java
index 3415def96e1d5c5c554800bb074d003254a7e579..5d1d42a07c31f74770baf53004b142b563a4299c 100644
--- a/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaVisitRepositoryImpl.java
+++ b/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaVisitRepositoryImpl.java
@@ -45,12 +45,11 @@ public class JpaVisitRepositoryImpl implements VisitRepository {
@Override
public void save(Visit visit) {
- if (visit.getId() == null) {
- this.em.persist(visit);
- }
- else {
- this.em.merge(visit);
- }
+ if (visit.getId() == null) {
+ this.em.persist(visit);
+ } else {
+ this.em.merge(visit);
+ }
}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jpa/package-info.java b/src/main/java/org/springframework/samples/petclinic/repository/jpa/package-info.java
index 13c8552edadc140e29bd443e7315c1824d79e70a..087dc15b6630c14887561b1dc325487fceb609e4 100644
--- a/src/main/java/org/springframework/samples/petclinic/repository/jpa/package-info.java
+++ b/src/main/java/org/springframework/samples/petclinic/repository/jpa/package-info.java
@@ -1,9 +1,6 @@
-
/**
- *
* The classes in this package represent the JPA implementation
* of PetClinic's persistence layer.
- *
*/
package org.springframework.samples.petclinic.repository.jpa;
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataOwnerRepository.java b/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataOwnerRepository.java
index ca1f709f6f05dba01f07c93ab5128b5e733a9108..24c573eb7d4fe0c0a9ebf50cd8c882b7b46f7a26 100644
--- a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataOwnerRepository.java
+++ b/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataOwnerRepository.java
@@ -30,12 +30,12 @@ import org.springframework.samples.petclinic.repository.OwnerRepository;
* @since 15.1.2013
*/
public interface SpringDataOwnerRepository extends OwnerRepository, Repository<Owner, Integer> {
-
- @Override
- @Query("SELECT DISTINCT owner FROM Owner owner left join fetch owner.pets WHERE owner.lastName LIKE :lastName%")
- public Collection<Owner> findByLastName(@Param("lastName") String lastName);
-
- @Override
- @Query("SELECT owner FROM Owner owner left join fetch owner.pets WHERE owner.id =:id")
- public Owner findById(@Param("id") int id);
+
+ @Override
+ @Query("SELECT DISTINCT owner FROM Owner owner left join fetch owner.pets WHERE owner.lastName LIKE :lastName%")
+ public Collection<Owner> findByLastName(@Param("lastName") String lastName);
+
+ @Override
+ @Query("SELECT owner FROM Owner owner left join fetch owner.pets WHERE owner.id =:id")
+ public Owner findById(@Param("id") int id);
}
diff --git a/src/main/java/org/springframework/samples/petclinic/util/CallMonitoringAspect.java b/src/main/java/org/springframework/samples/petclinic/util/CallMonitoringAspect.java
index 494d6503ebaa1ecade4b2303aaf429f001fd4838..fddf17dfae2b12d9bfc0a31f6a859a57aba57739 100644
--- a/src/main/java/org/springframework/samples/petclinic/util/CallMonitoringAspect.java
+++ b/src/main/java/org/springframework/samples/petclinic/util/CallMonitoringAspect.java
@@ -26,8 +26,8 @@ import org.springframework.util.StopWatch;
/**
* Simple aspect that monitors call count and call invocation time. It uses JMX annotations and therefore can be
* monitored using any JMX console such as the jConsole
- *
- * This is only useful if you use JPA or JDBC. Spring-data-jpa doesn't have any correctly annotated classes to join on
+ * <p/>
+ * This is only useful if you use JPA or JDBC. Spring-data-jpa doesn't have any correctly annotated classes to join on
*
* @author Rob Harrop
* @author Juergen Hoeller
@@ -44,15 +44,14 @@ public class CallMonitoringAspect {
private long accumulatedCallTime = 0;
-
@ManagedAttribute
- public void setEnabled(boolean enabled) {
- this.enabled = enabled;
+ public boolean isEnabled() {
+ return enabled;
}
@ManagedAttribute
- public boolean isEnabled() {
- return enabled;
+ public void setEnabled(boolean enabled) {
+ this.enabled = enabled;
}
@ManagedOperation
@@ -68,10 +67,10 @@ public class CallMonitoringAspect {
@ManagedAttribute
public long getCallTime() {
- if (this.callCount > 0)
- return this.accumulatedCallTime / this.callCount;
- else
- return 0;
+ if (this.callCount > 0)
+ return this.accumulatedCallTime / this.callCount;
+ else
+ return 0;
}
diff --git a/src/main/java/org/springframework/samples/petclinic/util/EntityUtils.java b/src/main/java/org/springframework/samples/petclinic/util/EntityUtils.java
index 41486a5a76d25eb5813a86174e0dd79bf503ab07..eee3906945378e83dafa8099deabd0e6aa31359f 100644
--- a/src/main/java/org/springframework/samples/petclinic/util/EntityUtils.java
+++ b/src/main/java/org/springframework/samples/petclinic/util/EntityUtils.java
@@ -39,11 +39,10 @@ public abstract class EntityUtils {
* @param entityClass the entity class to look up
* @param entityId the entity id to look up
* @return the found entity
- * @throws ObjectRetrievalFailureException
- * if the entity was not found
+ * @throws ObjectRetrievalFailureException if the entity was not found
*/
public static <T extends BaseEntity> T getById(Collection<T> entities, Class<T> entityClass, int entityId)
- throws ObjectRetrievalFailureException {
+ throws ObjectRetrievalFailureException {
for (T entity : entities) {
if (entity.getId() == entityId && entityClass.isInstance(entity)) {
return entity;
diff --git a/src/main/java/org/springframework/samples/petclinic/web/CrashController.java b/src/main/java/org/springframework/samples/petclinic/web/CrashController.java
index e413f3f3b8c73c3ed4931447dc123d419ab998c6..29c55c1c03ab315555e16f4b9d9dba1ae672d1be 100644
--- a/src/main/java/org/springframework/samples/petclinic/web/CrashController.java
+++ b/src/main/java/org/springframework/samples/petclinic/web/CrashController.java
@@ -33,7 +33,7 @@ public class CrashController {
@RequestMapping(value = "/oups", method = RequestMethod.GET)
public String triggerException() {
throw new RuntimeException("Expected: controller used to showcase what " +
- "happens when an exception is thrown");
+ "happens when an exception is thrown");
}
diff --git a/src/main/java/org/springframework/samples/petclinic/web/OwnerController.java b/src/main/java/org/springframework/samples/petclinic/web/OwnerController.java
index 9f2ffb05cb78cee426767c9f9c40262157acf0a6..4b54e0f9b26cfa3aca1c17e5993994d7334f2eeb 100644
--- a/src/main/java/org/springframework/samples/petclinic/web/OwnerController.java
+++ b/src/main/java/org/springframework/samples/petclinic/web/OwnerController.java
@@ -96,19 +96,17 @@ public class OwnerController {
// no owners found
result.rejectValue("lastName", "notFound", "not found");
return "owners/findOwners";
- }
- else if (results.size() == 1) {
- // 1 owner found
- owner = results.iterator().next();
- return "redirect:/owners/" + owner.getId();
- }
- else {
+ } else if (results.size() == 1) {
+ // 1 owner found
+ owner = results.iterator().next();
+ return "redirect:/owners/" + owner.getId();
+ } else {
// multiple owners found
model.put("selections", results);
return "owners/ownersList";
}
}
-
+
@RequestMapping(value = "/owners/{ownerId}/edit", method = RequestMethod.GET)
public String initUpdateOwnerForm(@PathVariable("ownerId") int ownerId, Model model) {
Owner owner = this.clinicService.findOwnerById(ownerId);
diff --git a/src/main/java/org/springframework/samples/petclinic/web/PetValidator.java b/src/main/java/org/springframework/samples/petclinic/web/PetValidator.java
index 5784278b964516aa8925c08fd9dd38b40b99c9a9..3aefb024ee07f043694cfb8c5800fbfc946a1033 100644
--- a/src/main/java/org/springframework/samples/petclinic/web/PetValidator.java
+++ b/src/main/java/org/springframework/samples/petclinic/web/PetValidator.java
@@ -41,14 +41,14 @@ public class PetValidator implements Validator {
} else if (pet.isNew() && pet.getOwner().getPet(name, true) != null) {
errors.rejectValue("name", "duplicate", "already exists");
}
-
+
// type validation
if (pet.isNew() && pet.getType() == null) {
errors.rejectValue("type", "required", "required");
}
-
+
// birth date validation
- if (pet.getBirthDate()==null) {
+ if (pet.getBirthDate() == null) {
errors.rejectValue("birthDate", "required", "required");
}
}
diff --git a/src/main/java/org/springframework/samples/petclinic/web/VetController.java b/src/main/java/org/springframework/samples/petclinic/web/VetController.java
index ebbb8d6e277b08f0d0e0be994fa2a7bb90c3aa18..3121e60e8bc6f20a675237ca830b18911b6056e7 100644
--- a/src/main/java/org/springframework/samples/petclinic/web/VetController.java
+++ b/src/main/java/org/springframework/samples/petclinic/web/VetController.java
@@ -41,19 +41,21 @@ public class VetController {
this.clinicService = clinicService;
}
- @RequestMapping(value={"/vets.xml","/vets.html"})
+ @RequestMapping(value = {"/vets.xml", "/vets.html"})
public String showVetList(Map<String, Object> model) {
- // Here we are returning an object of type 'Vets' rather than a collection of Vet objects
+ // Here we are returning an object of type 'Vets' rather than a collection of Vet objects
// so it is simpler for Object-Xml mapping
Vets vets = new Vets();
vets.getVetList().addAll(this.clinicService.findVets());
model.put("vets", vets);
return "vets/vetList";
}
-
+
@RequestMapping("/vets.json")
- public @ResponseBody Vets showResourcesVetList() {
- // Here we are returning an object of type 'Vets' rather than a collection of Vet objects
+ public
+ @ResponseBody
+ Vets showResourcesVetList() {
+ // Here we are returning an object of type 'Vets' rather than a collection of Vet objects
// so it is simpler for JSon/Object mapping
Vets vets = new Vets();
vets.getVetList().addAll(this.clinicService.findVets());
diff --git a/src/main/java/org/springframework/samples/petclinic/web/VisitController.java b/src/main/java/org/springframework/samples/petclinic/web/VisitController.java
index f3f6f3ffb54811245c6776daafb53c612a6a4b01..144eba2d9d078bd13cb6b73a75dca4f93057e622 100644
--- a/src/main/java/org/springframework/samples/petclinic/web/VisitController.java
+++ b/src/main/java/org/springframework/samples/petclinic/web/VisitController.java
@@ -53,13 +53,14 @@ public class VisitController {
public void setAllowedFields(WebDataBinder dataBinder) {
dataBinder.setDisallowedFields("id");
}
-
+
/**
- * Called before each and every @RequestMapping annotated method.
- * 2 goals:
- * - Make sure we always have fresh data
- * - Since we do not use the session scope, make sure that Pet object always has an id
- * (Even though id is not part of the form fields)
+ * Called before each and every @RequestMapping annotated method.
+ * 2 goals:
+ * - Make sure we always have fresh data
+ * - Since we do not use the session scope, make sure that Pet object always has an id
+ * (Even though id is not part of the form fields)
+ *
* @param petId
* @return Pet
*/
@@ -67,17 +68,17 @@ public class VisitController {
public Visit loadPetWithVisit(@PathVariable("petId") int petId) {
Pet pet = this.clinicService.findPetById(petId);
Visit visit = new Visit();
- pet.addVisit(visit);
+ pet.addVisit(visit);
return visit;
}
- // Spring MVC calls method loadPetWithVisit(...) before initNewVisitForm is called
+ // Spring MVC calls method loadPetWithVisit(...) before initNewVisitForm is called
@RequestMapping(value = "/owners/*/pets/{petId}/visits/new", method = RequestMethod.GET)
public String initNewVisitForm(@PathVariable("petId") int petId, Map<String, Object> model) {
return "pets/createOrUpdateVisitForm";
}
- // Spring MVC calls method loadPetWithVisit(...) before processNewVisitForm is called
+ // Spring MVC calls method loadPetWithVisit(...) before processNewVisitForm is called
@RequestMapping(value = "/owners/{ownerId}/pets/{petId}/visits/new", method = RequestMethod.POST)
public String processNewVisitForm(@Valid Visit visit, BindingResult result) {
if (result.hasErrors()) {
diff --git a/src/main/java/org/springframework/samples/petclinic/web/package-info.java b/src/main/java/org/springframework/samples/petclinic/web/package-info.java
index c909ccf7f046b781d90619e48754247afe2fed18..ca189f19a84103f78825b670f5267813861139f7 100644
--- a/src/main/java/org/springframework/samples/petclinic/web/package-info.java
+++ b/src/main/java/org/springframework/samples/petclinic/web/package-info.java
@@ -1,8 +1,5 @@
-
/**
- *
* The classes in this package represent PetClinic's web presentation layer.
- *
*/
package org.springframework.samples.petclinic.web;
diff --git a/src/main/java/test.html b/src/main/java/test.html
index 9a7a99675f40430526615532bd0c96e53ed2217b..8c5cb2cf3e7511536521ec6e8eadd82c198264e0 100644
--- a/src/main/java/test.html
+++ b/src/main/java/test.html
@@ -1,39 +1,53 @@
<head>
- <style type="text/css">
- table.speakersTable {
- width: 70%;
- padding: 10;
- spacing: 10;
- }
-
- img.speakerPic {
- float: right;
- padding:10;
- width: 90;
- }
- </style>
+ <style type="text/css">
+ table.speakersTable {
+ width: 70%;
+ padding: 10;
+ spacing: 10;
+ }
+
+ img.speakerPic {
+ float: right;
+ padding: 10;
+ width: 90;
+ }
+ </style>
</head>
<h1>Organisation</h1>
<h1>Speakers</h1>
<table class="speakersTable">
-<tbody>
-<tr>
- <td>
- <img class="speakerPic" alt="Sergiu Bodiu" src="http://m.c.lnkd.licdn.com/mpr/mpr/shrink_200_200/p/4/000/16a/2ba/0ba653e.jpg" />
- <h2>Sergiu Bodiu </h2>
- <h3> Java Consultant at Bank of America </h3>
- <font size="5">S</font>easoned consultant experienced in large-scale e-commerce projects, passionate about providing innovative technology solutions to solve complex business problems, have extensive knowledge and experience delivering enterprise wide applications. He is skilled in software design, data modeling, stakeholder management, IT strategic planning, technical know-how and security. Able to design, implement, test and maintain software product components with strong focus on design elegance and software reuse.
- </td>
-</tr>
-<tr>
- <td>
- <img alt="Sergiu Bodiu" src="http://m.c.lnkd.licdn.com/mpr/mpr/shrink_200_200/p/4/000/16a/2ba/0ba653e.jpg" width="84" height="84" align="right" hspace="10"/>
- <h2>Sergiu Bodiu </h2>
- <h3> Java Consultant at Bank of America </h3>
- <font size="5">S</font>easoned consultant experienced in large-scale e-commerce projects, passionate about providing innovative technology solutions to solve complex business problems, have extensive knowledge and experience delivering enterprise wide applications. He is skilled in software design, data modeling, stakeholder management, IT strategic planning, technical know-how and security. Able to design, implement, test and maintain software product components with strong focus on design elegance and software reuse.
- </td>
-</tr>
-</tbody>
+ <tbody>
+ <tr>
+ <td>
+ <img class="speakerPic" alt="Sergiu Bodiu"
+ src="http://m.c.lnkd.licdn.com/mpr/mpr/shrink_200_200/p/4/000/16a/2ba/0ba653e.jpg"/>
+
+ <h2>Sergiu Bodiu </h2>
+
+ <h3> Java Consultant at Bank of America </h3>
+ <font size="5">S</font>easoned consultant experienced in large-scale e-commerce projects, passionate about
+ providing innovative technology solutions to solve complex business problems, have extensive knowledge and
+ experience delivering enterprise wide applications. He is skilled in software design, data modeling,
+ stakeholder management, IT strategic planning, technical know-how and security. Able to design, implement,
+ test and maintain software product components with strong focus on design elegance and software reuse.
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <img alt="Sergiu Bodiu" src="http://m.c.lnkd.licdn.com/mpr/mpr/shrink_200_200/p/4/000/16a/2ba/0ba653e.jpg"
+ width="84" height="84" align="right" hspace="10"/>
+
+ <h2>Sergiu Bodiu </h2>
+
+ <h3> Java Consultant at Bank of America </h3>
+ <font size="5">S</font>easoned consultant experienced in large-scale e-commerce projects, passionate about
+ providing innovative technology solutions to solve complex business problems, have extensive knowledge and
+ experience delivering enterprise wide applications. He is skilled in software design, data modeling,
+ stakeholder management, IT strategic planning, technical know-how and security. Able to design, implement,
+ test and maintain software product components with strong focus on design elegance and software reuse.
+ </td>
+ </tr>
+ </tbody>
</table>
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index 830ef37debf91155f1270fd59f6212cd320008a8..ba2b5146390a17cfd894c07bab24f85d4f0bfc21 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -16,9 +16,9 @@
</encoder>
</appender>
- <!--<logger name="org.hibernate" level="debug"/> -->
+ <!--<logger name="org.hibernate" level="debug"/> -->
<logger name="org.springframework.samples.petclinic" level="debug"/>
-
+
<root level="info">
<appender-ref ref="console"/>
</root>
diff --git a/src/main/resources/spring/business-config.xml b/src/main/resources/spring/business-config.xml
index 99cf4c1d30949d713d253a70f44696e0e186a5f4..a029c45ab15fdca789e46dada690850c8071310e 100644
--- a/src/main/resources/spring/business-config.xml
+++ b/src/main/resources/spring/business-config.xml
@@ -2,36 +2,36 @@
<!--
Repository and Service layers
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:p="http://www.springframework.org/schema/p" xmlns:context="http://www.springframework.org/schema/context"
- xmlns:tx="http://www.springframework.org/schema/tx" xmlns:jpa="http://www.springframework.org/schema/data/jpa"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:context="http://www.springframework.org/schema/context" xmlns:tx="http://www.springframework.org/schema/tx"
+ xmlns:jpa="http://www.springframework.org/schema/data/jpa" xmlns="http://www.springframework.org/schema/beans"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa.xsd
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
-
+
<!-- ========================= RESOURCE DEFINITIONS ========================= -->
<!-- import the dataSource definition -->
<import resource="datasource-config.xml"/>
<context:component-scan
- base-package="org.springframework.samples.petclinic.service"/>
+ base-package="org.springframework.samples.petclinic.service"/>
<!-- Configurer that replaces ${...} placeholders with values from a properties file -->
<!-- (in this case, JDBC-related settings for the JPA EntityManager definition below) -->
<context:property-placeholder location="classpath:spring/data-access.properties" system-properties-mode="OVERRIDE"/>
- <!-- enables scanning for @Transactional annotations -->
- <tx:annotation-driven />
-
-
- <!-- ================== 3 Profiles to choose from ===================
- - jdbc (uses Spring" JdbcTemplate)
- - jpa
- - spring-data-jpa
- =============================================================================-->
-
+ <!-- enables scanning for @Transactional annotations -->
+ <tx:annotation-driven/>
+
+
+ <!-- ================== 3 Profiles to choose from ===================
+ - jdbc (uses Spring" JdbcTemplate)
+ - jpa
+ - spring-data-jpa
+ =============================================================================-->
+
<beans profile="jpa,spring-data-jpa">
<!-- JPA EntityManagerFactory -->
<bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean"
@@ -42,7 +42,7 @@
<!-- the 'database' parameter refers to the database dialect being used.
By default, Hibernate will use a 'HSQL' dialect because 'jpa.database' has been set to 'HSQL'
inside file spring/data-access.properties
-
+
-->
</property>
<!-- gDickens: BOTH Persistence Unit and Packages to Scan are NOT compatible, persistenceUnit will win -->
@@ -93,4 +93,4 @@
<beans profile="spring-data-jpa">
<jpa:repositories base-package="org.springframework.samples.petclinic.repository.springdatajpa"/>
</beans>
-</beans>
\ No newline at end of file
+</beans>
diff --git a/src/main/resources/spring/datasource-config.xml b/src/main/resources/spring/datasource-config.xml
index f74129963b5d156a54ee85e790d26a8519bfde36..aa705de14d7bf3a29fc9b73e1cd6977cbcafe588 100644
--- a/src/main/resources/spring/datasource-config.xml
+++ b/src/main/resources/spring/datasource-config.xml
@@ -2,11 +2,11 @@
<!--
Application context definition for PetClinic Datasource.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:p="http://www.springframework.org/schema/p"
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:jdbc="http://www.springframework.org/schema/jdbc"
xmlns:jee="http://www.springframework.org/schema/jee"
+ xmlns="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
@@ -36,8 +36,8 @@
<jdbc:script location="${jdbc.dataLocation}"/>
</jdbc:initialize-database>
- <beans profile="javaee" >
+ <beans profile="javaee">
<!-- JNDI DataSource for JEE environments -->
<jee:jndi-lookup id="dataSource" jndi-name="java:comp/env/jdbc/petclinic"/>
</beans>
-</beans>
\ No newline at end of file
+</beans>
diff --git a/src/main/resources/spring/mvc-core-config.xml b/src/main/resources/spring/mvc-core-config.xml
index eab2062dc33a146931cc6f9fcef89a67e45bddc4..641ea44087b8af9b40f05f51c8e79813eb71b1d1 100644
--- a/src/main/resources/spring/mvc-core-config.xml
+++ b/src/main/resources/spring/mvc-core-config.xml
@@ -2,11 +2,11 @@
<!--
- DispatcherServlet application context for PetClinic's web tier.
-->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:p="http://www.springframework.org/schema/p"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:mvc="http://www.springframework.org/schema/mvc"
+ xmlns="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/mvc
http://www.springframework.org/schema/mvc/spring-mvc.xsd
http://www.springframework.org/schema/beans
@@ -20,7 +20,7 @@
- POJOs labeled with the @Controller and @Service annotations are auto-detected.
-->
<context:component-scan
- base-package="org.springframework.samples.petclinic.web"/>
+ base-package="org.springframework.samples.petclinic.web"/>
<mvc:annotation-driven conversion-service="conversionService"/>
@@ -31,11 +31,11 @@
<!-- uses WebJars so Javascript and CSS libs can be declared as Maven dependencies (Bootstrap, jQuery...) -->
<mvc:resources mapping="/webjars/**" location="classpath:/META-INF/resources/webjars/"/>
- <mvc:view-controller path="/" view-name="welcome" />
+ <mvc:view-controller path="/" view-name="welcome"/>
- <!-- serve static resources (*.html, ...) from src/main/webapp/
+ <!-- serve static resources (*.html, ...) from src/main/webapp/
Required when both servlet-mapping is '/' and static resources need to be served -->
- <mvc:default-servlet-handler />
+ <mvc:default-servlet-handler/>
<bean id="conversionService" class="org.springframework.format.support.FormattingConversionServiceFactoryBean">
<property name="formatters">
@@ -53,7 +53,7 @@
p:basename="messages/messages"/>
<!--
- - This bean resolves specific types of exceptions to corresponding logical
+ - This bean resolves specific types of exceptions to corresponding logical
- view names for error views.
-->
<bean class="org.springframework.web.servlet.handler.SimpleMappingExceptionResolver">
diff --git a/src/main/resources/spring/mvc-view-config.xml b/src/main/resources/spring/mvc-view-config.xml
index 309707cf1529b6d88f6c62af5868b5ed93f1e84f..9ba6723c520c288c919e89db7ce5ffd4cb83f525 100644
--- a/src/main/resources/spring/mvc-view-config.xml
+++ b/src/main/resources/spring/mvc-view-config.xml
@@ -2,9 +2,9 @@
<!--
- DispatcherServlet application context for PetClinic's web tier.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:oxm="http://www.springframework.org/schema/oxm" xmlns:mvc="http://www.springframework.org/schema/mvc"
- xsi:schemaLocation="http://www.springframework.org/schema/oxm http://www.springframework.org/schema/oxm/spring-oxm.xsd
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:oxm="http://www.springframework.org/schema/oxm"
+ xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns="http://www.springframework.org/schema/beans"
+ xsi:schemaLocation="http://www.springframework.org/schema/oxm http://www.springframework.org/schema/oxm/spring-oxm.xsd
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<!--
@@ -13,19 +13,19 @@
- When the media type is 'text/html', it will delegate to the InternalResourceViewResolver's JstlView,
- otherwise to the BeanNameViewResolver.
-->
- <mvc:view-resolvers>
- <mvc:content-negotiation use-not-acceptable="true">
- <mvc:default-views>
- <bean class="org.springframework.web.servlet.view.JstlView">
- <property name="url" value="" />
- </bean>
- </mvc:default-views>
- </mvc:content-negotiation>
-
- <!-- Registering BeanNameViewResolver and InternalViewResolver -->
- <mvc:bean-name />
- <mvc:jsp prefix="/WEB-INF/jsp/" suffix=".jsp"/>
- </mvc:view-resolvers>
+ <mvc:view-resolvers>
+ <mvc:content-negotiation use-not-acceptable="true">
+ <mvc:default-views>
+ <bean class="org.springframework.web.servlet.view.JstlView">
+ <property name="url" value=""/>
+ </bean>
+ </mvc:default-views>
+ </mvc:content-negotiation>
+
+ <!-- Registering BeanNameViewResolver and InternalViewResolver -->
+ <mvc:bean-name/>
+ <mvc:jsp prefix="/WEB-INF/jsp/" suffix=".jsp"/>
+ </mvc:view-resolvers>
<!-- Renders an XML view. Used by the BeanNameViewResolver -->
<bean id="vets/vetList.xml" class="org.springframework.web.servlet.view.xml.MarshallingView">
diff --git a/src/main/resources/spring/tools-config.xml b/src/main/resources/spring/tools-config.xml
index 1be7e3b6c75287ccac316bf3e32e0532258a5649..61db5e57dbd1b249dcfd190bd342b93540c94772 100644
--- a/src/main/resources/spring/tools-config.xml
+++ b/src/main/resources/spring/tools-config.xml
@@ -2,11 +2,11 @@
<!--
Application context definition for PetClinic on JPA.
-->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:aop="http://www.springframework.org/schema/aop"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:cache="http://www.springframework.org/schema/cache"
+ xmlns="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/aop
http://www.springframework.org/schema/aop/spring-aop.xsd
http://www.springframework.org/schema/beans
@@ -46,4 +46,4 @@
</bean>
-</beans>
\ No newline at end of file
+</beans>
diff --git a/src/main/webapp/WEB-INF/jsp/exception.jsp b/src/main/webapp/WEB-INF/jsp/exception.jsp
index 876fb04a3f3ed19eb297fe74a8aa2bae4db771fb..3d7ef0b01a92060768fa722fdf1158906135a428 100644
--- a/src/main/webapp/WEB-INF/jsp/exception.jsp
+++ b/src/main/webapp/WEB-INF/jsp/exception.jsp
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
diff --git a/src/main/webapp/WEB-INF/jsp/fragments/bodyHeader.jsp b/src/main/webapp/WEB-INF/jsp/fragments/bodyHeader.jsp
index 207a5b72710db9994207489ed8fdb4406913abec..3cb66aa25590e7a4537cc77a4ed097735019022d 100644
--- a/src/main/webapp/WEB-INF/jsp/fragments/bodyHeader.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fragments/bodyHeader.jsp
@@ -14,7 +14,7 @@
<li style="width: 160px;"><a href="<spring:url value="/vets.html" htmlEscape="true" />"><i
class="icon-th-list"></i> Veterinarians</a></li>
<li style="width: 110px;"><a href="<spring:url value="/oups.html" htmlEscape="true" />"
- title="trigger a RuntimeException to see how it is handled"><i
+ title="trigger a RuntimeException to see how it is handled"><i
class="icon-warning-sign"></i> Error</a></li>
</ul>
</div>
diff --git a/src/main/webapp/WEB-INF/jsp/fragments/staticFiles.jsp b/src/main/webapp/WEB-INF/jsp/fragments/staticFiles.jsp
index f1eea21e63dac0106fc08523222b74b38d88066d..add28329ff2361d5f0a78f49ab2e42b8cb1f1dc3 100644
--- a/src/main/webapp/WEB-INF/jsp/fragments/staticFiles.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fragments/staticFiles.jsp
@@ -18,13 +18,13 @@ PetClinic :: a Spring Framework demonstration
<spring:url value="/webjars/jquery/2.0.3/jquery.js" var="jQuery"/>
<script src="${jQuery}"></script>
- <!-- jquery-ui.js file is really big so we only load what we need instead of loading everything -->
+ <!-- jquery-ui.js file is really big so we only load what we need instead of loading everything -->
<spring:url value="/webjars/jquery-ui/1.10.3/ui/jquery.ui.core.js" var="jQueryUiCore"/>
<script src="${jQueryUiCore}"></script>
- <spring:url value="/webjars/jquery-ui/1.10.3/ui/jquery.ui.datepicker.js" var="jQueryUiDatePicker"/>
+ <spring:url value="/webjars/jquery-ui/1.10.3/ui/jquery.ui.datepicker.js" var="jQueryUiDatePicker"/>
<script src="${jQueryUiDatePicker}"></script>
-
+
<!-- jquery-ui.css file is not that big so we can afford to load it -->
<spring:url value="/webjars/jquery-ui/1.10.3/themes/base/jquery-ui.css" var="jQueryUiCss"/>
<link href="${jQueryUiCss}" rel="stylesheet"></link>
diff --git a/src/main/webapp/WEB-INF/jsp/owners/createOrUpdateOwnerForm.jsp b/src/main/webapp/WEB-INF/jsp/owners/createOrUpdateOwnerForm.jsp
index a3cc2ade96a329900f3fe60af9b6c4846834c8e2..0086220ce94fd2654bd3de4b2d4155bd974ca32c 100644
--- a/src/main/webapp/WEB-INF/jsp/owners/createOrUpdateOwnerForm.jsp
+++ b/src/main/webapp/WEB-INF/jsp/owners/createOrUpdateOwnerForm.jsp
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
diff --git a/src/main/webapp/WEB-INF/jsp/owners/findOwners.jsp b/src/main/webapp/WEB-INF/jsp/owners/findOwners.jsp
index 91d2ebabccb0eb7bbbf07ebe637660a6f240c5df..662ac7ffdeda3662c612227a20dd896dff60df10 100644
--- a/src/main/webapp/WEB-INF/jsp/owners/findOwners.jsp
+++ b/src/main/webapp/WEB-INF/jsp/owners/findOwners.jsp
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
diff --git a/src/main/webapp/WEB-INF/jsp/owners/ownerDetails.jsp b/src/main/webapp/WEB-INF/jsp/owners/ownerDetails.jsp
index 4ace4ba23834449fa52a084aa3c4e2b2ea13f98b..e4a970a2c7acb4a900aa40bd87868af836ab1dd3 100644
--- a/src/main/webapp/WEB-INF/jsp/owners/ownerDetails.jsp
+++ b/src/main/webapp/WEB-INF/jsp/owners/ownerDetails.jsp
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
@@ -33,17 +33,17 @@
<th>Telephone</th>
<td><c:out value="${owner.telephone}"/></td>
</tr>
- <tr>
- <td>
- <spring:url value="{ownerId}/edit.html" var="editUrl">
+ <tr>
+ <td>
+ <spring:url value="{ownerId}/edit.html" var="editUrl">
<spring:param name="ownerId" value="${owner.id}"/>
</spring:url>
<a href="${fn:escapeXml(editUrl)}" class="btn btn-info">Edit Owner</a></td>
<td>
- <spring:url value="{ownerId}/pets/new.html" var="addUrl">
+ <spring:url value="{ownerId}/pets/new.html" var="addUrl">
<spring:param name="ownerId" value="${owner.id}"/>
</spring:url>
- <a href="${fn:escapeXml(addUrl)}" class="btn btn-success">Add New Pet</a></td>
+ <a href="${fn:escapeXml(addUrl)}" class="btn btn-success">Add New Pet</a></td>
</tr>
</table>
@@ -77,21 +77,21 @@
</tr>
</c:forEach>
<tr>
- <td>
- <spring:url value="/owners/{ownerId}/pets/{petId}/edit" var="petUrl">
- <spring:param name="ownerId" value="${owner.id}"/>
- <spring:param name="petId" value="${pet.id}"/>
- </spring:url>
- <a href="${fn:escapeXml(petUrl)}">Edit Pet</a>
- </td>
<td>
- <spring:url value="/owners/{ownerId}/pets/{petId}/visits/new" var="visitUrl">
- <spring:param name="ownerId" value="${owner.id}"/>
- <spring:param name="petId" value="${pet.id}"/>
- </spring:url>
- <a href="${fn:escapeXml(visitUrl)}">Add Visit</a>
+ <spring:url value="/owners/{ownerId}/pets/{petId}/edit" var="petUrl">
+ <spring:param name="ownerId" value="${owner.id}"/>
+ <spring:param name="petId" value="${pet.id}"/>
+ </spring:url>
+ <a href="${fn:escapeXml(petUrl)}">Edit Pet</a>
</td>
- </tr>
+ <td>
+ <spring:url value="/owners/{ownerId}/pets/{petId}/visits/new" var="visitUrl">
+ <spring:param name="ownerId" value="${owner.id}"/>
+ <spring:param name="petId" value="${pet.id}"/>
+ </spring:url>
+ <a href="${fn:escapeXml(visitUrl)}">Add Visit</a>
+ </td>
+ </tr>
</table>
</td>
</tr>
diff --git a/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp b/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp
index 5e8eaaaaa90a1bec637ba382981bcfa67307bc1b..68e4b0666ee96737bab4283a3dec4c1d69102dcb 100644
--- a/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
@@ -14,8 +14,8 @@
<div class="container">
<jsp:include page="../fragments/bodyHeader.jsp"/>
<h2>Owners</h2>
-
- <datatables:table id="owners" data="${selections}" row="owner" theme="bootstrap2"
+
+ <datatables:table id="owners" data="${selections}" row="owner" theme="bootstrap2"
cssClass="table table-striped" pageable="false" info="false" export="pdf">
<datatables:column title="Name" cssStyle="width: 150px;" display="html">
<spring:url value="/owners/{ownerId}.html" var="ownerUrl">
@@ -34,9 +34,9 @@
<c:out value="${pet.name}"/>
</c:forEach>
</datatables:column>
- <datatables:export type="pdf" cssClass="btn" cssStyle="height: 25px;" />
+ <datatables:export type="pdf" cssClass="btn" cssStyle="height: 25px;"/>
</datatables:table>
-
+
<jsp:include page="../fragments/footer.jsp"/>
</div>
diff --git a/src/main/webapp/WEB-INF/jsp/pets/createOrUpdatePetForm.jsp b/src/main/webapp/WEB-INF/jsp/pets/createOrUpdatePetForm.jsp
index a3d144135df3e133e6a393c1d4cf92d94991741a..387959b5d10fce1b6eb1c123a008ee8ab70e39d6 100644
--- a/src/main/webapp/WEB-INF/jsp/pets/createOrUpdatePetForm.jsp
+++ b/src/main/webapp/WEB-INF/jsp/pets/createOrUpdatePetForm.jsp
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
@@ -13,7 +13,7 @@
<script>
$(function () {
- $("#birthDate").datepicker({ dateFormat: 'yy/mm/dd'});
+ $("#birthDate").datepicker({dateFormat: 'yy/mm/dd'});
});
</script>
<div class="container">
diff --git a/src/main/webapp/WEB-INF/jsp/pets/createOrUpdateVisitForm.jsp b/src/main/webapp/WEB-INF/jsp/pets/createOrUpdateVisitForm.jsp
index 501a0d48e7582d4b9375d90d9214e69154d5b718..a5eb87fcd872cf1f12ca31e19b73d7a03f98b290 100644
--- a/src/main/webapp/WEB-INF/jsp/pets/createOrUpdateVisitForm.jsp
+++ b/src/main/webapp/WEB-INF/jsp/pets/createOrUpdateVisitForm.jsp
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
@@ -16,7 +16,7 @@
<body>
<script>
$(function () {
- $("#date").datepicker({ dateFormat: 'yy/mm/dd'});
+ $("#date").datepicker({dateFormat: 'yy/mm/dd'});
});
</script>
<div class="container">
@@ -42,10 +42,10 @@
</table>
<form:form modelAttribute="visit">
-
- <petclinic:inputField label="date" name="date" />
- <petclinic:inputField label="description" name="description" />
-
+
+ <petclinic:inputField label="date" name="date"/>
+ <petclinic:inputField label="description" name="description"/>
+
<div class="form-actions">
<input type="hidden" name="petId" value="${visit.pet.id}"/>
<button type="submit">Add Visit</button>
diff --git a/src/main/webapp/WEB-INF/jsp/vets/vetList.jsp b/src/main/webapp/WEB-INF/jsp/vets/vetList.jsp
index 040679c282df251b8c41b3ac446231c4098541ef..d2794718d807f609f15cf38ca32c86bae3335f49 100644
--- a/src/main/webapp/WEB-INF/jsp/vets/vetList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/vets/vetList.jsp
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
@@ -16,7 +16,8 @@
<h2>Veterinarians</h2>
- <datatables:table id="vets" data="${vets.vetList}" row="vet" theme="bootstrap2" cssClass="table table-striped" pageable="false" info="false">
+ <datatables:table id="vets" data="${vets.vetList}" row="vet" theme="bootstrap2" cssClass="table table-striped"
+ pageable="false" info="false">
<datatables:column title="Name">
<c:out value="${vet.firstName} ${vet.lastName}"></c:out>
</datatables:column>
@@ -27,7 +28,7 @@
<c:if test="${vet.nrOfSpecialties == 0}">none</c:if>
</datatables:column>
</datatables:table>
-
+
<table class="table-buttons">
<tr>
<td>
diff --git a/src/main/webapp/WEB-INF/jsp/welcome.jsp b/src/main/webapp/WEB-INF/jsp/welcome.jsp
index f33b84e5543e1ead9317ec43d277113aebb3ccb7..4bd4f767f85fa698ae6cdf1d648b8c748d3f7278 100644
--- a/src/main/webapp/WEB-INF/jsp/welcome.jsp
+++ b/src/main/webapp/WEB-INF/jsp/welcome.jsp
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index e699ca92d8e12576d4ef84c24b9b4789a60e4eda..ea965de257a930c0478136f72babfd8707a3bc5a 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -1,33 +1,33 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/javaee"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
version="3.0" metadata-complete="true">
<display-name>Spring PetClinic</display-name>
<description>Spring PetClinic sample application</description>
-
- <!-- When using Spring jpa, use the following: -->
+
+ <!-- When using Spring jpa, use the following: -->
<context-param>
<param-name>spring.profiles.active</param-name>
<param-value>jpa</param-value>
</context-param>
- <!-- When using Spring JDBC, use the following: -->
- <!-- <context-param>
- <param-name>spring.profiles.active</param-name>
- <param-value>jdbc</param-value>
- </context-param> -->
+ <!-- When using Spring JDBC, use the following: -->
+ <!-- <context-param>
+ <param-name>spring.profiles.active</param-name>
+ <param-value>jdbc</param-value>
+ </context-param> -->
- <!-- the CallMonitoringAspect counts invocations on classes with @Repository on them. Classes in spring-data-jpa don't have that annotation -->
- <!-- When using Spring Data JPA, uncomment the following: -->
- <!--
- <context-param>
- <param-name>spring.profiles.active</param-name>
- <param-value>spring-data-jpa</param-value>
- </context-param>
- -->
+ <!-- the CallMonitoringAspect counts invocations on classes with @Repository on them. Classes in spring-data-jpa don't have that annotation -->
+ <!-- When using Spring Data JPA, uncomment the following: -->
+ <!--
+ <context-param>
+ <param-name>spring.profiles.active</param-name>
+ <param-value>spring-data-jpa</param-value>
+ </context-param>
+ -->
<!--
- Location of the XML file that defines the root application context.
@@ -70,26 +70,26 @@
<servlet-name>dandelionServlet</servlet-name>
<url-pattern>/dandelion-assets/*</url-pattern>
</servlet-mapping>
-
- <!-- used to provide the ability to enter Chinese characters inside the Owner Form -->
+
+ <!-- used to provide the ability to enter Chinese characters inside the Owner Form -->
<filter>
- <filter-name>encodingFilter</filter-name>
- <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
- <init-param>
- <param-name>encoding</param-name>
- <param-value>UTF-8</param-value>
- </init-param>
- <init-param>
- <param-name>forceEncoding</param-name>
- <param-value>true</param-value>
- </init-param>
- </filter>
-
- <filter-mapping>
- <filter-name>encodingFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
+ <filter-name>encodingFilter</filter-name>
+ <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
+ <init-param>
+ <param-name>encoding</param-name>
+ <param-value>UTF-8</param-value>
+ </init-param>
+ <init-param>
+ <param-name>forceEncoding</param-name>
+ <param-value>true</param-value>
+ </init-param>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>encodingFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
<!-- Dandelion filter definition and mapping -->
<filter>
<filter-name>dandelionFilter</filter-name>
@@ -100,19 +100,19 @@
<url-pattern>/*</url-pattern>
</filter-mapping>
- <!-- Dandelion-Datatables filter, used for basic export -->
- <filter>
+ <!-- Dandelion-Datatables filter, used for basic export -->
+ <filter>
<filter-name>datatables</filter-name>
<filter-class>com.github.dandelion.datatables.core.web.filter.DatatablesFilter</filter-class>
- </filter>
- <filter-mapping>
+ </filter>
+ <filter-mapping>
<filter-name>datatables</filter-name>
<url-pattern>/*</url-pattern>
- </filter-mapping>
-
+ </filter-mapping>
+
<!-- No need for welcome-file declaration here.
See inside spring/mvc-core-config.xml :
<mvc:view-controller path="/" view-name="welcome" />
-->
-</web-app>
\ No newline at end of file
+</web-app>
diff --git a/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java b/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java
index f8582b5d9fbaea898bcc3a831ba441d3a835a944..b836d0cc2bda6fad7a2dded46f69accf794b0ff2 100644
--- a/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java
@@ -13,24 +13,22 @@ import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
/**
- *
* @author Michael Isvy
- * Simple test to make sure that Bean Validation is working
- * (useful when upgrading to a new version of Hibernate Validator/ Bean Validation)
- *
+ * Simple test to make sure that Bean Validation is working
+ * (useful when upgrading to a new version of Hibernate Validator/ Bean Validation)
*/
public class ValidatorTests {
-
- private Validator createValidator() {
- LocalValidatorFactoryBean localValidatorFactoryBean = new LocalValidatorFactoryBean();
- localValidatorFactoryBean.afterPropertiesSet();
- return localValidatorFactoryBean;
- }
-
- @Test
+
+ private Validator createValidator() {
+ LocalValidatorFactoryBean localValidatorFactoryBean = new LocalValidatorFactoryBean();
+ localValidatorFactoryBean.afterPropertiesSet();
+ return localValidatorFactoryBean;
+ }
+
+ @Test
public void shouldNotValidateWhenFirstNameEmpty() {
- LocaleContextHolder.setLocale(Locale.ENGLISH);
+ LocaleContextHolder.setLocale(Locale.ENGLISH);
Person person = new Person();
person.setFirstName("");
person.setLastName("smith");
@@ -39,9 +37,9 @@ public class ValidatorTests {
Set<ConstraintViolation<Person>> constraintViolations = validator.validate(person);
assertThat(constraintViolations.size()).isEqualTo(1);
- ConstraintViolation<Person> violation = constraintViolations.iterator().next();
+ ConstraintViolation<Person> violation = constraintViolations.iterator().next();
assertThat(violation.getPropertyPath().toString()).isEqualTo("firstName");
assertThat(violation.getMessage()).isEqualTo("may not be empty");
}
-
+
}
diff --git a/src/test/java/org/springframework/samples/petclinic/service/AbstractClinicServiceTests.java b/src/test/java/org/springframework/samples/petclinic/service/AbstractClinicServiceTests.java
index 473acdc6e07332f234020a65b78ab8d932b1be41..0dd87379b8df4d106bed42973b675578e0284886 100644
--- a/src/test/java/org/springframework/samples/petclinic/service/AbstractClinicServiceTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/service/AbstractClinicServiceTests.java
@@ -69,8 +69,8 @@ public abstract class AbstractClinicServiceTests {
Owner owner = this.clinicService.findOwnerById(1);
assertThat(owner.getLastName()).startsWith("Franklin");
assertThat(owner.getPets().size()).isEqualTo(1);
- assertThat(owner.getPets().get(0).getType()).isNotNull();
- assertThat(owner.getPets().get(0).getType().getName()).isEqualTo("cat");
+ assertThat(owner.getPets().get(0).getType()).isNotNull();
+ assertThat(owner.getPets().get(0).getType().getName()).isEqualTo("cat");
}
@Test
@@ -78,7 +78,7 @@ public abstract class AbstractClinicServiceTests {
public void shouldInsertOwner() {
Collection<Owner> owners = this.clinicService.findOwnerByLastName("Schultz");
int found = owners.size();
-
+
Owner owner = new Owner();
owner.setFirstName("Sam");
owner.setLastName("Schultz");
@@ -94,11 +94,11 @@ public abstract class AbstractClinicServiceTests {
@Test
@Transactional
- public void shouldUpdateOwner() {
+ public void shouldUpdateOwner() {
Owner owner = this.clinicService.findOwnerById(1);
String oldLastName = owner.getLastName();
String newLastName = oldLastName + "X";
-
+
owner.setLastName(newLastName);
this.clinicService.saveOwner(owner);
@@ -107,87 +107,87 @@ public abstract class AbstractClinicServiceTests {
assertThat(owner.getLastName()).isEqualTo(newLastName);
}
- @Test
- public void shouldFindPetWithCorrectId() {
- Pet pet7 = this.clinicService.findPetById(7);
- assertThat(pet7.getName()).startsWith("Samantha");
- assertThat(pet7.getOwner().getFirstName()).isEqualTo("Jean");
-
- }
-
- @Test
- public void shouldFindAllPetTypes() {
- Collection<PetType> petTypes = this.clinicService.findPetTypes();
-
- PetType petType1 = EntityUtils.getById(petTypes, PetType.class, 1);
- assertThat(petType1.getName()).isEqualTo("cat");
- PetType petType4 = EntityUtils.getById(petTypes, PetType.class, 4);
- assertThat(petType4.getName()).isEqualTo("snake");
- }
-
- @Test
- @Transactional
- public void shouldInsertPetIntoDatabaseAndGenerateId() {
- Owner owner6 = this.clinicService.findOwnerById(6);
- int found = owner6.getPets().size();
-
- Pet pet = new Pet();
- pet.setName("bowser");
- Collection<PetType> types = this.clinicService.findPetTypes();
- pet.setType(EntityUtils.getById(types, PetType.class, 2));
- pet.setBirthDate(new DateTime());
- owner6.addPet(pet);
- assertThat(owner6.getPets().size()).isEqualTo(found + 1);
-
- this.clinicService.savePet(pet);
- this.clinicService.saveOwner(owner6);
-
- owner6 = this.clinicService.findOwnerById(6);
- assertThat(owner6.getPets().size()).isEqualTo(found + 1);
- // checks that id has been generated
- assertThat(pet.getId()).isNotNull();
- }
-
- @Test
- @Transactional
- public void shouldUpdatePetName() throws Exception {
- Pet pet7 = this.clinicService.findPetById(7);
- String oldName = pet7.getName();
-
- String newName = oldName + "X";
- pet7.setName(newName);
- this.clinicService.savePet(pet7);
-
- pet7 = this.clinicService.findPetById(7);
- assertThat(pet7.getName()).isEqualTo(newName);
- }
-
- @Test
- public void shouldFindVets() {
- Collection<Vet> vets = this.clinicService.findVets();
-
- Vet vet = EntityUtils.getById(vets, Vet.class, 3);
- assertThat(vet.getLastName()).isEqualTo("Douglas");
- assertThat(vet.getNrOfSpecialties()).isEqualTo(2);
- assertThat(vet.getSpecialties().get(0).getName()).isEqualTo("dentistry");
- assertThat(vet.getSpecialties().get(1).getName()).isEqualTo("surgery");
- }
-
- @Test
- @Transactional
- public void shouldAddNewVisitForPet() {
- Pet pet7 = this.clinicService.findPetById(7);
- int found = pet7.getVisits().size();
- Visit visit = new Visit();
- pet7.addVisit(visit);
- visit.setDescription("test");
- this.clinicService.saveVisit(visit);
- this.clinicService.savePet(pet7);
-
- pet7 = this.clinicService.findPetById(7);
- assertThat(pet7.getVisits().size()).isEqualTo(found + 1);
- assertThat(visit.getId()).isNotNull();
- }
+ @Test
+ public void shouldFindPetWithCorrectId() {
+ Pet pet7 = this.clinicService.findPetById(7);
+ assertThat(pet7.getName()).startsWith("Samantha");
+ assertThat(pet7.getOwner().getFirstName()).isEqualTo("Jean");
+
+ }
+
+ @Test
+ public void shouldFindAllPetTypes() {
+ Collection<PetType> petTypes = this.clinicService.findPetTypes();
+
+ PetType petType1 = EntityUtils.getById(petTypes, PetType.class, 1);
+ assertThat(petType1.getName()).isEqualTo("cat");
+ PetType petType4 = EntityUtils.getById(petTypes, PetType.class, 4);
+ assertThat(petType4.getName()).isEqualTo("snake");
+ }
+
+ @Test
+ @Transactional
+ public void shouldInsertPetIntoDatabaseAndGenerateId() {
+ Owner owner6 = this.clinicService.findOwnerById(6);
+ int found = owner6.getPets().size();
+
+ Pet pet = new Pet();
+ pet.setName("bowser");
+ Collection<PetType> types = this.clinicService.findPetTypes();
+ pet.setType(EntityUtils.getById(types, PetType.class, 2));
+ pet.setBirthDate(new DateTime());
+ owner6.addPet(pet);
+ assertThat(owner6.getPets().size()).isEqualTo(found + 1);
+
+ this.clinicService.savePet(pet);
+ this.clinicService.saveOwner(owner6);
+
+ owner6 = this.clinicService.findOwnerById(6);
+ assertThat(owner6.getPets().size()).isEqualTo(found + 1);
+ // checks that id has been generated
+ assertThat(pet.getId()).isNotNull();
+ }
+
+ @Test
+ @Transactional
+ public void shouldUpdatePetName() throws Exception {
+ Pet pet7 = this.clinicService.findPetById(7);
+ String oldName = pet7.getName();
+
+ String newName = oldName + "X";
+ pet7.setName(newName);
+ this.clinicService.savePet(pet7);
+
+ pet7 = this.clinicService.findPetById(7);
+ assertThat(pet7.getName()).isEqualTo(newName);
+ }
+
+ @Test
+ public void shouldFindVets() {
+ Collection<Vet> vets = this.clinicService.findVets();
+
+ Vet vet = EntityUtils.getById(vets, Vet.class, 3);
+ assertThat(vet.getLastName()).isEqualTo("Douglas");
+ assertThat(vet.getNrOfSpecialties()).isEqualTo(2);
+ assertThat(vet.getSpecialties().get(0).getName()).isEqualTo("dentistry");
+ assertThat(vet.getSpecialties().get(1).getName()).isEqualTo("surgery");
+ }
+
+ @Test
+ @Transactional
+ public void shouldAddNewVisitForPet() {
+ Pet pet7 = this.clinicService.findPetById(7);
+ int found = pet7.getVisits().size();
+ Visit visit = new Visit();
+ pet7.addVisit(visit);
+ visit.setDescription("test");
+ this.clinicService.saveVisit(visit);
+ this.clinicService.savePet(pet7);
+
+ pet7 = this.clinicService.findPetById(7);
+ assertThat(pet7.getVisits().size()).isEqualTo(found + 1);
+ assertThat(visit.getId()).isNotNull();
+ }
}
diff --git a/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceJdbcTests.java b/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceJdbcTests.java
index 49e57ea402120f21be330742397071be9c89325f..74c5df7cf56cbd3b0124604d9e79dd4eace53524 100644
--- a/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceJdbcTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceJdbcTests.java
@@ -21,11 +21,11 @@ import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
/**
- * <p> Integration test using the jdbc profile.
- * @see AbstractClinicServiceTests AbstractClinicServiceTests for more details. </p>
+ * <p> Integration test using the jdbc profile.
*
* @author Thomas Risberg
* @author Michael Isvy
+ * @see AbstractClinicServiceTests AbstractClinicServiceTests for more details. </p>
*/
@ContextConfiguration(locations = {"classpath:spring/business-config.xml"})
@RunWith(SpringJUnit4ClassRunner.class)
diff --git a/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceJpaTests.java b/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceJpaTests.java
index e024f21fd09c37fb8e838e114872b8877fc41971..dba2b195a0b571c061f251fdcfba6f8577a86c5c 100644
--- a/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceJpaTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceJpaTests.java
@@ -1,4 +1,3 @@
-
package org.springframework.samples.petclinic.service;
import org.junit.runner.RunWith;
@@ -7,12 +6,12 @@ import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
/**
- * <p> Integration test using the jpa profile.
- * @see AbstractClinicServiceTests AbstractClinicServiceTests for more details. </p>
+ * <p> Integration test using the jpa profile.
*
* @author Rod Johnson
* @author Sam Brannen
* @author Michael Isvy
+ * @see AbstractClinicServiceTests AbstractClinicServiceTests for more details. </p>
*/
@ContextConfiguration(locations = {"classpath:spring/business-config.xml"})
@@ -20,4 +19,4 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@ActiveProfiles("jpa")
public class ClinicServiceJpaTests extends AbstractClinicServiceTests {
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceSpringDataJpaTests.java b/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceSpringDataJpaTests.java
index e01dda55168a4bdf97a42a3c1258323987c82578..31b62289fa16c4ca87394473888808691e41d8d2 100644
--- a/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceSpringDataJpaTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceSpringDataJpaTests.java
@@ -1,4 +1,3 @@
-
package org.springframework.samples.petclinic.service;
import org.junit.runner.RunWith;
@@ -7,9 +6,10 @@ import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
/**
- * <p> Integration test using the 'Spring Data' profile.
- * @see AbstractClinicServiceTests AbstractClinicServiceTests for more details. </p>
+ * <p> Integration test using the 'Spring Data' profile.
+ *
* @author Michael Isvy
+ * @see AbstractClinicServiceTests AbstractClinicServiceTests for more details. </p>
*/
@ContextConfiguration(locations = {"classpath:spring/business-config.xml"})
@@ -17,4 +17,4 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@ActiveProfiles("spring-data-jpa")
public class ClinicServiceSpringDataJpaTests extends AbstractClinicServiceTests {
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/springframework/samples/petclinic/web/VetControllerTests.java b/src/test/java/org/springframework/samples/petclinic/web/VetControllerTests.java
index 61e6d32876f65efbd6552305fa4f39854c915731..28b9348a100350e4e1c3d4023c7b562e562c6e89 100644
--- a/src/test/java/org/springframework/samples/petclinic/web/VetControllerTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/web/VetControllerTests.java
@@ -40,9 +40,9 @@ public class VetControllerTests {
@Test
public void testGetExistingUser() throws Exception {
- ResultActions actions = mockMvc.perform(get("/vets.json").accept(MediaType.APPLICATION_JSON))
- .andExpect(status().isOk());
- actions.andExpect(content().contentType("application/json;charset=UTF-8"))
- .andExpect(jsonPath("$.vetList[0].id").value(1));
+ ResultActions actions = mockMvc.perform(get("/vets.json").accept(MediaType.APPLICATION_JSON))
+ .andExpect(status().isOk());
+ actions.andExpect(content().contentType("application/json;charset=UTF-8"))
+ .andExpect(jsonPath("$.vetList[0].id").value(1));
}
}