From dc161c8d3b7e2f1f27258bcc0d45431a99857546 Mon Sep 17 00:00:00 2001 From: Alejandro Gervasio Date: Sat, 7 Jul 2018 18:45:49 -0300 Subject: [PATCH 1/9] Initial Commit --- javax-servlets/.gitignore | 6 - javax-servlets/README.md | 2 - javax-servlets/pom.xml | 106 +++++++++++++++--- .../com/baeldung/servlets/FormServlet.java | 47 -------- .../com/baeldung/servlets/UserServlet.java | 49 ++++++++ .../src/main/webapp/WEB-INF/jsp/result.jsp | 16 +++ .../{web => src/main/webapp}/WEB-INF/web.xml | 11 +- javax-servlets/src/main/webapp/user.jsp | 19 ++++ .../servlets/FormServletLiveTest.java | 34 ------ .../baeldung/test/UserServletUnitTest.java | 52 +++++++++ javax-servlets/web/index.jsp | 26 ----- 11 files changed, 235 insertions(+), 133 deletions(-) delete mode 100644 javax-servlets/.gitignore delete mode 100644 javax-servlets/README.md delete mode 100644 javax-servlets/src/main/java/com/baeldung/servlets/FormServlet.java create mode 100644 javax-servlets/src/main/java/com/baeldung/servlets/UserServlet.java create mode 100644 javax-servlets/src/main/webapp/WEB-INF/jsp/result.jsp rename javax-servlets/{web => src/main/webapp}/WEB-INF/web.xml (52%) create mode 100644 javax-servlets/src/main/webapp/user.jsp delete mode 100644 javax-servlets/src/test/java/com/baeldung/servlets/FormServletLiveTest.java create mode 100644 javax-servlets/src/test/java/com/baeldung/test/UserServletUnitTest.java delete mode 100644 javax-servlets/web/index.jsp diff --git a/javax-servlets/.gitignore b/javax-servlets/.gitignore deleted file mode 100644 index dfbd0632874e..000000000000 --- a/javax-servlets/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -# Created by .ignore support plugin (hsz.mobi) -.idea -classes -target -*.iml -out \ No newline at end of file diff --git a/javax-servlets/README.md b/javax-servlets/README.md deleted file mode 100644 index d6bc6db8b807..000000000000 --- a/javax-servlets/README.md +++ /dev/null @@ -1,2 +0,0 @@ -### Relevant Articles: -- [Introduction to Java Servlets](http://www.baeldung.com/intro-to-servlets) diff --git a/javax-servlets/pom.xml b/javax-servlets/pom.xml index 740766630949..963bb4817ffb 100644 --- a/javax-servlets/pom.xml +++ b/javax-servlets/pom.xml @@ -1,27 +1,93 @@ + 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 - + war + com.baeldung parent-modules 1.0.0-SNAPSHOT - - - + + + junit + junit + 4.12 + test + + + org.assertj + assertj-core + 3.9.1 + test + + + org.hamcrest + hamcrest-core + 1.3 + test + + + org.mockito + mockito-core + 2.18.3 + test + + + javax + javaee-web-api + 7.0 + provided + + + jstl + jstl + 1.2 + + + javax.el + el-api + 2.2 + + + + commons-fileupload + commons-fileupload + 1.3.3 + + + commons-io + commons-io + 2.6 + + + javax.servlet javax.servlet-api - ${javax.servlet.version} + 4.0.1 + + javax.servlet.jsp.jstl + jstl-api + 1.2 + + + javax.servlet.jsp + javax.servlet.jsp-api + 2.3.1 + + + javax.servlet + jstl + 1.2 + + org.apache.httpcomponents httpclient @@ -34,12 +100,20 @@ - + + com.google.code.gson + gson + ${gson.version} + + + org.springframework + spring-test + ${spring-test.version} + test + - - - 3.1.0 - 4.5.3 - - - \ No newline at end of file + 4.5.3 + 5.0.5.RELEASE + 2.8.2 + + diff --git a/javax-servlets/src/main/java/com/baeldung/servlets/FormServlet.java b/javax-servlets/src/main/java/com/baeldung/servlets/FormServlet.java deleted file mode 100644 index fcd9143dff0a..000000000000 --- a/javax-servlets/src/main/java/com/baeldung/servlets/FormServlet.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.baeldung.servlets; - -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - -@WebServlet(name = "FormServlet", urlPatterns = "/calculateServlet") -public class FormServlet extends HttpServlet { - - @Override - protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - - String height = request.getParameter("height"); - String weight = request.getParameter("weight"); - - try { - double bmi = calculateBMI(Double.parseDouble(weight), Double.parseDouble(height)); - - request.setAttribute("bmi", bmi); - response.setHeader("Test", "Success"); - response.setHeader("BMI", String.valueOf(bmi)); - - RequestDispatcher dispatcher = request.getRequestDispatcher("index.jsp"); - dispatcher.forward(request, response); - } catch (Exception e) { - - response.sendRedirect("index.jsp"); - } - } - - @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - - // do something else here - } - - private Double calculateBMI(Double weight, Double height) { - - return weight / (height * height); - } -} \ No newline at end of file diff --git a/javax-servlets/src/main/java/com/baeldung/servlets/UserServlet.java b/javax-servlets/src/main/java/com/baeldung/servlets/UserServlet.java new file mode 100644 index 000000000000..269cee3922fa --- /dev/null +++ b/javax-servlets/src/main/java/com/baeldung/servlets/UserServlet.java @@ -0,0 +1,49 @@ +package com.baeldung.servlets; + +import java.io.IOException; +import javax.servlet.ServletException; +import javax.servlet.annotation.WebInitParam; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +@WebServlet(name = "UserServlet", urlPatterns = {"/userServlet"}, initParams={ + @WebInitParam(name="name", value="Not provided"), + @WebInitParam(name="email", value="Not provided")}) +public class UserServlet extends HttpServlet { + + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + } + + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + processRequest(request, response); + forwardRequest(request, response, "/WEB-INF/jsp/result.jsp"); + } + + protected void processRequest(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + request.setAttribute("name", getRequestParameter(request, "name")); + request.setAttribute("email", getRequestParameter(request, "email")); + request.setAttribute("province", getContextParameter("province")); + request.setAttribute("country", getContextParameter("country")); + } + + protected String getRequestParameter(HttpServletRequest request, String name) { + String param = request.getParameter(name); + return !param.isEmpty() ? param : getInitParameter(name); + } + + protected String getContextParameter(String name) { + return getServletContext().getInitParameter(name); + } + + protected void forwardRequest(HttpServletRequest request, HttpServletResponse response, String path) + throws ServletException, IOException { + request.getRequestDispatcher(path).forward(request, response); + } +} \ No newline at end of file diff --git a/javax-servlets/src/main/webapp/WEB-INF/jsp/result.jsp b/javax-servlets/src/main/webapp/WEB-INF/jsp/result.jsp new file mode 100644 index 000000000000..01cc54858e24 --- /dev/null +++ b/javax-servlets/src/main/webapp/WEB-INF/jsp/result.jsp @@ -0,0 +1,16 @@ +<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> +<%@ page contentType="text/html" pageEncoding="UTF-8"%> + + + + + User Data + + +

