From 4f9923c465d507d1669191d227311671a77bb190 Mon Sep 17 00:00:00 2001 From: Petr Portnov Date: Tue, 5 Jul 2022 13:33:22 +0300 Subject: [PATCH 01/23] feat: add `ArrayUtils` with `map` methods --- .../javacommons/util/ArrayUtils.java | 63 +++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 java-commons/src/main/java/ru/progrm_jarvis/javacommons/util/ArrayUtils.java diff --git a/java-commons/src/main/java/ru/progrm_jarvis/javacommons/util/ArrayUtils.java b/java-commons/src/main/java/ru/progrm_jarvis/javacommons/util/ArrayUtils.java new file mode 100644 index 00000000..d5b3a938 --- /dev/null +++ b/java-commons/src/main/java/ru/progrm_jarvis/javacommons/util/ArrayUtils.java @@ -0,0 +1,63 @@ +package ru.progrm_jarvis.javacommons.util; + +import lombok.NonNull; +import lombok.experimental.UtilityClass; +import lombok.val; +import lombok.var; +import org.jetbrains.annotations.NotNull; + +import java.lang.reflect.Array; +import java.util.function.Function; +import java.util.function.IntFunction; + +/** + * Utilities for working with arrays. + */ +@UtilityClass +public class ArrayUtils { + + /** + * Maps the given array by-element using the provided function. + * + * @param source source array + * @param mappingFunction function used to map elements + * @param arrayFactory function used to create a new array by its length + * @return created array + * @param the type of source elements + * @param the type of target elements + */ + public static R @NotNull [] map( + final T @NonNull [] source, + final @NonNull Function mappingFunction, + final @NonNull IntFunction arrayFactory + ) { + final int length; + val target = arrayFactory.apply(length = source.length); + for (var i = 0; i < length; i++) target[i] = mappingFunction.apply(source[i]); + + return target; + } + /** + * Maps the given array by-element using the provided function. + * + * @param source source array + * @param mappingFunction function used to map elements + * @param typeHint pseudo-array of the same type as the target array + * @return created array + * @param the type of source elements + * @param the type of target elements + */ + public static R @NotNull [] map( + final T @NonNull [] source, + final @NonNull Function mappingFunction, + @TypeHints.TypeHint + final @NonNull R... typeHint + ) { + final int length; + @SuppressWarnings("unchecked") + val target = (R[]) Array.newInstance(TypeHints.resolve(typeHint), length = source.length); + for (var i = 0; i < length; i++) target[i] = mappingFunction.apply(source[i]); + + return target; + } +} From 6521a08e4161c814c34c764e4212d6f5939a3318 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Jul 2022 10:07:00 +0000 Subject: [PATCH 02/23] build(deps): bump actions/setup-java from 3.4.0 to 3.4.1 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.4.0 to 3.4.1. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v3.4.0...v3.4.1) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yaml | 2 +- .github/workflows/deploy-release.yaml | 2 +- .github/workflows/deploy-snapshot.yaml | 2 +- .github/workflows/test.yaml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml index 117ed513..27177832 100644 --- a/.github/workflows/codeql-analysis.yaml +++ b/.github/workflows/codeql-analysis.yaml @@ -22,7 +22,7 @@ jobs: - uses: actions/checkout@v3.0.2 - name: Set up Java 17 - uses: actions/setup-java@v3.4.0 + uses: actions/setup-java@v3.4.1 with: distribution: 'zulu' java-version: '17' diff --git a/.github/workflows/deploy-release.yaml b/.github/workflows/deploy-release.yaml index bae5ad05..a08bd6b4 100644 --- a/.github/workflows/deploy-release.yaml +++ b/.github/workflows/deploy-release.yaml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v3.0.2 - name: Set up Java 17 & Deployment credentials - uses: actions/setup-java@v3.4.0 + uses: actions/setup-java@v3.4.1 with: distribution: 'zulu' java-version: '17' diff --git a/.github/workflows/deploy-snapshot.yaml b/.github/workflows/deploy-snapshot.yaml index ee63090b..875c4f41 100644 --- a/.github/workflows/deploy-snapshot.yaml +++ b/.github/workflows/deploy-snapshot.yaml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v3.0.2 - name: Set up Java 17 & Deployment credentials - uses: actions/setup-java@v3.4.0 + uses: actions/setup-java@v3.4.1 with: distribution: 'zulu' java-version: '17' diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 112df70d..943bc2a4 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -11,7 +11,7 @@ jobs: - uses: actions/checkout@v3.0.2 - name: Set up Java 17 - uses: actions/setup-java@v3.4.0 + uses: actions/setup-java@v3.4.1 with: distribution: 'zulu' java-version: '17' @@ -29,7 +29,7 @@ jobs: - uses: actions/checkout@v3.0.2 - name: Set up Java 17 - uses: actions/setup-java@v3.4.0 + uses: actions/setup-java@v3.4.1 with: distribution: 'zulu' java-version: '17' From 85bebea63c118c480d78c5bc7922ee9903b24620 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Jul 2022 10:08:24 +0000 Subject: [PATCH 03/23] build(deps): bump github/codeql-action from 2.1.15 to 2.1.16 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.1.15 to 2.1.16. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v2.1.15...v2.1.16) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml index 27177832..a3493b71 100644 --- a/.github/workflows/codeql-analysis.yaml +++ b/.github/workflows/codeql-analysis.yaml @@ -29,12 +29,12 @@ jobs: cache: 'maven' - name: Initialize CodeQL - uses: github/codeql-action/init@v2.1.15 + uses: github/codeql-action/init@v2.1.16 with: languages: java - name: Autobuild - uses: github/codeql-action/autobuild@v2.1.15 + uses: github/codeql-action/autobuild@v2.1.16 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2.1.15 + uses: github/codeql-action/analyze@v2.1.16 From c648e01ba000d96acc36aa5caacff4830be0b49e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Jul 2022 10:05:21 +0000 Subject: [PATCH 04/23] build(deps): bump junit-bom from 5.8.2 to 5.9.0 Bumps [junit-bom](https://github.com/junit-team/junit5) from 5.8.2 to 5.9.0. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.8.2...r5.9.0) --- updated-dependencies: - dependency-name: org.junit:junit-bom dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- padla-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/padla-parent/pom.xml b/padla-parent/pom.xml index e8190b83..4ee4348d 100644 --- a/padla-parent/pom.xml +++ b/padla-parent/pom.xml @@ -55,7 +55,7 @@ org.junit junit-bom - 5.8.2 + 5.9.0 pom import From bfc67557848263c2108120a5c549e92eebbb61b1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 Jul 2022 10:07:19 +0000 Subject: [PATCH 05/23] build(deps): bump github/codeql-action from 2.1.16 to 2.1.17 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.1.16 to 2.1.17. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v2.1.16...v2.1.17) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml index a3493b71..84084f46 100644 --- a/.github/workflows/codeql-analysis.yaml +++ b/.github/workflows/codeql-analysis.yaml @@ -29,12 +29,12 @@ jobs: cache: 'maven' - name: Initialize CodeQL - uses: github/codeql-action/init@v2.1.16 + uses: github/codeql-action/init@v2.1.17 with: languages: java - name: Autobuild - uses: github/codeql-action/autobuild@v2.1.16 + uses: github/codeql-action/autobuild@v2.1.17 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2.1.16 + uses: github/codeql-action/analyze@v2.1.17 From 3fa82a878945bcf367046f28477081e5a2dc3163 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Aug 2022 10:10:51 +0000 Subject: [PATCH 06/23] build(deps): bump jactions/maven-version from 1.0.1 to 1.1.0 Bumps [jactions/maven-version](https://github.com/jactions/maven-version) from 1.0.1 to 1.1.0. - [Release notes](https://github.com/jactions/maven-version/releases) - [Commits](https://github.com/jactions/maven-version/compare/v1.0.1...v1.1.0) --- updated-dependencies: - dependency-name: jactions/maven-version dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/deploy-release.yaml | 2 +- .github/workflows/deploy-snapshot.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-release.yaml b/.github/workflows/deploy-release.yaml index a08bd6b4..4fbac139 100644 --- a/.github/workflows/deploy-release.yaml +++ b/.github/workflows/deploy-release.yaml @@ -24,7 +24,7 @@ jobs: gpg-private-key: ${{ secrets.CODE_SIGNING_GPG_PRIVATE_KEY }} gpg-passphrase: CODE_SIGNING_GPG_KEY_PASSPHRASE - - uses: jactions/maven-version@v1.0.1 + - uses: jactions/maven-version@v1.1.0 id: get_version - name: Deploy release diff --git a/.github/workflows/deploy-snapshot.yaml b/.github/workflows/deploy-snapshot.yaml index 875c4f41..a4cedc1b 100644 --- a/.github/workflows/deploy-snapshot.yaml +++ b/.github/workflows/deploy-snapshot.yaml @@ -24,7 +24,7 @@ jobs: gpg-private-key: ${{ secrets.CODE_SIGNING_GPG_PRIVATE_KEY }} gpg-passphrase: CODE_SIGNING_GPG_KEY_PASSPHRASE - - uses: jactions/maven-version@v1.0.1 + - uses: jactions/maven-version@v1.1.0 id: get_version - name: Deploy snapshot From 45f6ce6f0cdd2c136165819da09af1e9cc89e86d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Aug 2022 10:04:16 +0000 Subject: [PATCH 07/23] build(deps): bump drill-fmpp-maven-plugin from 1.20.0-hadoop2 to 1.20.2 Bumps drill-fmpp-maven-plugin from 1.20.0-hadoop2 to 1.20.2. --- updated-dependencies: - dependency-name: org.apache.drill.tools:drill-fmpp-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 553e74a3..3f4e75fc 100644 --- a/pom.xml +++ b/pom.xml @@ -158,7 +158,7 @@ org.apache.drill.tools drill-fmpp-maven-plugin - 1.20.0-hadoop2 + 1.20.2 generate-fmpp From 3890b3a4e2d141a9c5a0c6383205b60e007aafa5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Aug 2022 10:09:30 +0000 Subject: [PATCH 08/23] build(deps): bump github/codeql-action from 2.1.17 to 2.1.18 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.1.17 to 2.1.18. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v2.1.17...v2.1.18) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml index 84084f46..b25d32d4 100644 --- a/.github/workflows/codeql-analysis.yaml +++ b/.github/workflows/codeql-analysis.yaml @@ -29,12 +29,12 @@ jobs: cache: 'maven' - name: Initialize CodeQL - uses: github/codeql-action/init@v2.1.17 + uses: github/codeql-action/init@v2.1.18 with: languages: java - name: Autobuild - uses: github/codeql-action/autobuild@v2.1.17 + uses: github/codeql-action/autobuild@v2.1.18 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2.1.17 + uses: github/codeql-action/analyze@v2.1.18 From c62d84dbd1d4f461521938b8592c77164092a7ff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Aug 2022 10:05:31 +0000 Subject: [PATCH 09/23] build(deps): bump javassist from 3.29.0-GA to 3.29.1-GA Bumps [javassist](https://github.com/jboss-javassist/javassist) from 3.29.0-GA to 3.29.1-GA. - [Release notes](https://github.com/jboss-javassist/javassist/releases) - [Changelog](https://github.com/jboss-javassist/javassist/blob/master/Changes.md) - [Commits](https://github.com/jboss-javassist/javassist/commits) --- updated-dependencies: - dependency-name: org.javassist:javassist dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3f4e75fc..6695dc53 100644 --- a/pom.xml +++ b/pom.xml @@ -271,7 +271,7 @@ org.javassist javassist - 3.29.0-GA + 3.29.1-GA provided true From 1bb3bc474c84b0c43f03a22788d5f7f8b0d6481d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Aug 2022 10:04:17 +0000 Subject: [PATCH 10/23] build(deps): bump mockito-bom from 4.6.1 to 4.7.0 Bumps [mockito-bom](https://github.com/mockito/mockito) from 4.6.1 to 4.7.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.6.1...v4.7.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-bom dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- padla-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/padla-parent/pom.xml b/padla-parent/pom.xml index 4ee4348d..ee9f7463 100644 --- a/padla-parent/pom.xml +++ b/padla-parent/pom.xml @@ -62,7 +62,7 @@ org.mockito mockito-bom - 4.6.1 + 4.7.0 pom import From c387ef3e4eb6bb4fa2a9bbe6ac3052c08e0a16b8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Aug 2022 10:04:22 +0000 Subject: [PATCH 11/23] build(deps): bump maven-javadoc-plugin from 3.4.0 to 3.4.1 Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.4.0 to 3.4.1. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.4.0...maven-javadoc-plugin-3.4.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6695dc53..ef461d34 100644 --- a/pom.xml +++ b/pom.xml @@ -200,7 +200,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.4.0 + 3.4.1 ${java.version.minimal} From 2bbf8aac5f3d8f62472f672547ba19530fc71217 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Aug 2022 10:04:59 +0000 Subject: [PATCH 12/23] build(deps): bump github/codeql-action from 2.1.18 to 2.1.19 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.1.18 to 2.1.19. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/v2.1.19/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v2.1.18...v2.1.19) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml index b25d32d4..dede2bf3 100644 --- a/.github/workflows/codeql-analysis.yaml +++ b/.github/workflows/codeql-analysis.yaml @@ -29,12 +29,12 @@ jobs: cache: 'maven' - name: Initialize CodeQL - uses: github/codeql-action/init@v2.1.18 + uses: github/codeql-action/init@v2.1.19 with: languages: java - name: Autobuild - uses: github/codeql-action/autobuild@v2.1.18 + uses: github/codeql-action/autobuild@v2.1.19 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2.1.18 + uses: github/codeql-action/analyze@v2.1.19 From fbbfe2f27888693ac584bfe5d2f08c921c8f4356 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Aug 2022 10:07:40 +0000 Subject: [PATCH 13/23] build(deps): bump github/codeql-action from 2.1.19 to 2.1.20 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.1.19 to 2.1.20. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v2.1.19...v2.1.20) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml index dede2bf3..8d933ac1 100644 --- a/.github/workflows/codeql-analysis.yaml +++ b/.github/workflows/codeql-analysis.yaml @@ -29,12 +29,12 @@ jobs: cache: 'maven' - name: Initialize CodeQL - uses: github/codeql-action/init@v2.1.19 + uses: github/codeql-action/init@v2.1.20 with: languages: java - name: Autobuild - uses: github/codeql-action/autobuild@v2.1.19 + uses: github/codeql-action/autobuild@v2.1.20 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2.1.19 + uses: github/codeql-action/analyze@v2.1.20 From 8f7362163b2be6e534e95e6834c389c2846eec4c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Aug 2022 10:06:01 +0000 Subject: [PATCH 14/23] build(deps): bump github/codeql-action from 2.1.20 to 2.1.21 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.1.20 to 2.1.21. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v2.1.20...v2.1.21) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml index 8d933ac1..ae3dbf0e 100644 --- a/.github/workflows/codeql-analysis.yaml +++ b/.github/workflows/codeql-analysis.yaml @@ -29,12 +29,12 @@ jobs: cache: 'maven' - name: Initialize CodeQL - uses: github/codeql-action/init@v2.1.20 + uses: github/codeql-action/init@v2.1.21 with: languages: java - name: Autobuild - uses: github/codeql-action/autobuild@v2.1.20 + uses: github/codeql-action/autobuild@v2.1.21 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2.1.20 + uses: github/codeql-action/analyze@v2.1.21 From c9fcbed6d29cb66d129cf2711f9909b1da14522f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Sep 2022 10:06:59 +0000 Subject: [PATCH 15/23] build(deps): bump github/codeql-action from 2.1.21 to 2.1.22 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.1.21 to 2.1.22. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v2.1.21...v2.1.22) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml index ae3dbf0e..32c7fc3c 100644 --- a/.github/workflows/codeql-analysis.yaml +++ b/.github/workflows/codeql-analysis.yaml @@ -29,12 +29,12 @@ jobs: cache: 'maven' - name: Initialize CodeQL - uses: github/codeql-action/init@v2.1.21 + uses: github/codeql-action/init@v2.1.22 with: languages: java - name: Autobuild - uses: github/codeql-action/autobuild@v2.1.21 + uses: github/codeql-action/autobuild@v2.1.22 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2.1.21 + uses: github/codeql-action/analyze@v2.1.22 From 4421fb2b4aa73e01dd3c06b8d46fc3e357a4aae3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Sep 2022 10:06:15 +0000 Subject: [PATCH 16/23] build(deps): bump mockito-bom from 4.7.0 to 4.8.0 Bumps [mockito-bom](https://github.com/mockito/mockito) from 4.7.0 to 4.8.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.7.0...v4.8.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-bom dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- padla-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/padla-parent/pom.xml b/padla-parent/pom.xml index ee9f7463..2df6c886 100644 --- a/padla-parent/pom.xml +++ b/padla-parent/pom.xml @@ -62,7 +62,7 @@ org.mockito mockito-bom - 4.7.0 + 4.8.0 pom import From 5f3b674334ce5aba6da6cfe516bfc37ba94f90e8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Sep 2022 10:08:38 +0000 Subject: [PATCH 17/23] build(deps): bump actions/setup-java from 3.4.1 to 3.5.0 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.4.1 to 3.5.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v3.4.1...v3.5.0) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yaml | 2 +- .github/workflows/deploy-release.yaml | 2 +- .github/workflows/deploy-snapshot.yaml | 2 +- .github/workflows/test.yaml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml index 32c7fc3c..36dc92d1 100644 --- a/.github/workflows/codeql-analysis.yaml +++ b/.github/workflows/codeql-analysis.yaml @@ -22,7 +22,7 @@ jobs: - uses: actions/checkout@v3.0.2 - name: Set up Java 17 - uses: actions/setup-java@v3.4.1 + uses: actions/setup-java@v3.5.0 with: distribution: 'zulu' java-version: '17' diff --git a/.github/workflows/deploy-release.yaml b/.github/workflows/deploy-release.yaml index 4fbac139..a026c263 100644 --- a/.github/workflows/deploy-release.yaml +++ b/.github/workflows/deploy-release.yaml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v3.0.2 - name: Set up Java 17 & Deployment credentials - uses: actions/setup-java@v3.4.1 + uses: actions/setup-java@v3.5.0 with: distribution: 'zulu' java-version: '17' diff --git a/.github/workflows/deploy-snapshot.yaml b/.github/workflows/deploy-snapshot.yaml index a4cedc1b..aee8e2bb 100644 --- a/.github/workflows/deploy-snapshot.yaml +++ b/.github/workflows/deploy-snapshot.yaml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v3.0.2 - name: Set up Java 17 & Deployment credentials - uses: actions/setup-java@v3.4.1 + uses: actions/setup-java@v3.5.0 with: distribution: 'zulu' java-version: '17' diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 943bc2a4..6fd29098 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -11,7 +11,7 @@ jobs: - uses: actions/checkout@v3.0.2 - name: Set up Java 17 - uses: actions/setup-java@v3.4.1 + uses: actions/setup-java@v3.5.0 with: distribution: 'zulu' java-version: '17' @@ -29,7 +29,7 @@ jobs: - uses: actions/checkout@v3.0.2 - name: Set up Java 17 - uses: actions/setup-java@v3.4.1 + uses: actions/setup-java@v3.5.0 with: distribution: 'zulu' java-version: '17' From 481b88a837fa9099501a95ff2021e1fc79939677 Mon Sep 17 00:00:00 2001 From: Petr Portnov Date: Fri, 9 Sep 2022 21:25:11 +0300 Subject: [PATCH 18/23] feat(java-commons): add more error handling methods to `Result` --- .../javacommons/object/Result.java | 109 +++++++++++++++++- 1 file changed, 104 insertions(+), 5 deletions(-) diff --git a/java-commons/src/main/java/ru/progrm_jarvis/javacommons/object/Result.java b/java-commons/src/main/java/ru/progrm_jarvis/javacommons/object/Result.java index e34c945c..5f594402 100644 --- a/java-commons/src/main/java/ru/progrm_jarvis/javacommons/object/Result.java +++ b/java-commons/src/main/java/ru/progrm_jarvis/javacommons/object/Result.java @@ -134,8 +134,10 @@ public interface Result extends Supplier { * @see #from(Optional) alternative with default (i.e. null) error */ @SuppressWarnings("OptionalUsedAsFieldOrParameterType") // convertion from optional itself - static @NotNull Result from(final @NonNull Optional optional, - final @NonNull Supplier errorSupplier) { + static @NotNull Result from( + final @NonNull Optional optional, + final @NonNull Supplier errorSupplier + ) { return optional.>map(Result::success).orElseGet(() -> error(errorSupplier.get())); } @@ -401,17 +403,25 @@ default T orElseSneakyThrow( * Gets the value of this result if this is a {@link #isSuccess() successful} * otherwise returning default value. * - * @param defaultValue default value to be returned if this is an {@link #isError()} error value} + * @param defaultValue default value to be returned if this is an {@link #isError() error value} * @return successful value if this a {@link #isSuccess() successful result} or {@code defaultValue} otherwise */ T orDefault(T defaultValue); + /** + * Gets the value of this result if this is a {@link #isSuccess() successful} + * otherwise returning {@code null}. + * + * @return successful value if this a {@link #isSuccess() successful result} or {@code null} otherwise + */ + @Nullable T orNull(); + /** * Gets the value of this result if this is a {@link #isSuccess() successful} * otherwise returning the value got by using the specified supplier. * * @param defaultValueSupplier supplier of the default value - * to be returned if this is an {@link #isError()} error value} + * to be returned if this is an {@link #isError() error value} * @return successful value if this a {@link #isSuccess() successful result} or got default otherwise */ T orGetDefault(@NonNull Supplier defaultValueSupplier); @@ -421,7 +431,7 @@ default T orElseSneakyThrow( * otherwise returning the value computed by applying the given function to the {@link #unwrapError() error value}. * * @param defaultValueFactory factory used for creation of the default value - * to be returned if this is an {@link #isError()} error value} + * to be returned if this is an {@link #isError() error value} * @return successful value if this a {@link #isSuccess() successful result} or the computed default otherwise */ T orComputeDefault(@NonNull Function defaultValueFactory); @@ -488,6 +498,45 @@ default E errorOrElseSneakyThrow( return errorOrElseThrow(exceptionFactory); } + /** + * Gets the error of this result if this is an {@link #isError() error} + * otherwise returning default value. + * + * @param defaultError default value to be returned if this is an {@link #isSuccess() successful result} + * @return error value if this an {@link #isError() error result} or {@code defaultError} otherwise + */ + E errorOrDefault(E defaultError); + + /** + * Gets the error of this result if this is an {@link #isError() error} + * otherwise returning {@code null}. + * + * @return error value if this an {@link #isError() error result} or {@code null} otherwise + */ + @Nullable E errorOrNull(); + + /** + * Gets the value of this result if this is an {@link #isError() error} + * otherwise returning the value got by using the specified supplier. + * + * @param defaultErrorSupplier supplier of the default error + * to be returned if this is a {@link #isSuccess() successful value} + * @return error value if this an {@link #isError() error result} or got default otherwise + */ + E errorOrGetDefault(@NonNull Supplier defaultErrorSupplier); + + /** + * Gets the value of this result if this is a {@link #isSuccess() successful} + * otherwise returning the value computed by applying the given function to the {@link #unwrapError() error value}. + * + * @param defaultErrorFactory factory used for creation of the default error + * to be returned if this is a {@link #isSuccess() successful value} + * @return successful value if this an {@link #isError() error result} or the computed default otherwise + */ + E errorOrComputeDefault(@NonNull Function defaultErrorFactory); + + /* ********************************************** Handling methods ********************************************** */ + /** * Invokes the given function if this result is a {@link #isSuccess() successful result}. * @@ -727,6 +776,11 @@ public T orDefault(final T defaultValue) { return value; } + @Override + public @Nullable T orNull() { + return value; + } + @Override public T orGetDefault(final @NonNull Supplier defaultValueSupplier) { return value; @@ -754,6 +808,26 @@ public E errorOrElseThrow( throw exceptionSupplier.apply(value); } + @Override + public E errorOrDefault(final E defaultError) { + return defaultError; + } + + @Override + public @Nullable E errorOrNull() { + return null; + } + + @Override + public E errorOrGetDefault(@NonNull final Supplier defaultErrorSupplier) { + return defaultErrorSupplier.get(); + } + + @Override + public E errorOrComputeDefault(@NonNull final Function defaultErrorFactory) { + return defaultErrorFactory.apply(value); + } + @Override public void ifSuccess(final @NonNull Consumer successConsumer) { successConsumer.accept(value); @@ -928,6 +1002,11 @@ public T orDefault(final T defaultValue) { return defaultValue; } + @Override + public @Nullable T orNull() { + return null; + } + @Override public T orGetDefault(final @NonNull Supplier defaultValueSupplier) { return defaultValueSupplier.get(); @@ -955,6 +1034,26 @@ public E errorOrElseThrow( return error; } + @Override + public E errorOrDefault(final E defaultError) { + return error; + } + + @Override + public @Nullable E errorOrNull() { + return error; + } + + @Override + public E errorOrGetDefault(@NonNull final Supplier defaultErrorSupplier) { + return error; + } + + @Override + public E errorOrComputeDefault(@NonNull final Function defaultErrorFactory) { + return error; + } + @Override public void ifSuccess(final @NonNull Consumer successConsumer) {} From f53172055a5b8fe87a950bd6e7f3424a6dfb18fc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 Sep 2022 10:05:22 +0000 Subject: [PATCH 19/23] build(deps): bump javassist from 3.29.1-GA to 3.29.2-GA Bumps [javassist](https://github.com/jboss-javassist/javassist) from 3.29.1-GA to 3.29.2-GA. - [Release notes](https://github.com/jboss-javassist/javassist/releases) - [Changelog](https://github.com/jboss-javassist/javassist/blob/master/Changes.md) - [Commits](https://github.com/jboss-javassist/javassist/commits) --- updated-dependencies: - dependency-name: org.javassist:javassist dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ef461d34..fdcd2b06 100644 --- a/pom.xml +++ b/pom.xml @@ -271,7 +271,7 @@ org.javassist javassist - 3.29.1-GA + 3.29.2-GA provided true From 0da7ff542399d670ad12fae9834dc3e236b51a0a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 Sep 2022 10:08:34 +0000 Subject: [PATCH 20/23] build(deps): bump github/codeql-action from 2.1.22 to 2.1.23 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.1.22 to 2.1.23. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/v2.1.23/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v2.1.22...v2.1.23) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml index 36dc92d1..50cd3db5 100644 --- a/.github/workflows/codeql-analysis.yaml +++ b/.github/workflows/codeql-analysis.yaml @@ -29,12 +29,12 @@ jobs: cache: 'maven' - name: Initialize CodeQL - uses: github/codeql-action/init@v2.1.22 + uses: github/codeql-action/init@v2.1.23 with: languages: java - name: Autobuild - uses: github/codeql-action/autobuild@v2.1.22 + uses: github/codeql-action/autobuild@v2.1.23 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2.1.22 + uses: github/codeql-action/analyze@v2.1.23 From b8d5b6fbf0f03f1851caf0e471b8b164a0b71802 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Sep 2022 10:08:37 +0000 Subject: [PATCH 21/23] build(deps): bump maven-jar-plugin from 3.2.2 to 3.3.0 Bumps [maven-jar-plugin](https://github.com/apache/maven-jar-plugin) from 3.2.2 to 3.3.0. - [Release notes](https://github.com/apache/maven-jar-plugin/releases) - [Commits](https://github.com/apache/maven-jar-plugin/compare/maven-jar-plugin-3.2.2...maven-jar-plugin-3.3.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-jar-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ef461d34..8dcee3c4 100644 --- a/pom.xml +++ b/pom.xml @@ -139,7 +139,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.2.2 + 3.3.0 From 7c914674d932c9d260f353c595cf5ac9a5c94664 Mon Sep 17 00:00:00 2001 From: Petr Portnov Date: Sun, 18 Sep 2022 22:36:36 +0300 Subject: [PATCH 22/23] fix(dep): use correct javassist module name --- java-commons/src/main/java9/module-info.java | 2 +- ultimate-messenger/src/main/java9/module-info.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-commons/src/main/java9/module-info.java b/java-commons/src/main/java9/module-info.java index 538529e1..2132a06d 100644 --- a/java-commons/src/main/java9/module-info.java +++ b/java-commons/src/main/java9/module-info.java @@ -5,7 +5,7 @@ module ru.progrm_jarvis.javacommons { // optional dependencies requires org.objectweb.asm; - requires javassist; + requires org.javassist; requires static lombok; requires static org.jetbrains.annotations; diff --git a/ultimate-messenger/src/main/java9/module-info.java b/ultimate-messenger/src/main/java9/module-info.java index 94593223..070072f8 100644 --- a/ultimate-messenger/src/main/java9/module-info.java +++ b/ultimate-messenger/src/main/java9/module-info.java @@ -10,7 +10,7 @@ requires java.logging; // optional dependencies requires org.objectweb.asm; - requires javassist; + requires org.javassist; requires static lombok; requires static org.jetbrains.annotations; From 83319d65859b170f8dc5b9ef45950ffdebf1917a Mon Sep 17 00:00:00 2001 From: Petr Portnov Date: Sun, 18 Sep 2022 22:32:17 +0300 Subject: [PATCH 23/23] build: bump version to 1.0.0-rc.11 --- SECURITY.md | 10 +++++----- java-commons/pom.xml | 2 +- padla-bom/pom.xml | 8 ++++---- padla-parent/pom.xml | 2 +- pom.xml | 2 +- reflector/pom.xml | 2 +- ultimate-messenger/pom.xml | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/SECURITY.md b/SECURITY.md index 2ee59481..39d27906 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -2,10 +2,10 @@ ## Supported Versions -| Version | Supported | -|--------------| ------------------ | -| [1.0.0-rc.9] | :heavy_check_mark: | -| < 1.0.0-rc.9 | :x: | +| Version | Supported | +|---------------| ------------------ | +| [1.0.0-rc.11] | :heavy_check_mark: | +| < 1.0.0-rc.11 | :x: | ## Reporting a Vulnerability @@ -15,4 +15,4 @@ These are checked regularly and are the primary support channel. -[1.0.0-rc.8]: https://mvnrepository.com/artifact/ru.progrm-jarvis/padla/1.0.0-rc.8 +[1.0.0-rc.11]: https://mvnrepository.com/artifact/ru.progrm-jarvis/padla/1.0.0-rc.11 diff --git a/java-commons/pom.xml b/java-commons/pom.xml index 4b915a9a..da5e9dec 100644 --- a/java-commons/pom.xml +++ b/java-commons/pom.xml @@ -6,7 +6,7 @@ ru.progrm-jarvis padla-parent - 1.0.0-SNAPSHOT + 1.0.0-rc.11 ../padla-parent java-commons diff --git a/padla-bom/pom.xml b/padla-bom/pom.xml index f9c59a21..8510a4c1 100644 --- a/padla-bom/pom.xml +++ b/padla-bom/pom.xml @@ -6,7 +6,7 @@ ru.progrm-jarvis padla - 1.0.0-SNAPSHOT + 1.0.0-rc.11 padla-bom pom @@ -20,17 +20,17 @@ ru.progrm-jarvis java-commons - 1.0.0-SNAPSHOT + 1.0.0-rc.11 ru.progrm-jarvis reflector - 1.0.0-SNAPSHOT + 1.0.0-rc.11 ru.progrm-jarvis ultimate-messenger - 1.0.0-SNAPSHOT + 1.0.0-rc.11 diff --git a/padla-parent/pom.xml b/padla-parent/pom.xml index 2df6c886..929daf4c 100644 --- a/padla-parent/pom.xml +++ b/padla-parent/pom.xml @@ -6,7 +6,7 @@ ru.progrm-jarvis padla - 1.0.0-SNAPSHOT + 1.0.0-rc.11 padla-parent pom diff --git a/pom.xml b/pom.xml index 6b0d2b75..8b2e467f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 ru.progrm-jarvis padla - 1.0.0-SNAPSHOT + 1.0.0-rc.11 padla-bom padla-parent diff --git a/reflector/pom.xml b/reflector/pom.xml index e55f0bea..329f4e40 100644 --- a/reflector/pom.xml +++ b/reflector/pom.xml @@ -6,7 +6,7 @@ ru.progrm-jarvis padla-parent - 1.0.0-SNAPSHOT + 1.0.0-rc.11 ../padla-parent reflector diff --git a/ultimate-messenger/pom.xml b/ultimate-messenger/pom.xml index 87c8fb70..dc82dd53 100644 --- a/ultimate-messenger/pom.xml +++ b/ultimate-messenger/pom.xml @@ -6,7 +6,7 @@ ru.progrm-jarvis padla-parent - 1.0.0-SNAPSHOT + 1.0.0-rc.11 ../padla-parent ultimate-messenger