From b360955e67813a91373ddc810cfd730bde9e1598 Mon Sep 17 00:00:00 2001 From: Juan Moreno Date: Thu, 11 Jan 2018 23:30:31 -0300 Subject: [PATCH] BAEL-1148 earth001@gmail.com - Mapped get method in controller / Removed resources (#3395) * Sample code for BAEL-1148 - earth001@gmail.com * Change tabs for spaces in non java files * Change tabs for spaces in non java files * Removed unnecessary argument * BAEL-1148 earth001@gmail.com - Mapped get method in controller / Removed resources --- .../baeldung/controller/PushController.java | 12 +++-------- .../src/main/webapp/WEB-INF/views/demo.jsp | 20 ++++++++----------- 2 files changed, 11 insertions(+), 21 deletions(-) diff --git a/spring-mvc-push/src/main/java/com/baeldung/controller/PushController.java b/spring-mvc-push/src/main/java/com/baeldung/controller/PushController.java index efee3a840f..c4698fe976 100644 --- a/spring-mvc-push/src/main/java/com/baeldung/controller/PushController.java +++ b/spring-mvc-push/src/main/java/com/baeldung/controller/PushController.java @@ -3,28 +3,22 @@ package com.baeldung.controller; import javax.servlet.http.PushBuilder; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.GetMapping; @Controller public class PushController { - @RequestMapping(value = "/demoWithPush") + @GetMapping(path = "/demoWithPush") public String demoWithPush(PushBuilder pushBuilder) { if (null != pushBuilder) { pushBuilder.path("resources/logo.png") .addHeader("Content-Type", "image/png") .push(); - pushBuilder.path("resources/script.js") - .addHeader("Content-Type", "text/javascript") - .push(); - pushBuilder.path("resources/style.css") - .addHeader("Content-Type", "text/css") - .push(); } return "demo"; } - @RequestMapping(value = "/demoWithoutPush") + @GetMapping(path = "/demoWithoutPush") public String demoWithoutPush() { return "demo"; } diff --git a/spring-mvc-push/src/main/webapp/WEB-INF/views/demo.jsp b/spring-mvc-push/src/main/webapp/WEB-INF/views/demo.jsp index d77619283a..28b27322ae 100644 --- a/spring-mvc-push/src/main/webapp/WEB-INF/views/demo.jsp +++ b/spring-mvc-push/src/main/webapp/WEB-INF/views/demo.jsp @@ -1,22 +1,18 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> + pageEncoding="UTF-8"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> PushBuilder demo -" rel="stylesheet" /> - - PushBuilder demo -
- " alt="Logo" height="126" - width="411"> -
- -
Go to - index + PushBuilder demo +
+ " alt="Logo" + height="126" width="411"> +
+
Go to + index \ No newline at end of file