Skip to content

Commit e704103

Browse files
sugan0techsugan0tech
authored
Merge branch 'master' into master
2 parents 08b77c5 + dd9beeb commit e704103

File tree

7 files changed

+37
-21
lines changed

7 files changed

+37
-21
lines changed

Diff for: ‎.all-contributorsrc

+2-1
Original file line numberDiff line numberDiff line change
@@ -2567,7 +2567,8 @@
25672567
"avatar_url": "https://avatars.githubusercontent.com/u/101238933?v=4",
25682568
"profile": "https://surjendu-pal.netlify.app/",
25692569
"contributions": [
2570-
"translation"
2570+
"translation",
2571+
"code"
25712572
]
25722573
},
25732574
{

Diff for: ‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ This project is licensed under the terms of the MIT license.
437437
</tr>
438438
<tr>
439439
<td align="center" valign="top" width="14.28%"><a href="https://github.com/VladimirCreator"><img src="https://avatars.githubusercontent.com/u/49140851?v=4?s=100" width="100px;" alt="Vladimir"/><br /><sub><b>Vladimir</b></sub></a><br /><a href="#translation-VladimirCreator" title="Translation">🌍</a></td>
440-
<td align="center" valign="top" width="14.28%"><a href="https://surjendu-pal.netlify.app/"><img src="https://avatars.githubusercontent.com/u/101238933?v=4?s=100" width="100px;" alt="Surjendu"/><br /><sub><b>Surjendu</b></sub></a><br /><a href="#translation-surjendu104" title="Translation">🌍</a></td>
440+
<td align="center" valign="top" width="14.28%"><a href="https://surjendu-pal.netlify.app/"><img src="https://avatars.githubusercontent.com/u/101238933?v=4?s=100" width="100px;" alt="Surjendu"/><br /><sub><b>Surjendu</b></sub></a><br /><a href="#translation-surjendu104" title="Translation">🌍</a> <a href="https://github.com/iluwatar/java-design-patterns/commits?author=surjendu104" title="Code">💻</a></td>
441441
<td align="center" valign="top" width="14.28%"><a href="https://github.com/bakazhou"><img src="https://avatars.githubusercontent.com/u/81795984?v=4?s=100" width="100px;" alt="bakazhou"/><br /><sub><b>bakazhou</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=bakazhou" title="Code">💻</a></td>
442442
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Owen-CH-Leung"><img src="https://avatars.githubusercontent.com/u/43698890?v=4?s=100" width="100px;" alt="Owen Leung"/><br /><sub><b>Owen Leung</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=Owen-CH-Leung" title="Code">💻</a></td>
443443
<td align="center" valign="top" width="14.28%"><a href="https://github.com/thestbar"><img src="https://avatars.githubusercontent.com/u/20283468?v=4?s=100" width="100px;" alt="Stavros Barousis"/><br /><sub><b>Stavros Barousis</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=thestbar" title="Documentation">📖</a></td>

Diff for: ‎composite-view/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<dependency>
5050
<groupId>jakarta.servlet</groupId>
5151
<artifactId>jakarta.servlet-api</artifactId>
52-
<version>5.0.0</version>
52+
<version>6.0.0</version>
5353
<scope>compile</scope>
5454
</dependency>
5555
<dependency>

Diff for: ‎composite-view/src/main/java/com/iluwatar/compositeview/AppServlet.java

+20-16
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,17 @@
2525
package com.iluwatar.compositeview;
2626

2727
import jakarta.servlet.RequestDispatcher;
28-
import jakarta.servlet.ServletException;
2928
import jakarta.servlet.http.HttpServlet;
3029
import jakarta.servlet.http.HttpServletRequest;
3130
import jakarta.servlet.http.HttpServletResponse;
32-
import java.io.IOException;
3331
import java.io.PrintWriter;
32+
import lombok.extern.slf4j.Slf4j;
3433

3534
/**
3635
* A servlet object that extends HttpServlet.
3736
* Runs on Tomcat 10 and handles Http requests
3837
*/
39-
38+
@Slf4j
4039
public final class AppServlet extends HttpServlet {
4140
private static final String CONTENT_TYPE = "text/html";
4241
private String msgPartOne = "<h1>This Server Doesn't Support";
@@ -56,39 +55,44 @@ public AppServlet() {
5655
}
5756

5857
@Override
59-
public void doGet(HttpServletRequest req, HttpServletResponse resp)
60-
throws ServletException, IOException {
61-
RequestDispatcher requestDispatcher = req.getRequestDispatcher(destination);
62-
ClientPropertiesBean reqParams = new ClientPropertiesBean(req);
63-
req.setAttribute("properties", reqParams);
64-
requestDispatcher.forward(req, resp);
58+
public void doGet(HttpServletRequest req, HttpServletResponse resp) {
59+
try {
60+
RequestDispatcher requestDispatcher = req.getRequestDispatcher(destination);
61+
ClientPropertiesBean reqParams = new ClientPropertiesBean(req);
62+
req.setAttribute("properties", reqParams);
63+
requestDispatcher.forward(req, resp);
64+
} catch (Exception e) {
65+
LOGGER.error("Exception occurred GET request processing ", e);
66+
}
6567
}
6668

6769
@Override
68-
public void doPost(HttpServletRequest req, HttpServletResponse resp)
69-
throws ServletException, IOException {
70+
public void doPost(HttpServletRequest req, HttpServletResponse resp) {
7071
resp.setContentType(CONTENT_TYPE);
7172
try (PrintWriter out = resp.getWriter()) {
7273
out.println(msgPartOne + " Post " + msgPartTwo);
74+
} catch (Exception e) {
75+
LOGGER.error("Exception occurred POST request processing ", e);
7376
}
74-
7577
}
7678

7779
@Override
78-
public void doDelete(HttpServletRequest req, HttpServletResponse resp)
79-
throws ServletException, IOException {
80+
public void doDelete(HttpServletRequest req, HttpServletResponse resp) {
8081
resp.setContentType(CONTENT_TYPE);
8182
try (PrintWriter out = resp.getWriter()) {
8283
out.println(msgPartOne + " Delete " + msgPartTwo);
84+
} catch (Exception e) {
85+
LOGGER.error("Exception occurred DELETE request processing ", e);
8386
}
8487
}
8588

8689
@Override
87-
public void doPut(HttpServletRequest req, HttpServletResponse resp)
88-
throws ServletException, IOException {
90+
public void doPut(HttpServletRequest req, HttpServletResponse resp) {
8991
resp.setContentType(CONTENT_TYPE);
9092
try (PrintWriter out = resp.getWriter()) {
9193
out.println(msgPartOne + " Put " + msgPartTwo);
94+
} catch (Exception e) {
95+
LOGGER.error("Exception occurred PUT request processing ", e);
9296
}
9397
}
9498
}

Diff for: ‎domain-model/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<dependency>
5252
<groupId>org.joda</groupId>
5353
<artifactId>joda-money</artifactId>
54-
<version>1.0.1</version>
54+
<version>1.0.4</version>
5555
</dependency>
5656
</dependencies>
5757
<build>

Diff for: ‎dynamic-proxy/pom.xml

+6-1
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,15 @@
3535
</parent>
3636
<artifactId>dynamic-proxy</artifactId>
3737
<dependencies>
38+
<dependency>
39+
<groupId>com.fasterxml.jackson.core</groupId>
40+
<artifactId>jackson-core</artifactId>
41+
<version>2.17.0</version>
42+
</dependency>
3843
<dependency>
3944
<groupId>com.fasterxml.jackson.core</groupId>
4045
<artifactId>jackson-databind</artifactId>
41-
<version>2.16.1</version>
46+
<version>2.17.0</version>
4247
</dependency>
4348
<dependency>
4449
<groupId>org.springframework</groupId>

Diff for: ‎event-sourcing/pom.xml

+6
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,15 @@
3939
<artifactId>junit-jupiter-engine</artifactId>
4040
<scope>test</scope>
4141
</dependency>
42+
<dependency>
43+
<groupId>com.fasterxml.jackson.core</groupId>
44+
<artifactId>jackson-core</artifactId>
45+
<version>2.17.0</version>
46+
</dependency>
4247
<dependency>
4348
<groupId>com.fasterxml.jackson.core</groupId>
4449
<artifactId>jackson-databind</artifactId>
50+
<version>2.17.0</version>
4551
</dependency>
4652
</dependencies>
4753
<build>

0 commit comments

Comments
 (0)