From a38487287024e1db0aac135adf9583f62e7dd311 Mon Sep 17 00:00:00 2001
From: MafaldaLandeiro <1110590@isep.ipp.pt>
Date: Wed, 27 Jul 2016 20:55:04 +0100
Subject: [PATCH] Spring JSON-P with Jackson

---
 .../src/main/webapp/WEB-INF/company.html      | 93 ++++++++++++++-----
 .../src/main/webapp/WEB-INF/company.html      | 62 +++++++++----
 2 files changed, 110 insertions(+), 45 deletions(-)
diff --git a/spring-mvc-java/src/main/webapp/WEB-INF/company.html b/spring-mvc-java/src/main/webapp/WEB-INF/company.html
index 97c94fc400..e1b3c6e441 100644
--- a/spring-mvc-java/src/main/webapp/WEB-INF/company.html
+++ b/spring-mvc-java/src/main/webapp/WEB-INF/company.html
@@ -1,27 +1,70 @@
 <!DOCTYPE html>
 <html>
-<head>
-<meta charset="ISO-8859-1">
-<title>Company Data</title>
-<script>
-     function getCompanyData(data) { 
-		document.write("<b>ID:</b> "+data.id+"<br/>");	 
-		document.write("<b>NAME:</b> "+data.name+"<br/>");
-		document.write("<br/>");
-     }
-   </script>
-</head>
-<body>
-	<!--Using @ResponseBody -->
-	<script
-		src="http://localhost:8080/spring-mvc-java/companyResponseBody?callback=getCompanyData"
-		type="application/javascript"> </script>
-
-	<!--Using ResponseEntity -->
-	<script
-		src="http://localhost:8080/spring-mvc-java/companyResponseEntity?callback=getCompanyData"
-		type="application/javascript"> </script>
-
-</body>
-</html>
-
+	<head>
+		<meta charset="ISO-8859-1">
+		<title>Company Data</title>
+		<script src="https://code.jquery.com/jquery-3.1.0.js"
+			integrity="sha256-slogkvB1K3VOkzAI8QITxV3VzpOnkeNVsKvtkYLMjfk="
+			crossorigin="anonymous"></script>
+		<script>
+			$(document).ready(function(){
+				$('#ResponseBody-button').click(function() {
+				   $.ajax({
+				      url: 'http://localhost:8080/spring-mvc-java/companyResponseBody?callback=getCompanyData',
+				      data: {
+				         format: 'json'
+				      },
+					  type: 'GET',
+					  jsonpCallback:'getCompanyData',
+					  dataType: 'jsonp',
+				      error: function() {
+				         $('#infoResponseBody').html('<p>An error has occurred</p>');
+				      },
+				      success: function(data) {
+				        console.log("sucess");
+				      }
+				   });
+				});
+				$('#ResponseEntity-button').click(function() {
+				console.log("ResponseEntity");
+				   $.ajax({
+				      url: 'http://localhost:8080/spring-mvc-java/companyResponseEntity?callback=getCompanyData',
+				      data: {
+				         format: 'json'
+				      },
+					  type: 'GET',
+					  jsonpCallback:'getCompanyData',
+					  dataType: 'jsonp',
+				      error: function() {
+				         $('#infoResponseEntity').html('<p>An error has occurred</p>');
+				      },
+				      success: function(data) {
+				        console.log("sucess");
+				      }
+				   });
+				});	
+			});
+		
+		    function getCompanyData(data) { 
+				document.write("<b>ID:</b> "+data.id+"<br/>");	 
+				document.write("<b>NAME:</b> "+data.name+"<br/>");
+				document.write("<br/>");
+		     }
+	     </script>
+	</head>
+	<body>
+	
+		<!-- Using REST URL-->
+		<button id="REST-button">Test REST JSON-P!</button>
+		<div id="infoREST"></div>
+	
+		<!--Using @ResponseBody -->
+		<button id="ResponseBody-button">Test ResponseBody JSON-P!</button>
+		<div id="infoResponseBody"></div>
+	
+		<!--Using ResponseEntity -->
+		<button id="ResponseEntity-button">Test ResponseEntity JSON-P!</button>
+		<div id="ResponseEntity"></div>
+	
+	</body>
+</html>
\ No newline at end of file
diff --git a/spring-rest/src/main/webapp/WEB-INF/company.html b/spring-rest/src/main/webapp/WEB-INF/company.html
index bf213c62b6..d2072bfd3c 100644
--- a/spring-rest/src/main/webapp/WEB-INF/company.html
+++ b/spring-rest/src/main/webapp/WEB-INF/company.html
@@ -1,22 +1,44 @@
 <!DOCTYPE html>
 <html>
-<head>
-<meta charset="ISO-8859-1">
-<title>Company Data</title>
-<script>
-     function getCompanyData(data) { 
-		document.write("<b>ID:</b> "+data.id+"<br/>");	 
-		document.write("<b>NAME:</b> "+data.name+"<br/>");
-		document.write("<br/>");
-     }
-   </script>
-</head>
-<body>
-	<!-- Using REST URL-->
-	<script
-		src="http://localhost:8080/spring-rest/companyRest?callback=getCompanyData"
-		type="application/javascript"> </script>
-
-</body>
-</html>
-
+	<head>
+		<meta charset="ISO-8859-1">
+		<title>Company Data</title>
+		<script src="https://code.jquery.com/jquery-3.1.0.js"
+			integrity="sha256-slogkvB1K3VOkzAI8QITxV3VzpOnkeNVsKvtkYLMjfk="
+			crossorigin="anonymous"></script>
+		<script>
+			$(document).ready(function(){
+				$('#REST-button').click(function() {
+				   $.ajax({
+				      url: 'http://localhost:8080/spring-rest/companyRest?callback=getCompanyData',
+				      data: {
+				         format: 'json'
+				      },
+					  type: 'GET',
+					  jsonpCallback:'getCompanyData',
+					  dataType: 'jsonp',
+				      error: function() {
+				         $('#infoREST').html('<p>An error has occurred</p>');
+				      },
+				      success: function(data) {
+						console.log("sucess");
+				      }
+				   });
+				});
+			});
+		
+		    function getCompanyData(data) { 
+				document.write("<b>ID:</b> "+data.id+"<br/>");	 
+				document.write("<b>NAME:</b> "+data.name+"<br/>");
+				document.write("<br/>");
+		     }
+	     </script>
+	</head>
+	<body>
+	
+		<!-- Using REST URL-->
+		<button id="REST-button">Test REST JSON-P!</button>
+		<div id="infoREST"></div>
+	
+	</body>
+</html>
\ No newline at end of file
