From fb4c450a2f35899e3112c16b5f3eac017f396d08 Mon Sep 17 00:00:00 2001 From: pauljervis Date: Sun, 15 Apr 2018 18:22:42 +0100 Subject: [PATCH] Bael 1601 redirects (#4006) * tidy pom move classes to javax-servlets * move into spring-mvc-simple * updated POM to handle no default tests in module --- javax-servlets/pom.xml | 9 ++++--- spring-boot-bootstrap/pom.xml | 1 - spring-mvc-simple/pom.xml | 24 ++++++++++++------- .../spring/servlets}/ForwardedServlet.java | 2 +- .../spring/servlets}/HelloServlet.java | 2 +- .../spring/servlets}/RedirectedServlet.java | 2 +- .../spring/servlets}/WelcomeServlet.java | 3 +-- .../spring/servlets}/HelloServletTest.java | 11 ++++----- .../spring/servlets}/WelcomeServletTest.java | 7 +++--- 9 files changed, 34 insertions(+), 27 deletions(-) rename {spring-boot-bootstrap/src/main/java/org/baeldung => spring-mvc-simple/src/main/java/com/baeldung/spring/servlets}/ForwardedServlet.java (94%) rename {spring-boot-bootstrap/src/main/java/org/baeldung => spring-mvc-simple/src/main/java/com/baeldung/spring/servlets}/HelloServlet.java (94%) rename {spring-boot-bootstrap/src/main/java/org/baeldung => spring-mvc-simple/src/main/java/com/baeldung/spring/servlets}/RedirectedServlet.java (94%) rename {spring-boot-bootstrap/src/main/java/org/baeldung => spring-mvc-simple/src/main/java/com/baeldung/spring/servlets}/WelcomeServlet.java (93%) rename {spring-boot-bootstrap/src/test/java/org/baeldung => spring-mvc-simple/src/test/java/com/baeldung/spring/servlets}/HelloServletTest.java (84%) rename {spring-boot-bootstrap/src/test/java/org/baeldung => spring-mvc-simple/src/test/java/com/baeldung/spring/servlets}/WelcomeServletTest.java (85%) diff --git a/javax-servlets/pom.xml b/javax-servlets/pom.xml index 7407666309..a75af414cd 100644 --- a/javax-servlets/pom.xml +++ b/javax-servlets/pom.xml @@ -3,7 +3,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.baeldung javax-servlets 1.0-SNAPSHOT @@ -13,8 +12,6 @@ 1.0.0-SNAPSHOT - - @@ -35,6 +32,12 @@ + + org.springframework + spring-test + 5.0.5.RELEASE + test + diff --git a/spring-boot-bootstrap/pom.xml b/spring-boot-bootstrap/pom.xml index eb97d6d426..ad2512846b 100644 --- a/spring-boot-bootstrap/pom.xml +++ b/spring-boot-bootstrap/pom.xml @@ -5,7 +5,6 @@ org.baeldung spring-boot-bootstrap - 0.0.1-SNAPSHOT jar spring-boot-bootstrap diff --git a/spring-mvc-simple/pom.xml b/spring-mvc-simple/pom.xml index 10d267aeb5..4e7f39bad3 100644 --- a/spring-mvc-simple/pom.xml +++ b/spring-mvc-simple/pom.xml @@ -1,17 +1,17 @@ - 4.0.0 - com.baeldung spring-mvc-simple war 0.0.1-SNAPSHOT Spring MVC simple Maven Webapp http://maven.apache.org - - com.baeldung - parent-modules - 1.0.0-SNAPSHOT - + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + 1.8 1.8 @@ -19,7 +19,7 @@ 5.0.2.RELEASE 3.2.0 3.7.0 - 2.20 + 2.21.0 1.2 2.3.2-b02 4.0.0 @@ -172,6 +172,14 @@ maven-surefire-plugin ${maven-surefire-plugin.version} + + + default-test + + true + + + org.junit.platform diff --git a/spring-boot-bootstrap/src/main/java/org/baeldung/ForwardedServlet.java b/spring-mvc-simple/src/main/java/com/baeldung/spring/servlets/ForwardedServlet.java similarity index 94% rename from spring-boot-bootstrap/src/main/java/org/baeldung/ForwardedServlet.java rename to spring-mvc-simple/src/main/java/com/baeldung/spring/servlets/ForwardedServlet.java index e42da22852..222ed16c17 100644 --- a/spring-boot-bootstrap/src/main/java/org/baeldung/ForwardedServlet.java +++ b/spring-mvc-simple/src/main/java/com/baeldung/spring/servlets/ForwardedServlet.java @@ -1,4 +1,4 @@ -package org.baeldung; +package com.baeldung.spring.servlets; import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; diff --git a/spring-boot-bootstrap/src/main/java/org/baeldung/HelloServlet.java b/spring-mvc-simple/src/main/java/com/baeldung/spring/servlets/HelloServlet.java similarity index 94% rename from spring-boot-bootstrap/src/main/java/org/baeldung/HelloServlet.java rename to spring-mvc-simple/src/main/java/com/baeldung/spring/servlets/HelloServlet.java index 63673143d6..89bfca795f 100644 --- a/spring-boot-bootstrap/src/main/java/org/baeldung/HelloServlet.java +++ b/spring-mvc-simple/src/main/java/com/baeldung/spring/servlets/HelloServlet.java @@ -1,4 +1,4 @@ -package org.baeldung; +package com.baeldung.spring.servlets; import javax.servlet.RequestDispatcher; import javax.servlet.ServletException; diff --git a/spring-boot-bootstrap/src/main/java/org/baeldung/RedirectedServlet.java b/spring-mvc-simple/src/main/java/com/baeldung/spring/servlets/RedirectedServlet.java similarity index 94% rename from spring-boot-bootstrap/src/main/java/org/baeldung/RedirectedServlet.java rename to spring-mvc-simple/src/main/java/com/baeldung/spring/servlets/RedirectedServlet.java index 6d4b1ebce9..3074eec018 100644 --- a/spring-boot-bootstrap/src/main/java/org/baeldung/RedirectedServlet.java +++ b/spring-mvc-simple/src/main/java/com/baeldung/spring/servlets/RedirectedServlet.java @@ -1,4 +1,4 @@ -package org.baeldung; +package com.baeldung.spring.servlets; import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; diff --git a/spring-boot-bootstrap/src/main/java/org/baeldung/WelcomeServlet.java b/spring-mvc-simple/src/main/java/com/baeldung/spring/servlets/WelcomeServlet.java similarity index 93% rename from spring-boot-bootstrap/src/main/java/org/baeldung/WelcomeServlet.java rename to spring-mvc-simple/src/main/java/com/baeldung/spring/servlets/WelcomeServlet.java index b4a51fc4dc..6f9ee8e7c4 100644 --- a/spring-boot-bootstrap/src/main/java/org/baeldung/WelcomeServlet.java +++ b/spring-mvc-simple/src/main/java/com/baeldung/spring/servlets/WelcomeServlet.java @@ -1,5 +1,4 @@ -package org.baeldung; - +package com.baeldung.spring.servlets; import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; diff --git a/spring-boot-bootstrap/src/test/java/org/baeldung/HelloServletTest.java b/spring-mvc-simple/src/test/java/com/baeldung/spring/servlets/HelloServletTest.java similarity index 84% rename from spring-boot-bootstrap/src/test/java/org/baeldung/HelloServletTest.java rename to spring-mvc-simple/src/test/java/com/baeldung/spring/servlets/HelloServletTest.java index 93e52cf0be..e8dd8f1b73 100644 --- a/spring-boot-bootstrap/src/test/java/org/baeldung/HelloServletTest.java +++ b/spring-mvc-simple/src/test/java/com/baeldung/spring/servlets/HelloServletTest.java @@ -1,13 +1,12 @@ -package org.baeldung; +package com.baeldung.spring.servlets; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; - import javax.servlet.ServletException; import java.io.IOException; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HelloServletTest { @Test @@ -16,9 +15,9 @@ public class HelloServletTest { request.addParameter("name", "Dennis"); MockHttpServletResponse response = new MockHttpServletResponse(); HelloServlet servlet = new HelloServlet(); - + servlet.doGet(request, response); - + assertEquals("/forwarded", response.getForwardedUrl()); assertEquals(200, response.getStatus()); } diff --git a/spring-boot-bootstrap/src/test/java/org/baeldung/WelcomeServletTest.java b/spring-mvc-simple/src/test/java/com/baeldung/spring/servlets/WelcomeServletTest.java similarity index 85% rename from spring-boot-bootstrap/src/test/java/org/baeldung/WelcomeServletTest.java rename to spring-mvc-simple/src/test/java/com/baeldung/spring/servlets/WelcomeServletTest.java index a52b2a5c01..9ec177a452 100644 --- a/spring-boot-bootstrap/src/test/java/org/baeldung/WelcomeServletTest.java +++ b/spring-mvc-simple/src/test/java/com/baeldung/spring/servlets/WelcomeServletTest.java @@ -1,13 +1,12 @@ -package org.baeldung; +package com.baeldung.spring.servlets; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; - import javax.servlet.ServletException; import java.io.IOException; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class WelcomeServletTest { @Test