Skip to content

Commit

Permalink
Merge branch 'iluwatar:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
dmgodoy authored Nov 3, 2024
2 parents f7612e7 + f48c686 commit 361a5b4
Show file tree
Hide file tree
Showing 6 changed files with 51 additions and 6 deletions.
18 changes: 18 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -3222,6 +3222,24 @@
"contributions": [
"translation"
]
},
{
"login": "LakshyaPunyani-01",
"name": "LakshyaPunyani-01",
"avatar_url": "https://avatars.githubusercontent.com/u/103628913?v=4",
"profile": "https://github.com/LakshyaPunyani-01",
"contributions": [
"code"
]
},
{
"login": "jasonjyu",
"name": "jasonjyu",
"avatar_url": "https://avatars.githubusercontent.com/u/10333076?v=4",
"profile": "https://github.com/jasonjyu",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 6,
Expand Down
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=iluwatar_java-design-patterns&metric=coverage)](https://sonarcloud.io/dashboard?id=iluwatar_java-design-patterns)
[![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)
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
[![All Contributors](https://img.shields.io/badge/all_contributors-353-orange.svg?style=flat-square)](#contributors-)
[![All Contributors](https://img.shields.io/badge/all_contributors-355-orange.svg?style=flat-square)](#contributors-)
<!-- ALL-CONTRIBUTORS-BADGE:END -->

<br/>
Expand Down Expand Up @@ -530,6 +530,10 @@ This project is licensed under the terms of the MIT license.
<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>
<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>
<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>
<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>
</tr>
<tr>
<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>
</tr>
</tbody>
</table>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,16 @@ void shouldUpdateExistingValue() {
final String originalValue = "originalValue";
final String updatedValue = "updatedValue";

// Initializing the value
document.put(key, originalValue);

// Verifying that the initial value is retrieved correctly
assertEquals(originalValue, document.get(key));

// Updating the value
document.put(key, updatedValue);

//Verifying that the updated value is retrieved correctly
// Verifying that the updated value is retrieved correctly
assertEquals(updatedValue, document.get(key));
}
}
21 changes: 20 additions & 1 deletion composite-view/web/header.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,30 @@
h1 { text-align: center;}
h2 { text-align: center;}
h3 { text-align: center;}
nav {
text-align: center;
margin-bottom: 20px;
}
.home-link {
padding: 10px 20px;
background-color: #007bff;
color: white;
text-decoration: none;
border-radius: 5px;
}
.home-link:hover {
background-color: #0056b3;
}
</style>
</head>
<body>
<nav>
<!-- Add a Home button that links back to the homepage -->
<a href="/" class="home-link">Home</a>
</nav>

<% String todayDateStr = (new Date().toString()); %>
<h1>Today's Personalized Frontpage</h1>
<h2><%=todayDateStr%></h2>
<h2><%= todayDateStr %></h2>
</body>
</html>
2 changes: 1 addition & 1 deletion model-view-viewmodel/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<version>1.26.0-SNAPSHOT</version>
<properties>
<zk.version>10.0.0-jakarta</zk.version>
<jetty-maven-plugin.version>11.0.22</jetty-maven-plugin.version>
<jetty-maven-plugin.version>11.0.24</jetty-maven-plugin.version>
<maven-war-plugin.version>3.4.0</maven-war-plugin.version>
<maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
<packname>-${project.version}-FL-${maven.build.timestamp}</packname>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@
<spring-boot.version>2.7.5</spring-boot.version>
<jacoco.version>0.8.12</jacoco.version>
<commons-dbcp.version>1.4</commons-dbcp.version>
<htmlunit.version>4.4.0</htmlunit.version>
<htmlunit.version>4.5.0</htmlunit.version>
<gson.version>2.11.0</gson.version>
<guice.version>6.0.0</guice.version>
<system-lambda.version>1.1.0</system-lambda.version>
<maven-surefire-plugin.version>3.5.0</maven-surefire-plugin.version>
<maven-surefire-plugin.version>3.5.1</maven-surefire-plugin.version>
<maven-checkstyle-plugin.version>3.5.0</maven-checkstyle-plugin.version>
<license-maven-plugin.version>4.6</license-maven-plugin.version>
<urm-maven-plugin.version>2.1.1</urm-maven-plugin.version>
Expand Down

0 comments on commit 361a5b4

Please sign in to comment.