From 50e9269f7cf334141ccd25d98a2da39519e3a798 Mon Sep 17 00:00:00 2001
From: Antoine Rey <antoine.rey@free.fr>
Date: Wed, 27 May 2015 21:48:50 +0200
Subject: [PATCH] Finish to remove Atom feed

---
 .../springframework/samples/petclinic/config/MvcCoreConfig.java | 1 -
 .../springframework/samples/petclinic/config/MvcViewConfig.java | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/org/springframework/samples/petclinic/config/MvcCoreConfig.java b/src/main/java/org/springframework/samples/petclinic/config/MvcCoreConfig.java
index e96af0043..780eaf343 100644
--- a/src/main/java/org/springframework/samples/petclinic/config/MvcCoreConfig.java
+++ b/src/main/java/org/springframework/samples/petclinic/config/MvcCoreConfig.java
@@ -80,7 +80,6 @@ public class MvcCoreConfig extends WebMvcConfigurerAdapter {
 		configurer.defaultContentType(MediaType.TEXT_HTML);
 		configurer.mediaType("html", MediaType.TEXT_HTML);
 		configurer.mediaType("xml", MediaType.APPLICATION_XML);
-		configurer.mediaType("atom", MediaType.APPLICATION_ATOM_XML);
 	}
 
 	@Override
diff --git a/src/main/java/org/springframework/samples/petclinic/config/MvcViewConfig.java b/src/main/java/org/springframework/samples/petclinic/config/MvcViewConfig.java
index c0fb4df5c..477152837 100644
--- a/src/main/java/org/springframework/samples/petclinic/config/MvcViewConfig.java
+++ b/src/main/java/org/springframework/samples/petclinic/config/MvcViewConfig.java
@@ -74,7 +74,7 @@ public class MvcViewConfig {
 	}
 
 	@Bean
-	@Description("Used for 'xml' and 'atom' views")
+	@Description("Used for 'xml' views")
 	public ViewResolver beanNameViewResolver() {
 		return new BeanNameViewResolver();
 	}