diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0ff11dc..c412bb0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,4 +7,4 @@ on: jobs: build: - uses: valitydev/base-workflow/.github/workflows/maven-library-build.yml@v1 + uses: valitydev/base-workflow/.github/workflows/maven-library-build.yml@v3 diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 4a3050f..1437af1 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -8,7 +8,7 @@ on: jobs: deploy: - uses: valitydev/base-workflow/.github/workflows/maven-library-deploy.yml@v1 + uses: valitydev/base-workflow/.github/workflows/maven-library-deploy.yml@v3 secrets: server-username: ${{ secrets.OSSRH_USERNAME }} server-password: ${{ secrets.OSSRH_TOKEN }} diff --git a/pom.xml b/pom.xml index 6c86235..1124425 100644 --- a/pom.xml +++ b/pom.xml @@ -7,12 +7,12 @@ dev.vality library-parent-pom - 1.0.2 + 2.0.2 adapter-flow-lib - 0.2.6 + 1.0.0 jar adapter-flow-lib @@ -44,7 +44,7 @@ ${env.REGISTRY} UTF-8 UTF-8 - 1.0.4 + 2.0.0 1.20-be9cdeb 1.614-3df747f 3.12.0 @@ -54,14 +54,14 @@ 1.2.11 7.1.1 2.14.0 - 5.8.2 + 5.10.3 2.22.2 4.0.1 2.0.1.Final - 5.3.19 - 2.6.7 + 6.1.6 + 3.3.1 1.66-01353ce - 1.1.2 + 2.0.0 @@ -90,12 +90,6 @@ validation-api ${validation-api.version} - - javax.servlet - javax.servlet-api - ${javax.servlet-api.version} - provided - org.apache.commons commons-lang3 @@ -223,6 +217,13 @@ maven-surefire-plugin ${maven-surefire-plugin.version} + + org.apache.maven.plugins + maven-compiler-plugin + + true + + diff --git a/src/main/java/dev/vality/adapter/flow/lib/controller/ThreeDsCallbackController.java b/src/main/java/dev/vality/adapter/flow/lib/controller/ThreeDsCallbackController.java index 98b8e9a..4027f64 100644 --- a/src/main/java/dev/vality/adapter/flow/lib/controller/ThreeDsCallbackController.java +++ b/src/main/java/dev/vality/adapter/flow/lib/controller/ThreeDsCallbackController.java @@ -1,15 +1,14 @@ package dev.vality.adapter.flow.lib.controller; import dev.vality.adapter.flow.lib.service.ThreeDsAdapterService; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - @Slf4j @RestController @RequestMapping({"/${server.rest.endpoint}"}) @@ -29,5 +28,4 @@ public class ThreeDsCallbackController { HttpServletResponse servletResponse) { return this.threeDsAdapterService.receiveRecurrentIncomingParameters(servletRequest, servletResponse); } - } \ No newline at end of file diff --git a/src/main/java/dev/vality/adapter/flow/lib/serde/ParametersDeserializer.java b/src/main/java/dev/vality/adapter/flow/lib/serde/ParametersDeserializer.java index f780870..be5da94 100644 --- a/src/main/java/dev/vality/adapter/flow/lib/serde/ParametersDeserializer.java +++ b/src/main/java/dev/vality/adapter/flow/lib/serde/ParametersDeserializer.java @@ -3,9 +3,9 @@ package dev.vality.adapter.flow.lib.serde; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import dev.vality.adapter.flow.lib.exception.DeserializationException; +import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; -import javax.servlet.http.HttpServletRequest; import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -24,8 +24,8 @@ public class ParametersDeserializer implements Deserializer> try { return mapper.readValue(data, new TypeReference>() { }); - } catch (IOException var3) { - throw new IllegalArgumentException(var3); + } catch (IOException ex) { + throw new IllegalArgumentException(ex); } } } @@ -41,5 +41,4 @@ public class ParametersDeserializer implements Deserializer> .collect(Collectors.toMap(k -> k.getKey().trim(), v -> v.getValue()[0])); } - } \ No newline at end of file diff --git a/src/main/java/dev/vality/adapter/flow/lib/service/TagManagementService.java b/src/main/java/dev/vality/adapter/flow/lib/service/TagManagementService.java index 194efbb..23cbc13 100644 --- a/src/main/java/dev/vality/adapter/flow/lib/service/TagManagementService.java +++ b/src/main/java/dev/vality/adapter/flow/lib/service/TagManagementService.java @@ -1,29 +1,10 @@ package dev.vality.adapter.flow.lib.service; -import dev.vality.adapter.flow.lib.utils.AdapterProperties; -import lombok.RequiredArgsConstructor; -import lombok.SneakyThrows; -import org.springframework.util.StringUtils; - import java.util.Map; -import java.util.Optional; -@RequiredArgsConstructor -public class TagManagementService { +public interface TagManagementService { - private final AdapterProperties adapterProperties; - - @SneakyThrows - public String findTag(Map parameters) { - Optional first = adapterProperties.getTagGeneratorFieldNames().stream() - .filter(s -> StringUtils.hasText(parameters.get(s))) - .findFirst(); - String tagId = parameters.get(first.get()); - return initTag(tagId); - } - - public String initTag(String tagId) { - return adapterProperties.getTagPrefix() + tagId; - } + String findTag(Map parameters); + String initTag(String tagId); } diff --git a/src/main/java/dev/vality/adapter/flow/lib/service/TagManagementServiceImpl.java b/src/main/java/dev/vality/adapter/flow/lib/service/TagManagementServiceImpl.java new file mode 100644 index 0000000..5973ec3 --- /dev/null +++ b/src/main/java/dev/vality/adapter/flow/lib/service/TagManagementServiceImpl.java @@ -0,0 +1,30 @@ +package dev.vality.adapter.flow.lib.service; + +import dev.vality.adapter.flow.lib.utils.AdapterProperties; +import lombok.RequiredArgsConstructor; +import lombok.SneakyThrows; +import org.springframework.util.StringUtils; + +import java.util.Map; +import java.util.Optional; + +@RequiredArgsConstructor +public class TagManagementServiceImpl implements TagManagementService { + + private final AdapterProperties adapterProperties; + + @SneakyThrows + @Override + public String findTag(Map parameters) { + Optional first = adapterProperties.getTagGeneratorFieldNames().stream() + .filter(s -> StringUtils.hasText(parameters.get(s))) + .findFirst(); + String tagId = parameters.get(first.get()); + return initTag(tagId); + } + + @Override + public String initTag(String tagId) { + return adapterProperties.getTagPrefix() + tagId; + } +} diff --git a/src/main/java/dev/vality/adapter/flow/lib/service/ThreeDsAdapterService.java b/src/main/java/dev/vality/adapter/flow/lib/service/ThreeDsAdapterService.java index f3ec46f..6c74228 100644 --- a/src/main/java/dev/vality/adapter/flow/lib/service/ThreeDsAdapterService.java +++ b/src/main/java/dev/vality/adapter/flow/lib/service/ThreeDsAdapterService.java @@ -4,12 +4,12 @@ import dev.vality.adapter.common.exception.HellgateException; import dev.vality.adapter.common.hellgate.HellgateClient; import dev.vality.adapter.flow.lib.serde.ParametersDeserializer; import dev.vality.adapter.flow.lib.serde.ParametersSerializer; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.util.StringUtils; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.util.Map; @@ -57,5 +57,4 @@ public class ThreeDsAdapterService { log.info("<- callback 3ds {}", resp); return resp; } - } diff --git a/src/main/java/dev/vality/adapter/flow/lib/service/factory/IntentResultQrPaymentFactory.java b/src/main/java/dev/vality/adapter/flow/lib/service/factory/IntentResultQrPaymentFactory.java index 3422e40..59dbc0a 100644 --- a/src/main/java/dev/vality/adapter/flow/lib/service/factory/IntentResultQrPaymentFactory.java +++ b/src/main/java/dev/vality/adapter/flow/lib/service/factory/IntentResultQrPaymentFactory.java @@ -1,7 +1,10 @@ package dev.vality.adapter.flow.lib.service.factory; import dev.vality.adapter.common.mapper.ErrorMapping; -import dev.vality.adapter.flow.lib.model.*; +import dev.vality.adapter.flow.lib.model.EntryStateModel; +import dev.vality.adapter.flow.lib.model.ExitStateModel; +import dev.vality.adapter.flow.lib.model.PollingInfo; +import dev.vality.adapter.flow.lib.model.QrDisplayData; import dev.vality.adapter.flow.lib.serde.ParametersSerializer; import dev.vality.adapter.flow.lib.service.ExponentialBackOffPollingService; import dev.vality.adapter.flow.lib.service.PollingInfoService; @@ -21,7 +24,7 @@ import java.nio.ByteBuffer; import java.util.Map; import static dev.vality.adapter.common.damsel.OptionsExtractors.extractRedirectTimeout; -import static dev.vality.adapter.common.damsel.ProxyProviderPackageCreators.*; +import static dev.vality.adapter.common.damsel.ProxyProviderPackageCreators.createFinishIntentSuccessWithToken; import static dev.vality.adapter.flow.lib.utils.ThreeDsDataInitializer.TAG; @RequiredArgsConstructor diff --git a/src/main/java/dev/vality/adapter/flow/lib/servlet/AdapterServlet.java b/src/main/java/dev/vality/adapter/flow/lib/servlet/AdapterServlet.java index 2ff481b..07a21ea 100644 --- a/src/main/java/dev/vality/adapter/flow/lib/servlet/AdapterServlet.java +++ b/src/main/java/dev/vality/adapter/flow/lib/servlet/AdapterServlet.java @@ -2,10 +2,11 @@ package dev.vality.adapter.flow.lib.servlet; import dev.vality.damsel.proxy_provider.ProviderProxySrv; import dev.vality.woody.thrift.impl.http.THServiceBuilder; +import jakarta.servlet.*; +import jakarta.servlet.annotation.WebServlet; import org.springframework.beans.factory.annotation.Autowired; -import javax.servlet.*; -import javax.servlet.annotation.WebServlet; + import java.io.IOException; @WebServlet("/adapter/${service.name}") @@ -23,9 +24,9 @@ public class AdapterServlet extends GenericServlet { } @Override - public void service(ServletRequest request, ServletResponse response) throws ServletException, IOException { + public void service(ServletRequest request, + ServletResponse response) throws ServletException, IOException { servlet.service(request, response); } - } diff --git a/src/test/java/dev/vality/adapter/flow/lib/flow/AbstractGenerateTokenTest.java b/src/test/java/dev/vality/adapter/flow/lib/flow/AbstractGenerateTokenTest.java index 64c6763..c835b48 100644 --- a/src/test/java/dev/vality/adapter/flow/lib/flow/AbstractGenerateTokenTest.java +++ b/src/test/java/dev/vality/adapter/flow/lib/flow/AbstractGenerateTokenTest.java @@ -10,7 +10,7 @@ import dev.vality.adapter.flow.lib.flow.config.*; import dev.vality.adapter.flow.lib.flow.full.FullThreeDsAllVersionsStepResolverImpl; import dev.vality.adapter.flow.lib.flow.full.GenerateTokenFullThreeDsAllVersionsStepResolverImpl; import dev.vality.adapter.flow.lib.serde.TemporaryContextDeserializer; -import dev.vality.adapter.flow.lib.service.TagManagementService; +import dev.vality.adapter.flow.lib.service.TagManagementServiceImpl; import dev.vality.adapter.flow.lib.service.impl.CallbackUrlExtractorImpl; import dev.vality.adapter.flow.lib.validator.AdapterConfigurationValidator; import dev.vality.bender.BenderSrv; @@ -27,7 +27,7 @@ import static org.junit.jupiter.api.Assertions.*; @PropertySource("classpath:application.yaml") @ContextConfiguration(classes = {HandlerConfig.class, AppConfig.class, ProcessorConfig.class, SerdeConfig.class, - ThreeDsCallbackController.class, TomcatEmbeddedConfiguration.class, TagManagementService.class, + ThreeDsCallbackController.class, TomcatEmbeddedConfiguration.class, TagManagementServiceImpl.class, CallbackUrlExtractorImpl.class, FullThreeDsAllVersionsStepResolverImpl.class, GenerateTokenFullThreeDsAllVersionsStepResolverImpl.class}) public class AbstractGenerateTokenTest { diff --git a/src/test/java/dev/vality/adapter/flow/lib/flow/AbstractPaymentTest.java b/src/test/java/dev/vality/adapter/flow/lib/flow/AbstractPaymentTest.java index 00b0f25..39d8e56 100644 --- a/src/test/java/dev/vality/adapter/flow/lib/flow/AbstractPaymentTest.java +++ b/src/test/java/dev/vality/adapter/flow/lib/flow/AbstractPaymentTest.java @@ -10,7 +10,7 @@ import dev.vality.adapter.flow.lib.flow.config.*; import dev.vality.adapter.flow.lib.flow.full.FullThreeDsAllVersionsStepResolverImpl; import dev.vality.adapter.flow.lib.flow.full.GenerateTokenFullThreeDsAllVersionsStepResolverImpl; import dev.vality.adapter.flow.lib.serde.TemporaryContextDeserializer; -import dev.vality.adapter.flow.lib.service.TagManagementService; +import dev.vality.adapter.flow.lib.service.TagManagementServiceImpl; import dev.vality.adapter.flow.lib.service.impl.CallbackUrlExtractorImpl; import dev.vality.adapter.flow.lib.validator.AdapterConfigurationValidator; import dev.vality.bender.BenderSrv; @@ -29,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.*; @PropertySource("classpath:application.yaml") @ContextConfiguration(classes = {HandlerConfig.class, AppConfig.class, ProcessorConfig.class, SerdeConfig.class, - ThreeDsCallbackController.class, TomcatEmbeddedConfiguration.class, TagManagementService.class, + ThreeDsCallbackController.class, TomcatEmbeddedConfiguration.class, TagManagementServiceImpl.class, CallbackUrlExtractorImpl.class, FullThreeDsAllVersionsStepResolverImpl.class, GenerateTokenFullThreeDsAllVersionsStepResolverImpl.class}) public class AbstractPaymentTest { diff --git a/src/test/java/dev/vality/adapter/flow/lib/flow/config/HandlerConfig.java b/src/test/java/dev/vality/adapter/flow/lib/flow/config/HandlerConfig.java index 7fceaba..b37f280 100644 --- a/src/test/java/dev/vality/adapter/flow/lib/flow/config/HandlerConfig.java +++ b/src/test/java/dev/vality/adapter/flow/lib/flow/config/HandlerConfig.java @@ -30,7 +30,7 @@ import dev.vality.adapter.flow.lib.service.CallbackUrlExtractor; import dev.vality.adapter.flow.lib.utils.TimerProperties; import dev.vality.adapter.flow.lib.validator.AdapterConfigurationValidator; import dev.vality.bender.BenderSrv; -import dev.vality.damsel.proxy_provider.ProviderProxySrv; +import dev.vality.damsel.proxy_provider.*; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -163,7 +163,7 @@ public class HandlerConfig { @Bean public TagManagementService tagManagementService(AdapterProperties adapterProperties) { - return new TagManagementService(adapterProperties); + return new TagManagementServiceImpl(adapterProperties); } @Bean @@ -207,8 +207,8 @@ public class HandlerConfig { public ProviderProxySrv.Iface serverHandlerLogDecorator( PaymentCallbackHandler paymentCallbackHandler, RecurrentTokenCallbackHandler recurrentTokenCallbackHandler, - ServerFlowHandler serverFlowHandler, - ServerFlowHandler generateTokenFlowHandler, + ServerFlowHandler serverFlowHandler, + ServerFlowHandler generateTokenFlowHandler, AdapterConfigurationValidator paymentContextValidator) { return new ServerHandlerLogDecorator(new ProxyProviderServiceImpl( paymentCallbackHandler, diff --git a/src/test/java/dev/vality/adapter/flow/lib/flow/config/TomcatEmbeddedConfiguration.java b/src/test/java/dev/vality/adapter/flow/lib/flow/config/TomcatEmbeddedConfiguration.java index ef311d0..7be7eca 100644 --- a/src/test/java/dev/vality/adapter/flow/lib/flow/config/TomcatEmbeddedConfiguration.java +++ b/src/test/java/dev/vality/adapter/flow/lib/flow/config/TomcatEmbeddedConfiguration.java @@ -10,11 +10,11 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.filter.OncePerRequestFilter; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; @Configuration diff --git a/src/test/java/dev/vality/adapter/flow/lib/flow/qr/config/QrRedirectWithPollingDsFlowConfig.java b/src/test/java/dev/vality/adapter/flow/lib/flow/qr/config/QrRedirectWithPollingDsFlowConfig.java index 3fa4b0d..f2a4643 100644 --- a/src/test/java/dev/vality/adapter/flow/lib/flow/qr/config/QrRedirectWithPollingDsFlowConfig.java +++ b/src/test/java/dev/vality/adapter/flow/lib/flow/qr/config/QrRedirectWithPollingDsFlowConfig.java @@ -39,11 +39,6 @@ import java.util.List; @Configuration public class QrRedirectWithPollingDsFlowConfig { - @Bean - public StepResolver stepResolverImpl() { - return new SimpleRedirectWithPollingStepResolverImpl(); - } - @Bean public StepResolver generateTokenStepResolverImpl() { return new UnsupportedGenerateTokenStepResolverImpl(); @@ -54,12 +49,11 @@ public class QrRedirectWithPollingDsFlowConfig { RemoteClient client, EntryModelToBaseRequestModelConverter entryModelToBaseRequestModelConverter, Processor baseProcessor, - StepResolver stepResolverImpl, CtxToEntryModelConverter ctxToEntryModelConverter, ExitModelToProxyResultConverter exitModelToProxyResultConverter) { return new ServerFlowHandlerImpl<>( getHandlers(client, entryModelToBaseRequestModelConverter, baseProcessor), - stepResolverImpl, + new SimpleRedirectWithPollingStepResolverImpl(), ctxToEntryModelConverter, exitModelToProxyResultConverter); } diff --git a/src/test/java/dev/vality/adapter/flow/lib/flow/simple/redirect/PaymentSuccess3dsTest.java b/src/test/java/dev/vality/adapter/flow/lib/flow/simple/redirect/PaymentSuccess3dsTest.java index c1794e9..a62aeef 100644 --- a/src/test/java/dev/vality/adapter/flow/lib/flow/simple/redirect/PaymentSuccess3dsTest.java +++ b/src/test/java/dev/vality/adapter/flow/lib/flow/simple/redirect/PaymentSuccess3dsTest.java @@ -1,6 +1,7 @@ package dev.vality.adapter.flow.lib.flow.simple.redirect; import com.fasterxml.jackson.core.JsonProcessingException; +import dev.vality.adapter.flow.lib.client.RemoteClient; import dev.vality.adapter.flow.lib.constant.OptionFields; import dev.vality.adapter.flow.lib.constant.Stage; import dev.vality.adapter.flow.lib.constant.Status; @@ -9,6 +10,7 @@ import dev.vality.adapter.flow.lib.flow.AbstractPaymentTest; import dev.vality.adapter.flow.lib.flow.simple.redirect.config.SimpleRedirectWithPollingDsFlowConfig; import dev.vality.adapter.flow.lib.flow.utils.BeanUtils; import dev.vality.adapter.flow.lib.flow.utils.MockUtil; +import dev.vality.adapter.flow.lib.handler.ServerFlowHandler; import dev.vality.adapter.flow.lib.model.BaseResponseModel; import dev.vality.damsel.proxy_provider.PaymentContext; import dev.vality.damsel.proxy_provider.PaymentProxyResult; @@ -19,6 +21,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; +import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit.jupiter.SpringExtension; @@ -39,6 +42,9 @@ import static org.mockito.ArgumentMatchers.any; "server.rest.port=8083"}) public class PaymentSuccess3dsTest extends AbstractPaymentTest { +// @MockBean +// private ServerFlowHandler serverFlowHandler; + @BeforeEach public void setUp() throws TException { MockitoAnnotations.openMocks(this); diff --git a/src/test/java/dev/vality/adapter/flow/lib/flow/simple/redirect/config/SimpleRedirectWithPollingDsFlowConfig.java b/src/test/java/dev/vality/adapter/flow/lib/flow/simple/redirect/config/SimpleRedirectWithPollingDsFlowConfig.java index 51a7b4e..c21c58b 100644 --- a/src/test/java/dev/vality/adapter/flow/lib/flow/simple/redirect/config/SimpleRedirectWithPollingDsFlowConfig.java +++ b/src/test/java/dev/vality/adapter/flow/lib/flow/simple/redirect/config/SimpleRedirectWithPollingDsFlowConfig.java @@ -35,11 +35,6 @@ import java.util.List; @Configuration public class SimpleRedirectWithPollingDsFlowConfig { - @Bean - public StepResolver stepResolverImpl() { - return new SimpleRedirectWithPollingStepResolverImpl(); - } - @Bean public StepResolver generateTokenStepResolverImpl() { return new GenerateTokenSimpleRedirectWithPollingStepResolverImpl(); @@ -50,12 +45,11 @@ public class SimpleRedirectWithPollingDsFlowConfig { RemoteClient client, EntryModelToBaseRequestModelConverter entryModelToBaseRequestModelConverter, Processor baseProcessor, - StepResolver stepResolverImpl, CtxToEntryModelConverter ctxToEntryModelConverter, ExitModelToProxyResultConverter exitModelToProxyResultConverter) { return new ServerFlowHandlerImpl<>( getHandlers(client, entryModelToBaseRequestModelConverter, baseProcessor), - stepResolverImpl, + new SimpleRedirectWithPollingStepResolverImpl(), ctxToEntryModelConverter, exitModelToProxyResultConverter); }