User Information

+

Name: ${name}

+

Email: ${email}

+

Province: ${province}

+

Country: ${country}

+ + diff --git a/javax-servlets/web/WEB-INF/web.xml b/javax-servlets/src/main/webapp/WEB-INF/web.xml similarity index 52% rename from javax-servlets/web/WEB-INF/web.xml rename to javax-servlets/src/main/webapp/WEB-INF/web.xml index 66934d8fd341..1b801171b316 100644 --- a/javax-servlets/web/WEB-INF/web.xml +++ b/javax-servlets/src/main/webapp/WEB-INF/web.xml @@ -3,5 +3,12 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" version="3.1"> - - \ No newline at end of file + + province + Mendoza + + + country + Argentina + + diff --git a/javax-servlets/src/main/webapp/user.jsp b/javax-servlets/src/main/webapp/user.jsp new file mode 100644 index 000000000000..c6e1bb69f9d2 --- /dev/null +++ b/javax-servlets/src/main/webapp/user.jsp @@ -0,0 +1,19 @@ +<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> +<%@ page contentType="text/html" pageEncoding="UTF-8"%> + + + + Context and Servlet Initialization Parameters + + + +

Please fill the form below:

+
+ + + + + +
+ + diff --git a/javax-servlets/src/test/java/com/baeldung/servlets/FormServletLiveTest.java b/javax-servlets/src/test/java/com/baeldung/servlets/FormServletLiveTest.java deleted file mode 100644 index 120a555c5b77..000000000000 --- a/javax-servlets/src/test/java/com/baeldung/servlets/FormServletLiveTest.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.baeldung.servlets; - -import org.apache.http.HttpResponse; -import org.apache.http.client.HttpClient; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.message.BasicNameValuePair; -import org.junit.Test; - -import java.util.ArrayList; -import java.util.List; - -import static org.junit.Assert.assertEquals; - -public class FormServletLiveTest { - - @Test - public void whenPostRequestUsingHttpClient_thenCorrect() throws Exception { - - HttpClient client = HttpClientBuilder.create().build(); - HttpPost method = new HttpPost("http://localhost:8080/calculateServlet"); - - List nvps = new ArrayList<>(); - nvps.add(new BasicNameValuePair("height", String.valueOf(2))); - nvps.add(new BasicNameValuePair("weight", String.valueOf(80))); - - method.setEntity(new UrlEncodedFormEntity(nvps)); - HttpResponse httpResponse = client.execute(method); - - assertEquals("Success", httpResponse.getHeaders("Test")[0].getValue()); - assertEquals("20.0", httpResponse.getHeaders("BMI")[0].getValue()); - } -} diff --git a/javax-servlets/src/test/java/com/baeldung/test/UserServletUnitTest.java b/javax-servlets/src/test/java/com/baeldung/test/UserServletUnitTest.java new file mode 100644 index 000000000000..d4c93791d222 --- /dev/null +++ b/javax-servlets/src/test/java/com/baeldung/test/UserServletUnitTest.java @@ -0,0 +1,52 @@ +package com.baeldung.servlets; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import static org.assertj.core.api.Assertions.assertThat; +import org.junit.BeforeClass; +import org.junit.Test; +import static org.mockito.Mockito.atLeast; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +public class UserServletUnitTest { + + private static HttpServletRequest request; + private static HttpServletResponse response; + + + @BeforeClass + public static void setUpHttpServletRequestMockInstance() { + request = mock(HttpServletRequest.class); + } + + @BeforeClass + public static void setUpHttpServletResponsetMockInstance() { + response = mock(HttpServletResponse.class); + } + + @Test + public void givenHttpServletRequestMockInstance_whenCalledgetParameter_thenCalledAtLeastOnce() { + request.getParameter("name"); + verify(request, atLeast(1)).getParameter("name"); + } + + @Test + public void givenHttpServletRequestMockInstance_whenCalledgetParameter_thenOneAssertion() { + when(request.getParameter("name")).thenReturn("username"); + assertThat(request.getParameter("name")).isEqualTo("username"); + } + + @Test + public void givenHttpServletResponseMockInstance_whenCalledgetContentType_thenCalledAtLeastOnce() { + response.getContentType(); + verify(response, atLeast(1)).getContentType(); + } + + @Test + public void givenHttpServletResponseMockInstance_whenCalledgetContentType_thenOneAssertion() { + when(response.getContentType()).thenReturn("text/html"); + assertThat(response.getContentType()).isEqualTo("text/html"); + } +} \ No newline at end of file diff --git a/javax-servlets/web/index.jsp b/javax-servlets/web/index.jsp deleted file mode 100644 index 5a2e018a413e..000000000000 --- a/javax-servlets/web/index.jsp +++ /dev/null @@ -1,26 +0,0 @@ -<%@ page contentType="text/html;charset=UTF-8" language="java" %> - - - Calculate BMI - - - -
- - - - - - - - - - - - -
Your Weight (kg) :
Your Height (m) :
-

