Skip to content

Commit 1abc937

Browse files
authored
Merge branch 'main' into fix/async-executor-memory-leak
Signed-off-by: Dev dev <kalpanagola9897@gmail.com>
2 parents 48641bd + deb44d8 commit 1abc937

16 files changed

Lines changed: 36 additions & 34 deletions

File tree

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
registry.username: ${{ secrets.REGISTRY_USERNAME }}
1515
registry.password: ${{ secrets.REGISTRY_PASSWORD }}
1616
steps:
17-
- uses: actions/checkout@v4
17+
- uses: actions/checkout@v6
1818
- name: Set up JDK 21
1919
uses: actions/setup-java@v4
2020
with:
@@ -33,7 +33,7 @@ jobs:
3333
build:
3434
runs-on: ubuntu-latest
3535
steps:
36-
- uses: actions/checkout@v4
36+
- uses: actions/checkout@v6
3737
- name: Set up JDK 21
3838
uses: actions/setup-java@v4
3939
with:
@@ -50,4 +50,4 @@ jobs:
5050
- name: Build
5151
run: ./gradlew test
5252
- name: Upload coverage reports to Codecov with GitHub Action
53-
uses: codecov/codecov-action@v3
53+
uses: codecov/codecov-action@v5

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929

3030
steps:
3131
- name: Checkout repository
32-
uses: actions/checkout@v4
32+
uses: actions/checkout@v6
3333

3434
- name: Set up JDK 21
3535
uses: actions/setup-java@v4

.github/workflows/publish-snapshot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
JRELEASER_MAVENCENTRAL_CENTRAL_PASSWORD: ${{ secrets.JRELEASER_MAVENCENTRAL_CENTRAL_PASSWORD }}
1919
JRELEASER_GITHUB_TOKEN: ${{ secrets.JRELEASER_GITHUB_TOKEN }}
2020
steps:
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v6
2222
- name: Set up JDK 21
2323
uses: actions/setup-java@v4
2424
with:

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
JRELEASER_MAVENCENTRAL_CENTRAL_PASSWORD: ${{ secrets.JRELEASER_MAVENCENTRAL_CENTRAL_PASSWORD }}
1515
JRELEASER_GITHUB_TOKEN: ${{ secrets.JRELEASER_GITHUB_TOKEN }}
1616
steps:
17-
- uses: actions/checkout@v4
17+
- uses: actions/checkout@v6
1818
- name: Build Workflow Dispatch
1919
uses: convictional/trigger-workflow-and-wait@v1.3.0
2020
with:
@@ -62,7 +62,7 @@ jobs:
6262
needs: release
6363
runs-on: ubuntu-latest
6464
steps:
65-
- uses: actions/checkout@v4
65+
- uses: actions/checkout@v6
6666
- name: Set up JDK 21
6767
uses: actions/setup-java@v4
6868
with:

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
88
### Bug Fixes
99

1010
* Fix Async executor lifecycle to support safe shutdown and reuse (#2244)
11-
* Replace raw usage of EthLog.LogResult with parameterized type to improve type safety (#2252)
11+
* Replace raw usage of `EthLog.LogResult` with parameterized type to improve type safety (#2252)
12+
(https://github.com/LFDT-web3j/web3j/pull/2254)
1213

1314
### Features
1415

core/src/main/java/org/web3j/protocol/core/filters/BlockFilter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ protected EthFilter sendRequest() throws IOException {
3535
}
3636

3737
@Override
38-
protected void process(List<EthLog.LogResult> logResults) {
39-
for (EthLog.LogResult logResult : logResults) {
38+
protected void process(List<EthLog.LogResult<?>> logResults) {
39+
for (EthLog.LogResult<?> logResult : logResults) {
4040
if (logResult instanceof EthLog.Hash) {
4141
String blockHash = ((EthLog.Hash) logResult).get();
4242
callback.onEvent(blockHash);

core/src/main/java/org/web3j/protocol/core/filters/BlocksFilter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ protected EthFilter sendRequest() throws IOException {
3737
}
3838

3939
@Override
40-
protected void process(List<LogResult> logResults) {
40+
protected void process(List<LogResult<?>> logResults) {
4141
List<String> blockHashes = new ArrayList<>(logResults.size());
4242

43-
for (EthLog.LogResult logResult : logResults) {
43+
for (EthLog.LogResult<?> logResult : logResults) {
4444
if (!(logResult instanceof EthLog.Hash)) {
4545
throw new FilterException(
4646
"Unexpected result type: " + logResult.get() + ", required Hash");

core/src/main/java/org/web3j/protocol/core/filters/Filter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ private void pollFilter(EthFilter ethFilter) {
157157

158158
protected abstract EthFilter sendRequest() throws IOException;
159159

160-
protected abstract void process(List<EthLog.LogResult> logResults);
160+
protected abstract void process(List<EthLog.LogResult<?>> logResults);
161161

162162
private void reinstallFilter() {
163163
log.warn(

core/src/main/java/org/web3j/protocol/core/filters/LogFilter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ protected EthFilter sendRequest() throws IOException {
4242
}
4343

4444
@Override
45-
protected void process(List<EthLog.LogResult> logResults) {
46-
for (EthLog.LogResult logResult : logResults) {
45+
protected void process(List<EthLog.LogResult<?>> logResults) {
46+
for (EthLog.LogResult<?> logResult : logResults) {
4747
if (logResult instanceof EthLog.LogObject) {
4848
Log log = ((EthLog.LogObject) logResult).get();
4949
callback.onEvent(log);

core/src/main/java/org/web3j/protocol/core/filters/LogsFilter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ protected EthFilter sendRequest() throws IOException {
4444
}
4545

4646
@Override
47-
protected void process(List<LogResult> logResults) {
47+
protected void process(List<LogResult<?>> logResults) {
4848
List<Log> logs = new ArrayList<>(logResults.size());
4949

50-
for (EthLog.LogResult logResult : logResults) {
50+
for (EthLog.LogResult<?> logResult : logResults) {
5151
if (!(logResult instanceof EthLog.LogObject)) {
5252
throw new FilterException(
5353
"Unexpected result type: " + logResult.get() + " required LogObject");

0 commit comments

Comments
 (0)