Skip to content

Commit 4dd5042

Browse files
panos-kakospanos-kakos
authored
[JAVA-40672] (#17803)
* [JAVA-40672] Moved article "Set a Parameter in an HttpServletRequest in Java" from jakarta-servlets-2 to jakarta-servlets * [JAVA-40672] Moved article "Get Client Information From HTTP Request in Java" from jakarta-servlets-2 to jakarta-servlets * [JAVA-40672] Moved article "How to Mock HttpServletRequest" from jakarta-servlets-2 to jakarta-servlets * [JAVA-40672] Moved article "Uploading Files with Servlets and JSP" from jakarta-servlets to jakarta-servlets-2 * [JAVA-40672] Moved article "Example of Downloading File in a Servlet" from jakarta-servlets to jakarta-servlets-2 * [JAVA-40672] Moved article "Returning a JSON Response from a Servlet" from jakarta-servlets to jakarta-servlets-2 * [JAVA-40672] Moved article "Jakarta EE Servlet Exception Handling" from jakarta-servlets to jakarta-servlets-2 * [JAVA-40672] Moved article "An MVC Example with Servlets and JSP" from jakarta-servlets to jakarta-servlets-2 * [JAVA-40672] Moved article "Context and Servlet Initialization Parameters" from jakarta-servlets to jakarta-servlets-2 * [JAVA-40672] Moved article "The Difference between getRequestURI and getPathInfo in HttpServletRequest" from jakarta-servlets to jakarta-servlets-2 * [JAVA-40672] Moved article "Difference Between request.getSession() and request.getSession(true)" from jakarta-servlets to jakarta-servlets-2 * [JAVA-40672] Clean up
1 parent 852df7c commit 4dd5042

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+178
-159
lines changed

‎web-modules/jakarta-servlets-2/README.md

+9-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@
33
This module contains articles about Servlets.
44

55
### Relevant Articles:
6+
- [An MVC Example with Servlets and JSP](https://www.baeldung.com/mvc-servlet-jsp)
67
- [Check if a User Is Logged-in With Servlets and JSP](https://www.baeldung.com/servlets-jsp-check-user-login)
7-
- [How to Mock HttpServletRequest](https://www.baeldung.com/java-httpservletrequest-mock)
8-
- [Set a Parameter in an HttpServletRequest in Java](https://www.baeldung.com/java-servlet-request-set-parameter)
9-
- [Get Client Information From HTTP Request in Java](https://www.baeldung.com/java-http-request-client-info)
8+
- [Uploading Files with Servlets and JSP](https://www.baeldung.com/upload-file-servlet)
9+
- [Example of Downloading File in a Servlet](https://www.baeldung.com/servlet-download-file)
10+
- [Returning a JSON Response from a Servlet](https://www.baeldung.com/servlet-json-response)
11+
- [Jakarta EE Servlet Exception Handling](https://www.baeldung.com/servlet-exceptions)
12+
- [Context and Servlet Initialization Parameters](https://www.baeldung.com/context-servlet-initialization-param)
13+
- [The Difference between getRequestURI and getPathInfo in HttpServletRequest](https://www.baeldung.com/http-servlet-request-requesturi-pathinfo)
14+
- [Difference Between request.getSession() and request.getSession(true)](https://www.baeldung.com/java-request-getsession)
15+
- More articles: [[<-- prev]](/jakarta-servlets)

‎web-modules/jakarta-servlets-2/pom.xml

+8-43
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,15 @@
1818
<dependencies>
1919
<!-- File Uploading -->
2020
<dependency>
21-
<groupId>commons-fileupload</groupId>
22-
<artifactId>commons-fileupload</artifactId>
23-
<version>${commons-fileupload.version}</version>
21+
<groupId>org.apache.commons</groupId>
22+
<artifactId>commons-fileupload2-jakarta-servlet6</artifactId>
23+
<version>${commons-fileupload2-jakarta-servlet6.version}</version>
2424
</dependency>
2525
<dependency>
26-
<groupId>org.apache.commons</groupId>
27-
<artifactId>commons-text</artifactId>
28-
<version>${commons-text.version}</version>
26+
<groupId>com.google.code.gson</groupId>
27+
<artifactId>gson</artifactId>
28+
<version>${gson.version}</version>
2929
</dependency>
30-
<!-- Servlet -->
3130
<dependency>
3231
<groupId>jakarta.servlet</groupId>
3332
<artifactId>jakarta.servlet-api</artifactId>
@@ -44,18 +43,6 @@
4443
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
4544
<version>${jakarta.servlet.jsp.jstl-api.version}</version>
4645
</dependency>
47-
<dependency>
48-
<groupId>org.jmockit</groupId>
49-
<artifactId>jmockit</artifactId>
50-
<version>${jmockit.version}</version>
51-
<scope>test</scope>
52-
</dependency>
53-
<dependency>
54-
<groupId>org.springframework</groupId>
55-
<artifactId>spring-test</artifactId>
56-
<version>${spring-test.version}</version>
57-
<scope>test</scope>
58-
</dependency>
5946
<dependency>
6047
<groupId>org.apache.httpcomponents</groupId>
6148
<artifactId>httpclient</artifactId>
@@ -68,30 +55,10 @@
6855
</exclusion>
6956
</exclusions>
7057
</dependency>
71-
<dependency>
72-
<groupId>org.mockito</groupId>
73-
<artifactId>mockito-core</artifactId>
74-
<version>${mockito.version}</version>
75-
<scope>test</scope>
76-
</dependency>
77-
<dependency>
78-
<groupId>com.github.ua-parser</groupId>
79-
<artifactId>uap-java</artifactId>
80-
<version>${uap.version}</version>
81-
</dependency>
8258
</dependencies>
8359

8460
<build>
8561
<plugins>
86-
<plugin>
87-
<artifactId>maven-surefire-plugin</artifactId>
88-
<version>${maven-surefire-plugin.version}</version>
89-
<configuration>
90-
<argLine>
91-
-javaagent:"${settings.localRepository}"/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar
92-
</argLine>
93-
</configuration>
94-
</plugin>
9562
<plugin>
9663
<groupId>org.eclipse.jetty</groupId>
9764
<artifactId>jetty-maven-plugin</artifactId>
@@ -107,15 +74,13 @@
10774

10875
<properties>
10976
<httpclient.version>4.5.13</httpclient.version>
110-
<jmockit.version>1.49</jmockit.version>
111-
<spring-test.version>6.1.10</spring-test.version>
112-
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
11377
<jetty-maven-plugin.version>10.0.4</jetty-maven-plugin.version>
11478
<commons-text.version>1.10.0</commons-text.version>
115-
<uap.version>1.5.4</uap.version>
11679
<jakarta.servlet-api.version>6.1.0</jakarta.servlet-api.version>
11780
<jakarta.servlet.jsp-api.version>4.0.0</jakarta.servlet.jsp-api.version>
11881
<jakarta.servlet.jsp.jstl-api.version>3.0.0</jakarta.servlet.jsp.jstl-api.version>
82+
<gson.version>2.11.0</gson.version>
83+
<commons-fileupload2-jakarta-servlet6.version>2.0.0-M2</commons-fileupload2-jakarta-servlet6.version>
11984
</properties>
12085

12186
</project>

‎web-modules/jakarta-servlets/src/main/java/com/baeldung/servlets/MyHttpServlet.java renamed to ‎web-modules/jakarta-servlets-2/src/main/java/com/baeldung/MyHttpServlet.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.baeldung.servlets;
1+
package com.baeldung;
22

33
import java.io.IOException;
44
import java.io.PrintWriter;

‎web-modules/jakarta-servlets/src/main/java/com/baeldung/servlets/UpdateServlet.java renamed to ‎web-modules/jakarta-servlets-2/src/main/java/com/baeldung/UpdateServlet.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.baeldung.servlets;
1+
package com.baeldung;
22

33
import java.io.IOException;
44

‎web-modules/jakarta-servlets/src/main/java/com/baeldung/servlets/UserServlet.java renamed to ‎web-modules/jakarta-servlets-2/src/main/java/com/baeldung/UserServlet.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
package com.baeldung.servlets;
1+
package com.baeldung;
22

33
import java.io.IOException;
4+
45
import jakarta.servlet.ServletException;
56
import jakarta.servlet.annotation.WebInitParam;
67
import jakarta.servlet.annotation.WebServlet;

‎web-modules/jakarta-servlets/src/main/java/com/baeldung/servlets/DownloadServlet.java renamed to ‎web-modules/jakarta-servlets-2/src/main/java/com/baeldung/download/DownloadServlet.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.baeldung.servlets;
1+
package com.baeldung.download;
22

33
import java.io.IOException;
44
import java.io.InputStream;

‎web-modules/jakarta-servlets/src/main/java/com/baeldung/servlets/ErrorHandlerServlet.java renamed to ‎web-modules/jakarta-servlets-2/src/main/java/com/baeldung/error/ErrorHandlerServlet.java

+13-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
1-
package com.baeldung.servlets;
1+
package com.baeldung.error;
22

3-
import jakarta.servlet.annotation.*;
4-
import jakarta.servlet.http.*;
5-
import java.io.*;
6-
import java.util.*;
3+
import static jakarta.servlet.RequestDispatcher.ERROR_EXCEPTION;
4+
import static jakarta.servlet.RequestDispatcher.ERROR_EXCEPTION_TYPE;
5+
import static jakarta.servlet.RequestDispatcher.ERROR_MESSAGE;
6+
import static jakarta.servlet.RequestDispatcher.ERROR_STATUS_CODE;
77

8-
import static jakarta.servlet.RequestDispatcher.*;
8+
import java.io.IOException;
9+
import java.io.PrintWriter;
10+
import java.util.Arrays;
11+
12+
import jakarta.servlet.annotation.WebServlet;
13+
import jakarta.servlet.http.HttpServlet;
14+
import jakarta.servlet.http.HttpServletRequest;
15+
import jakarta.servlet.http.HttpServletResponse;
916

1017
@WebServlet(urlPatterns = "/errorHandler")
1118
public class ErrorHandlerServlet extends HttpServlet {

‎web-modules/jakarta-servlets/src/main/java/com/baeldung/servlets/RandomErrorServlet.java renamed to ‎web-modules/jakarta-servlets-2/src/main/java/com/baeldung/error/RandomErrorServlet.java

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
package com.baeldung.servlets;
1+
package com.baeldung.error;
22

3-
import jakarta.servlet.annotation.*;
4-
import jakarta.servlet.http.*;
3+
import jakarta.servlet.annotation.WebServlet;
4+
import jakarta.servlet.http.HttpServlet;
5+
import jakarta.servlet.http.HttpServletRequest;
6+
import jakarta.servlet.http.HttpServletResponse;
57

68
@WebServlet(urlPatterns = "/randomError")
79
public class RandomErrorServlet extends HttpServlet {

‎web-modules/jakarta-servlets/src/main/java/com/baeldung/model/Employee.java renamed to ‎web-modules/jakarta-servlets-2/src/main/java/com/baeldung/jsonresponse/Employee.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.baeldung.model;
1+
package com.baeldung.jsonresponse;
22

33
public class Employee {
44

‎web-modules/jakarta-servlets/src/main/java/com/baeldung/servlets/EmployeeServlet.java renamed to ‎web-modules/jakarta-servlets-2/src/main/java/com/baeldung/jsonresponse/EmployeeServlet.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
1-
package com.baeldung.servlets;
1+
package com.baeldung.jsonresponse;
22

33
import java.io.IOException;
44
import java.io.PrintWriter;
55

6+
import com.google.gson.Gson;
7+
68
import jakarta.servlet.annotation.WebServlet;
79
import jakarta.servlet.http.HttpServlet;
810
import jakarta.servlet.http.HttpServletRequest;
911
import jakarta.servlet.http.HttpServletResponse;
1012

11-
import com.baeldung.model.Employee;
12-
import com.google.gson.Gson;
13-
14-
1513
@WebServlet(name = "EmployeeServlet", urlPatterns = "/employeeServlet")
1614
public class EmployeeServlet extends HttpServlet {
1715

‎web-modules/jakarta-servlets/src/main/java/com/baeldung/model/Student.java renamed to ‎web-modules/jakarta-servlets-2/src/main/java/com/baeldung/mvc/Student.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.baeldung.model;
1+
package com.baeldung.mvc;
22

33
public class Student {
44

‎web-modules/jakarta-servlets/src/main/java/com/baeldung/service/StudentService.java renamed to ‎web-modules/jakarta-servlets-2/src/main/java/com/baeldung/mvc/StudentService.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
package com.baeldung.service;
2-
3-
import com.baeldung.model.Student;
1+
package com.baeldung.mvc;
42

53
import java.util.Optional;
64

‎web-modules/jakarta-servlets/src/main/java/com/baeldung/controller/StudentServlet.java renamed to ‎web-modules/jakarta-servlets-2/src/main/java/com/baeldung/mvc/StudentServlet.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
package com.baeldung.controller;
1+
package com.baeldung.mvc;
22

3-
import com.baeldung.service.StudentService;
3+
import java.io.IOException;
44

55
import jakarta.servlet.RequestDispatcher;
66
import jakarta.servlet.ServletException;
77
import jakarta.servlet.annotation.WebServlet;
88
import jakarta.servlet.http.HttpServlet;
99
import jakarta.servlet.http.HttpServletRequest;
1010
import jakarta.servlet.http.HttpServletResponse;
11-
import java.io.IOException;
1211

1312
@WebServlet(name = "StudentServlet", urlPatterns = "/student-record")
1413
public class StudentServlet extends HttpServlet {

‎web-modules/jakarta-servlets/src/main/java/com/baeldung/Constants.java renamed to ‎web-modules/jakarta-servlets-2/src/main/java/com/baeldung/upload/Constants.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.baeldung;
1+
package com.baeldung.upload;
22

33
public class Constants {
44

‎web-modules/jakarta-servlets/src/main/java/com/baeldung/servlets/MultipartServlet.java renamed to ‎web-modules/jakarta-servlets-2/src/main/java/com/baeldung/upload/MultipartServlet.java

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
package com.baeldung.servlets;
1+
package com.baeldung.upload;
22

3-
import com.baeldung.Constants;
3+
import static com.baeldung.upload.Constants.UPLOAD_DIRECTORY;
4+
5+
import java.io.File;
6+
import java.io.FileNotFoundException;
7+
import java.io.IOException;
48

59
import jakarta.servlet.ServletException;
610
import jakarta.servlet.annotation.MultipartConfig;
@@ -9,11 +13,6 @@
913
import jakarta.servlet.http.HttpServletRequest;
1014
import jakarta.servlet.http.HttpServletResponse;
1115
import jakarta.servlet.http.Part;
12-
import java.io.File;
13-
import java.io.FileNotFoundException;
14-
import java.io.IOException;
15-
16-
import static com.baeldung.Constants.UPLOAD_DIRECTORY;
1716

1817
@WebServlet(
1918
name = "MultiPartServlet",

‎web-modules/jakarta-servlets/src/main/java/com/baeldung/servlets/UploadServlet.java renamed to ‎web-modules/jakarta-servlets-2/src/main/java/com/baeldung/upload/UploadServlet.java

+10-8
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
1-
package com.baeldung.servlets;
1+
package com.baeldung.upload;
22

3-
import jakarta.servlet.annotation.WebServlet;
3+
import static com.baeldung.upload.Constants.MAX_FILE_SIZE;
4+
import static com.baeldung.upload.Constants.MAX_REQUEST_SIZE;
5+
import static com.baeldung.upload.Constants.UPLOAD_DIRECTORY;
46

5-
import jakarta.servlet.ServletException;
6-
import jakarta.servlet.http.HttpServlet;
7-
import jakarta.servlet.http.HttpServletRequest;
8-
import jakarta.servlet.http.HttpServletResponse;
97
import java.io.File;
108
import java.io.IOException;
119
import java.nio.file.Path;
1210
import java.util.List;
1311

14-
import static com.baeldung.Constants.*;
15-
1612
import org.apache.commons.fileupload2.core.DiskFileItemFactory;
1713
import org.apache.commons.fileupload2.core.FileItem;
1814
import org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletFileUpload;
1915

16+
import jakarta.servlet.ServletException;
17+
import jakarta.servlet.annotation.WebServlet;
18+
import jakarta.servlet.http.HttpServlet;
19+
import jakarta.servlet.http.HttpServletRequest;
20+
import jakarta.servlet.http.HttpServletResponse;
21+
2022
@WebServlet(
2123
name = "UploadServlet",
2224
urlPatterns = {"/uploadFile"}

‎web-modules/jakarta-servlets/src/main/java/com/baeldung/servlets/UploadWelcomeServlet.java renamed to ‎web-modules/jakarta-servlets-2/src/main/java/com/baeldung/upload/UploadWelcomeServlet.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
package com.baeldung.servlets;
1+
package com.baeldung.upload;
22

33
import java.io.IOException;
4+
45
import jakarta.servlet.ServletException;
56
import jakarta.servlet.annotation.WebServlet;
67
import jakarta.servlet.http.HttpServlet;

‎web-modules/jakarta-servlets/src/main/webapp/WEB-INF/jsp/result.jsp renamed to ‎web-modules/jakarta-servlets-2/src/main/webapp/WEB-INF/jsp/result.jsp

File renamed without changes.

‎web-modules/jakarta-servlets/src/main/webapp/WEB-INF/jsp/student-record.jsp renamed to ‎web-modules/jakarta-servlets-2/src/main/webapp/WEB-INF/jsp/student-record.jsp

File renamed without changes.

‎web-modules/jakarta-servlets/src/main/webapp/WEB-INF/jsp/update.jsp renamed to ‎web-modules/jakarta-servlets-2/src/main/webapp/WEB-INF/jsp/update.jsp

File renamed without changes.

‎web-modules/jakarta-servlets/src/main/webapp/WEB-INF/sample.txt renamed to ‎web-modules/jakarta-servlets-2/src/main/webapp/WEB-INF/sample.txt

File renamed without changes.

‎web-modules/jakarta-servlets-2/src/main/webapp/WEB-INF/web.xml

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xmlns="http://java.sun.com/xml/ns/javaee"
4+
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
5+
http://java.sun.com/xml/ns/javaee/web-app_3_1.xsd"
6+
version="3.1">
7+
<context-param>
8+
<param-name>province</param-name>
9+
<param-value>Mendoza</param-value>
10+
</context-param>
11+
12+
<context-param>
13+
<param-name>country</param-name>
14+
<param-value>Argentina</param-value>
15+
</context-param>
16+
17+
<error-page>
18+
<error-code>404</error-code>
19+
<location>/error-404.html</location> <!-- /src/main/webapp/error-404.html-->
20+
</error-page>
21+
22+
<error-page>
23+
<exception-type>java.lang.Exception</exception-type>
24+
<location>/errorHandler</location>
25+
</error-page>
26+
</web-app>

‎web-modules/jakarta-servlets/src/main/webapp/upload.jsp renamed to ‎web-modules/jakarta-servlets-2/src/main/webapp/upload.jsp

File renamed without changes.

‎web-modules/jakarta-servlets/src/test/java/com/baeldung/servlets/EmployeeServletIntegrationTest.java renamed to ‎web-modules/jakarta-servlets-2/src/test/java/com/baeldung/jsonresponse/EmployeeServletIntegrationTest.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
1-
package com.baeldung.servlets;
1+
package com.baeldung.jsonresponse;
22

33
import static org.junit.Assert.assertEquals;
44
import static org.mockito.Mockito.when;
55

66
import java.io.PrintWriter;
77
import java.io.StringWriter;
88

9-
import jakarta.servlet.http.HttpServletRequest;
10-
import jakarta.servlet.http.HttpServletResponse;
11-
129
import org.junit.Test;
1310
import org.junit.runner.RunWith;
1411
import org.mockito.Mock;
1512
import org.mockito.junit.MockitoJUnitRunner;
1613

17-
import com.baeldung.model.Employee;
1814
import com.google.gson.Gson;
1915

16+
import jakarta.servlet.http.HttpServletRequest;
17+
import jakarta.servlet.http.HttpServletResponse;
2018

2119
@RunWith(MockitoJUnitRunner.class)
2220
public class EmployeeServletIntegrationTest {

‎web-modules/jakarta-servlets/README.md

+4-8
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,8 @@ This module contains articles about Servlets.
44

55
### Relevant Articles:
66
- [Introduction to Java Servlets](https://www.baeldung.com/intro-to-servlets)
7-
- [An MVC Example with Servlets and JSP](https://www.baeldung.com/mvc-servlet-jsp)
87
- [Handling Cookies and a Session in a Java Servlet](https://www.baeldung.com/java-servlet-cookies-session)
9-
- [Uploading Files with Servlets and JSP](https://www.baeldung.com/upload-file-servlet)
10-
- [Example of Downloading File in a Servlet](https://www.baeldung.com/servlet-download-file)
11-
- [Returning a JSON Response from a Servlet](https://www.baeldung.com/servlet-json-response)
12-
- [Jakarta EE Servlet Exception Handling](https://www.baeldung.com/servlet-exceptions)
13-
- [Context and Servlet Initialization Parameters](https://www.baeldung.com/context-servlet-initialization-param)
14-
- [The Difference between getRequestURI and getPathInfo in HttpServletRequest](https://www.baeldung.com/http-servlet-request-requesturi-pathinfo)
15-
- [Difference Between request.getSession() and request.getSession(true)](https://www.baeldung.com/java-request-getsession)
8+
- [Set a Parameter in an HttpServletRequest in Java](https://www.baeldung.com/java-servlet-request-set-parameter)
9+
- [Get Client Information From HTTP Request in Java](https://www.baeldung.com/java-http-request-client-info)
10+
- [How to Mock HttpServletRequest](https://www.baeldung.com/java-httpservletrequest-mock)
11+
- More articles: [[next -->]](/jakarta-servlets-2)

0 commit comments

Comments
 (0)