From 36193b5a78719d3038e9bf203c0a7cb7a4a0edea Mon Sep 17 00:00:00 2001 From: Lubos Racansky Date: Wed, 2 Oct 2024 07:42:52 +0200 Subject: [PATCH 01/23] Fix #327: Set develop version to 1.12.0-SNAPSHOT --- annotations/pom.xml | 2 +- audit-base/pom.xml | 2 +- bom/pom.xml | 2 +- http-common/pom.xml | 2 +- pom.xml | 2 +- rest-client-base/pom.xml | 2 +- rest-model-base/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/annotations/pom.xml b/annotations/pom.xml index fb7fe9c..2edb9ec 100644 --- a/annotations/pom.xml +++ b/annotations/pom.xml @@ -7,7 +7,7 @@ io.getlime.core lime-java-core-parent - 1.11.0 + 1.12.0-SNAPSHOT annotations diff --git a/audit-base/pom.xml b/audit-base/pom.xml index 4cd56a8..84263b6 100644 --- a/audit-base/pom.xml +++ b/audit-base/pom.xml @@ -6,7 +6,7 @@ io.getlime.core lime-java-core-parent - 1.11.0 + 1.12.0-SNAPSHOT audit-base diff --git a/bom/pom.xml b/bom/pom.xml index 00301f5..c9cca6f 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -7,7 +7,7 @@ io.getlime.core lime-java-core-parent - 1.11.0 + 1.12.0-SNAPSHOT core-bom diff --git a/http-common/pom.xml b/http-common/pom.xml index e7a65ec..6827669 100644 --- a/http-common/pom.xml +++ b/http-common/pom.xml @@ -7,7 +7,7 @@ io.getlime.core lime-java-core-parent - 1.11.0 + 1.12.0-SNAPSHOT http-common diff --git a/pom.xml b/pom.xml index f652dd7..03a503d 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ Wultra - Core Java Libraries io.getlime.core lime-java-core-parent - 1.11.0 + 1.12.0-SNAPSHOT pom 2017 diff --git a/rest-client-base/pom.xml b/rest-client-base/pom.xml index d148272..da1323b 100644 --- a/rest-client-base/pom.xml +++ b/rest-client-base/pom.xml @@ -6,7 +6,7 @@ io.getlime.core lime-java-core-parent - 1.11.0 + 1.12.0-SNAPSHOT rest-client-base diff --git a/rest-model-base/pom.xml b/rest-model-base/pom.xml index 5c28381..45bc586 100644 --- a/rest-model-base/pom.xml +++ b/rest-model-base/pom.xml @@ -6,7 +6,7 @@ io.getlime.core lime-java-core-parent - 1.11.0 + 1.12.0-SNAPSHOT rest-model-base From 036e10e2d40ea8b8dfede3fbc30f8f360e911990 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 17:37:13 +0000 Subject: [PATCH 02/23] Bump org.apache.maven.plugins:maven-surefire-plugin from 3.5.0 to 3.5.1 Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.5.0 to 3.5.1. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.5.0...surefire-3.5.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-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 03a503d..5b653d1 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,7 @@ ${java.version} 3.13.0 - 3.5.0 + 3.5.1 3.5.0 From 7d10c4016e2c5dbaab48a20fb4ff55bf1e4d06aa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 17:37:20 +0000 Subject: [PATCH 03/23] Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.10.0 to 3.10.1 Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.10.0 to 3.10.1. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.10.0...maven-javadoc-plugin-3.10.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 03a503d..0f54045 100644 --- a/pom.xml +++ b/pom.xml @@ -119,7 +119,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.10.0 + 3.10.1 false From 4c65d03febc1e31c91b28ddfe6467657a89ccac9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 17:45:23 +0000 Subject: [PATCH 04/23] Bump spring-boot.version from 3.3.4 to 3.3.5 Bumps `spring-boot.version` from 3.3.4 to 3.3.5. Updates `org.springframework.boot:spring-boot-dependencies` from 3.3.4 to 3.3.5 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.4...v3.3.5) Updates `org.springframework.boot:spring-boot-maven-plugin` from 3.3.4 to 3.3.5 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.4...v3.3.5) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-dependencies dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework.boot:spring-boot-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 f05c2c5..6ad35d7 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 3.5.0 - 3.3.4 + 3.3.5 From e0a308e3fff801cac8b7b5519e5dc5478ab491ae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 17:31:46 +0000 Subject: [PATCH 05/23] Bump org.apache.maven.plugins:maven-surefire-plugin from 3.5.1 to 3.5.2 Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.5.1 to 3.5.2. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.5.1...surefire-3.5.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-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 6ad35d7..37da538 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,7 @@ ${java.version} 3.13.0 - 3.5.1 + 3.5.2 3.5.0 From 437be7112b25abfc235fbfedb6d22b9d4a2126e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 17:31:56 +0000 Subject: [PATCH 06/23] Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.10.1 to 3.11.1 Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.10.1 to 3.11.1. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.10.1...maven-javadoc-plugin-3.11.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-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 6ad35d7..cdd02bb 100644 --- a/pom.xml +++ b/pom.xml @@ -119,7 +119,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.10.1 + 3.11.1 false From fa8fc0f515670e3398eed5f7c6cd90de44260234 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 06:59:56 +0000 Subject: [PATCH 07/23] Bump spring-boot.version from 3.3.5 to 3.4.0 Bumps `spring-boot.version` from 3.3.5 to 3.4.0. Updates `org.springframework.boot:spring-boot-dependencies` from 3.3.5 to 3.4.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.5...v3.4.0) Updates `org.springframework.boot:spring-boot-maven-plugin` from 3.3.5 to 3.4.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.5...v3.4.0) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-dependencies dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.springframework.boot:spring-boot-maven-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 cf4acb8..5b5849d 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 3.5.0 - 3.3.5 + 3.4.0 From d9b1247c3b9241ff0530f675230d0876e10426d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 17:47:54 +0000 Subject: [PATCH 08/23] Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.11.1 to 3.11.2 Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.11.1 to 3.11.2. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.11.1...maven-javadoc-plugin-3.11.2) --- 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 5b5849d..afb2de9 100644 --- a/pom.xml +++ b/pom.xml @@ -119,7 +119,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.11.1 + 3.11.2 false From 4c393196351414f99be100e5eaa5561ebeb7bed4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2024 17:04:58 +0000 Subject: [PATCH 09/23] Bump spring-boot.version from 3.4.0 to 3.4.1 Bumps `spring-boot.version` from 3.4.0 to 3.4.1. Updates `org.springframework.boot:spring-boot-dependencies` from 3.4.0 to 3.4.1 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.4.0...v3.4.1) Updates `org.springframework.boot:spring-boot-maven-plugin` from 3.4.0 to 3.4.1 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.4.0...v3.4.1) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-dependencies dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework.boot:spring-boot-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 afb2de9..0798126 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 3.5.0 - 3.4.0 + 3.4.1 From 37437f6fe85af073218eb0d7075d5e88d80f8ee1 Mon Sep 17 00:00:00 2001 From: Roman Strobl Date: Tue, 31 Dec 2024 12:57:11 +0100 Subject: [PATCH 10/23] Fix #339: REST client should allow key store and trust store in memory configuration --- .../rest/client/base/DefaultRestClient.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/rest-client-base/src/main/java/com/wultra/core/rest/client/base/DefaultRestClient.java b/rest-client-base/src/main/java/com/wultra/core/rest/client/base/DefaultRestClient.java index a64e19c..4e8f5a6 100644 --- a/rest-client-base/src/main/java/com/wultra/core/rest/client/base/DefaultRestClient.java +++ b/rest-client-base/src/main/java/com/wultra/core/rest/client/base/DefaultRestClient.java @@ -1296,6 +1296,16 @@ public CertificateAuthBuilder keyStoreLocation(String keyStoreLocation) { return this; } + /** + * Set keystore bytes. + * @param keyStoreBytes Keystore bytes. + * @return Builder. + */ + public CertificateAuthBuilder keyStoreBytes(byte[] keyStoreBytes) { + mainBuilder.config.setKeyStoreBytes(keyStoreBytes); + return this; + } + /** * Set keystore password. * @param keyStorePassword Keystore password. @@ -1345,6 +1355,16 @@ public CertificateAuthBuilder trustStoreLocation(String trustStoreLocation) { return this; } + /** + * Set truststore bytes. + * @param trustStoreBytes Truststore bytes. + * @return Builder. + */ + public CertificateAuthBuilder trustStoreBytes(byte[] trustStoreBytes) { + mainBuilder.config.setTrustStoreBytes(trustStoreBytes); + return this; + } + /** * Set truststore password. * @param trustStorePassword Truststore password. From d5ef2a1a46cfff09dd895b1412aa5535dfce71b5 Mon Sep 17 00:00:00 2001 From: Roman Strobl Date: Fri, 10 Jan 2025 09:36:06 +0100 Subject: [PATCH 11/23] Fix #341: Null pointer exception when setting certificates --- .../core/rest/client/base/RestClientConfiguration.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/rest-client-base/src/main/java/com/wultra/core/rest/client/base/RestClientConfiguration.java b/rest-client-base/src/main/java/com/wultra/core/rest/client/base/RestClientConfiguration.java index f00ee1b..0150b0a 100644 --- a/rest-client-base/src/main/java/com/wultra/core/rest/client/base/RestClientConfiguration.java +++ b/rest-client-base/src/main/java/com/wultra/core/rest/client/base/RestClientConfiguration.java @@ -543,6 +543,10 @@ public byte[] getKeyStoreBytes() { * @param keyStoreBytes Byte data with the key store. */ public void setKeyStoreBytes(byte[] keyStoreBytes) { + if (keyStoreBytes == null) { + this.keyStoreBytes = null; + return; + } this.keyStoreBytes = Arrays.copyOf(keyStoreBytes, keyStoreBytes.length); } @@ -643,6 +647,10 @@ public byte[] getTrustStoreBytes() { * @param trustStoreBytes Byte data with the trust store. */ public void setTrustStoreBytes(byte[] trustStoreBytes) { + if (trustStoreBytes == null) { + this.trustStoreBytes = null; + return; + } this.trustStoreBytes = Arrays.copyOf(trustStoreBytes, trustStoreBytes.length); } From 97ebee0bf86bdcbda69ca1a63411533464ec8467 Mon Sep 17 00:00:00 2001 From: Roman Strobl Date: Mon, 20 Jan 2025 15:36:55 +0100 Subject: [PATCH 12/23] Fix #344: Change package to com.wultra --- annotations/pom.xml | 6 +++--- audit-base/pom.xml | 6 +++--- bom/pom.xml | 16 ++++++++-------- http-common/pom.xml | 6 +++--- pom.xml | 14 +++++++------- rest-client-base/pom.xml | 8 ++++---- .../core/rest/client/base/DefaultRestClient.java | 8 ++++---- .../wultra/core/rest/client/base/RestClient.java | 6 +++--- .../rest/client/base/RestClientException.java | 2 +- .../rest/client/base/DefaultRestClientTest.java | 6 +++--- .../controller/PrivateTestRestController.java | 2 +- .../controller/PublicTestRestController.java | 6 +++--- .../base/errorhandling/RestControllerAdvice.java | 2 +- rest-model-base/pom.xml | 6 +++--- .../core/rest/model/base/entity/Error.java | 2 +- .../rest/model/base/request/ObjectRequest.java | 2 +- .../rest/model/base/response/ErrorResponse.java | 4 ++-- .../rest/model/base/response/ObjectResponse.java | 4 ++-- .../core/rest/model/base/response/Response.java | 2 +- 19 files changed, 54 insertions(+), 54 deletions(-) rename rest-model-base/src/main/java/{io/getlime => com/wultra}/core/rest/model/base/entity/Error.java (98%) rename rest-model-base/src/main/java/{io/getlime => com/wultra}/core/rest/model/base/request/ObjectRequest.java (97%) rename rest-model-base/src/main/java/{io/getlime => com/wultra}/core/rest/model/base/response/ErrorResponse.java (96%) rename rest-model-base/src/main/java/{io/getlime => com/wultra}/core/rest/model/base/response/ObjectResponse.java (94%) rename rest-model-base/src/main/java/{io/getlime => com/wultra}/core/rest/model/base/response/Response.java (97%) diff --git a/annotations/pom.xml b/annotations/pom.xml index 2edb9ec..76d230e 100644 --- a/annotations/pom.xml +++ b/annotations/pom.xml @@ -5,9 +5,9 @@ 4.0.0 - io.getlime.core - lime-java-core-parent - 1.12.0-SNAPSHOT + com.wultra.core + wultra-java-core-parent + 2.0.0-SNAPSHOT annotations diff --git a/audit-base/pom.xml b/audit-base/pom.xml index 84263b6..2d73ebe 100644 --- a/audit-base/pom.xml +++ b/audit-base/pom.xml @@ -4,9 +4,9 @@ 4.0.0 - io.getlime.core - lime-java-core-parent - 1.12.0-SNAPSHOT + com.wultra.core + wultra-java-core-parent + 2.0.0-SNAPSHOT audit-base diff --git a/bom/pom.xml b/bom/pom.xml index c9cca6f..95d843d 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -5,9 +5,9 @@ 4.0.0 - io.getlime.core - lime-java-core-parent - 1.12.0-SNAPSHOT + com.wultra.core + wultra-java-core-parent + 2.0.0-SNAPSHOT core-bom @@ -17,31 +17,31 @@ - io.getlime.core + com.wultra.core annotations ${project.version} - io.getlime.core + com.wultra.core audit-base ${project.version} - io.getlime.core + com.wultra.core http-common ${project.version} - io.getlime.core + com.wultra.core rest-client-base ${project.version} - io.getlime.core + com.wultra.core rest-model-base ${project.version} diff --git a/http-common/pom.xml b/http-common/pom.xml index 6827669..8d0751c 100644 --- a/http-common/pom.xml +++ b/http-common/pom.xml @@ -5,9 +5,9 @@ 4.0.0 - io.getlime.core - lime-java-core-parent - 1.12.0-SNAPSHOT + com.wultra.core + wultra-java-core-parent + 2.0.0-SNAPSHOT http-common diff --git a/pom.xml b/pom.xml index 0798126..3975c54 100644 --- a/pom.xml +++ b/pom.xml @@ -4,11 +4,11 @@ 4.0.0 - lime-java-core-parent + wultra-java-core-parent Wultra - Core Java Libraries - io.getlime.core - lime-java-core-parent - 1.12.0-SNAPSHOT + com.wultra.core + wultra-java-core-parent + 2.0.0-SNAPSHOT pom 2017 @@ -27,9 +27,9 @@ - scm:git:https://github.com/wultra/lime-java-core.git - scm:git:https://github.com/wultra/lime-java-core.git - https://github.com/wultra/lime-java-core + scm:git:https://github.com/wultra/java-core.git + scm:git:https://github.com/wultra/java-core.git + https://github.com/wultra/java-core diff --git a/rest-client-base/pom.xml b/rest-client-base/pom.xml index da1323b..793fe73 100644 --- a/rest-client-base/pom.xml +++ b/rest-client-base/pom.xml @@ -4,9 +4,9 @@ 4.0.0 - io.getlime.core - lime-java-core-parent - 1.12.0-SNAPSHOT + com.wultra.core + wultra-java-core-parent + 2.0.0-SNAPSHOT rest-client-base @@ -40,7 +40,7 @@ test - io.getlime.core + com.wultra.core rest-model-base ${project.version} compile diff --git a/rest-client-base/src/main/java/com/wultra/core/rest/client/base/DefaultRestClient.java b/rest-client-base/src/main/java/com/wultra/core/rest/client/base/DefaultRestClient.java index 4e8f5a6..8d84133 100644 --- a/rest-client-base/src/main/java/com/wultra/core/rest/client/base/DefaultRestClient.java +++ b/rest-client-base/src/main/java/com/wultra/core/rest/client/base/DefaultRestClient.java @@ -19,10 +19,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.type.TypeFactory; import com.wultra.core.rest.client.base.util.SslUtils; -import io.getlime.core.rest.model.base.request.ObjectRequest; -import io.getlime.core.rest.model.base.response.ErrorResponse; -import io.getlime.core.rest.model.base.response.ObjectResponse; -import io.getlime.core.rest.model.base.response.Response; +import com.wultra.core.rest.model.base.request.ObjectRequest; +import com.wultra.core.rest.model.base.response.ErrorResponse; +import com.wultra.core.rest.model.base.response.ObjectResponse; +import com.wultra.core.rest.model.base.response.Response; import io.netty.channel.ChannelOption; import io.netty.channel.epoll.EpollChannelOption; import io.netty.channel.socket.nio.NioChannelOption; diff --git a/rest-client-base/src/main/java/com/wultra/core/rest/client/base/RestClient.java b/rest-client-base/src/main/java/com/wultra/core/rest/client/base/RestClient.java index 0d790d5..94b1fbb 100644 --- a/rest-client-base/src/main/java/com/wultra/core/rest/client/base/RestClient.java +++ b/rest-client-base/src/main/java/com/wultra/core/rest/client/base/RestClient.java @@ -15,9 +15,9 @@ */ package com.wultra.core.rest.client.base; -import io.getlime.core.rest.model.base.request.ObjectRequest; -import io.getlime.core.rest.model.base.response.ObjectResponse; -import io.getlime.core.rest.model.base.response.Response; +import com.wultra.core.rest.model.base.request.ObjectRequest; +import com.wultra.core.rest.model.base.response.ObjectResponse; +import com.wultra.core.rest.model.base.response.Response; import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.ResponseEntity; import org.springframework.util.MultiValueMap; diff --git a/rest-client-base/src/main/java/com/wultra/core/rest/client/base/RestClientException.java b/rest-client-base/src/main/java/com/wultra/core/rest/client/base/RestClientException.java index aa22d27..689b0ca 100644 --- a/rest-client-base/src/main/java/com/wultra/core/rest/client/base/RestClientException.java +++ b/rest-client-base/src/main/java/com/wultra/core/rest/client/base/RestClientException.java @@ -15,7 +15,7 @@ */ package com.wultra.core.rest.client.base; -import io.getlime.core.rest.model.base.response.ErrorResponse; +import com.wultra.core.rest.model.base.response.ErrorResponse; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatusCode; diff --git a/rest-client-base/src/test/java/com/wultra/core/rest/client/base/DefaultRestClientTest.java b/rest-client-base/src/test/java/com/wultra/core/rest/client/base/DefaultRestClientTest.java index b50e29f..8db544c 100644 --- a/rest-client-base/src/test/java/com/wultra/core/rest/client/base/DefaultRestClientTest.java +++ b/rest-client-base/src/test/java/com/wultra/core/rest/client/base/DefaultRestClientTest.java @@ -23,9 +23,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.wultra.core.rest.client.base.model.TestRequest; import com.wultra.core.rest.client.base.model.TestResponse; -import io.getlime.core.rest.model.base.request.ObjectRequest; -import io.getlime.core.rest.model.base.response.ObjectResponse; -import io.getlime.core.rest.model.base.response.Response; +import com.wultra.core.rest.model.base.request.ObjectRequest; +import com.wultra.core.rest.model.base.response.ObjectResponse; +import com.wultra.core.rest.model.base.response.Response; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/rest-client-base/src/test/java/com/wultra/core/rest/client/base/controller/PrivateTestRestController.java b/rest-client-base/src/test/java/com/wultra/core/rest/client/base/controller/PrivateTestRestController.java index 34ec038..96a48cd 100644 --- a/rest-client-base/src/test/java/com/wultra/core/rest/client/base/controller/PrivateTestRestController.java +++ b/rest-client-base/src/test/java/com/wultra/core/rest/client/base/controller/PrivateTestRestController.java @@ -15,7 +15,7 @@ */ package com.wultra.core.rest.client.base.controller; -import io.getlime.core.rest.model.base.response.Response; +import com.wultra.core.rest.model.base.response.Response; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/rest-client-base/src/test/java/com/wultra/core/rest/client/base/controller/PublicTestRestController.java b/rest-client-base/src/test/java/com/wultra/core/rest/client/base/controller/PublicTestRestController.java index 5dbdb03..9e5b197 100644 --- a/rest-client-base/src/test/java/com/wultra/core/rest/client/base/controller/PublicTestRestController.java +++ b/rest-client-base/src/test/java/com/wultra/core/rest/client/base/controller/PublicTestRestController.java @@ -18,9 +18,9 @@ import com.wultra.core.rest.client.base.model.TestRequest; import com.wultra.core.rest.client.base.model.TestResponse; import com.wultra.core.rest.client.base.model.error.RestException; -import io.getlime.core.rest.model.base.request.ObjectRequest; -import io.getlime.core.rest.model.base.response.ObjectResponse; -import io.getlime.core.rest.model.base.response.Response; +import com.wultra.core.rest.model.base.request.ObjectRequest; +import com.wultra.core.rest.model.base.response.ObjectResponse; +import com.wultra.core.rest.model.base.response.Response; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.springframework.http.HttpStatus; diff --git a/rest-client-base/src/test/java/com/wultra/core/rest/client/base/errorhandling/RestControllerAdvice.java b/rest-client-base/src/test/java/com/wultra/core/rest/client/base/errorhandling/RestControllerAdvice.java index a9a28fd..7f2db9b 100644 --- a/rest-client-base/src/test/java/com/wultra/core/rest/client/base/errorhandling/RestControllerAdvice.java +++ b/rest-client-base/src/test/java/com/wultra/core/rest/client/base/errorhandling/RestControllerAdvice.java @@ -16,7 +16,7 @@ package com.wultra.core.rest.client.base.errorhandling; import com.wultra.core.rest.client.base.model.error.RestException; -import io.getlime.core.rest.model.base.response.ErrorResponse; +import com.wultra.core.rest.model.base.response.ErrorResponse; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ExceptionHandler; diff --git a/rest-model-base/pom.xml b/rest-model-base/pom.xml index 45bc586..1ec391f 100644 --- a/rest-model-base/pom.xml +++ b/rest-model-base/pom.xml @@ -4,9 +4,9 @@ 4.0.0 - io.getlime.core - lime-java-core-parent - 1.12.0-SNAPSHOT + com.wultra.core + wultra-java-core-parent + 2.0.0-SNAPSHOT rest-model-base diff --git a/rest-model-base/src/main/java/io/getlime/core/rest/model/base/entity/Error.java b/rest-model-base/src/main/java/com/wultra/core/rest/model/base/entity/Error.java similarity index 98% rename from rest-model-base/src/main/java/io/getlime/core/rest/model/base/entity/Error.java rename to rest-model-base/src/main/java/com/wultra/core/rest/model/base/entity/Error.java index b58df89..b8f2b19 100644 --- a/rest-model-base/src/main/java/io/getlime/core/rest/model/base/entity/Error.java +++ b/rest-model-base/src/main/java/com/wultra/core/rest/model/base/entity/Error.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.getlime.core.rest.model.base.entity; +package com.wultra.core.rest.model.base.entity; import jakarta.validation.constraints.NotBlank; diff --git a/rest-model-base/src/main/java/io/getlime/core/rest/model/base/request/ObjectRequest.java b/rest-model-base/src/main/java/com/wultra/core/rest/model/base/request/ObjectRequest.java similarity index 97% rename from rest-model-base/src/main/java/io/getlime/core/rest/model/base/request/ObjectRequest.java rename to rest-model-base/src/main/java/com/wultra/core/rest/model/base/request/ObjectRequest.java index 7b9425c..28a93f1 100644 --- a/rest-model-base/src/main/java/io/getlime/core/rest/model/base/request/ObjectRequest.java +++ b/rest-model-base/src/main/java/com/wultra/core/rest/model/base/request/ObjectRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.getlime.core.rest.model.base.request; +package com.wultra.core.rest.model.base.request; import jakarta.validation.Valid; diff --git a/rest-model-base/src/main/java/io/getlime/core/rest/model/base/response/ErrorResponse.java b/rest-model-base/src/main/java/com/wultra/core/rest/model/base/response/ErrorResponse.java similarity index 96% rename from rest-model-base/src/main/java/io/getlime/core/rest/model/base/response/ErrorResponse.java rename to rest-model-base/src/main/java/com/wultra/core/rest/model/base/response/ErrorResponse.java index c7c13fe..f26ee01 100644 --- a/rest-model-base/src/main/java/io/getlime/core/rest/model/base/response/ErrorResponse.java +++ b/rest-model-base/src/main/java/com/wultra/core/rest/model/base/response/ErrorResponse.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.getlime.core.rest.model.base.response; +package com.wultra.core.rest.model.base.response; -import io.getlime.core.rest.model.base.entity.Error; +import com.wultra.core.rest.model.base.entity.Error; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/rest-model-base/src/main/java/io/getlime/core/rest/model/base/response/ObjectResponse.java b/rest-model-base/src/main/java/com/wultra/core/rest/model/base/response/ObjectResponse.java similarity index 94% rename from rest-model-base/src/main/java/io/getlime/core/rest/model/base/response/ObjectResponse.java rename to rest-model-base/src/main/java/com/wultra/core/rest/model/base/response/ObjectResponse.java index 77196a4..1be9af6 100644 --- a/rest-model-base/src/main/java/io/getlime/core/rest/model/base/response/ObjectResponse.java +++ b/rest-model-base/src/main/java/com/wultra/core/rest/model/base/response/ObjectResponse.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.getlime.core.rest.model.base.response; +package com.wultra.core.rest.model.base.response; import jakarta.validation.Valid; @@ -56,7 +56,7 @@ public ObjectResponse(T responseObject) { /** * Constructor with response status and response object * - * @param status Response status, use static constant from {@link io.getlime.core.rest.model.base.response.Response.Status} class. + * @param status Response status, use static constant from {@link com.wultra.core.rest.model.base.response.Response.Status} class. * @param responseObject Response object. */ public ObjectResponse(String status, T responseObject) { diff --git a/rest-model-base/src/main/java/io/getlime/core/rest/model/base/response/Response.java b/rest-model-base/src/main/java/com/wultra/core/rest/model/base/response/Response.java similarity index 97% rename from rest-model-base/src/main/java/io/getlime/core/rest/model/base/response/Response.java rename to rest-model-base/src/main/java/com/wultra/core/rest/model/base/response/Response.java index 32bfab1..6f1934e 100644 --- a/rest-model-base/src/main/java/io/getlime/core/rest/model/base/response/Response.java +++ b/rest-model-base/src/main/java/com/wultra/core/rest/model/base/response/Response.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.getlime.core.rest.model.base.response; +package com.wultra.core.rest.model.base.response; import jakarta.validation.constraints.NotBlank; From d8e52f6f7c0034859b653bdde379c0188f2bcc69 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Jan 2025 18:00:09 +0000 Subject: [PATCH 13/23] Bump spring-boot.version from 3.4.1 to 3.4.2 Bumps `spring-boot.version` from 3.4.1 to 3.4.2. Updates `org.springframework.boot:spring-boot-dependencies` from 3.4.1 to 3.4.2 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.4.1...v3.4.2) Updates `org.springframework.boot:spring-boot-maven-plugin` from 3.4.1 to 3.4.2 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.4.1...v3.4.2) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-dependencies dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework.boot:spring-boot-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 3975c54..132d9c7 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 3.5.0 - 3.4.1 + 3.4.2 From 4a36b723781cb5dd39a1c5463643b36dfefd9aa5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2025 05:55:17 +0000 Subject: [PATCH 14/23] Bump spring-boot.version from 3.4.2 to 3.4.3 Bumps `spring-boot.version` from 3.4.2 to 3.4.3. Updates `org.springframework.boot:spring-boot-dependencies` from 3.4.2 to 3.4.3 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.4.2...v3.4.3) Updates `org.springframework.boot:spring-boot-maven-plugin` from 3.4.2 to 3.4.3 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.4.2...v3.4.3) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-dependencies dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework.boot:spring-boot-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 132d9c7..f7484a1 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 3.5.0 - 3.4.2 + 3.4.3 From 6da0426d7d7e60e2b6c2bd74dbb7d4b519bdca0c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2025 05:55:21 +0000 Subject: [PATCH 15/23] Bump org.apache.maven.plugins:maven-compiler-plugin Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.13.0 to 3.14.0. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.13.0...maven-compiler-plugin-3.14.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-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 132d9c7..03c5c68 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ 17 ${java.version} - 3.13.0 + 3.14.0 3.5.2 3.5.0 From 415f932525844188c4d121e0cb8a4265ce783bef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Mar 2025 17:19:29 +0000 Subject: [PATCH 16/23] Bump org.apache.maven.plugins:maven-deploy-plugin from 3.1.3 to 3.1.4 Bumps [org.apache.maven.plugins:maven-deploy-plugin](https://github.com/apache/maven-deploy-plugin) from 3.1.3 to 3.1.4. - [Release notes](https://github.com/apache/maven-deploy-plugin/releases) - [Commits](https://github.com/apache/maven-deploy-plugin/compare/maven-deploy-plugin-3.1.3...maven-deploy-plugin-3.1.4) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-deploy-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 517f431..ddb085c 100644 --- a/pom.xml +++ b/pom.xml @@ -135,7 +135,7 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.3 + 3.1.4 org.apache.maven.plugins From 2053b504128e4ea707ec0ac71e9935d885e1a961 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Mar 2025 10:50:43 +0000 Subject: [PATCH 17/23] Bump spring-boot.version from 3.4.3 to 3.4.4 Bumps `spring-boot.version` from 3.4.3 to 3.4.4. Updates `org.springframework.boot:spring-boot-dependencies` from 3.4.3 to 3.4.4 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.4.3...v3.4.4) Updates `org.springframework.boot:spring-boot-maven-plugin` from 3.4.3 to 3.4.4 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.4.3...v3.4.4) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-dependencies dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework.boot:spring-boot-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 ddb085c..7305cd9 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 3.5.0 - 3.4.3 + 3.4.4 From 2724261f47cca800adc904dd03353eb2c98030bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Mar 2025 18:03:41 +0000 Subject: [PATCH 18/23] Bump org.apache.maven.plugins:maven-surefire-plugin from 3.5.2 to 3.5.3 Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.5.2 to 3.5.3. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.5.2...surefire-3.5.3) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-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 7305cd9..dcd60ae 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,7 @@ ${java.version} 3.14.0 - 3.5.2 + 3.5.3 3.5.0 From ad482898d1484efa2644e5f15e25ce541e523633 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Apr 2025 18:25:09 +0000 Subject: [PATCH 19/23] Bump spring-boot.version from 3.4.4 to 3.4.5 Bumps `spring-boot.version` from 3.4.4 to 3.4.5. Updates `org.springframework.boot:spring-boot-dependencies` from 3.4.4 to 3.4.5 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.4.4...v3.4.5) Updates `org.springframework.boot:spring-boot-maven-plugin` from 3.4.4 to 3.4.5 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.4.4...v3.4.5) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-dependencies dependency-version: 3.4.5 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework.boot:spring-boot-maven-plugin dependency-version: 3.4.5 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 dcd60ae..4ef6075 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 3.5.0 - 3.4.4 + 3.4.5 From d1049853d3a8e60b84f042cf3eba66feeac39235 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Ra=C4=8Dansk=C3=BD?= Date: Wed, 14 May 2025 10:34:23 +0200 Subject: [PATCH 20/23] Fix #354: Performance improvement of DatabaseAuditWriter#scheduledCleanup (#355) * Fix #354: Performance improvement of DatabaseAuditWriter#scheduledCleanup (cherry picked from commit fd5de6cd196e0ff29faa6f78cfa46b3669571162) --- README.md | 12 +- audit-base/pom.xml | 15 +++ .../base/database/DatabaseAuditWriter.java | 22 +++- .../com/wultra/core/audit/base/AuditTest.java | 4 +- .../core/audit/base/TestApplication.java | 17 +++ .../database/DatabaseAuditWriterTest.java | 111 ++++++++++++++++++ audit-base/src/test/resources/db_schema.sql | 3 + docs/sql/mysql/create_schema.sql | 5 +- docs/sql/oracle/create_schema.sql | 5 +- docs/sql/postgresql/create_schema.sql | 5 +- pom.xml | 1 + 11 files changed, 186 insertions(+), 14 deletions(-) create mode 100644 audit-base/src/test/java/com/wultra/core/audit/base/database/DatabaseAuditWriterTest.java diff --git a/README.md b/README.md index 6240f01..863a3f6 100644 --- a/README.md +++ b/README.md @@ -298,7 +298,10 @@ Date: Fri, 25 Nov 2022 06:35:06 GMT The `audit-base` project provides auditing functionality for easier investigation of issues. Audit records are stored in a database and can be easily queried. The auditing library also handles removal of old audit records. -The audit library requires one database table `audit_log` and optionally the second table `audit_params` for logging detail parameters. The DDL is available for the following databases: +The audit library requires one database table `audit_log` and optionally the second table `audit_params` for logging detail parameters. +Also the `shedlock` table is required for locking scheduled tasks. + +The DDL is available for the following databases: - [DDL for MySQL](./docs/sql/mysql/create_schema.sql) - [DDL for Oracle](./docs/sql/oracle/create_schema.sql) - [DDL for PostgreSQL](./docs/sql/postgresql/create_schema.sql) @@ -306,7 +309,7 @@ The audit library requires one database table `audit_log` and optionally the sec ### Configuration The following configuration is required for integration of the auditing library: -- Enable scheduling on the application using `@EnableScheduling` annotation on class annotated with `@SpringBootApplication` so that the `flush` and `cleanup` functionality can be scheduled. +- Enable scheduling on the application using `@EnableScheduling` annotation on class annotated with `@SpringBootApplication` so that the `flush` and `cleanup` functionality can be scheduled. In order to enable schedule locking use `@EnableSchedulerLock` annotation and configure the `LockProvider` bean, see [ShedLock documentation](https://github.com/lukas-krecan/ShedLock) for details. - Add the `com.wultra.core.audit.base` package to the `@ComponentScan`, e.g. `@ComponentScan(basePackages = {"...", "com.wultra.core.audit.base"})`, so that the annotations used in auditing library can be discovered. - Configure the `spring.application.name` property to enable storing application name with audit records. @@ -318,7 +321,10 @@ The following properties can be configured in case the default configuration nee - `audit.db.table.log.name` - name of audit log database table (default: `audit_log`) - `audit.db.table.param.name` - name of audit parameters database table (default: `audit_param`) - `audit.db.table.param.enabled` - flag if logging params to parameters database is enabled (default: `false`) -- `audit.db.batch.size` - database batch size (default: `1000`) +- `audit.db.batch.size` - database batch size (default: `1000`) +- `audit.cleanup.cron` - A cron expression for the cleanup job. (default: `0 0 * * * *`, use `-` to turn it off completely) +- `audit.cleanup.lockAtLeastFor` - The lock will be held at least for given duration. (default: `5s`) +- `audit.cleanup.lockAtMostFor` - The lock will be held at most for given duration. (default: `30m`) You can configure database schema used by the auditing library using regular Spring JPA/Hibernate property in your application: - `spring.jpa.properties.hibernate.default_schema` - database database schema (default: none) diff --git a/audit-base/pom.xml b/audit-base/pom.xml index 2d73ebe..9020732 100644 --- a/audit-base/pom.xml +++ b/audit-base/pom.xml @@ -31,6 +31,21 @@ jakarta.annotation jakarta.annotation-api + + + + net.javacrumbs.shedlock + shedlock-provider-jdbc-template + ${shedlock.version} + + + + net.javacrumbs.shedlock + shedlock-spring + ${shedlock.version} + + + org.springframework.boot spring-boot-starter-test diff --git a/audit-base/src/main/java/com/wultra/core/audit/base/database/DatabaseAuditWriter.java b/audit-base/src/main/java/com/wultra/core/audit/base/database/DatabaseAuditWriter.java index a4d75ea..e4f64c1 100644 --- a/audit-base/src/main/java/com/wultra/core/audit/base/database/DatabaseAuditWriter.java +++ b/audit-base/src/main/java/com/wultra/core/audit/base/database/DatabaseAuditWriter.java @@ -23,6 +23,8 @@ import com.wultra.core.audit.base.util.JsonUtil; import com.wultra.core.audit.base.util.StringUtil; import jakarta.annotation.PreDestroy; +import net.javacrumbs.shedlock.core.LockAssert; +import net.javacrumbs.shedlock.spring.annotation.SchedulerLock; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -60,6 +62,8 @@ public class DatabaseAuditWriter implements AuditWriter { private static final Logger logger = LoggerFactory.getLogger(DatabaseAuditWriter.class); private static final String SPRING_FRAMEWORK_PACKAGE_PREFIX = "org.springframework"; + private static final String JDK_INTERNAL_REFLECT_PACKAGE_PREFIX = "jdk.internal.reflect"; + private static final String JAVA_LANG_REFLECT_PACKAGE_PREFIX = "java.lang.reflect"; private final BlockingQueue queue; private final JdbcTemplate jdbcTemplate; @@ -133,9 +137,11 @@ private void prepareSqlInsertQueries() { @Override public void write(AuditRecord auditRecord) { - List packageFilter = new ArrayList<>(); - packageFilter.add(this.getClass().getPackage().getName()); - packageFilter.add(SPRING_FRAMEWORK_PACKAGE_PREFIX); + final List packageFilter = List.of( + this.getClass().getPackage().getName(), + SPRING_FRAMEWORK_PACKAGE_PREFIX, + JDK_INTERNAL_REFLECT_PACKAGE_PREFIX, + JAVA_LANG_REFLECT_PACKAGE_PREFIX); auditRecord.setCallingClass(ClassUtil.getCallingClass(packageFilter)); auditRecord.setThreadName(Thread.currentThread().getName()); try { @@ -283,12 +289,16 @@ public void scheduledFlush() { } /** - * Scheduled cleanup of audit data in database. + * Scheduled cleanup of audit data in the database. */ - @Scheduled(fixedDelayString = "${audit.cleanup.delay.fixed:3600000}", initialDelayString = "${audit.cleanup.delay.initial:1000}") + @Scheduled(cron = "${audit.cleanup.cron:0 0 * * * *}") + @SchedulerLock(name = "audit.cleanup", lockAtLeastFor = "${audit.cleanup.lockAtLeastFor:5s}", lockAtMostFor = "${audit.cleanup.lockAtMostFor:30m}") public void scheduledCleanup() { - logger.debug("Scheduled audit log cleanup called"); + logger.info("action: scheduledCleanup, state: initiated"); + LockAssert.assertLocked(); + logger.info("action: scheduledCleanup, state: lockAsserted"); cleanup(); + logger.info("action: scheduledCleanup, state: succeeded"); } /** diff --git a/audit-base/src/test/java/com/wultra/core/audit/base/AuditTest.java b/audit-base/src/test/java/com/wultra/core/audit/base/AuditTest.java index e568832..de881ab 100644 --- a/audit-base/src/test/java/com/wultra/core/audit/base/AuditTest.java +++ b/audit-base/src/test/java/com/wultra/core/audit/base/AuditTest.java @@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.*; @SpringBootTest(classes = TestApplication.class, properties = {"audit.db.table.param.enabled=false"}) -@Sql(scripts = "/db_schema.sql") +@Sql("/db_schema.sql") class AuditTest { private final AuditFactory auditFactory; @@ -45,7 +45,7 @@ public AuditTest(AuditFactory auditFactory, JdbcTemplate jdbcTemplate) { } @BeforeEach - public void cleanTestDb() { + void cleanTestDb() { jdbcTemplate.execute("DELETE FROM audit_log"); jdbcTemplate.execute("DELETE FROM audit_param"); } diff --git a/audit-base/src/test/java/com/wultra/core/audit/base/TestApplication.java b/audit-base/src/test/java/com/wultra/core/audit/base/TestApplication.java index de9f0df..d97006f 100644 --- a/audit-base/src/test/java/com/wultra/core/audit/base/TestApplication.java +++ b/audit-base/src/test/java/com/wultra/core/audit/base/TestApplication.java @@ -15,12 +15,20 @@ */ package com.wultra.core.audit.base; +import net.javacrumbs.shedlock.core.LockProvider; +import net.javacrumbs.shedlock.provider.jdbctemplate.JdbcTemplateLockProvider; +import net.javacrumbs.shedlock.spring.annotation.EnableSchedulerLock; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; +import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.scheduling.annotation.EnableScheduling; +import javax.sql.DataSource; + @SpringBootApplication @EnableScheduling +@EnableSchedulerLock(defaultLockAtMostFor = "30m") public class TestApplication { /** @@ -32,4 +40,13 @@ public static void main(String[] args) { SpringApplication.run(TestApplication.class, args); } + @Bean + public LockProvider lockProvider(final DataSource dataSource) { + return new JdbcTemplateLockProvider( + JdbcTemplateLockProvider.Configuration.builder() + .withJdbcTemplate(new JdbcTemplate(dataSource)) + .usingDbTime() + .build() + ); + } } diff --git a/audit-base/src/test/java/com/wultra/core/audit/base/database/DatabaseAuditWriterTest.java b/audit-base/src/test/java/com/wultra/core/audit/base/database/DatabaseAuditWriterTest.java new file mode 100644 index 0000000..36002af --- /dev/null +++ b/audit-base/src/test/java/com/wultra/core/audit/base/database/DatabaseAuditWriterTest.java @@ -0,0 +1,111 @@ +/* + * Copyright 2025 Wultra s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.wultra.core.audit.base.database; + +import com.wultra.core.audit.base.Audit; +import com.wultra.core.audit.base.AuditFactory; +import com.wultra.core.audit.base.TestApplication; +import com.wultra.core.audit.base.model.AuditDetail; +import org.awaitility.Awaitility; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.support.rowset.SqlRowSet; +import org.springframework.test.context.jdbc.Sql; + +import java.time.Duration; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +/** + * Test for {@link DatabaseAuditWriter}. + * + * @author Lubos Racansky, lubos.racansky@wultra.com + */ +class DatabaseAuditWriterTest { + + @SpringBootTest( + classes = TestApplication.class, + properties = { + "audit.cleanup.cron=0/3 * * * * *", + "audit.db.cleanup.days=-1" // time shift to the future to enable cleanup test + } + ) + @Sql("/db_schema.sql") + @Nested + class ScheduledCleanupOn { + + @Autowired + private AuditFactory auditFactory; + + @Autowired + private JdbcTemplate jdbcTemplate; + + @Test + void testAuditScheduledCleanup() { + final Audit audit = auditFactory.getAudit(); + audit.info("test message", AuditDetail.builder().param("my_id", "test_id").build()); + audit.flush(); + + assertEquals(1, countAuditLogs(jdbcTemplate)); + + Awaitility.await() + .atMost(Duration.ofSeconds(5)) + .until(() -> countAuditLogs(jdbcTemplate) == 0); + } + } + + @SpringBootTest( + classes = TestApplication.class, + properties = { + "audit.cleanup.cron=-", + "audit.db.cleanup.days=-1" // time shift to the future to enable cleanup test + } + ) + @Sql("/db_schema.sql") + @Nested + class ScheduledCleanupOff { + + @Autowired + private AuditFactory auditFactory; + + @Autowired + private JdbcTemplate jdbcTemplate; + + @Test + void testAuditScheduledCleanup() { + final Audit audit = auditFactory.getAudit(); + audit.info("test message", AuditDetail.builder().param("my_id", "test_id").build()); + audit.flush(); + + assertEquals(1, countAuditLogs(jdbcTemplate)); + + Awaitility.await() + .atMost(Duration.ofSeconds(6)) + .pollInterval(Duration.ofSeconds(5)) + .until(() -> countAuditLogs(jdbcTemplate) == 1); + } + } + + private int countAuditLogs(final JdbcTemplate jdbcTemplate) { + final SqlRowSet rs = jdbcTemplate.queryForRowSet("SELECT COUNT(*) FROM audit_log"); + assertTrue(rs.next()); + return rs.getInt(1); + } +} diff --git a/audit-base/src/test/resources/db_schema.sql b/audit-base/src/test/resources/db_schema.sql index d8a2f26..1e1e058 100644 --- a/audit-base/src/test/resources/db_schema.sql +++ b/audit-base/src/test/resources/db_schema.sql @@ -44,3 +44,6 @@ CREATE INDEX audit_param_log ON audit_param (audit_log_id); CREATE INDEX audit_param_timestamp ON audit_param (timestamp_created); CREATE INDEX audit_param_key ON audit_param (param_key); CREATE INDEX audit_param_value ON audit_param (param_value); + +-- Shedlock +CREATE TABLE IF NOT EXISTS shedlock(name VARCHAR(64) NOT NULL, lock_until TIMESTAMP NOT NULL, locked_at TIMESTAMP NOT NULL, locked_by VARCHAR(255) NOT NULL, PRIMARY KEY (name)); \ No newline at end of file diff --git a/docs/sql/mysql/create_schema.sql b/docs/sql/mysql/create_schema.sql index 33851eb..c35dfdc 100644 --- a/docs/sql/mysql/create_schema.sql +++ b/docs/sql/mysql/create_schema.sql @@ -37,4 +37,7 @@ CREATE INDEX audit_log_type ON audit_log (audit_type); CREATE INDEX audit_param_log ON audit_param (audit_log_id); CREATE INDEX audit_param_timestamp ON audit_param (timestamp_created); CREATE INDEX audit_param_key ON audit_param (param_key); -CREATE FULLTEXT INDEX audit_param_value ON audit_param (param_value); \ No newline at end of file +CREATE FULLTEXT INDEX audit_param_value ON audit_param (param_value); + +-- Shedlock +CREATE TABLE shedlock(name VARCHAR(64) NOT NULL, lock_until TIMESTAMP(3) NOT NULL, locked_at TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3), locked_by VARCHAR(255) NOT NULL, PRIMARY KEY (name)); \ No newline at end of file diff --git a/docs/sql/oracle/create_schema.sql b/docs/sql/oracle/create_schema.sql index a2a257b..d5df5be 100644 --- a/docs/sql/oracle/create_schema.sql +++ b/docs/sql/oracle/create_schema.sql @@ -37,4 +37,7 @@ CREATE INDEX audit_log_type ON audit_log (audit_type); CREATE INDEX audit_param_log ON audit_param (audit_log_id); CREATE INDEX audit_param_timestamp ON audit_param (timestamp_created); CREATE INDEX audit_param_key ON audit_param (param_key); -CREATE INDEX audit_param_value ON audit_param (param_value); \ No newline at end of file +CREATE INDEX audit_param_value ON audit_param (param_value); + +-- Shedlock +CREATE TABLE shedlock(name VARCHAR(64) NOT NULL, lock_until TIMESTAMP(3) NOT NULL, locked_at TIMESTAMP(3) NOT NULL, locked_by VARCHAR(255) NOT NULL, PRIMARY KEY (name)); \ No newline at end of file diff --git a/docs/sql/postgresql/create_schema.sql b/docs/sql/postgresql/create_schema.sql index d969b8e..974892b 100644 --- a/docs/sql/postgresql/create_schema.sql +++ b/docs/sql/postgresql/create_schema.sql @@ -37,4 +37,7 @@ CREATE INDEX audit_log_type ON audit_log (audit_type); CREATE INDEX audit_param_log ON audit_param (audit_log_id); CREATE INDEX audit_param_timestamp ON audit_param (timestamp_created); CREATE INDEX audit_param_key ON audit_param (param_key); -CREATE INDEX audit_param_value ON audit_param (param_value); \ No newline at end of file +CREATE INDEX audit_param_value ON audit_param (param_value); + +-- Shedlock +CREATE TABLE shedlock(name VARCHAR(64) NOT NULL, lock_until TIMESTAMP NOT NULL, locked_at TIMESTAMP NOT NULL, locked_by VARCHAR(255) NOT NULL, PRIMARY KEY (name)); \ No newline at end of file diff --git a/pom.xml b/pom.xml index 4ef6075..4b2b7c9 100644 --- a/pom.xml +++ b/pom.xml @@ -62,6 +62,7 @@ 3.4.5 + 6.6.0 From 6ba418948532c2c1687d5bc0785920e61f0a7e9e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 May 2025 18:01:57 +0000 Subject: [PATCH 21/23] Bump shedlock.version from 6.6.0 to 6.6.1 Bumps `shedlock.version` from 6.6.0 to 6.6.1. Updates `net.javacrumbs.shedlock:shedlock-provider-jdbc-template` from 6.6.0 to 6.6.1 Updates `net.javacrumbs.shedlock:shedlock-spring` from 6.6.0 to 6.6.1 - [Changelog](https://github.com/lukas-krecan/ShedLock/blob/master/RELEASES.md) - [Commits](https://github.com/lukas-krecan/ShedLock/compare/shedlock-parent-6.6.0...shedlock-parent-6.6.1) --- updated-dependencies: - dependency-name: net.javacrumbs.shedlock:shedlock-provider-jdbc-template dependency-version: 6.6.1 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: net.javacrumbs.shedlock:shedlock-spring dependency-version: 6.6.1 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 4b2b7c9..5eb07cc 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ 3.4.5 - 6.6.0 + 6.6.1 From d124e547d5a8b2c1b069e8f735c699e876561605 Mon Sep 17 00:00:00 2001 From: Lubos Racansky Date: Tue, 20 May 2025 12:43:06 +0200 Subject: [PATCH 22/23] Revert "Fix #344: Change package to com.wultra" This reverts commit 97ebee0bf86bdcbda69ca1a63411533464ec8467. --- annotations/pom.xml | 6 +++--- audit-base/pom.xml | 6 +++--- bom/pom.xml | 16 ++++++++-------- http-common/pom.xml | 6 +++--- pom.xml | 14 +++++++------- rest-client-base/pom.xml | 8 ++++---- .../core/rest/client/base/DefaultRestClient.java | 8 ++++---- .../wultra/core/rest/client/base/RestClient.java | 6 +++--- .../rest/client/base/RestClientException.java | 2 +- .../rest/client/base/DefaultRestClientTest.java | 6 +++--- .../controller/PrivateTestRestController.java | 2 +- .../controller/PublicTestRestController.java | 6 +++--- .../base/errorhandling/RestControllerAdvice.java | 2 +- rest-model-base/pom.xml | 6 +++--- .../core/rest/model/base/entity/Error.java | 2 +- .../rest/model/base/request/ObjectRequest.java | 2 +- .../rest/model/base/response/ErrorResponse.java | 4 ++-- .../rest/model/base/response/ObjectResponse.java | 4 ++-- .../core/rest/model/base/response/Response.java | 2 +- 19 files changed, 54 insertions(+), 54 deletions(-) rename rest-model-base/src/main/java/{com/wultra => io/getlime}/core/rest/model/base/entity/Error.java (98%) rename rest-model-base/src/main/java/{com/wultra => io/getlime}/core/rest/model/base/request/ObjectRequest.java (97%) rename rest-model-base/src/main/java/{com/wultra => io/getlime}/core/rest/model/base/response/ErrorResponse.java (96%) rename rest-model-base/src/main/java/{com/wultra => io/getlime}/core/rest/model/base/response/ObjectResponse.java (94%) rename rest-model-base/src/main/java/{com/wultra => io/getlime}/core/rest/model/base/response/Response.java (97%) diff --git a/annotations/pom.xml b/annotations/pom.xml index 76d230e..2edb9ec 100644 --- a/annotations/pom.xml +++ b/annotations/pom.xml @@ -5,9 +5,9 @@ 4.0.0 - com.wultra.core - wultra-java-core-parent - 2.0.0-SNAPSHOT + io.getlime.core + lime-java-core-parent + 1.12.0-SNAPSHOT annotations diff --git a/audit-base/pom.xml b/audit-base/pom.xml index 9020732..bf885ba 100644 --- a/audit-base/pom.xml +++ b/audit-base/pom.xml @@ -4,9 +4,9 @@ 4.0.0 - com.wultra.core - wultra-java-core-parent - 2.0.0-SNAPSHOT + io.getlime.core + lime-java-core-parent + 1.12.0-SNAPSHOT audit-base diff --git a/bom/pom.xml b/bom/pom.xml index 95d843d..c9cca6f 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -5,9 +5,9 @@ 4.0.0 - com.wultra.core - wultra-java-core-parent - 2.0.0-SNAPSHOT + io.getlime.core + lime-java-core-parent + 1.12.0-SNAPSHOT core-bom @@ -17,31 +17,31 @@ - com.wultra.core + io.getlime.core annotations ${project.version} - com.wultra.core + io.getlime.core audit-base ${project.version} - com.wultra.core + io.getlime.core http-common ${project.version} - com.wultra.core + io.getlime.core rest-client-base ${project.version} - com.wultra.core + io.getlime.core rest-model-base ${project.version} diff --git a/http-common/pom.xml b/http-common/pom.xml index 8d0751c..6827669 100644 --- a/http-common/pom.xml +++ b/http-common/pom.xml @@ -5,9 +5,9 @@ 4.0.0 - com.wultra.core - wultra-java-core-parent - 2.0.0-SNAPSHOT + io.getlime.core + lime-java-core-parent + 1.12.0-SNAPSHOT http-common diff --git a/pom.xml b/pom.xml index 5eb07cc..9168da5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,11 +4,11 @@ 4.0.0 - wultra-java-core-parent + lime-java-core-parent Wultra - Core Java Libraries - com.wultra.core - wultra-java-core-parent - 2.0.0-SNAPSHOT + io.getlime.core + lime-java-core-parent + 1.12.0-SNAPSHOT pom 2017 @@ -27,9 +27,9 @@ - scm:git:https://github.com/wultra/java-core.git - scm:git:https://github.com/wultra/java-core.git - https://github.com/wultra/java-core + scm:git:https://github.com/wultra/lime-java-core.git + scm:git:https://github.com/wultra/lime-java-core.git + https://github.com/wultra/lime-java-core diff --git a/rest-client-base/pom.xml b/rest-client-base/pom.xml index 793fe73..da1323b 100644 --- a/rest-client-base/pom.xml +++ b/rest-client-base/pom.xml @@ -4,9 +4,9 @@ 4.0.0 - com.wultra.core - wultra-java-core-parent - 2.0.0-SNAPSHOT + io.getlime.core + lime-java-core-parent + 1.12.0-SNAPSHOT rest-client-base @@ -40,7 +40,7 @@ test - com.wultra.core + io.getlime.core rest-model-base ${project.version} compile diff --git a/rest-client-base/src/main/java/com/wultra/core/rest/client/base/DefaultRestClient.java b/rest-client-base/src/main/java/com/wultra/core/rest/client/base/DefaultRestClient.java index 8d84133..4e8f5a6 100644 --- a/rest-client-base/src/main/java/com/wultra/core/rest/client/base/DefaultRestClient.java +++ b/rest-client-base/src/main/java/com/wultra/core/rest/client/base/DefaultRestClient.java @@ -19,10 +19,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.type.TypeFactory; import com.wultra.core.rest.client.base.util.SslUtils; -import com.wultra.core.rest.model.base.request.ObjectRequest; -import com.wultra.core.rest.model.base.response.ErrorResponse; -import com.wultra.core.rest.model.base.response.ObjectResponse; -import com.wultra.core.rest.model.base.response.Response; +import io.getlime.core.rest.model.base.request.ObjectRequest; +import io.getlime.core.rest.model.base.response.ErrorResponse; +import io.getlime.core.rest.model.base.response.ObjectResponse; +import io.getlime.core.rest.model.base.response.Response; import io.netty.channel.ChannelOption; import io.netty.channel.epoll.EpollChannelOption; import io.netty.channel.socket.nio.NioChannelOption; diff --git a/rest-client-base/src/main/java/com/wultra/core/rest/client/base/RestClient.java b/rest-client-base/src/main/java/com/wultra/core/rest/client/base/RestClient.java index 94b1fbb..0d790d5 100644 --- a/rest-client-base/src/main/java/com/wultra/core/rest/client/base/RestClient.java +++ b/rest-client-base/src/main/java/com/wultra/core/rest/client/base/RestClient.java @@ -15,9 +15,9 @@ */ package com.wultra.core.rest.client.base; -import com.wultra.core.rest.model.base.request.ObjectRequest; -import com.wultra.core.rest.model.base.response.ObjectResponse; -import com.wultra.core.rest.model.base.response.Response; +import io.getlime.core.rest.model.base.request.ObjectRequest; +import io.getlime.core.rest.model.base.response.ObjectResponse; +import io.getlime.core.rest.model.base.response.Response; import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.ResponseEntity; import org.springframework.util.MultiValueMap; diff --git a/rest-client-base/src/main/java/com/wultra/core/rest/client/base/RestClientException.java b/rest-client-base/src/main/java/com/wultra/core/rest/client/base/RestClientException.java index 689b0ca..aa22d27 100644 --- a/rest-client-base/src/main/java/com/wultra/core/rest/client/base/RestClientException.java +++ b/rest-client-base/src/main/java/com/wultra/core/rest/client/base/RestClientException.java @@ -15,7 +15,7 @@ */ package com.wultra.core.rest.client.base; -import com.wultra.core.rest.model.base.response.ErrorResponse; +import io.getlime.core.rest.model.base.response.ErrorResponse; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatusCode; diff --git a/rest-client-base/src/test/java/com/wultra/core/rest/client/base/DefaultRestClientTest.java b/rest-client-base/src/test/java/com/wultra/core/rest/client/base/DefaultRestClientTest.java index 8db544c..b50e29f 100644 --- a/rest-client-base/src/test/java/com/wultra/core/rest/client/base/DefaultRestClientTest.java +++ b/rest-client-base/src/test/java/com/wultra/core/rest/client/base/DefaultRestClientTest.java @@ -23,9 +23,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.wultra.core.rest.client.base.model.TestRequest; import com.wultra.core.rest.client.base.model.TestResponse; -import com.wultra.core.rest.model.base.request.ObjectRequest; -import com.wultra.core.rest.model.base.response.ObjectResponse; -import com.wultra.core.rest.model.base.response.Response; +import io.getlime.core.rest.model.base.request.ObjectRequest; +import io.getlime.core.rest.model.base.response.ObjectResponse; +import io.getlime.core.rest.model.base.response.Response; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/rest-client-base/src/test/java/com/wultra/core/rest/client/base/controller/PrivateTestRestController.java b/rest-client-base/src/test/java/com/wultra/core/rest/client/base/controller/PrivateTestRestController.java index 96a48cd..34ec038 100644 --- a/rest-client-base/src/test/java/com/wultra/core/rest/client/base/controller/PrivateTestRestController.java +++ b/rest-client-base/src/test/java/com/wultra/core/rest/client/base/controller/PrivateTestRestController.java @@ -15,7 +15,7 @@ */ package com.wultra.core.rest.client.base.controller; -import com.wultra.core.rest.model.base.response.Response; +import io.getlime.core.rest.model.base.response.Response; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/rest-client-base/src/test/java/com/wultra/core/rest/client/base/controller/PublicTestRestController.java b/rest-client-base/src/test/java/com/wultra/core/rest/client/base/controller/PublicTestRestController.java index 9e5b197..5dbdb03 100644 --- a/rest-client-base/src/test/java/com/wultra/core/rest/client/base/controller/PublicTestRestController.java +++ b/rest-client-base/src/test/java/com/wultra/core/rest/client/base/controller/PublicTestRestController.java @@ -18,9 +18,9 @@ import com.wultra.core.rest.client.base.model.TestRequest; import com.wultra.core.rest.client.base.model.TestResponse; import com.wultra.core.rest.client.base.model.error.RestException; -import com.wultra.core.rest.model.base.request.ObjectRequest; -import com.wultra.core.rest.model.base.response.ObjectResponse; -import com.wultra.core.rest.model.base.response.Response; +import io.getlime.core.rest.model.base.request.ObjectRequest; +import io.getlime.core.rest.model.base.response.ObjectResponse; +import io.getlime.core.rest.model.base.response.Response; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.springframework.http.HttpStatus; diff --git a/rest-client-base/src/test/java/com/wultra/core/rest/client/base/errorhandling/RestControllerAdvice.java b/rest-client-base/src/test/java/com/wultra/core/rest/client/base/errorhandling/RestControllerAdvice.java index 7f2db9b..a9a28fd 100644 --- a/rest-client-base/src/test/java/com/wultra/core/rest/client/base/errorhandling/RestControllerAdvice.java +++ b/rest-client-base/src/test/java/com/wultra/core/rest/client/base/errorhandling/RestControllerAdvice.java @@ -16,7 +16,7 @@ package com.wultra.core.rest.client.base.errorhandling; import com.wultra.core.rest.client.base.model.error.RestException; -import com.wultra.core.rest.model.base.response.ErrorResponse; +import io.getlime.core.rest.model.base.response.ErrorResponse; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ExceptionHandler; diff --git a/rest-model-base/pom.xml b/rest-model-base/pom.xml index 1ec391f..45bc586 100644 --- a/rest-model-base/pom.xml +++ b/rest-model-base/pom.xml @@ -4,9 +4,9 @@ 4.0.0 - com.wultra.core - wultra-java-core-parent - 2.0.0-SNAPSHOT + io.getlime.core + lime-java-core-parent + 1.12.0-SNAPSHOT rest-model-base diff --git a/rest-model-base/src/main/java/com/wultra/core/rest/model/base/entity/Error.java b/rest-model-base/src/main/java/io/getlime/core/rest/model/base/entity/Error.java similarity index 98% rename from rest-model-base/src/main/java/com/wultra/core/rest/model/base/entity/Error.java rename to rest-model-base/src/main/java/io/getlime/core/rest/model/base/entity/Error.java index b8f2b19..b58df89 100644 --- a/rest-model-base/src/main/java/com/wultra/core/rest/model/base/entity/Error.java +++ b/rest-model-base/src/main/java/io/getlime/core/rest/model/base/entity/Error.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.wultra.core.rest.model.base.entity; +package io.getlime.core.rest.model.base.entity; import jakarta.validation.constraints.NotBlank; diff --git a/rest-model-base/src/main/java/com/wultra/core/rest/model/base/request/ObjectRequest.java b/rest-model-base/src/main/java/io/getlime/core/rest/model/base/request/ObjectRequest.java similarity index 97% rename from rest-model-base/src/main/java/com/wultra/core/rest/model/base/request/ObjectRequest.java rename to rest-model-base/src/main/java/io/getlime/core/rest/model/base/request/ObjectRequest.java index 28a93f1..7b9425c 100644 --- a/rest-model-base/src/main/java/com/wultra/core/rest/model/base/request/ObjectRequest.java +++ b/rest-model-base/src/main/java/io/getlime/core/rest/model/base/request/ObjectRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.wultra.core.rest.model.base.request; +package io.getlime.core.rest.model.base.request; import jakarta.validation.Valid; diff --git a/rest-model-base/src/main/java/com/wultra/core/rest/model/base/response/ErrorResponse.java b/rest-model-base/src/main/java/io/getlime/core/rest/model/base/response/ErrorResponse.java similarity index 96% rename from rest-model-base/src/main/java/com/wultra/core/rest/model/base/response/ErrorResponse.java rename to rest-model-base/src/main/java/io/getlime/core/rest/model/base/response/ErrorResponse.java index f26ee01..c7c13fe 100644 --- a/rest-model-base/src/main/java/com/wultra/core/rest/model/base/response/ErrorResponse.java +++ b/rest-model-base/src/main/java/io/getlime/core/rest/model/base/response/ErrorResponse.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.wultra.core.rest.model.base.response; +package io.getlime.core.rest.model.base.response; -import com.wultra.core.rest.model.base.entity.Error; +import io.getlime.core.rest.model.base.entity.Error; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/rest-model-base/src/main/java/com/wultra/core/rest/model/base/response/ObjectResponse.java b/rest-model-base/src/main/java/io/getlime/core/rest/model/base/response/ObjectResponse.java similarity index 94% rename from rest-model-base/src/main/java/com/wultra/core/rest/model/base/response/ObjectResponse.java rename to rest-model-base/src/main/java/io/getlime/core/rest/model/base/response/ObjectResponse.java index 1be9af6..77196a4 100644 --- a/rest-model-base/src/main/java/com/wultra/core/rest/model/base/response/ObjectResponse.java +++ b/rest-model-base/src/main/java/io/getlime/core/rest/model/base/response/ObjectResponse.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.wultra.core.rest.model.base.response; +package io.getlime.core.rest.model.base.response; import jakarta.validation.Valid; @@ -56,7 +56,7 @@ public ObjectResponse(T responseObject) { /** * Constructor with response status and response object * - * @param status Response status, use static constant from {@link com.wultra.core.rest.model.base.response.Response.Status} class. + * @param status Response status, use static constant from {@link io.getlime.core.rest.model.base.response.Response.Status} class. * @param responseObject Response object. */ public ObjectResponse(String status, T responseObject) { diff --git a/rest-model-base/src/main/java/com/wultra/core/rest/model/base/response/Response.java b/rest-model-base/src/main/java/io/getlime/core/rest/model/base/response/Response.java similarity index 97% rename from rest-model-base/src/main/java/com/wultra/core/rest/model/base/response/Response.java rename to rest-model-base/src/main/java/io/getlime/core/rest/model/base/response/Response.java index 6f1934e..32bfab1 100644 --- a/rest-model-base/src/main/java/com/wultra/core/rest/model/base/response/Response.java +++ b/rest-model-base/src/main/java/io/getlime/core/rest/model/base/response/Response.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.wultra.core.rest.model.base.response; +package io.getlime.core.rest.model.base.response; import jakarta.validation.constraints.NotBlank; From 7a2c45b7e73ea013d2013925a814384bc883534f Mon Sep 17 00:00:00 2001 From: Lubos Racansky Date: Fri, 23 May 2025 16:16:57 +0200 Subject: [PATCH 23/23] Fix #375: Bump Spring Boot to 3.4.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9168da5..205d012 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 3.5.0 - 3.4.5 + 3.4.6 6.6.1