Updated to Spring 4.3 & Spring Boot 1.4

gortazar · gortazar · commit 16b4b8df1012 · 2016-10-20T14:32:06.000+02:00
diff --git a/web_ejem1/pom.xml b/web_ejem1/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.3.3.RELEASE</version>
+		<version>1.4.1.RELEASE</version>
 		<relativePath/>
 	</parent>
 
diff --git a/web_ejem2/pom.xml b/web_ejem2/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.3.3.RELEASE</version>
+		<version>1.4.1.RELEASE</version>
 		<relativePath/>
 	</parent>
 
diff --git a/web_ejem3/pom.xml b/web_ejem3/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.3.3.RELEASE</version>
+		<version>1.4.1.RELEASE</version>
 		<relativePath/>
 	</parent>
 
diff --git a/web_ejem4/pom.xml b/web_ejem4/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.3.3.RELEASE</version>
+		<version>1.4.1.RELEASE</version>
 		<relativePath/>
 	</parent>
 
diff --git a/web_ejem5/pom.xml b/web_ejem5/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.3.3.RELEASE</version>
+		<version>1.4.1.RELEASE</version>
 		<relativePath/>
 	</parent>
 
diff --git a/web_ejem6/pom.xml b/web_ejem6/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.3.3.RELEASE</version>
+		<version>1.4.1.RELEASE</version>
 		<relativePath/>
 	</parent>
 
