Skip to content

Commit f1788c7

Browse files
darkhyper24darkhyper24
committed
syncing changes for conflicts
2 parents fb6132c + 3a1a714 commit f1788c7

File tree

147 files changed

+9954
-108
lines changed

Some content is hidden

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

147 files changed

+9954
-108
lines changed

‎.all-contributorsrc

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3294,6 +3294,96 @@
32943294
"contributions": [
32953295
"code"
32963296
]
3297+
},
3298+
{
3299+
"login": "CodeMaverick-143",
3300+
"name": "Arpit Sarang",
3301+
"avatar_url": "https://avatars.githubusercontent.com/u/182847716?v=4",
3302+
"profile": "https://codemaverick-143.github.io/My-Portfolio/",
3303+
"contributions": [
3304+
"code"
3305+
]
3306+
},
3307+
{
3308+
"login": "mayatarek",
3309+
"name": "Maya",
3310+
"avatar_url": "https://avatars.githubusercontent.com/u/111644421?v=4",
3311+
"profile": "https://github.com/mayatarek",
3312+
"contributions": [
3313+
"translation"
3314+
]
3315+
},
3316+
{
3317+
"login": "HabibaMekay",
3318+
"name": "HabibaMekay",
3319+
"avatar_url": "https://avatars.githubusercontent.com/u/133516736?v=4",
3320+
"profile": "https://github.com/HabibaMekay",
3321+
"contributions": [
3322+
"code"
3323+
]
3324+
},
3325+
{
3326+
"login": "Ahmed-Taha-981",
3327+
"name": "Ahmed-Taha-981",
3328+
"avatar_url": "https://avatars.githubusercontent.com/u/122402269?v=4",
3329+
"profile": "https://github.com/Ahmed-Taha-981",
3330+
"contributions": [
3331+
"code"
3332+
]
3333+
},
3334+
{
3335+
"login": "malak-elbanna",
3336+
"name": "Malak Elbanna",
3337+
"avatar_url": "https://avatars.githubusercontent.com/u/67643605?v=4",
3338+
"profile": "https://malakelbanna.netlify.app/",
3339+
"contributions": [
3340+
"code"
3341+
]
3342+
},
3343+
{
3344+
"login": "depthlending",
3345+
"name": "BiKangNing",
3346+
"avatar_url": "https://avatars.githubusercontent.com/u/164312726?v=4",
3347+
"profile": "https://github.com/depthlending",
3348+
"contributions": [
3349+
"doc"
3350+
]
3351+
},
3352+
{
3353+
"login": "TarunVishwakarma1",
3354+
"name": "Tarun Vishwakarma",
3355+
"avatar_url": "https://avatars.githubusercontent.com/u/138651451?v=4",
3356+
"profile": "https://github.com/TarunVishwakarma1",
3357+
"contributions": [
3358+
"code"
3359+
]
3360+
},
3361+
{
3362+
"login": "shahdhoss",
3363+
"name": "Shahd Hossam",
3364+
"avatar_url": "https://avatars.githubusercontent.com/u/132148556?v=4",
3365+
"profile": "https://github.com/shahdhoss",
3366+
"contributions": [
3367+
"code"
3368+
]
3369+
},
3370+
{
3371+
"login": "mehdirahimi",
3372+
"name": "Mehdi Rahimi",
3373+
"avatar_url": "https://avatars.githubusercontent.com/u/24210842?v=4",
3374+
"profile": "https://mehdirahimi.github.io",
3375+
"contributions": [
3376+
"code"
3377+
]
3378+
},
3379+
{
3380+
"login": "clintaire",
3381+
"name": "Clint Airé",
3382+
"avatar_url": "https://avatars.githubusercontent.com/u/111376518?v=4",
3383+
"profile": "https://github.com/clintaire",
3384+
"contributions": [
3385+
"code"
3386+
]
32973387
}
32983388
],
32993389
"contributorsPerLine": 6,

‎.github/stale.yml

Lines changed: 0 additions & 61 deletions
This file was deleted.

‎.github/workflows/presubmit.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Presubmit.ai
2+
3+
permissions:
4+
contents: read
5+
pull-requests: write
6+
issues: write
7+
8+
on:
9+
pull_request_target: # Handle forked repository PRs in the base repository context
10+
types: [opened, synchronize]
11+
pull_request_review_comment: # Handle review comments
12+
types: [created]
13+
14+
jobs:
15+
review:
16+
runs-on: ubuntu-latest
17+
steps:
18+
- name: Check required secrets
19+
run: |
20+
if [ -z "${{ secrets.LLM_API_KEY }}" ]; then
21+
echo "Error: LLM_API_KEY secret is not configured"
22+
exit 1
23+
fi
24+
25+
- name: Check out PR code
26+
uses: actions/checkout@v3
27+
with:
28+
ref: ${{ github.event.pull_request.head.sha }}
29+
30+
- name: Run AI Reviewer
31+
uses: presubmit/ai-reviewer@latest
32+
env:
33+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
34+
LLM_API_KEY: ${{ secrets.LLM_API_KEY }}
35+
LLM_MODEL: "gemini-1.5-flash"