${bmi}

-
- - - From bf89ed2764c412b2f421bb4b263bf7ef7a3ef004 Mon Sep 17 00:00:00 2001 From: Alejandro Gervasio Date: Sat, 7 Jul 2018 18:51:51 -0300 Subject: [PATCH 2/9] Add source files --- javax-servlets/.gitignore | 6 + javax-servlets/pom.xml | 106 +++--------------- .../com/baeldung/servlets/FormServlet.java | 47 ++++++++ .../baeldung/test/FormServletLiveTest.java | 34 ++++++ 4 files changed, 103 insertions(+), 90 deletions(-) create mode 100644 javax-servlets/.gitignore create mode 100644 javax-servlets/src/main/java/com/baeldung/servlets/FormServlet.java create mode 100644 javax-servlets/src/test/java/com/baeldung/test/FormServletLiveTest.java diff --git a/javax-servlets/.gitignore b/javax-servlets/.gitignore new file mode 100644 index 000000000000..dfbd0632874e --- /dev/null +++ b/javax-servlets/.gitignore @@ -0,0 +1,6 @@ +# Created by .ignore support plugin (hsz.mobi) +.idea +classes +target +*.iml +out \ No newline at end of file diff --git a/javax-servlets/pom.xml b/javax-servlets/pom.xml index 963bb4817ffb..740766630949 100644 --- a/javax-servlets/pom.xml +++ b/javax-servlets/pom.xml @@ -1,93 +1,27 @@ + 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 - war - + com.baeldung parent-modules 1.0.0-SNAPSHOT - + + + - - junit - junit - 4.12 - test - - - org.assertj - assertj-core - 3.9.1 - test - - - org.hamcrest - hamcrest-core - 1.3 - test - - - org.mockito - mockito-core - 2.18.3 - test - - - javax - javaee-web-api - 7.0 - provided - - - jstl - jstl - 1.2 - - - javax.el - el-api - 2.2 - - - - commons-fileupload - commons-fileupload - 1.3.3 - - - commons-io - commons-io - 2.6 - - - javax.servlet javax.servlet-api - 4.0.1 + ${javax.servlet.version} - - javax.servlet.jsp.jstl - jstl-api - 1.2 - - - javax.servlet.jsp - javax.servlet.jsp-api - 2.3.1 - - - javax.servlet - jstl - 1.2 - - org.apache.httpcomponents httpclient @@ -100,20 +34,12 @@ - - com.google.code.gson - gson - ${gson.version} - - - org.springframework - spring-test - ${spring-test.version} - test - + - 4.5.3 - 5.0.5.RELEASE - 2.8.2 - - + + + 3.1.0 + 4.5.3 + + + \ No newline at end of file diff --git a/javax-servlets/src/main/java/com/baeldung/servlets/FormServlet.java b/javax-servlets/src/main/java/com/baeldung/servlets/FormServlet.java new file mode 100644 index 000000000000..fcd9143dff0a --- /dev/null +++ b/javax-servlets/src/main/java/com/baeldung/servlets/FormServlet.java @@ -0,0 +1,47 @@ +package com.baeldung.servlets; + +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +@WebServlet(name = "FormServlet", urlPatterns = "/calculateServlet") +public class FormServlet extends HttpServlet { + + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + + String height = request.getParameter("height"); + String weight = request.getParameter("weight"); + + try { + double bmi = calculateBMI(Double.parseDouble(weight), Double.parseDouble(height)); + + request.setAttribute("bmi", bmi); + response.setHeader("Test", "Success"); + response.setHeader("BMI", String.valueOf(bmi)); + + RequestDispatcher dispatcher = request.getRequestDispatcher("index.jsp"); + dispatcher.forward(request, response); + } catch (Exception e) { + + response.sendRedirect("index.jsp"); + } + } + + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + + // do something else here + } + + private Double calculateBMI(Double weight, Double height) { + + return weight / (height * height); + } +} \ No newline at end of file diff --git a/javax-servlets/src/test/java/com/baeldung/test/FormServletLiveTest.java b/javax-servlets/src/test/java/com/baeldung/test/FormServletLiveTest.java new file mode 100644 index 000000000000..120a555c5b77 --- /dev/null +++ b/javax-servlets/src/test/java/com/baeldung/test/FormServletLiveTest.java @@ -0,0 +1,34 @@ +package com.baeldung.servlets; + +import org.apache.http.HttpResponse; +import org.apache.http.client.HttpClient; +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.message.BasicNameValuePair; +import org.junit.Test; + +import java.util.ArrayList; +import java.util.List; + +import static org.junit.Assert.assertEquals; + +public class FormServletLiveTest { + + @Test + public void whenPostRequestUsingHttpClient_thenCorrect() throws Exception { + + HttpClient client = HttpClientBuilder.create().build(); + HttpPost method = new HttpPost("http://localhost:8080/calculateServlet"); + + List nvps = new ArrayList<>(); + nvps.add(new BasicNameValuePair("height", String.valueOf(2))); + nvps.add(new BasicNameValuePair("weight", String.valueOf(80))); + + method.setEntity(new UrlEncodedFormEntity(nvps)); + HttpResponse httpResponse = client.execute(method); + + assertEquals("Success", httpResponse.getHeaders("Test")[0].getValue()); + assertEquals("20.0", httpResponse.getHeaders("BMI")[0].getValue()); + } +} From d53bde862d2b00bafcbd18f8512dc4d959ba2f6d Mon Sep 17 00:00:00 2001 From: Alejandro Gervasio Date: Sat, 7 Jul 2018 18:53:35 -0300 Subject: [PATCH 3/9] Add readme.md --- javax-servlets/README.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 javax-servlets/README.md diff --git a/javax-servlets/README.md b/javax-servlets/README.md new file mode 100644 index 000000000000..d6bc6db8b807 --- /dev/null +++ b/javax-servlets/README.md @@ -0,0 +1,2 @@ +### Relevant Articles: +- [Introduction to Java Servlets](http://www.baeldung.com/intro-to-servlets) From 05ddf28af014f74e5c402fbb24ddb52c4fe0b9f2 Mon Sep 17 00:00:00 2001 From: Alejandro Gervasio Date: Sat, 7 Jul 2018 18:55:53 -0300 Subject: [PATCH 4/9] Add web.xml --- javax-servlets/src/main/webapp/WEB-INF/web.xml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/javax-servlets/src/main/webapp/WEB-INF/web.xml b/javax-servlets/src/main/webapp/WEB-INF/web.xml index 1b801171b316..66934d8fd341 100644 --- a/javax-servlets/src/main/webapp/WEB-INF/web.xml +++ b/javax-servlets/src/main/webapp/WEB-INF/web.xml @@ -3,12 +3,5 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" version="3.1"> - - province - Mendoza - - - country - Argentina - - + + \ No newline at end of file From 7a2baee0c3fec1ef1e5f6e53ec77d122ee21e041 Mon Sep 17 00:00:00 2001 From: Alejandro Gervasio Date: Sat, 7 Jul 2018 19:04:32 -0300 Subject: [PATCH 5/9] Update pom.xml --- javax-servlets/pom.xml | 113 +++++++++++++++++++++++++---------------- 1 file changed, 69 insertions(+), 44 deletions(-) diff --git a/javax-servlets/pom.xml b/javax-servlets/pom.xml index 740766630949..2b5779fb209a 100644 --- a/javax-servlets/pom.xml +++ b/javax-servlets/pom.xml @@ -1,45 +1,70 @@ - - - 4.0.0 - - com.baeldung - javax-servlets - 1.0-SNAPSHOT - - - com.baeldung - parent-modules - 1.0.0-SNAPSHOT - - - - - - - - javax.servlet - javax.servlet-api - ${javax.servlet.version} - - - org.apache.httpcomponents - httpclient - ${org.apache.httpcomponents.version} - test - - - commons-logging - commons-logging - - - - - - - - 3.1.0 - 4.5.3 - - + + + 4.0.0 + + com.baeldung + javax-servlets + 1.0-SNAPSHOT + + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + + + + + + + + junit + junit + 4.12 + test + + + org.assertj + assertj-core + 3.9.1 + test + + + org.hamcrest + hamcrest-core + 1.3 + test + + + org.mockito + mockito-core + 2.18.3 + test + + + + javax.servlet + javax.servlet-api + ${javax.servlet.version} + + + org.apache.httpcomponents + httpclient + ${org.apache.httpcomponents.version} + test + + + commons-logging + commons-logging + + + + + + + + 3.1.0 + 4.5.3 + + \ No newline at end of file From e95667ec584867517a318dbb860fdfbf1b48bd5c Mon Sep 17 00:00:00 2001 From: Alejandro Gervasio Date: Sat, 7 Jul 2018 19:16:18 -0300 Subject: [PATCH 6/9] Update pom.xml --- javax-servlets/pom.xml | 150 +++++++++++++++++------------------------ 1 file changed, 60 insertions(+), 90 deletions(-) diff --git a/javax-servlets/pom.xml b/javax-servlets/pom.xml index 7f62faf193cf..a52f963b15f2 100644 --- a/javax-servlets/pom.xml +++ b/javax-servlets/pom.xml @@ -1,23 +1,16 @@ -<<<<<<< HEAD 4.0.0 - - com.baeldung + com.baeldung.javax-servlets javax-servlets 1.0-SNAPSHOT - com.baeldung parent-modules 1.0.0-SNAPSHOT - - - - junit junit @@ -43,6 +36,63 @@ test + + + commons-fileupload + commons-fileupload + 1.3.3 + + + commons-io + commons-io + 2.6 + + + + + javax.servlet + javax.servlet-api + 4.0.1 + + + javax.servlet.jsp.jstl + jstl-api + 1.2 + + + javax.servlet.jsp + javax.servlet.jsp-api + 2.3.1 + + + javax.servlet + jstl + 1.2 + + + + org.apache.httpcomponents + httpclient + ${org.apache.httpcomponents.version} + test + + + commons-logging + commons-logging + + + + + com.google.code.gson + gson + ${gson.version} + + + org.springframework + spring-test + ${spring-test.version} + test + javax.servlet javax.servlet-api @@ -66,86 +116,6 @@ 3.1.0 4.5.3 + 2.8.2 - -======= - - - 4.0.0 - javax-servlets - 1.0-SNAPSHOT - - - com.baeldung - parent-modules - 1.0.0-SNAPSHOT - - - - - - commons-fileupload - commons-fileupload - 1.3.3 - - - commons-io - commons-io - 2.6 - - - - - javax.servlet - javax.servlet-api - 4.0.1 - - - javax.servlet.jsp.jstl - jstl-api - 1.2 - - - javax.servlet.jsp - javax.servlet.jsp-api - 2.3.1 - - - javax.servlet - jstl - 1.2 - - - - org.apache.httpcomponents - httpclient - ${org.apache.httpcomponents.version} - test - - - commons-logging - commons-logging - - - - - com.google.code.gson - gson - ${gson.version} - - - org.springframework - spring-test - ${spring-test.version} - test - - - - - 4.5.3 - 5.0.5.RELEASE - 2.8.2 - ->>>>>>> 559cfeb05fcd102d7c70eacea8f0d4095780c259 - \ No newline at end of file + From 1ac81fb8589e8632c7738c5bc9773a8d63529d82 Mon Sep 17 00:00:00 2001 From: Alejandro Gervasio Date: Sat, 7 Jul 2018 19:24:49 -0300 Subject: [PATCH 7/9] Update pom.xml --- javax-servlets/pom.xml | 102 +++++++++++++++++------------------------ 1 file changed, 42 insertions(+), 60 deletions(-) diff --git a/javax-servlets/pom.xml b/javax-servlets/pom.xml index a52f963b15f2..3868ee0d31dc 100644 --- a/javax-servlets/pom.xml +++ b/javax-servlets/pom.xml @@ -38,66 +38,38 @@ - commons-fileupload - commons-fileupload - 1.3.3 - - - commons-io - commons-io - 2.6 - + commons-fileupload + commons-fileupload + 1.3.3 + + + commons-io + commons-io + 2.6 + - - - javax.servlet - javax.servlet-api - 4.0.1 - - - javax.servlet.jsp.jstl - jstl-api - 1.2 - - - javax.servlet.jsp - javax.servlet.jsp-api - 2.3.1 - - - javax.servlet - jstl - 1.2 - - - - org.apache.httpcomponents - httpclient - ${org.apache.httpcomponents.version} - test - - - commons-logging - commons-logging - - - - - com.google.code.gson - gson - ${gson.version} - - - org.springframework - spring-test - ${spring-test.version} - test - + javax.servlet javax.servlet-api - ${javax.servlet.version} + 4.0.1 + + + javax.servlet.jsp.jstl + jstl-api + 1.2 + + + javax.servlet.jsp + javax.servlet.jsp-api + 2.3.1 + + javax.servlet + jstl + 1.2 + + org.apache.httpcomponents httpclient @@ -110,12 +82,22 @@ - + + com.google.code.gson + gson + ${gson.version} + + + org.springframework + spring-test + ${spring-test.version} + test + - - 3.1.0 - 4.5.3 - 2.8.2 + 3.1.0 + 4.5.3 + 5.0.5.RELEASE + 2.8.2 From 1429b0ef2d7e8e22fc583aaf8b40809407e8b9bc Mon Sep 17 00:00:00 2001 From: Alejandro Gervasio Date: Mon, 9 Jul 2018 16:17:40 -0300 Subject: [PATCH 8/9] Remove project folder --- javax-servlet-init-params/pom.xml | 56 ------------------- .../com/baeldung/servlets/UserServlet.java | 49 ---------------- .../src/main/webapp/WEB-INF/jsp/result.jsp | 16 ------ .../src/main/webapp/WEB-INF/web.xml | 14 ----- .../src/main/webapp/index.jsp | 19 ------- .../baeldung/test/UserServletUnitTest.java | 52 ----------------- 6 files changed, 206 deletions(-) delete mode 100644 javax-servlet-init-params/pom.xml delete mode 100644 javax-servlet-init-params/src/main/java/com/baeldung/servlets/UserServlet.java delete mode 100644 javax-servlet-init-params/src/main/webapp/WEB-INF/jsp/result.jsp delete mode 100644 javax-servlet-init-params/src/main/webapp/WEB-INF/web.xml delete mode 100644 javax-servlet-init-params/src/main/webapp/index.jsp delete mode 100644 javax-servlet-init-params/src/test/java/com/baeldung/test/UserServletUnitTest.java diff --git a/javax-servlet-init-params/pom.xml b/javax-servlet-init-params/pom.xml deleted file mode 100644 index 4f766a7e2c83..000000000000 --- a/javax-servlet-init-params/pom.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - 4.0.0 - com.baeldung.javax-servlet-init-params - javax-servlet-init-params - 1.0 - - - com.baeldung - parent-modules - 1.0.0-SNAPSHOT - - - - - junit - junit - 4.12 - test - - - org.assertj - assertj-core - 3.9.1 - test - - - org.hamcrest - hamcrest-core - 1.3 - test - - - org.mockito - mockito-core - 2.18.3 - test - - - javax - javaee-web-api - 7.0 - provided - - - jstl - jstl - 1.2 - - - javax.el - el-api - 2.2 - - - \ No newline at end of file diff --git a/javax-servlet-init-params/src/main/java/com/baeldung/servlets/UserServlet.java b/javax-servlet-init-params/src/main/java/com/baeldung/servlets/UserServlet.java deleted file mode 100644 index e195aa092a56..000000000000 --- a/javax-servlet-init-params/src/main/java/com/baeldung/servlets/UserServlet.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.baeldung.servlets; - -import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebInitParam; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -@WebServlet(name = "UserServlet", urlPatterns = {"/userServlet"}, initParams={ - @WebInitParam(name="name", value="Not provided"), - @WebInitParam(name="email", value="Not provided")}) -public class UserServlet extends HttpServlet { - - @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - } - - @Override - protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - processRequest(request, response); - forwardRequest(request, response, "/WEB-INF/jsp/result.jsp"); - } - - protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - request.setAttribute("name", getRequestParameter(request, "name")); - request.setAttribute("email", getRequestParameter(request, "email")); - request.setAttribute("province", getContextParameter("province")); - request.setAttribute("country", getContextParameter("country")); - } - - protected String getRequestParameter(HttpServletRequest request, String name) { - String param = request.getParameter(name); - return !param.isEmpty() ? param : getInitParameter(name); - } - - protected String getContextParameter(String name) { - return getServletContext().getInitParameter(name); - } - - protected void forwardRequest(HttpServletRequest request, HttpServletResponse response, String path) - throws ServletException, IOException { - request.getRequestDispatcher(path).forward(request, response); - } -} \ No newline at end of file diff --git a/javax-servlet-init-params/src/main/webapp/WEB-INF/jsp/result.jsp b/javax-servlet-init-params/src/main/webapp/WEB-INF/jsp/result.jsp deleted file mode 100644 index 01cc54858e24..000000000000 --- a/javax-servlet-init-params/src/main/webapp/WEB-INF/jsp/result.jsp +++ /dev/null @@ -1,16 +0,0 @@ -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> -<%@ page contentType="text/html" pageEncoding="UTF-8"%> - - - - - User Data - - -