diff --git a/web_ejem6/src/main/java/es/urjc/code/daw/SesionController.java b/web_ejem6/src/main/java/es/urjc/code/daw/SesionController.java
@@ -4,16 +4,16 @@
 
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 @Controller
 public class SesionController {
 
 	private String infoCompartida;
 
-	@RequestMapping(value = "/procesarFormulario", method = RequestMethod.POST)
+	@PostMapping(value = "/procesarFormulario")
 	public String procesarFormulario(@RequestParam String info, HttpSession sesion) {
 
 		sesion.setAttribute("infoUsuario", info);
@@ -22,7 +22,7 @@ public String procesarFormulario(@RequestParam String info, HttpSession sesion)
 		return "resultado_formulario";
 	}
 
-	@RequestMapping("/mostrarDatos")
+	@GetMapping("/mostrarDatos")
 	public String mostrarDatos(Model model, HttpSession sesion) {
 
 		String infoUsuario = (String) sesion.getAttribute("infoUsuario");
diff --git a/web_ejem7/pom.xml b/web_ejem7/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.3.3.RELEASE</version>
+		<version>1.4.1.RELEASE</version>
 		<relativePath/>
 	</parent>
 
diff --git a/web_ejem7/src/main/java/es/urjc/code/daw/SesionController.java b/web_ejem7/src/main/java/es/urjc/code/daw/SesionController.java
@@ -3,8 +3,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 @Controller
@@ -15,7 +15,7 @@ public class SesionController {
 
 	private String infoCompartida;
 
-	@RequestMapping(value = "/procesarFormulario", method = RequestMethod.POST)
+	@PostMapping(value = "/procesarFormulario")
 	public String procesarFormulario(@RequestParam String info) {
 
 		usuario.setInfo(info);
@@ -24,7 +24,7 @@ public String procesarFormulario(@RequestParam String info) {
 		return "resultado_formulario";
 	}
 
-	@RequestMapping("/mostrarDatos")
+	@GetMapping("/mostrarDatos")
 	public String mostrarDatos(Model model) {
 
 		String infoUsuario = usuario.getInfo();
diff --git a/web_ejem7/src/main/java/es/urjc/code/daw/Usuario.java b/web_ejem7/src/main/java/es/urjc/code/daw/Usuario.java
@@ -1,12 +1,10 @@
 package es.urjc.code.daw;
 
-import org.springframework.context.annotation.Scope;
-import org.springframework.context.annotation.ScopedProxyMode;
 import org.springframework.stereotype.Component;
-import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.annotation.SessionScope;
 
 @Component
-@Scope(value = WebApplicationContext.SCOPE_SESSION, proxyMode = ScopedProxyMode.TARGET_CLASS)
+@SessionScope
 public class Usuario {
 
 	private String info;
diff --git a/web_ejer1/pom.xml b/web_ejer1/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.3.3.RELEASE</version>
+		<version>1.4.1.RELEASE</version>
 		<relativePath/>
 	</parent>
 
diff --git a/web_ejer1/src/main/java/es/urjc/code/daw/AnuncioController.java b/web_ejer1/src/main/java/es/urjc/code/daw/AnuncioController.java
@@ -3,13 +3,13 @@
 
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 @Controller
 public class AnuncioController {
 
-	@RequestMapping("/guardaranuncio")
+	@PostMapping("/guardaranuncio")
 	public String guardarAnuncio(Model model, @RequestParam String nombre, @RequestParam String asunto,
 			@RequestParam String comentario) {
 
diff --git a/web_ejer1b/pom.xml b/web_ejer1b/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.3.3.RELEASE</version>
+		<version>1.4.1.RELEASE</version>
 		<relativePath/>
 	</parent>
 
diff --git a/web_ejer1b/src/main/java/es/urjc/code/daw/AnuncioController.java b/web_ejer1b/src/main/java/es/urjc/code/daw/AnuncioController.java
@@ -3,12 +3,12 @@
 
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 
 @Controller
 public class AnuncioController {
 
-	@RequestMapping("/guardaranuncio")
+	@PostMapping("/guardaranuncio")
 	public String guardarAnuncio(Model model, Anuncio anuncio) {
 
 		model.addAttribute("anuncio", anuncio);
diff --git a/web_ejer2/pom.xml b/web_ejer2/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.3.3.RELEASE</version>
+		<version>1.4.1.RELEASE</version>
 		<relativePath/>
 	</parent>
 
diff --git a/web_ejer2/src/main/java/es/urjc/code/daw/EnlaceController.java b/web_ejer2/src/main/java/es/urjc/code/daw/EnlaceController.java
@@ -2,13 +2,13 @@
 
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 @Controller
 public class EnlaceController {
 
-	@RequestMapping("/enlace")
+	@GetMapping("/enlace")
 	public String enlace(Model model, @RequestParam String num) {
 
 		model.addAttribute("num", num);
diff --git a/web_ejer3_devtools/pom.xml b/web_ejer3_devtools/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.3.3.RELEASE</version>
+		<version>1.4.1.RELEASE</version>
 		<relativePath/>
 	</parent>
 
diff --git a/web_ejer3_devtools/src/main/java/es/urjc/code/daw/EnlaceController.java b/web_ejer3_devtools/src/main/java/es/urjc/code/daw/EnlaceController.java
@@ -2,13 +2,13 @@
 
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
 
 @Controller
 public class EnlaceController {
 
-	@RequestMapping("/enlace/{num}")
+	@GetMapping("/enlace/{num}")
 	public String enlace(Model model, @PathVariable String num) {
 
 		model.addAttribute("num", num);
diff --git a/web_ejer4/pom.xml b/web_ejer4/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.3.3.RELEASE</version>
+		<version>1.4.1.RELEASE</version>
 		<relativePath/>
 	</parent>
 
diff --git a/web_ejer4/src/main/java/es/urjc/code/daw/tablonanuncios/TablonController.java b/web_ejer4/src/main/java/es/urjc/code/daw/tablonanuncios/TablonController.java
@@ -5,8 +5,9 @@
 
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 
 @Controller
 public class TablonController {
@@ -18,15 +19,15 @@ public TablonController() {
 		anuncios.add(new Anuncio("Juan", "Hola caracola", "XXXX"));
 	}
 
-	@RequestMapping("/")
+	@GetMapping("/")
 	public String tablon(Model model) {
 
 		model.addAttribute("anuncios", anuncios);
 
 		return "tablon";
 	}
 
-	@RequestMapping("/anuncio/nuevo")
+	@PostMapping("/anuncio/nuevo")
 	public String nuevoAnuncio(Model model, Anuncio anuncio) {
 
 		anuncios.add(anuncio);
@@ -35,7 +36,7 @@ public String nuevoAnuncio(Model model, Anuncio anuncio) {
 
 	}
 
-	@RequestMapping("/anuncio/{num}")
+	@GetMapping("/anuncio/{num}")
 	public String verAnuncio(Model model, @PathVariable int num) {
 
 		Anuncio anuncio = anuncios.get(num - 1);
diff --git a/web_ejer5/pom.xml b/web_ejer5/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.3.3.RELEASE</version>
+		<version>1.4.1.RELEASE</version>
 		<relativePath/>
 	</parent>
 
diff --git a/web_ejer5/src/main/java/es/urjc/code/daw/tablonanuncios/TablonController.java b/web_ejer5/src/main/java/es/urjc/code/daw/tablonanuncios/TablonController.java
@@ -8,8 +8,9 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 
 @Controller
 public class TablonController {
@@ -24,7 +25,7 @@ public TablonController() {
 		anuncios.add(new Anuncio("Juan", "Hola caracola", "XXXX"));
 	}
 
-	@RequestMapping("/")
+	@GetMapping("/")
 	public String tablon(Model model, HttpSession session) {
 
 		model.addAttribute("anuncios", anuncios);
@@ -33,7 +34,7 @@ public String tablon(Model model, HttpSession session) {
 		return "tablon";
 	}
 
-	@RequestMapping("/anuncio/nuevo")
+	@PostMapping("/anuncio/nuevo")
 	public String nuevoAnuncio(Model model, Anuncio anuncio) {
 
 		anuncios.add(anuncio);
@@ -45,7 +46,7 @@ public String nuevoAnuncio(Model model, Anuncio anuncio) {
 
 	}
 
-	@RequestMapping("/anuncio/nuevo_form")
+	@GetMapping("/anuncio/nuevo_form")
 	public String nuevoAnuncioForm(Model model) {
 
 		model.addAttribute("nombre", usuario.getNombre());
@@ -54,7 +55,7 @@ public String nuevoAnuncioForm(Model model) {
 		return "nuevo_anuncio";
 	}
 
-	@RequestMapping("/anuncio/{num}")
+	@GetMapping("/anuncio/{num}")
 	public String nuevoAnuncio(Model model, @PathVariable int num) {
 
 		Anuncio anuncio = anuncios.get(num - 1);
diff --git a/web_ejer5/src/main/java/es/urjc/code/daw/tablonanuncios/Usuario.java b/web_ejer5/src/main/java/es/urjc/code/daw/tablonanuncios/Usuario.java
@@ -1,12 +1,10 @@
 package es.urjc.code.daw.tablonanuncios;
 
-import org.springframework.context.annotation.Scope;
-import org.springframework.context.annotation.ScopedProxyMode;
 import org.springframework.stereotype.Component;
-import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.annotation.SessionScope;
 
 @Component
-@Scope(value = WebApplicationContext.SCOPE_SESSION, proxyMode = ScopedProxyMode.TARGET_CLASS)
+@SessionScope
 public class Usuario {
 
 	private String nombre = "";