‎.github/workflows/stale.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: 'Comment on stale issues and PRs'
2+
on:
3+
schedule:
4+
- cron: '30 1 * * *'
5+
6+
jobs:
7+
stale:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/stale@v9
11+
with:
12+
stale-issue-message: 'This issue is stale because it has been open 60 days with no activity.'
13+
stale-pr-message: 'This PR is stale because it has been open 60 days with no activity.'
14+
close-issue-message: 'This issue was closed because it has been stalled for too long with no activity.'
15+
close-pr-message: 'This PR was closed because it has been stalled for too long with no activity.'
16+
days-before-issue-stale: 60
17+
days-before-pr-stale: 60
18+
days-before-issue-close: -1
19+
days-before-pr-close: -1
20+
exempt-issue-labels: 'info: help wanted'

‎PULL_REQUEST_TEMPLATE.md

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
1-
<!--
2-
Thank you for contributing to Java Design Patterns!
1+
# Pull Request Template
32

4-
If you're unsure where to start, please refer to the contributing doc:
3+
## What does this PR do?
54

6-
https://github.com/iluwatar/java-design-patterns/wiki/01.-How-to-contribute
5+
<!-- Provide a short description of what this pull request does. -->
76

8-
If you still have questions, please let us know via issues or [gitter](https://matrix.to/#/#iluwatar_java-design-patterns:gitter.im).
9-
-->
10-
11-
## What problem does this PR solve?
12-
13-
<!-- Please describe the problem you're trying to solve. Uncomment the following line if this PR closes some issues -->
14-
<!-- Close #<issue number> -->
7+
<!-- Fixes #<issue-number> (if applicable) -->

‎README.md

Lines changed: 13 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-361-orange.svg?style=flat-square)](#contributors-)
9+
[![All Contributors](https://img.shields.io/badge/all_contributors-371-orange.svg?style=flat-square)](#contributors-)
1010
<!-- ALL-CONTRIBUTORS-BADGE:END -->
1111

1212
<br/>
@@ -542,6 +542,18 @@ This project is licensed under the terms of the MIT license.
542542
</tr>
543543
<tr>
544544
<td align="center" valign="top" width="16.66%"><a href="https://github.com/SalmaAzeem"><img src="https://avatars.githubusercontent.com/u/121863224?v=4?s=100" width="100px;" alt="Salma"/><br /><sub><b>Salma</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=SalmaAzeem" title="Code">💻</a></td>
545+
<td align="center" valign="top" width="16.66%"><a href="https://codemaverick-143.github.io/My-Portfolio/"><img src="https://avatars.githubusercontent.com/u/182847716?v=4?s=100" width="100px;" alt="Arpit Sarang"/><br /><sub><b>Arpit Sarang</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=CodeMaverick-143" title="Code">💻</a></td>
546+
<td align="center" valign="top" width="16.66%"><a href="https://github.com/mayatarek"><img src="https://avatars.githubusercontent.com/u/111644421?v=4?s=100" width="100px;" alt="Maya"/><br /><sub><b>Maya</b></sub></a><br /><a href="#translation-mayatarek" title="Translation">🌍</a></td>
547+
<td align="center" valign="top" width="16.66%"><a href="https://github.com/HabibaMekay"><img src="https://avatars.githubusercontent.com/u/133516736?v=4?s=100" width="100px;" alt="HabibaMekay"/><br /><sub><b>HabibaMekay</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=HabibaMekay" title="Code">💻</a></td>
548+
<td align="center" valign="top" width="16.66%"><a href="https://github.com/Ahmed-Taha-981"><img src="https://avatars.githubusercontent.com/u/122402269?v=4?s=100" width="100px;" alt="Ahmed-Taha-981"/><br /><sub><b>Ahmed-Taha-981</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=Ahmed-Taha-981" title="Code">💻</a></td>
549+
<td align="center" valign="top" width="16.66%"><a href="https://malakelbanna.netlify.app/"><img src="https://avatars.githubusercontent.com/u/67643605?v=4?s=100" width="100px;" alt="Malak Elbanna"/><br /><sub><b>Malak Elbanna</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=malak-elbanna" title="Code">💻</a></td>
550+
</tr>
551+
<tr>
552+
<td align="center" valign="top" width="16.66%"><a href="https://github.com/depthlending"><img src="https://avatars.githubusercontent.com/u/164312726?v=4?s=100" width="100px;" alt="BiKangNing"/><br /><sub><b>BiKangNing</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=depthlending" title="Documentation">📖</a></td>
553+
<td align="center" valign="top" width="16.66%"><a href="https://github.com/TarunVishwakarma1"><img src="https://avatars.githubusercontent.com/u/138651451?v=4?s=100" width="100px;" alt="Tarun Vishwakarma"/><br /><sub><b>Tarun Vishwakarma</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=TarunVishwakarma1" title="Code">💻</a></td>
554+
<td align="center" valign="top" width="16.66%"><a href="https://github.com/shahdhoss"><img src="https://avatars.githubusercontent.com/u/132148556?v=4?s=100" width="100px;" alt="Shahd Hossam"/><br /><sub><b>Shahd Hossam</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=shahdhoss" title="Code">💻</a></td>
555+
<td align="center" valign="top" width="16.66%"><a href="https://mehdirahimi.github.io"><img src="https://avatars.githubusercontent.com/u/24210842?v=4?s=100" width="100px;" alt="Mehdi Rahimi"/><br /><sub><b>Mehdi Rahimi</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=mehdirahimi" title="Code">💻</a></td>
556+
<td align="center" valign="top" width="16.66%"><a href="https://github.com/clintaire"><img src="https://avatars.githubusercontent.com/u/111376518?v=4?s=100" width="100px;" alt="Clint Airé"/><br /><sub><b>Clint Airé</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=clintaire" title="Code">💻</a></td>
545557
</tr>
546558
</tbody>
547559
</table>

‎composite-view/web/index.jsp

Lines changed: 46 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,53 @@
2626
--%>
2727
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
2828
<html>
29-
<head>
29+
<head>
30+
<title>Composite Patterns Mock News Site</title>
3031
<style>
31-
h1 { text-align: center;}
32-
h2 { text-align: center;}
33-
h3 { text-align: center;}
32+
body {
33+
font-family: Arial, sans-serif;
34+
background-color: #f4f4f4;
35+
margin: 0;
36+
padding: 20px;
37+
}
38+
h1, h2, h3 {
39+
text-align: center;
40+
color: #333;
41+
}
42+
h1 {
43+
font-size: 2.5em;
44+
}
45+
h2 {
46+
font-size: 2em;
47+
margin-top: 20px;
48+
}
49+
h3 {
50+
font-size: 1.5em;
51+
margin-top: 10px;
52+
}
53+
.parameters {
54+
max-width: 600px;
55+
margin: 0 auto;
56+
background: #fff;
57+
padding: 20px;
58+
border-radius: 8px;
59+
box-shadow: 0 2px 10px rgba(0,0,0,0.1);
60+
}
3461
</style>
35-
</head>
36-
<body>
62+
</head>
63+
<body>
3764
<h1>Welcome To The Composite Patterns Mock News Site</h1>
38-
<h2>Send a GET request to the "/news" path to see the composite view with mock news</h2>
39-
<h2>Use the following parameters:</h2>
40-
<h3>name: string name to be dynamically displayed</h3>
41-
<h3>bus: boolean for whether you want to see the mock business news</h3>
42-
<h3>world: boolean for whether you want to see the mock world news</h3>
43-
<h3>sci: boolean for whether you want to see the mock world news</h3>
44-
<h3>sport: boolean for whether you want to see the mock world news</h3>
45-
</body>
65+
<div class="parameters">
66+
<h2>Send a GET request to the "/news" path to see the composite view with mock news</h2>
67+
<h2>Use the following parameters:</h2>
68+
<h3>name: <em>string</em> - Your name to be dynamically displayed</h3>
69+
<h3>bus: <em>boolean</em> - Set to true to see mock business news</h3>
70+
<h3>world: <em>boolean</em> - Set to true to see mock world news</h3>
71+
<h3>sci: <em>boolean</em> - Set to true to see mock science news</h3>
72+
<h3>sport: <em>boolean</em> - Set to true to see mock sports news</h3>
73+
<h2>Example Request:</h2>
74+
<h3>/news?name=John&bus=true&world=false&sci=true&sport=false</h3>
75+
<h3>If the request fails, ensure you have the correct parameters and try again.</h3>
76+
</div>
77+
</body>
4678
</html>

‎dynamic-proxy/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<dependency>
3939
<groupId>com.fasterxml.jackson.core</groupId>
4040
<artifactId>jackson-core</artifactId>
41-
<version>2.18.1</version>
41+
<version>2.18.2</version>
4242
</dependency>
4343
<dependency>
4444
<groupId>com.fasterxml.jackson.core</groupId>

‎event-sourcing/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<dependency>
4343
<groupId>com.fasterxml.jackson.core</groupId>
4444
<artifactId>jackson-core</artifactId>
45-
<version>2.18.1</version>
45+
<version>2.18.2</version>
4646
</dependency>
4747
<dependency>
4848
<groupId>com.fasterxml.jackson.core</groupId>

‎hexagonal-architecture/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ Hexagonal Architecture is particularly beneficial in scenarios:
180180
* There is a requirement for high testability and maintainability.
181181
* The application should remain unaffected by changes in external interfaces.
182182

183-
## Real-World Applications of Hexagonal Architecure Pattern in Java
183+
## Real-World Applications of Hexagonal Architecture Pattern in Java
184184

185185
* Implemented extensively within enterprise applications that leverage frameworks like Spring.
186186
* Used in microservices architectures to maintain clear boundaries and protocols between services.

‎hexagonal-architecture/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<dependency>
4747
<groupId>de.flapdoodle.embed</groupId>
4848
<artifactId>de.flapdoodle.embed.mongo</artifactId>
49-
<version>4.18.0</version>
49+
<version>4.18.1</version>
5050
<scope>test</scope>
5151
</dependency>
5252
<dependency>

0 commit comments

Comments
 (0)