diff --git a/.idea/sonarlint/issuestore/index.pb b/.idea/sonarlint/issuestore/index.pb deleted file mode 100644 index e69de29..0000000 diff --git a/.idea/sonarlint/securityhotspotstore/index.pb b/.idea/sonarlint/securityhotspotstore/index.pb deleted file mode 100644 index e69de29..0000000 diff --git a/pom.xml b/pom.xml index 26b7c7c..63db88e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ dev.struchkov.yookassa yookassa-parent-sdk - 0.1.1-SNAPSHOT + 1.0.0-SNAPSHOT pom @@ -37,7 +37,7 @@ 1.18.26 - 3.10.1 + 3.11.0 1.6.13 @@ -45,9 +45,10 @@ 3.5.0 - 3.0.1 + 3.1.0 - 3.0.0-M7 + 3.0.0 + 3.1.1 @@ -55,25 +56,25 @@ dev.struchkov.yookassa yookassa-model - 0.1.1-SNAPSHOT + 1.0.0-SNAPSHOT dev.struchkov.yookassa yookassa-context-quarkus - 0.1.1-SNAPSHOT + 1.0.0-SNAPSHOT io.smallrye.reactive mutiny - 2.1.0 + 2.2.0 io.quarkus quarkus-rest-client-reactive-jackson - 2.16.6.Final + 3.0.3.Final @@ -108,6 +109,19 @@ + + io.smallrye + jandex-maven-plugin + ${plugin.maven.jandex.version} + + + make-index + + jandex + + + + org.sonatype.plugins nexus-staging-maven-plugin diff --git a/yookassa-context/pom.xml b/yookassa-context/pom.xml index f918a6b..2069305 100644 --- a/yookassa-context/pom.xml +++ b/yookassa-context/pom.xml @@ -4,7 +4,7 @@ dev.struchkov.yookassa yookassa-parent-sdk - 0.1.1-SNAPSHOT + 1.0.0-SNAPSHOT yookassa-context diff --git a/yookassa-context/yookassa-context-quarkus/pom.xml b/yookassa-context/yookassa-context-quarkus/pom.xml index 4d7ac48..ac73ff4 100644 --- a/yookassa-context/yookassa-context-quarkus/pom.xml +++ b/yookassa-context/yookassa-context-quarkus/pom.xml @@ -4,7 +4,7 @@ dev.struchkov.yookassa yookassa-context - 0.1.1-SNAPSHOT + 1.0.0-SNAPSHOT yookassa-context-quarkus diff --git a/yookassa-model/pom.xml b/yookassa-model/pom.xml index e5279c0..ebb7509 100644 --- a/yookassa-model/pom.xml +++ b/yookassa-model/pom.xml @@ -4,7 +4,7 @@ dev.struchkov.yookassa yookassa-parent-sdk - 0.1.1-SNAPSHOT + 1.0.0-SNAPSHOT yookassa-model diff --git a/yookassa-sdk/pom.xml b/yookassa-sdk/pom.xml index e68c4ad..acf9fb9 100644 --- a/yookassa-sdk/pom.xml +++ b/yookassa-sdk/pom.xml @@ -4,7 +4,7 @@ dev.struchkov.yookassa yookassa-parent-sdk - 0.1.1-SNAPSHOT + 1.0.0-SNAPSHOT yookassa-sdk diff --git a/yookassa-sdk/yookassa-quarkus-sdk/pom.xml b/yookassa-sdk/yookassa-quarkus-sdk/pom.xml index 163a350..5254aea 100644 --- a/yookassa-sdk/yookassa-quarkus-sdk/pom.xml +++ b/yookassa-sdk/yookassa-quarkus-sdk/pom.xml @@ -4,7 +4,7 @@ dev.struchkov.yookassa yookassa-sdk - 0.1.1-SNAPSHOT + 1.0.0-SNAPSHOT yookassa-quarkus-sdk @@ -32,19 +32,9 @@ - io.smallrye jandex-maven-plugin - 3.0.5 - - - make-index - - jandex - - - diff --git a/yookassa-sdk/yookassa-quarkus-sdk/src/main/java/dev/struchkov/yookassa/sdk/YooKassaPaymentClient.java b/yookassa-sdk/yookassa-quarkus-sdk/src/main/java/dev/struchkov/yookassa/sdk/YooKassaPaymentClient.java index f41744d..8a17b17 100644 --- a/yookassa-sdk/yookassa-quarkus-sdk/src/main/java/dev/struchkov/yookassa/sdk/YooKassaPaymentClient.java +++ b/yookassa-sdk/yookassa-quarkus-sdk/src/main/java/dev/struchkov/yookassa/sdk/YooKassaPaymentClient.java @@ -9,11 +9,11 @@ import org.eclipse.microprofile.rest.client.annotation.ClientHeaderParam; import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("v3/payments") @Consumes(MediaType.APPLICATION_JSON) diff --git a/yookassa-sdk/yookassa-quarkus-sdk/src/main/java/dev/struchkov/yookassa/sdk/YooKassaWebhookController.java b/yookassa-sdk/yookassa-quarkus-sdk/src/main/java/dev/struchkov/yookassa/sdk/YooKassaWebhookController.java index d7d3a23..98ca73e 100644 --- a/yookassa-sdk/yookassa-quarkus-sdk/src/main/java/dev/struchkov/yookassa/sdk/YooKassaWebhookController.java +++ b/yookassa-sdk/yookassa-quarkus-sdk/src/main/java/dev/struchkov/yookassa/sdk/YooKassaWebhookController.java @@ -7,13 +7,13 @@ import io.smallrye.mutiny.Uni; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import static java.lang.Boolean.TRUE; @@ -29,6 +29,7 @@ public class YooKassaWebhookController { @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) public Uni callback(YooKassaNotification notification, @QueryParam("accessKey") String accessKey) { + log.info("Получен CallBack от YooKassa: {}", notification); if (yooKassaProp != null) { final String webhookAccessKey = yooKassaProp.getWebhookAccessKey(); if (webhookAccessKey != null && (!webhookAccessKey.equals(accessKey))) { diff --git a/yookassa-sdk/yookassa-quarkus-sdk/src/main/java/dev/struchkov/yookassa/sdk/util/IdempotenceKeyClientFilter.java b/yookassa-sdk/yookassa-quarkus-sdk/src/main/java/dev/struchkov/yookassa/sdk/util/IdempotenceKeyClientFilter.java index 5dfb8ee..aac857d 100644 --- a/yookassa-sdk/yookassa-quarkus-sdk/src/main/java/dev/struchkov/yookassa/sdk/util/IdempotenceKeyClientFilter.java +++ b/yookassa-sdk/yookassa-quarkus-sdk/src/main/java/dev/struchkov/yookassa/sdk/util/IdempotenceKeyClientFilter.java @@ -2,8 +2,8 @@ package dev.struchkov.yookassa.sdk.util; import dev.struchkov.yookassa.sdk.model.request.PaymentRequest; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; import java.io.IOException; public class IdempotenceKeyClientFilter implements ClientRequestFilter { diff --git a/yookassa-sdk/yookassa-quarkus-sdk/src/main/java/dev/struchkov/yookassa/sdk/util/YookassaExceptionHandler.java b/yookassa-sdk/yookassa-quarkus-sdk/src/main/java/dev/struchkov/yookassa/sdk/util/YookassaExceptionHandler.java index a51c5dd..34b5cbc 100644 --- a/yookassa-sdk/yookassa-quarkus-sdk/src/main/java/dev/struchkov/yookassa/sdk/util/YookassaExceptionHandler.java +++ b/yookassa-sdk/yookassa-quarkus-sdk/src/main/java/dev/struchkov/yookassa/sdk/util/YookassaExceptionHandler.java @@ -5,7 +5,7 @@ import dev.struchkov.yookassa.sdk.model.response.YooKassaApiErrorResponse; import lombok.extern.slf4j.Slf4j; import org.eclipse.microprofile.rest.client.ext.ResponseExceptionMapper; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; @Slf4j public class YookassaExceptionHandler implements ResponseExceptionMapper {