petclinic-uncached

diff --git a/pom.xml b/pom.xml
index b082009..a1180cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,8 +44,7 @@
 		<logback.version>1.1.2</logback.version>
 		<slf4j.version>1.7.10</slf4j.version>
 
-		<!-- RSS and JSon-->
-		<rome.version>1.5.0</rome.version>
+		<!-- JSon-->
 		<json-path.version>0.9.1</json-path.version>
 
 		<!-- Test -->
@@ -107,6 +106,7 @@
 			<version>${jaxb-impl.version}</version>
 			<scope>provided</scope>
 		</dependency>
+		<!--  JSon -->
 		 <dependency>
             <groupId>com.jayway.jsonpath</groupId>
             <artifactId>json-path</artifactId>
@@ -123,6 +123,7 @@
 			      <groupId>org.springframework</groupId>
 			      <artifactId>*</artifactId>
 			    </exclusion>
+			    <!--  because Spring Data usually comes with a slightly older version of Spring -->
 			</exclusions>
 		</dependency>
 
@@ -174,7 +175,18 @@
 			<version>${spring-framework.version}</version>
 		</dependency>
 
-
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjrt</artifactId>
+			<version>${aspectj.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjweaver</artifactId>
+			<version>${aspectj.version}</version>
+			<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/
@@ -199,13 +211,6 @@
 			<version>${logback.version}</version>
 			<scope>runtime</scope>
 		</dependency>
-
-		<!-- used for Atom -->
-		<dependency>
-			<groupId>com.rometools</groupId>
-			<artifactId>rome</artifactId>
-			<version>${rome.version}</version>
-		</dependency>
 		
 		<!-- Date and Time -->
 		<dependency>
@@ -299,19 +304,6 @@
 			<version>${assertj.version}</version>
 		</dependency>
 
-		<dependency>
-			<groupId>org.aspectj</groupId>
-			<artifactId>aspectjrt</artifactId>
-			<version>${aspectj.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.aspectj</groupId>
-			<artifactId>aspectjweaver</artifactId>
-			<version>${aspectj.version}</version>
-			<scope>runtime</scope>
-		</dependency>
-
-
 		<!-- Dandelion -->
 		<dependency>
 			<groupId>com.github.dandelion</groupId>

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 3a6c052..ea844ec 100644
--- a/src/main/java/org/springframework/samples/petclinic/web/VetController.java
+++ b/src/main/java/org/springframework/samples/petclinic/web/VetController.java
@@ -22,6 +22,7 @@ import org.springframework.samples.petclinic.model.Vets;
 import org.springframework.samples.petclinic.service.ClinicService;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 /**
  * @author Juergen Hoeller
@@ -40,7 +41,7 @@ public class VetController {
         this.clinicService = clinicService;
     }
 
-    @RequestMapping("/vets")
+    @RequestMapping(value="/vets.xml")
     public String showVetList(Map<String, Object> model) {
         // Here we are returning an object of type 'Vets' rather than a collection of Vet objects 
         // so it is simpler for Object-Xml mapping
@@ -49,6 +50,15 @@ public class VetController {
         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 
+        // so it is simpler for JSon/Object mapping
+        Vets vets = new Vets();
+        vets.getVetList().addAll(this.clinicService.findVets());
+        return vets;
+    }
 
 
 }

diff --git a/src/main/resources/spring/mvc-view-config.xml b/src/main/resources/spring/mvc-view-config.xml
index 205f7ff..f097a10 100644
--- a/src/main/resources/spring/mvc-view-config.xml
+++ b/src/main/resources/spring/mvc-view-config.xml
@@ -27,10 +27,6 @@
 	  	<mvc:jsp prefix="/WEB-INF/jsp/" suffix=".jsp"/>
 	</mvc:view-resolvers>
 
-
-    <!-- Renders an Atom feed of the visits. Used by the BeanNameViewResolver  -->
-    <bean id="vets/vetList.atom" class="org.springframework.samples.petclinic.web.VetsAtomView"/>
-
     <!-- Renders an XML view. Used by the BeanNameViewResolver  -->
     <bean id="vets/vetList.xml" class="org.springframework.web.servlet.view.xml.MarshallingView">
         <property name="marshaller" ref="marshaller"/>

diff --git a/src/main/webapp/WEB-INF/jsp/vets/vetList.jsp b/src/main/webapp/WEB-INF/jsp/vets/vetList.jsp
index bfcb985..040679c 100644
--- a/src/main/webapp/WEB-INF/jsp/vets/vetList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/vets/vetList.jsp
@@ -34,7 +34,7 @@
                 <a href="<spring:url value="/vets.xml" htmlEscape="true" />">View as XML</a>
             </td>
             <td>
-                <a href="<spring:url value="/vets.atom" htmlEscape="true" />">Subscribe to Atom feed</a>
+                <a href="<spring:url value="/vets.json" htmlEscape="true" />">View as JSon</a>
             </td>
         </tr>
     </table>

diff --git a/src/test/java/org/springframework/samples/petclinic/web/VetControllerTest.java b/src/test/java/org/springframework/samples/petclinic/web/VetControllerTest.java
new file mode 100644
index 0000000..be3ce0d
--- /dev/null
+++ b/src/test/java/org/springframework/samples/petclinic/web/VetControllerTest.java
@@ -0,0 +1,53 @@
+package org.springframework.samples.petclinic.web;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.ResultActions;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+
+/**
+ * Test class for the UserResource REST controller.
+ *
+ * @see UserResource
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration({"classpath:spring/business-config.xml", "classpath:spring/tools-config.xml", "classpath:spring/mvc-core-config.xml"})
+@WebAppConfiguration
+@ActiveProfiles("spring-data-jpa")
+public class VetControllerTest {
+
+    @Autowired
+    private VetController vetController;
+    
+    @Autowired 
+    private WebApplicationContext ctx;
+
+    private MockMvc mockMvc;
+
+    @Before
+    public void setup() {
+        this.mockMvc = MockMvcBuilders.standaloneSetup(vetController).build();
+    }
+
+    @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));
+    }
+}