diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 92f0c6c..91508ca 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,4 +7,6 @@ on: jobs: build: - uses: valitydev/java-workflow/.github/workflows/maven-library-build.yml@v3 + uses: valitydev/java-workflow/.github/workflows/maven-library-build.yml@v4 + with: + java-version: "25" diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index ae4af79..527c86f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -9,7 +9,9 @@ on: jobs: deploy: - uses: valitydev/java-workflow/.github/workflows/maven-library-deploy.yml@v3 + uses: valitydev/java-workflow/.github/workflows/maven-library-deploy.yml@v4 + with: + java-version: "25" secrets: server-username: ${{ secrets.OSSRH_USERNAME }} server-password: ${{ secrets.OSSRH_TOKEN }} diff --git a/pom.xml b/pom.xml index f37b17c..90935d5 100644 --- a/pom.xml +++ b/pom.xml @@ -7,12 +7,12 @@ dev.vality library-parent-pom - 3.1.0 + 4.0.0 adapter-flow-lib - 1.1.0 + 2.0.0 jar adapter-flow-lib @@ -44,65 +44,65 @@ ${env.REGISTRY} UTF-8 UTF-8 - 2.0.0 - 1.20-be9cdeb - 1.670-1d0c1ec - 3.12.0 - 1.15 - 1.7.36 - 1.18.36 - 1.2.11 - 7.1.1 - 2.14.0 - 5.10.3 - 2.22.2 - 3.0.2 - 6.1.6 - 3.3.1 - 1.66-01353ce - 3.0.0 + 3.0.0 + 1.27-753b935 + 1.698-99c91c9 + 4.0.6 + 1.18.46 + 9.0 + 3.5.5 + 1.71-b3db02c + 1.17-7481bb4 + 1.0.2 + 4.0.0 + + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + + org.springframework.boot spring-boot-starter-validation - ${spring-boot-starter.version} provided org.springframework spring-web - ${spring.version} provided org.springframework spring-core - ${spring.version} + provided + + + jakarta.servlet + jakarta.servlet-api provided jakarta.validation jakarta.validation-api - ${validation-api.version} org.apache.commons commons-lang3 - ${apache.commons.lang3.version} - - - commons-codec - commons-codec - ${apache.commons.codec.version} org.slf4j slf4j-api - ${slf4j.version} org.projectlombok @@ -113,13 +113,11 @@ ch.qos.logback logback-core - ${logback.version} compile ch.qos.logback logback-classic - ${logback.version} compile @@ -129,14 +127,8 @@ compile - com.fasterxml.jackson.core + tools.jackson.core jackson-databind - ${jackson.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - ${jackson.version} @@ -152,12 +144,30 @@ ${woody.version} provided + + dev.vality.woody + woody-api + ${woody.version} + provided + + + dev.vality.woody + libthrift + ${woody.version} + provided + dev.vality bender-proto ${bender-proto.version} provided + + dev.vality + msgpack-proto + ${msgpack-proto.version} + provided + dev.vality cds-proto @@ -175,31 +185,27 @@ org.springframework.boot spring-boot-starter-web - ${spring-boot-starter.version} test org.springframework.boot spring-boot-starter-actuator - ${spring-boot-starter.version} test org.springframework.boot spring-boot-starter-test - ${spring-boot-starter.version} test org.junit.jupiter junit-jupiter-engine - ${junit-jupiter-engine.version} test dev.vality.geck serializer - 0.0.1 + ${geck.version} test @@ -221,6 +227,13 @@ maven-compiler-plugin true + + + org.projectlombok + lombok + ${lombok.version} + + diff --git a/src/main/java/dev/vality/adapter/flow/lib/logback/mask/MaskedEvent.java b/src/main/java/dev/vality/adapter/flow/lib/logback/mask/MaskedEvent.java index aa6f520..044a31e 100644 --- a/src/main/java/dev/vality/adapter/flow/lib/logback/mask/MaskedEvent.java +++ b/src/main/java/dev/vality/adapter/flow/lib/logback/mask/MaskedEvent.java @@ -6,7 +6,9 @@ import ch.qos.logback.classic.spi.LoggerContextVO; import lombok.RequiredArgsConstructor; import org.slf4j.Marker; +import org.slf4j.event.KeyValuePair; +import java.util.List; import java.util.Map; @RequiredArgsConstructor @@ -70,6 +72,11 @@ public Marker getMarker() { return event.getMarker(); } + @Override + public List getMarkerList() { + return event.getMarkerList(); + } + @Override public Map getMDCPropertyMap() { return event.getMDCPropertyMap(); @@ -85,6 +92,21 @@ public long getTimeStamp() { return event.getTimeStamp(); } + @Override + public int getNanoseconds() { + return event.getNanoseconds(); + } + + @Override + public long getSequenceNumber() { + return event.getSequenceNumber(); + } + + @Override + public List getKeyValuePairs() { + return event.getKeyValuePairs(); + } + @Override public void prepareForDeferredProcessing() { // Do nothing diff --git a/src/main/java/dev/vality/adapter/flow/lib/logback/mask/PatternMaskingMessageJsonProvider.java b/src/main/java/dev/vality/adapter/flow/lib/logback/mask/PatternMaskingMessageJsonProvider.java index 5ef8f96..bc7a88b 100644 --- a/src/main/java/dev/vality/adapter/flow/lib/logback/mask/PatternMaskingMessageJsonProvider.java +++ b/src/main/java/dev/vality/adapter/flow/lib/logback/mask/PatternMaskingMessageJsonProvider.java @@ -1,13 +1,12 @@ package dev.vality.adapter.flow.lib.logback.mask; import ch.qos.logback.classic.spi.ILoggingEvent; -import com.fasterxml.jackson.core.JsonGenerator; import net.logstash.logback.composite.AbstractFieldJsonProvider; import net.logstash.logback.composite.FieldNamesAware; import net.logstash.logback.composite.JsonWritingUtils; import net.logstash.logback.fieldnames.LogstashFieldNames; +import tools.jackson.core.JsonGenerator; -import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.regex.Pattern; @@ -29,7 +28,7 @@ public PatternMaskingMessageJsonProvider() { } @Override - public void writeTo(JsonGenerator generator, ILoggingEvent event) throws IOException { + public void writeTo(JsonGenerator generator, ILoggingEvent event) { JsonWritingUtils.writeStringField(generator, getFieldName(), MaskingMessageWithPattern.maskMessage(event.getFormattedMessage(), multilinePattern) ); 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 be5da94..5b8dd15 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 @@ -1,12 +1,12 @@ 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 tools.jackson.core.JacksonException; +import tools.jackson.core.type.TypeReference; +import tools.jackson.databind.ObjectMapper; -import java.io.IOException; import java.util.HashMap; import java.util.Map; import java.util.Optional; @@ -24,7 +24,7 @@ public Map read(byte[] data) { try { return mapper.readValue(data, new TypeReference>() { }); - } catch (IOException ex) { + } catch (JacksonException ex) { throw new IllegalArgumentException(ex); } } @@ -41,4 +41,4 @@ public Map read(HttpServletRequest request) { .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/serde/ParametersSerializer.java b/src/main/java/dev/vality/adapter/flow/lib/serde/ParametersSerializer.java index 9e036de..95d340c 100644 --- a/src/main/java/dev/vality/adapter/flow/lib/serde/ParametersSerializer.java +++ b/src/main/java/dev/vality/adapter/flow/lib/serde/ParametersSerializer.java @@ -1,6 +1,6 @@ package dev.vality.adapter.flow.lib.serde; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.ObjectMapper; import java.util.Map; @@ -8,4 +8,4 @@ public class ParametersSerializer extends StateSerializer> { public ParametersSerializer(ObjectMapper mapper) { super(mapper); } -} \ No newline at end of file +} diff --git a/src/main/java/dev/vality/adapter/flow/lib/serde/StateSerializer.java b/src/main/java/dev/vality/adapter/flow/lib/serde/StateSerializer.java index f7a9c01..4336f76 100644 --- a/src/main/java/dev/vality/adapter/flow/lib/serde/StateSerializer.java +++ b/src/main/java/dev/vality/adapter/flow/lib/serde/StateSerializer.java @@ -1,12 +1,12 @@ package dev.vality.adapter.flow.lib.serde; -import com.fasterxml.jackson.databind.ObjectMapper; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; import org.apache.commons.lang3.SerializationException; +import tools.jackson.core.JacksonException; +import tools.jackson.databind.ObjectMapper; -import java.io.IOException; import java.util.Base64; @Getter @@ -20,7 +20,7 @@ public abstract class StateSerializer implements Serializer { public byte[] writeByte(Object obj) { try { return mapper.writeValueAsBytes(obj); - } catch (IOException e) { + } catch (JacksonException e) { throw new SerializationException(e); } } @@ -29,9 +29,9 @@ public byte[] writeByte(Object obj) { public String writeString(Object obj) { try { return Base64.getEncoder().encodeToString(getMapper().writeValueAsBytes(obj)); - } catch (IOException e) { + } catch (JacksonException e) { throw new SerializationException(e); } } -} \ No newline at end of file +} diff --git a/src/main/java/dev/vality/adapter/flow/lib/serde/TemporaryContextDeserializer.java b/src/main/java/dev/vality/adapter/flow/lib/serde/TemporaryContextDeserializer.java index 667f944..1923ff4 100644 --- a/src/main/java/dev/vality/adapter/flow/lib/serde/TemporaryContextDeserializer.java +++ b/src/main/java/dev/vality/adapter/flow/lib/serde/TemporaryContextDeserializer.java @@ -1,10 +1,9 @@ package dev.vality.adapter.flow.lib.serde; -import com.fasterxml.jackson.databind.ObjectMapper; import dev.vality.adapter.flow.lib.exception.DeserializationException; import dev.vality.adapter.flow.lib.model.TemporaryContext; - -import java.io.IOException; +import tools.jackson.core.JacksonException; +import tools.jackson.databind.ObjectMapper; public class TemporaryContextDeserializer implements Deserializer { @@ -16,7 +15,7 @@ public TemporaryContext read(byte[] data) { } else { try { return this.getMapper().readValue(data, TemporaryContext.class); - } catch (IOException var3) { + } catch (JacksonException var3) { throw new IllegalArgumentException(var3); } } @@ -34,4 +33,4 @@ public TemporaryContextDeserializer(ObjectMapper mapper) { this.mapper = mapper; } -} \ No newline at end of file +} diff --git a/src/main/java/dev/vality/adapter/flow/lib/serde/TemporaryContextSerializer.java b/src/main/java/dev/vality/adapter/flow/lib/serde/TemporaryContextSerializer.java index c3d5b96..67c34fd 100644 --- a/src/main/java/dev/vality/adapter/flow/lib/serde/TemporaryContextSerializer.java +++ b/src/main/java/dev/vality/adapter/flow/lib/serde/TemporaryContextSerializer.java @@ -1,10 +1,10 @@ package dev.vality.adapter.flow.lib.serde; -import com.fasterxml.jackson.databind.ObjectMapper; import dev.vality.adapter.flow.lib.model.TemporaryContext; +import tools.jackson.databind.ObjectMapper; public class TemporaryContextSerializer extends StateSerializer { public TemporaryContextSerializer(ObjectMapper mapper) { super(mapper); } -} \ No newline at end of file +} diff --git a/src/main/java/dev/vality/adapter/flow/lib/service/factory/IntentResultForwardThreeDsParamsFactory.java b/src/main/java/dev/vality/adapter/flow/lib/service/factory/IntentResultForwardThreeDsParamsFactory.java index a89a889..4f46db6 100644 --- a/src/main/java/dev/vality/adapter/flow/lib/service/factory/IntentResultForwardThreeDsParamsFactory.java +++ b/src/main/java/dev/vality/adapter/flow/lib/service/factory/IntentResultForwardThreeDsParamsFactory.java @@ -1,6 +1,6 @@ package dev.vality.adapter.flow.lib.service.factory; -import dev.vality.adapter.common.mapper.ErrorMapping; +import dev.vality.adapter.common.v2.mapper.ErrorMapping; import dev.vality.adapter.flow.lib.constant.HttpMethod; import dev.vality.adapter.flow.lib.model.EntryStateModel; import dev.vality.adapter.flow.lib.model.ExitStateModel; @@ -14,7 +14,12 @@ import dev.vality.adapter.flow.lib.utils.TimeoutUtils; import dev.vality.adapter.flow.lib.utils.TimerProperties; import dev.vality.damsel.base.Timer; -import dev.vality.damsel.proxy_provider.*; +import dev.vality.damsel.proxy_provider.FinishIntent; +import dev.vality.damsel.proxy_provider.FinishStatus; +import dev.vality.damsel.proxy_provider.Intent; +import dev.vality.damsel.proxy_provider.SleepIntent; +import dev.vality.damsel.proxy_provider.Success; +import dev.vality.damsel.proxy_provider.SuspendIntent; import dev.vality.damsel.timeout_behaviour.TimeoutBehaviour; import dev.vality.damsel.user_interaction.UserInteraction; import lombok.RequiredArgsConstructor; @@ -24,7 +29,9 @@ 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.common.damsel.ProxyProviderPackageCreators.createGetUserInteraction; +import static dev.vality.adapter.common.damsel.ProxyProviderPackageCreators.createPostUserInteraction; @RequiredArgsConstructor public class IntentResultForwardThreeDsParamsFactory implements IntentResultFactory { 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 d30d55b..62e74a4 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,6 +1,6 @@ package dev.vality.adapter.flow.lib.service.factory; -import dev.vality.adapter.common.mapper.ErrorMapping; +import dev.vality.adapter.common.v2.mapper.ErrorMapping; import dev.vality.adapter.flow.lib.model.EntryStateModel; import dev.vality.adapter.flow.lib.model.ExitStateModel; import dev.vality.adapter.flow.lib.model.PollingInfo; @@ -12,7 +12,12 @@ import dev.vality.adapter.flow.lib.utils.TimeoutUtils; import dev.vality.adapter.flow.lib.utils.TimerProperties; import dev.vality.damsel.base.Timer; -import dev.vality.damsel.proxy_provider.*; +import dev.vality.damsel.proxy_provider.FinishIntent; +import dev.vality.damsel.proxy_provider.FinishStatus; +import dev.vality.damsel.proxy_provider.Intent; +import dev.vality.damsel.proxy_provider.SleepIntent; +import dev.vality.damsel.proxy_provider.Success; +import dev.vality.damsel.proxy_provider.SuspendIntent; import dev.vality.damsel.timeout_behaviour.TimeoutBehaviour; import dev.vality.damsel.user_interaction.QrCode; import dev.vality.damsel.user_interaction.QrCodeDisplayRequest; diff --git a/src/main/java/dev/vality/adapter/flow/lib/service/factory/SimpleIntentResultFactory.java b/src/main/java/dev/vality/adapter/flow/lib/service/factory/SimpleIntentResultFactory.java index ed7dd61..7249a5a 100644 --- a/src/main/java/dev/vality/adapter/flow/lib/service/factory/SimpleIntentResultFactory.java +++ b/src/main/java/dev/vality/adapter/flow/lib/service/factory/SimpleIntentResultFactory.java @@ -1,6 +1,6 @@ package dev.vality.adapter.flow.lib.service.factory; -import dev.vality.adapter.common.mapper.ErrorMapping; +import dev.vality.adapter.common.v2.mapper.ErrorMapping; import dev.vality.adapter.flow.lib.constant.HttpMethod; import dev.vality.adapter.flow.lib.constant.RedirectFields; import dev.vality.adapter.flow.lib.model.EntryStateModel; @@ -16,7 +16,12 @@ import dev.vality.adapter.flow.lib.utils.TimeoutUtils; import dev.vality.adapter.flow.lib.utils.TimerProperties; import dev.vality.damsel.base.Timer; -import dev.vality.damsel.proxy_provider.*; +import dev.vality.damsel.proxy_provider.FinishIntent; +import dev.vality.damsel.proxy_provider.FinishStatus; +import dev.vality.damsel.proxy_provider.Intent; +import dev.vality.damsel.proxy_provider.SleepIntent; +import dev.vality.damsel.proxy_provider.Success; +import dev.vality.damsel.proxy_provider.SuspendIntent; import dev.vality.damsel.timeout_behaviour.TimeoutBehaviour; import dev.vality.damsel.user_interaction.UserInteraction; import lombok.RequiredArgsConstructor; @@ -26,7 +31,9 @@ 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.common.damsel.ProxyProviderPackageCreators.createGetUserInteraction; +import static dev.vality.adapter.common.damsel.ProxyProviderPackageCreators.createPostUserInteraction; @RequiredArgsConstructor public class SimpleIntentResultFactory implements IntentResultFactory { 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 af87716..b1e240b 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 @@ -5,7 +5,11 @@ import dev.vality.adapter.flow.lib.client.RemoteClient; import dev.vality.adapter.flow.lib.constant.Step; import dev.vality.adapter.flow.lib.controller.ThreeDsCallbackController; -import dev.vality.adapter.flow.lib.flow.config.*; +import dev.vality.adapter.flow.lib.flow.config.AppConfig; +import dev.vality.adapter.flow.lib.flow.config.HandlerConfig; +import dev.vality.adapter.flow.lib.flow.config.ProcessorConfig; +import dev.vality.adapter.flow.lib.flow.config.SerdeConfig; +import dev.vality.adapter.flow.lib.flow.config.TomcatEmbeddedConfiguration; 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; @@ -19,13 +23,13 @@ import dev.vality.damsel.proxy_provider.ProviderProxySrv; import org.apache.thrift.TException; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.PropertySource; import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import static dev.vality.adapter.common.damsel.DomainPackageCreators.createTargetProcessed; -import static dev.vality.adapter.flow.lib.flow.full.three.ds.ForwardRecurrentPaymentNon3dsTest.RECURRENT_TOKEN; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; @PropertySource("classpath:application.yaml") @ContextConfiguration(classes = {HandlerConfig.class, AppConfig.class, ProcessorConfig.class, SerdeConfig.class, @@ -34,15 +38,15 @@ GenerateTokenFullThreeDsAllVersionsStepResolverImpl.class}) public class AbstractGenerateTokenTest { - @MockBean + @MockitoBean protected CdsStorageClient cdsStorageClient; - @MockBean + @MockitoBean protected AdapterConfigurationValidator paymentContextValidator; - @MockBean + @MockitoBean protected BenderSrv.Iface benderClient; - @MockBean + @MockitoBean protected RemoteClient client; - @MockBean + @MockitoBean protected HellgateClient hellgateClient; @Autowired public TemporaryContextDeserializer temporaryContextDeserializer; 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 39d8e56..1303fe2 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 @@ -6,7 +6,11 @@ import dev.vality.adapter.flow.lib.client.RemoteClient; import dev.vality.adapter.flow.lib.constant.Step; import dev.vality.adapter.flow.lib.controller.ThreeDsCallbackController; -import dev.vality.adapter.flow.lib.flow.config.*; +import dev.vality.adapter.flow.lib.flow.config.AppConfig; +import dev.vality.adapter.flow.lib.flow.config.HandlerConfig; +import dev.vality.adapter.flow.lib.flow.config.ProcessorConfig; +import dev.vality.adapter.flow.lib.flow.config.SerdeConfig; +import dev.vality.adapter.flow.lib.flow.config.TomcatEmbeddedConfiguration; 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; @@ -17,15 +21,23 @@ import dev.vality.damsel.domain.InvoicePaymentCaptured; import dev.vality.damsel.domain.InvoicePaymentRefunded; import dev.vality.damsel.domain.TargetInvoicePaymentStatus; -import dev.vality.damsel.proxy_provider.*; +import dev.vality.damsel.proxy_provider.Cash; +import dev.vality.damsel.proxy_provider.InvoicePaymentRefund; +import dev.vality.damsel.proxy_provider.PaymentCallbackResult; +import dev.vality.damsel.proxy_provider.PaymentContext; +import dev.vality.damsel.proxy_provider.PaymentProxyResult; +import dev.vality.damsel.proxy_provider.ProviderProxySrv; +import dev.vality.damsel.proxy_provider.Success; import org.apache.thrift.TException; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.PropertySource; import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import static dev.vality.adapter.common.damsel.DomainPackageCreators.createTargetProcessed; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; @PropertySource("classpath:application.yaml") @ContextConfiguration(classes = {HandlerConfig.class, AppConfig.class, ProcessorConfig.class, SerdeConfig.class, @@ -34,15 +46,15 @@ GenerateTokenFullThreeDsAllVersionsStepResolverImpl.class}) public class AbstractPaymentTest { - @MockBean + @MockitoBean protected CdsStorageClient cdsStorageClient; - @MockBean + @MockitoBean protected BenderSrv.Iface benderClient; - @MockBean + @MockitoBean protected RemoteClient client; - @MockBean + @MockitoBean protected HellgateClient hellgateClient; - @MockBean + @MockitoBean protected AdapterConfigurationValidator paymentContextValidator; @Autowired diff --git a/src/test/java/dev/vality/adapter/flow/lib/flow/config/AppConfig.java b/src/test/java/dev/vality/adapter/flow/lib/flow/config/AppConfig.java index 20f0e4a..0a65b6e 100644 --- a/src/test/java/dev/vality/adapter/flow/lib/flow/config/AppConfig.java +++ b/src/test/java/dev/vality/adapter/flow/lib/flow/config/AppConfig.java @@ -1,17 +1,15 @@ package dev.vality.adapter.flow.lib.flow.config; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import dev.vality.adapter.common.component.SimpleErrorMapping; -import dev.vality.adapter.common.mapper.ErrorMapping; +import dev.vality.adapter.common.v2.mapper.ErrorMapping; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Primary; import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; +import tools.jackson.databind.DeserializationFeature; +import tools.jackson.databind.json.JsonMapper; import java.io.IOException; @@ -32,15 +30,16 @@ public static PropertySourcesPlaceholderConfigurer properties() { @Bean public ErrorMapping errorMapping(@Value("${error-mapping.file}") Resource errorMappingFilePath, @Value("${error-mapping.patternReason:\"'%s' - '%s'\"}") - String errorMappingPattern) throws IOException { - return new SimpleErrorMapping(errorMappingFilePath, errorMappingPattern).createErrorMapping(); + String errorMappingPattern) + throws IOException { + return new SimpleErrorMapping(errorMappingFilePath, errorMappingPattern) + .createErrorMapping(); } @Bean - @Primary - public ObjectMapper objectMapper() { - return new ObjectMapper() - .registerModule(new JavaTimeModule()) - .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + public JsonMapper objectMapper() { + return JsonMapper.builder() + .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) + .build(); } } 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 8fd8066..c8d005e 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 @@ -1,9 +1,8 @@ package dev.vality.adapter.flow.lib.flow.config; -import com.fasterxml.jackson.databind.ObjectMapper; import dev.vality.adapter.common.cds.CdsStorageClient; import dev.vality.adapter.common.hellgate.HellgateClient; -import dev.vality.adapter.common.mapper.ErrorMapping; +import dev.vality.adapter.common.v2.mapper.ErrorMapping; import dev.vality.adapter.flow.lib.converter.ExitStateModelToTemporaryContextConverter; import dev.vality.adapter.flow.lib.converter.base.EntryModelToBaseRequestModelConverter; import dev.vality.adapter.flow.lib.converter.entry.CtxToEntryModelConverter; @@ -17,7 +16,17 @@ import dev.vality.adapter.flow.lib.serde.ParametersSerializer; import dev.vality.adapter.flow.lib.serde.TemporaryContextDeserializer; import dev.vality.adapter.flow.lib.serde.TemporaryContextSerializer; -import dev.vality.adapter.flow.lib.service.*; +import dev.vality.adapter.flow.lib.service.BenderGenerator; +import dev.vality.adapter.flow.lib.service.CallbackUrlExtractor; +import dev.vality.adapter.flow.lib.service.CardDataServiceWithHolderNamesImpl; +import dev.vality.adapter.flow.lib.service.CardHolderNamesService; +import dev.vality.adapter.flow.lib.service.ExponentialBackOffPollingService; +import dev.vality.adapter.flow.lib.service.IdGenerator; +import dev.vality.adapter.flow.lib.service.PollingInfoService; +import dev.vality.adapter.flow.lib.service.TagManagementService; +import dev.vality.adapter.flow.lib.service.TagManagementServiceImpl; +import dev.vality.adapter.flow.lib.service.TemporaryContextService; +import dev.vality.adapter.flow.lib.service.ThreeDsAdapterService; import dev.vality.adapter.flow.lib.service.factory.IntentResultFactory; import dev.vality.adapter.flow.lib.service.factory.SimpleIntentResultFactory; import dev.vality.adapter.flow.lib.utils.AdapterProperties; @@ -31,6 +40,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.io.ClassPathResource; +import tools.jackson.databind.ObjectMapper; import java.io.IOException; import java.util.List; diff --git a/src/test/java/dev/vality/adapter/flow/lib/flow/config/SerdeConfig.java b/src/test/java/dev/vality/adapter/flow/lib/flow/config/SerdeConfig.java index ffe4986..2d2213a 100644 --- a/src/test/java/dev/vality/adapter/flow/lib/flow/config/SerdeConfig.java +++ b/src/test/java/dev/vality/adapter/flow/lib/flow/config/SerdeConfig.java @@ -1,11 +1,11 @@ package dev.vality.adapter.flow.lib.flow.config; -import com.fasterxml.jackson.databind.ObjectMapper; import dev.vality.adapter.flow.lib.serde.ParametersDeserializer; import dev.vality.adapter.flow.lib.serde.TemporaryContextDeserializer; import dev.vality.adapter.flow.lib.serde.TemporaryContextSerializer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import tools.jackson.databind.ObjectMapper; @Configuration public class SerdeConfig { 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 8e72932..ce85f8f 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 @@ -8,9 +8,9 @@ import jakarta.servlet.http.HttpServletResponse; import org.apache.catalina.connector.Connector; import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; +import org.springframework.boot.tomcat.servlet.TomcatServletWebServerFactory; +import org.springframework.boot.web.server.servlet.ServletWebServerFactory; import org.springframework.boot.web.servlet.FilterRegistrationBean; -import org.springframework.boot.web.servlet.server.ServletWebServerFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.filter.OncePerRequestFilter; @@ -33,7 +33,7 @@ public ServletWebServerFactory servletContainer() { TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory(); Connector connector = new Connector(); connector.setPort(restPort); - tomcat.addAdditionalTomcatConnectors(connector); + tomcat.addAdditionalConnectors(connector); return tomcat; } diff --git a/src/test/java/dev/vality/adapter/flow/lib/flow/full/three/ds/PaymentSuccess3ds1Test.java b/src/test/java/dev/vality/adapter/flow/lib/flow/full/three/ds/PaymentSuccess3ds1Test.java index 954135d..5dbf8f8 100644 --- a/src/test/java/dev/vality/adapter/flow/lib/flow/full/three/ds/PaymentSuccess3ds1Test.java +++ b/src/test/java/dev/vality/adapter/flow/lib/flow/full/three/ds/PaymentSuccess3ds1Test.java @@ -1,6 +1,5 @@ package dev.vality.adapter.flow.lib.flow.full.three.ds; -import com.fasterxml.jackson.core.JsonProcessingException; import dev.vality.adapter.flow.lib.constant.Status; import dev.vality.adapter.flow.lib.constant.Step; import dev.vality.adapter.flow.lib.flow.AbstractPaymentTest; @@ -21,6 +20,7 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit.jupiter.SpringExtension; +import tools.jackson.core.JacksonException; import java.io.IOException; import java.nio.ByteBuffer; @@ -75,7 +75,7 @@ public void testTwoStage() throws TException, IOException { test3ds1(options); } - private void test3ds1(Map options) throws TException, JsonProcessingException { + private void test3ds1(Map options) throws TException, JacksonException { PaymentContext paymentContext = MockUtil.buildPaymentContext("invoice_id", options); PaymentProxyResult paymentProxyResult = serverHandlerLogDecorator.processPayment(paymentContext); @@ -94,7 +94,7 @@ private void test3ds1(Map options) throws TException, JsonProces //capture PaymentProxyResult paymentProxyResultDeposit = - checkSuccessCapture(paymentContext, paymentProxyResult, new byte[] {}); + checkSuccessCapture(paymentContext, paymentProxyResult, new byte[]{}); //refund checkSuccessRefund(1100L, paymentContext, paymentProxyResultDeposit); diff --git a/src/test/java/dev/vality/adapter/flow/lib/flow/full/three/ds/PaymentSuccess3ds2FullTest.java b/src/test/java/dev/vality/adapter/flow/lib/flow/full/three/ds/PaymentSuccess3ds2FullTest.java index 2986c3f..485a355 100644 --- a/src/test/java/dev/vality/adapter/flow/lib/flow/full/three/ds/PaymentSuccess3ds2FullTest.java +++ b/src/test/java/dev/vality/adapter/flow/lib/flow/full/three/ds/PaymentSuccess3ds2FullTest.java @@ -1,6 +1,5 @@ package dev.vality.adapter.flow.lib.flow.full.three.ds; -import com.fasterxml.jackson.core.JsonProcessingException; import dev.vality.adapter.flow.lib.constant.Status; import dev.vality.adapter.flow.lib.constant.Step; import dev.vality.adapter.flow.lib.flow.AbstractPaymentTest; @@ -21,6 +20,7 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit.jupiter.SpringExtension; +import tools.jackson.core.JacksonException; import java.io.IOException; import java.nio.ByteBuffer; @@ -78,7 +78,7 @@ public void testTwoStage() throws TException, IOException { test3ds2Full(options); } - private void test3ds2Full(Map options) throws TException, JsonProcessingException { + private void test3ds2Full(Map options) throws TException, JacksonException { // auth PaymentContext paymentContext = MockUtil.buildPaymentContext("invoice_id", options); @@ -106,7 +106,7 @@ private void test3ds2Full(Map options) throws TException, JsonPr //capture PaymentProxyResult paymentProxyResultDeposit = - checkSuccessCapture(paymentContext, paymentProxyResult, new byte[] {}); + checkSuccessCapture(paymentContext, paymentProxyResult, new byte[]{}); //refund checkSuccessRefund(1100L, paymentContext, paymentProxyResultDeposit); diff --git a/src/test/java/dev/vality/adapter/flow/lib/flow/full/three/ds/PaymentSuccess3ds2SimpleTest.java b/src/test/java/dev/vality/adapter/flow/lib/flow/full/three/ds/PaymentSuccess3ds2SimpleTest.java index 1999477..df22f04 100644 --- a/src/test/java/dev/vality/adapter/flow/lib/flow/full/three/ds/PaymentSuccess3ds2SimpleTest.java +++ b/src/test/java/dev/vality/adapter/flow/lib/flow/full/three/ds/PaymentSuccess3ds2SimpleTest.java @@ -1,6 +1,5 @@ package dev.vality.adapter.flow.lib.flow.full.three.ds; -import com.fasterxml.jackson.core.JsonProcessingException; import dev.vality.adapter.flow.lib.constant.Status; import dev.vality.adapter.flow.lib.constant.Step; import dev.vality.adapter.flow.lib.flow.AbstractPaymentTest; @@ -21,6 +20,7 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit.jupiter.SpringExtension; +import tools.jackson.core.JacksonException; import java.io.IOException; import java.nio.ByteBuffer; @@ -72,7 +72,7 @@ public void testTwoStage() throws TException, IOException { test3ds2Full(options); } - private void test3ds2Full(Map options) throws TException, JsonProcessingException { + private void test3ds2Full(Map options) throws TException, JacksonException { // auth PaymentContext paymentContext = MockUtil.buildPaymentContext("invoice_id", options); @@ -96,7 +96,7 @@ private void test3ds2Full(Map options) throws TException, JsonPr //capture PaymentProxyResult paymentProxyResultDeposit = - checkSuccessCapture(paymentContext, paymentProxyResult, new byte[] {}); + checkSuccessCapture(paymentContext, paymentProxyResult, new byte[]{}); //refund checkSuccessRefund(1100L, paymentContext, paymentProxyResultDeposit); diff --git a/src/test/java/dev/vality/adapter/flow/lib/flow/qr/PaymentSuccessQrTest.java b/src/test/java/dev/vality/adapter/flow/lib/flow/qr/PaymentSuccessQrTest.java index 3f4ede6..47991c1 100644 --- a/src/test/java/dev/vality/adapter/flow/lib/flow/qr/PaymentSuccessQrTest.java +++ b/src/test/java/dev/vality/adapter/flow/lib/flow/qr/PaymentSuccessQrTest.java @@ -1,6 +1,5 @@ package dev.vality.adapter.flow.lib.flow.qr; -import com.fasterxml.jackson.core.JsonProcessingException; import dev.vality.adapter.flow.lib.constant.OptionFields; import dev.vality.adapter.flow.lib.constant.Stage; import dev.vality.adapter.flow.lib.constant.Status; @@ -22,6 +21,7 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit.jupiter.SpringExtension; +import tools.jackson.core.JacksonException; import java.io.IOException; import java.util.Map; @@ -72,7 +72,7 @@ public void testTwoStage() throws TException, IOException { testQr(options); } - private void testQr(Map options) throws TException, JsonProcessingException { + private void testQr(Map options) throws TException, JacksonException { PaymentContext paymentContext = MockUtil.buildPaymentContextPaymentTerminal("invoice_id", options); PaymentProxyResult paymentProxyResult = serverHandlerLogDecorator.processPayment(paymentContext); @@ -85,10 +85,10 @@ private void testQr(Map options) throws TException, JsonProcessi //capture if (Stage.ONE.equals(options.get(OptionFields.STAGE.name()))) { - paymentProxyResult = checkSuccessCapture(paymentContext, paymentProxyResult, new byte[] {}); + paymentProxyResult = checkSuccessCapture(paymentContext, paymentProxyResult, new byte[]{}); processWithDoNothingSuccessResult(paymentContext, paymentProxyResult); } else { - paymentProxyResult = processCaptureWithCheckStatusResult(paymentContext, paymentProxyResult, new byte[] {}); + paymentProxyResult = processCaptureWithCheckStatusResult(paymentContext, paymentProxyResult, new byte[]{}); processWithCheckStatusResult(paymentContext, paymentProxyResult); } 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 f83d2b1..80128a6 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 @@ -1,6 +1,6 @@ package dev.vality.adapter.flow.lib.flow.qr.config; -import dev.vality.adapter.common.mapper.ErrorMapping; +import dev.vality.adapter.common.v2.mapper.ErrorMapping; import dev.vality.adapter.flow.lib.client.RemoteClient; import dev.vality.adapter.flow.lib.converter.base.EntryModelToBaseRequestModelConverter; import dev.vality.adapter.flow.lib.converter.entry.CtxToEntryModelConverter; @@ -13,11 +13,21 @@ import dev.vality.adapter.flow.lib.handler.CommonHandler; import dev.vality.adapter.flow.lib.handler.ServerFlowHandler; import dev.vality.adapter.flow.lib.handler.ServerFlowHandlerImpl; -import dev.vality.adapter.flow.lib.handler.payment.*; +import dev.vality.adapter.flow.lib.handler.payment.AuthHandler; +import dev.vality.adapter.flow.lib.handler.payment.CancelHandler; +import dev.vality.adapter.flow.lib.handler.payment.CaptureHandler; +import dev.vality.adapter.flow.lib.handler.payment.DoNothingHandler; +import dev.vality.adapter.flow.lib.handler.payment.PaymentHandler; +import dev.vality.adapter.flow.lib.handler.payment.RefundHandler; +import dev.vality.adapter.flow.lib.handler.payment.StatusHandler; import dev.vality.adapter.flow.lib.model.BaseResponseModel; import dev.vality.adapter.flow.lib.model.EntryStateModel; import dev.vality.adapter.flow.lib.model.ExitStateModel; -import dev.vality.adapter.flow.lib.processor.*; +import dev.vality.adapter.flow.lib.processor.ErrorProcessor; +import dev.vality.adapter.flow.lib.processor.Processor; +import dev.vality.adapter.flow.lib.processor.QrDisplayProcessor; +import dev.vality.adapter.flow.lib.processor.RetryProcessor; +import dev.vality.adapter.flow.lib.processor.SuccessFinishProcessor; import dev.vality.adapter.flow.lib.serde.ParametersSerializer; import dev.vality.adapter.flow.lib.service.ExponentialBackOffPollingService; import dev.vality.adapter.flow.lib.service.PollingInfoService; 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 23ca9d2..6e62c60 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,5 @@ package dev.vality.adapter.flow.lib.flow.simple.redirect; -import com.fasterxml.jackson.core.JsonProcessingException; import dev.vality.adapter.flow.lib.constant.OptionFields; import dev.vality.adapter.flow.lib.constant.Stage; import dev.vality.adapter.flow.lib.constant.Status; @@ -22,6 +21,7 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit.jupiter.SpringExtension; +import tools.jackson.core.JacksonException; import java.io.IOException; import java.util.Map; @@ -78,7 +78,7 @@ public void testTwoStage() throws TException, IOException { test3ds1(options); } - private void test3ds1(Map options) throws TException, JsonProcessingException { + private void test3ds1(Map options) throws TException, JacksonException { PaymentContext paymentContext = MockUtil.buildPaymentContext("invoice_id", options); PaymentProxyResult paymentProxyResult = serverHandlerLogDecorator.processPayment(paymentContext); @@ -91,10 +91,10 @@ private void test3ds1(Map options) throws TException, JsonProces //capture if (Stage.ONE.equals(options.get(OptionFields.STAGE.name()))) { - paymentProxyResult = checkSuccessCapture(paymentContext, paymentProxyResult, new byte[] {}); + paymentProxyResult = checkSuccessCapture(paymentContext, paymentProxyResult, new byte[]{}); processWithDoNothingSuccessResult(paymentContext, paymentProxyResult); } else { - paymentProxyResult = processCaptureWithCheckStatusResult(paymentContext, paymentProxyResult, new byte[] {}); + paymentProxyResult = processCaptureWithCheckStatusResult(paymentContext, paymentProxyResult, new byte[]{}); processWithCheckStatusResult(paymentContext, paymentProxyResult); } diff --git a/src/test/java/dev/vality/adapter/flow/lib/flow/utils/BeanUtils.java b/src/test/java/dev/vality/adapter/flow/lib/flow/utils/BeanUtils.java index a720801..9d7aec8 100644 --- a/src/test/java/dev/vality/adapter/flow/lib/flow/utils/BeanUtils.java +++ b/src/test/java/dev/vality/adapter/flow/lib/flow/utils/BeanUtils.java @@ -1,12 +1,12 @@ package dev.vality.adapter.flow.lib.flow.utils; -import com.fasterxml.jackson.core.JsonProcessingException; import dev.vality.adapter.common.utils.CommonConverter; import dev.vality.adapter.flow.lib.constant.Status; import dev.vality.adapter.flow.lib.constant.ThreeDsType; import dev.vality.adapter.flow.lib.model.BaseResponseModel; import dev.vality.adapter.flow.lib.model.QrDisplayData; import dev.vality.adapter.flow.lib.model.ThreeDsData; +import tools.jackson.core.JacksonException; import java.nio.ByteBuffer; import java.util.HashMap; @@ -71,14 +71,14 @@ public static ThreeDsData create3Ds2FullFinish() { .build(); } - public static ByteBuffer createParesBuffer(String pares, String md) throws JsonProcessingException { + public static ByteBuffer createParesBuffer(String pares, String md) throws JacksonException { Map map = new HashMap<>(); map.put(PA_RES, pares); map.put(MD, md); return CommonConverter.mapToByteBuffer(map); } - public static ByteBuffer createCresBuffer(String cres, String threeDSSessionData) throws JsonProcessingException { + public static ByteBuffer createCresBuffer(String cres, String threeDSSessionData) throws JacksonException { Map map = new HashMap<>(); map.put(C_RES, cres); map.put(THREE_DS_SESSION_DATA, threeDSSessionData); @@ -86,7 +86,7 @@ public static ByteBuffer createCresBuffer(String cres, String threeDSSessionData } public static ByteBuffer createSessionBuffer(String methodData, String threeDSSessionData) - throws JsonProcessingException { + throws JacksonException { Map map = new HashMap<>(); map.put(THREE_DS_METHOD_DATA, methodData); map.put(THREE_DS_METHOD_STATE, threeDSSessionData); diff --git a/src/test/java/dev/vality/adapter/flow/lib/logback/mask/PatternMaskingLayoutTest.java b/src/test/java/dev/vality/adapter/flow/lib/logback/mask/PatternMaskingLayoutTest.java index ca6c290..277103e 100644 --- a/src/test/java/dev/vality/adapter/flow/lib/logback/mask/PatternMaskingLayoutTest.java +++ b/src/test/java/dev/vality/adapter/flow/lib/logback/mask/PatternMaskingLayoutTest.java @@ -9,10 +9,12 @@ import org.junit.jupiter.api.Test; import org.slf4j.LoggerFactory; import org.slf4j.Marker; +import org.slf4j.event.KeyValuePair; import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; +import java.util.List; import java.util.Map; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -114,6 +116,11 @@ public Marker getMarker() { return null; } + @Override + public List getMarkerList() { + return null; + } + @Override public Map getMDCPropertyMap() { return null; @@ -129,6 +136,21 @@ public long getTimeStamp() { return date.getTime(); } + @Override + public int getNanoseconds() { + return 0; + } + + @Override + public long getSequenceNumber() { + return 0; + } + + @Override + public List getKeyValuePairs() { + return null; + } + @Override public void prepareForDeferredProcessing() { @@ -136,4 +158,4 @@ public void prepareForDeferredProcessing() { }; } -} \ No newline at end of file +}