Skip to content

Commit 361a5b4

Browse files
authored
Merge branch 'iluwatar:master' into master
2 parents f7612e7 + f48c686 commit 361a5b4

File tree

6 files changed

+51
-6
lines changed

6 files changed

+51
-6
lines changed

.all-contributorsrc

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3222,6 +3222,24 @@
32223222
"contributions": [
32233223
"translation"
32243224
]
3225+
},
3226+
{
3227+
"login": "LakshyaPunyani-01",
3228+
"name": "LakshyaPunyani-01",
3229+
"avatar_url": "https://avatars.githubusercontent.com/u/103628913?v=4",
3230+
"profile": "https://github.com/LakshyaPunyani-01",
3231+
"contributions": [
3232+
"code"
3233+
]
3234+
},
3235+
{
3236+
"login": "jasonjyu",
3237+
"name": "jasonjyu",
3238+
"avatar_url": "https://avatars.githubusercontent.com/u/10333076?v=4",
3239+
"profile": "https://github.com/jasonjyu",
3240+
"contributions": [
3241+
"code"
3242+
]
32253243
}
32263244
],
32273245
"contributorsPerLine": 6,

README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=coverage)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns)
77
[![Join the chat at https://gitter.im/iluwatar/java-design-patterns](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iluwatar/java-design-patterns?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
88
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
9-
[![All Contributors](https://img.shields.io/badge/all_contributors-353-orange.svg?style=flat-square)](#contributors-)
9+
[![All Contributors](https://img.shields.io/badge/all_contributors-355-orange.svg?style=flat-square)](#contributors-)
1010
<!-- ALL-CONTRIBUTORS-BADGE:END -->
1111

1212
<br/>
@@ -530,6 +530,10 @@ This project is licensed under the terms of the MIT license.
530530
<td align="center" valign="top" width="16.66%"><a href="https://github.com/vvanghelle"><img src="https://avatars.githubusercontent.com/u/3204600?v=4?s=100" width="100px;" alt="Vincent Vanghelle"/><br /><sub><b>Vincent Vanghelle</b></sub></a><br /><a href="#translation-vvanghelle" title="Translation">🌍</a></td>
531531
<td align="center" valign="top" width="16.66%"><a href="https://github.com/antoheri"><img src="https://avatars.githubusercontent.com/u/79988396?v=4?s=100" width="100px;" alt="Antoine Héritier"/><br /><sub><b>Antoine Héritier</b></sub></a><br /><a href="#translation-antoheri" title="Translation">🌍</a></td>
532532
<td align="center" valign="top" width="16.66%"><a href="https://github.com/fishandsheep"><img src="https://avatars.githubusercontent.com/u/43347407?v=4?s=100" width="100px;" alt="QinShower"/><br /><sub><b>QinShower</b></sub></a><br /><a href="#translation-fishandsheep" title="Translation">🌍</a></td>
533+
<td align="center" valign="top" width="16.66%"><a href="https://github.com/LakshyaPunyani-01"><img src="https://avatars.githubusercontent.com/u/103628913?v=4?s=100" width="100px;" alt="LakshyaPunyani-01"/><br /><sub><b>LakshyaPunyani-01</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=LakshyaPunyani-01" title="Code">💻</a></td>
534+
</tr>
535+
<tr>
536+
<td align="center" valign="top" width="16.66%"><a href="https://github.com/jasonjyu"><img src="https://avatars.githubusercontent.com/u/10333076?v=4?s=100" width="100px;" alt="jasonjyu"/><br /><sub><b>jasonjyu</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=jasonjyu" title="Code">💻</a></td>
533537
</tr>
534538
</tbody>
535539
</table>

abstract-document/src/test/java/com/iluwatar/abstractdocument/AbstractDocumentTest.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,16 @@ void shouldUpdateExistingValue() {
114114
final String originalValue = "originalValue";
115115
final String updatedValue = "updatedValue";
116116

117+
// Initializing the value
117118
document.put(key, originalValue);
118119

120+
// Verifying that the initial value is retrieved correctly
121+
assertEquals(originalValue, document.get(key));
122+
119123
// Updating the value
120124
document.put(key, updatedValue);
121125

122-
//Verifying that the updated value is retrieved correctly
126+
// Verifying that the updated value is retrieved correctly
123127
assertEquals(updatedValue, document.get(key));
124128
}
125129
}

composite-view/web/header.jsp

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,30 @@
3939
h1 { text-align: center;}
4040
h2 { text-align: center;}
4141
h3 { text-align: center;}
42+
nav {
43+
text-align: center;
44+
margin-bottom: 20px;
45+
}
46+
.home-link {
47+
padding: 10px 20px;
48+
background-color: #007bff;
49+
color: white;
50+
text-decoration: none;
51+
border-radius: 5px;
52+
}
53+
.home-link:hover {
54+
background-color: #0056b3;
55+
}
4256
</style>
4357
</head>
4458
<body>
59+
<nav>
60+
<!-- Add a Home button that links back to the homepage -->
61+
<a href="/" class="home-link">Home</a>
62+
</nav>
63+
4564
<% String todayDateStr = (new Date().toString()); %>
4665
<h1>Today's Personalized Frontpage</h1>
47-
<h2><%=todayDateStr%></h2>
66+
<h2><%= todayDateStr %></h2>
4867
</body>
4968
</html>

model-view-viewmodel/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<version>1.26.0-SNAPSHOT</version>
3737
<properties>
3838
<zk.version>10.0.0-jakarta</zk.version>
39-
<jetty-maven-plugin.version>11.0.22</jetty-maven-plugin.version>
39+
<jetty-maven-plugin.version>11.0.24</jetty-maven-plugin.version>
4040
<maven-war-plugin.version>3.4.0</maven-war-plugin.version>
4141
<maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
4242
<packname>-${project.version}-FL-${maven.build.timestamp}</packname>

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@
4040
<spring-boot.version>2.7.5</spring-boot.version>
4141
<jacoco.version>0.8.12</jacoco.version>
4242
<commons-dbcp.version>1.4</commons-dbcp.version>
43-
<htmlunit.version>4.4.0</htmlunit.version>
43+
<htmlunit.version>4.5.0</htmlunit.version>
4444
<gson.version>2.11.0</gson.version>
4545
<guice.version>6.0.0</guice.version>
4646
<system-lambda.version>1.1.0</system-lambda.version>
47-
<maven-surefire-plugin.version>3.5.0</maven-surefire-plugin.version>
47+
<maven-surefire-plugin.version>3.5.1</maven-surefire-plugin.version>
4848
<maven-checkstyle-plugin.version>3.5.0</maven-checkstyle-plugin.version>
4949
<license-maven-plugin.version>4.6</license-maven-plugin.version>
5050
<urm-maven-plugin.version>2.1.1</urm-maven-plugin.version>

0 commit comments

Comments
 (0)