Skip to content

Commit c6290fd

Browse files
#refs 395: upgrade to Java 17, Spring Boot 3 and other dependencies (#397)
1 parent 7641b76 commit c6290fd

File tree

128 files changed

+3699
-3974
lines changed

Some content is hidden

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

128 files changed

+3699
-3974
lines changed

.github/workflows/build-and-test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@ jobs:
88
steps:
99
- uses: actions/checkout@v2
1010
- name: Install Yarn
11-
uses: borales/actions-yarn@v2.0.0
11+
uses: borales/actions-yarn@v4
1212
with:
1313
cmd: install
1414
- name: Markdown link checks and code formatting
15-
uses: borales/actions-yarn@v2.0.0
15+
uses: borales/actions-yarn@v4
1616
with:
1717
cmd: test
18-
- name: Set up JDK 1.8
18+
- name: Set up JDK 17
1919
uses: actions/setup-java@v1
2020
with:
21-
java-version: 1.8
21+
java-version: 17
2222
- name: Build with Gradle
2323
uses: eskatos/gradle-command-action@v1
2424
env:

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ jobs:
66
runs-on: ubuntu-latest
77
steps:
88
- uses: actions/checkout@v2
9-
- name: Set up JDK 1.8
9+
- name: Set up JDK 17
1010
uses: actions/setup-java@v1
1111
with:
12-
java-version: 1.8
12+
java-version: 17
1313
- name: Set version to release version
1414
uses: eskatos/gradle-command-action@v1
1515
with:

.gitignore

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,16 @@ hs_err_pid*
3636
.idea
3737
*.iml
3838

39+
# Java Dumps
40+
*.hprof
41+
42+
# Yarn
43+
.yarn/*
44+
!.yarn/cache
45+
!.yarn/patches
46+
!.yarn/plugins
47+
!.yarn/releases
48+
!.yarn/sdks
49+
!.yarn/versions
50+
3951
!gradle-wrapper.jar

.husky/pre-commit

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/usr/bin/env sh
2+
. "$(dirname -- "$0")/_/husky.sh"
3+
4+
npx lint-staged

.prettierignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,8 @@ lombok.config
2121
*.kt
2222
*.kts
2323

24+
.husky
25+
26+
org.springframework.boot.autoconfigure.AutoConfiguration.imports
27+
2428
doc/resources/**/*.xml

.prettierrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"plugins": ["prettier-plugin-java", "@prettier/plugin-xml"],
23
"printWidth": 140,
34
"tabWidth": 4,
45
"useTabs": false,

.yarn/releases/yarn-3.6.1.cjs

Lines changed: 874 additions & 0 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
nodeLinker: node-modules
2+
3+
yarnPath: .yarn/releases/yarn-3.6.1.cjs

README.md

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ The framework relies on the following dependencies and therefore it is recommend
257257
for compatibility.
258258

259259
- [Core Framework](./core)
260-
- JDK 1.8 or higher
260+
- JDK 17 or higher
261261
- [AWS SQS SDK](https://docs.aws.amazon.com/sdk-for-java/v2/developer-guide/welcome.html)
262262
- [Jackson Databind](https://github.com/FasterXML/jackson-databind)
263263
- [SLF4J API](https://github.com/qos-ch/slf4j)
@@ -720,14 +720,6 @@ fifoMessageListener("identifier", sqsAsyncClient, "${insert.queue.url.here}") {
720720
}
721721
```
722722
723-
### Comparing other SQS Libraries
724-
725-
If you want to see the difference in usage between this library and others like the
726-
[Spring Cloud AWS Messaging](https://github.com/spring-cloud/spring-cloud-aws/tree/master/spring-cloud-aws-messaging) and
727-
[Amazon SQS Java Messaging Library](https://github.com/awslabs/amazon-sqs-java-messaging-lib), take a look at
728-
the [sqs-listener-library-comparison](./examples/sqs-listener-library-comparison) module. This allows you to test the performance and usage of
729-
each library for different scenarios, such as heavy IO message processing, etc.
730-
731723
## Examples
732724
733725
See [examples](./examples) for all the available examples.

api/src/main/java/com/jashmore/sqs/broker/MessageBroker.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ void processMessages(
5353
BooleanSupplier keepProcessingMessages,
5454
Supplier<CompletableFuture<Message>> messageSupplier,
5555
Function<Message, CompletableFuture<?>> messageProcessor
56-
)
57-
throws InterruptedException;
56+
) throws InterruptedException;
5857

5958
/**
6059
* Requests for messages and consume these when they are eventually obtained by the provided message {@link Consumer}.
@@ -74,8 +73,7 @@ default void processMessages(
7473
ExecutorService messageProcessingExecutorService,
7574
Supplier<CompletableFuture<Message>> messageSupplier,
7675
Function<Message, CompletableFuture<?>> messageProcessor
77-
)
78-
throws InterruptedException {
76+
) throws InterruptedException {
7977
processMessages(messageProcessingExecutorService, () -> true, messageSupplier, messageProcessor);
8078
}
8179
}

0 commit comments

Comments
 (0)