Upgrade to 4.0.3 and rever code commited in error

rstoyanchev · rstoyanchev · commit 92f5393d6edb · 2014-04-23T12:59:29.000-04:00
diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
 	<version>1.0.0-BUILD-SNAPSHOT</version>
 	<properties>
 		<java-version>1.7</java-version>
-		<org.springframework-version>4.0.1.RELEASE</org.springframework-version>
+		<org.springframework-version>4.0.3.RELEASE</org.springframework-version>
 		<org.springframework.security-version>3.2.0.RELEASE</org.springframework.security-version>
 		<org.aspectj-version>1.7.4</org.aspectj-version>
 		<org.slf4j-version>1.6.1</org.slf4j-version>
diff --git a/src/main/java/org/springframework/samples/mvc/messageconverters/MessageConvertersController.java b/src/main/java/org/springframework/samples/mvc/messageconverters/MessageConvertersController.java
@@ -69,11 +69,8 @@ public class MessageConvertersController {
 	}
 
 	@RequestMapping(value="/json", method=RequestMethod.GET)
-	public ResponseEntity<JavaBean> writeJson() {
-		HttpHeaders headers = new HttpHeaders();
-		headers.setContentType(MediaType.TEXT_PLAIN);
-		return new ResponseEntity<JavaBean>(new JavaBean("bar", "apple"), headers , HttpStatus.OK);
-//		return new JavaBean("bar", "apple");
+	public @ResponseBody JavaBean writeJson() {
+		return new JavaBean("bar", "apple");
 	}
 
 	// AtomFeedHttpMessageConverter (requires Rome on the classpath - useful for serving Atom feeds)

Original file line number	Diff line number	Diff line change
`@@ -69,11 +69,8 @@ public class MessageConvertersController {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`@RequestMapping(value="/json", method=RequestMethod.GET)`
`72`		`- public ResponseEntity<JavaBean> writeJson() {`
`73`		`- HttpHeaders headers = new HttpHeaders();`
`74`		`- headers.setContentType(MediaType.TEXT_PLAIN);`
`75`		`- return new ResponseEntity<JavaBean>(new JavaBean("bar", "apple"), headers , HttpStatus.OK);`
`76`		`-// return new JavaBean("bar", "apple");`
	`72`	`+ public @ResponseBody JavaBean writeJson() {`
	`73`	`+ return new JavaBean("bar", "apple");`
`77`	`74`	`}`
`78`	`75`
`79`	`76`	`// AtomFeedHttpMessageConverter (requires Rome on the classpath - useful for serving Atom feeds)`