User Information

-

Name: ${name}

-

Email: ${email}

-

Province: ${province}

-

Country: ${country}

- - diff --git a/javax-servlet-init-params/src/main/webapp/WEB-INF/web.xml b/javax-servlet-init-params/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 1b801171b316..000000000000 --- a/javax-servlet-init-params/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - province - Mendoza - - - country - Argentina - - diff --git a/javax-servlet-init-params/src/main/webapp/index.jsp b/javax-servlet-init-params/src/main/webapp/index.jsp deleted file mode 100644 index ca41942e5dca..000000000000 --- a/javax-servlet-init-params/src/main/webapp/index.jsp +++ /dev/null @@ -1,19 +0,0 @@ -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> -<%@ page contentType="text/html" pageEncoding="UTF-8"%> - - - - Context and Initialization Servlet Parameters - - - -

Please fill the form below:

-
- - - - - -
- - diff --git a/javax-servlet-init-params/src/test/java/com/baeldung/test/UserServletUnitTest.java b/javax-servlet-init-params/src/test/java/com/baeldung/test/UserServletUnitTest.java deleted file mode 100644 index ef3d877dd72f..000000000000 --- a/javax-servlet-init-params/src/test/java/com/baeldung/test/UserServletUnitTest.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.baeldung.test; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import static org.assertj.core.api.Assertions.assertThat; -import org.junit.BeforeClass; -import org.junit.Test; -import static org.mockito.Mockito.atLeast; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -public class UserServletUnitTest { - - private static HttpServletRequest request; - private static HttpServletResponse response; - - - @BeforeClass - public static void setUpHttpServletRequestMockInstance() { - request = mock(HttpServletRequest.class); - } - - @BeforeClass - public static void setUpHttpServletResponsetMockInstance() { - response = mock(HttpServletResponse.class); - } - - @Test - public void givenHttpServletRequestMockInstance_whenCalledgetParameter_thenCalledAtLeastOnce() { - request.getParameter("name"); - verify(request, atLeast(1)).getParameter("name"); - } - - @Test - public void givenHttpServletRequestMockInstance_whenCalledgetParameter_thenOneAssertion() { - when(request.getParameter("name")).thenReturn("username"); - assertThat(request.getParameter("name")).isEqualTo("username"); - } - - @Test - public void givenHttpServletResponseMockInstance_whenCalledgetContentType_thenCalledAtLeastOnce() { - response.getContentType(); - verify(response, atLeast(1)).getContentType(); - } - - @Test - public void givenHttpServletResponseMockInstance_whenCalledgetContentType_thenOneAssertion() { - when(response.getContentType()).thenReturn("text/html"); - assertThat(response.getContentType()).isEqualTo("text/html"); - } -} \ No newline at end of file From 6ee13b3acff101ab5b6615874d52f2074e95d3cd Mon Sep 17 00:00:00 2001 From: Alejandro Gervasio Date: Mon, 9 Jul 2018 17:31:33 -0300 Subject: [PATCH 9/9] Update pom.xml --- javax-servlets/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/javax-servlets/pom.xml b/javax-servlets/pom.xml index 3868ee0d31dc..fadf0216ce50 100644 --- a/javax-servlets/pom.xml +++ b/javax-servlets/pom.xml @@ -5,6 +5,7 @@ com.baeldung.javax-servlets javax-servlets 1.0-SNAPSHOT + war com.baeldung parent-modules