diff --git a/Jenkinsfile b/Jenkinsfile index fc57192..8ffd298 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,6 +8,6 @@ build('three-ds-server-domain-lib', 'docker-host') { javaLibPipeline = load("build_utils/jenkins_lib/pipeJavaLib.groovy") } - def buildImageTag = "b04c5291d101132e53e578d96e1628d2e6dab0c0" + def buildImageTag = "442c2c274c1d8e484e5213089906a4271641d95e" javaLibPipeline(buildImageTag) } diff --git a/README.md b/README.md index f3d003f..c17531a 100644 --- a/README.md +++ b/README.md @@ -1 +1,5 @@ -# three-ds-server-domain-lib \ No newline at end of file +# three-ds-server-domain-lib + +Описание моделей домена макросервиса 3DSS + +[3DSS Docker Compose description](https://github.com/rbkmoney/three-ds-server-compose#three-ds-server-compose) diff --git a/build_utils b/build_utils index e131872..24aa772 160000 --- a/build_utils +++ b/build_utils @@ -1 +1 @@ -Subproject commit e1318727d4d0c3e48f5122bf3197158b6695f50e +Subproject commit 24aa772730be966667adb285a09fcb494d4f218e diff --git a/pom.xml b/pom.xml index db1a804..8e48d92 100644 --- a/pom.xml +++ b/pom.xml @@ -5,14 +5,14 @@ com.rbkmoney - parent - 1.0.5 + library-parent-pom + 1.0.3 jar three-ds-server-domain-lib - 1.2.3 + 1.3.0 https://github.com/rbkmoney/three-ds-server-domain-lib @@ -36,12 +36,10 @@ - UTF-8 - UTF-8 - 8 1.18.4 2.11.0 5.2.9.RELEASE + ./src/main/resources/checkstyle/checkstyle-suppressions.xml diff --git a/src/main/java/com/rbkmoney/threeds/server/constraint/validation/CustomValidator.java b/src/main/java/com/rbkmoney/threeds/server/constraint/validation/CustomValidator.java index 3132b78..0bc52e2 100644 --- a/src/main/java/com/rbkmoney/threeds/server/constraint/validation/CustomValidator.java +++ b/src/main/java/com/rbkmoney/threeds/server/constraint/validation/CustomValidator.java @@ -29,7 +29,10 @@ public class CustomValidator implements ConstraintValidator { - public RBKMoneyAuthenticationRequestCustomValidator(List> constraintValidationHandlers, - ValidatorContextEnricherService contextEnricher) { + public RBKMoneyAuthenticationRequestCustomValidator( + List> constraintValidationHandlers, + ValidatorContextEnricherService contextEnricher + ) { super(constraintValidationHandlers, contextEnricher); } } diff --git a/src/main/java/com/rbkmoney/threeds/server/constraint/validation/RBKMoneyGetChallengeRequestCustomValidator.java b/src/main/java/com/rbkmoney/threeds/server/constraint/validation/RBKMoneyGetChallengeRequestCustomValidator.java index 970e812..f5e388d 100644 --- a/src/main/java/com/rbkmoney/threeds/server/constraint/validation/RBKMoneyGetChallengeRequestCustomValidator.java +++ b/src/main/java/com/rbkmoney/threeds/server/constraint/validation/RBKMoneyGetChallengeRequestCustomValidator.java @@ -8,8 +8,10 @@ import java.util.List; public class RBKMoneyGetChallengeRequestCustomValidator extends CustomValidator { - public RBKMoneyGetChallengeRequestCustomValidator(List> constraintValidationHandlers, - ValidatorContextEnricherService contextEnricher) { + public RBKMoneyGetChallengeRequestCustomValidator( + List> constraintValidationHandlers, + ValidatorContextEnricherService contextEnricher + ) { super(constraintValidationHandlers, contextEnricher); } } diff --git a/src/main/java/com/rbkmoney/threeds/server/constraint/validation/RBKMoneyPreparationRequestCustomValidator.java b/src/main/java/com/rbkmoney/threeds/server/constraint/validation/RBKMoneyPreparationRequestCustomValidator.java index 3631853..68c967a 100644 --- a/src/main/java/com/rbkmoney/threeds/server/constraint/validation/RBKMoneyPreparationRequestCustomValidator.java +++ b/src/main/java/com/rbkmoney/threeds/server/constraint/validation/RBKMoneyPreparationRequestCustomValidator.java @@ -8,8 +8,10 @@ import java.util.List; public class RBKMoneyPreparationRequestCustomValidator extends CustomValidator { - public RBKMoneyPreparationRequestCustomValidator(List> constraintValidationHandlers, - ValidatorContextEnricherService contextEnricher) { + public RBKMoneyPreparationRequestCustomValidator( + List> constraintValidationHandlers, + ValidatorContextEnricherService contextEnricher + ) { super(constraintValidationHandlers, contextEnricher); } } diff --git a/src/main/java/com/rbkmoney/threeds/server/domain/cardrange/CardRange.java b/src/main/java/com/rbkmoney/threeds/server/domain/cardrange/CardRange.java index a8f83fb..47eaaaa 100644 --- a/src/main/java/com/rbkmoney/threeds/server/domain/cardrange/CardRange.java +++ b/src/main/java/com/rbkmoney/threeds/server/domain/cardrange/CardRange.java @@ -16,8 +16,10 @@ import lombok.*; import static com.rbkmoney.threeds.server.utils.AccountNumberUtils.hideAccountNumber; /** - * The Card Range Data data element contains information returned in the PRes message to the 3DS Server from the DS that indicates the most - * recent EMV 3-D Secure version supported by the ACS that hosts that card range. It also may optionally contain the ACS URL for the 3DS + * The Card Range Data data element contains information returned in the PRes message + * to the 3DS Server from the DS that indicates the most + * recent EMV 3-D Secure version supported by the ACS that hosts that card range. + * It also may optionally contain the ACS URL for the 3DS * Method if supported by the ACS and the DS Start and End Protocol Versions which support the card range. */ @AllArgsConstructor diff --git a/src/main/java/com/rbkmoney/threeds/server/domain/result/ThreeDsResultRequest.java b/src/main/java/com/rbkmoney/threeds/server/domain/result/ThreeDsResultRequest.java new file mode 100644 index 0000000..c2cb16f --- /dev/null +++ b/src/main/java/com/rbkmoney/threeds/server/domain/result/ThreeDsResultRequest.java @@ -0,0 +1,18 @@ +package com.rbkmoney.threeds.server.domain.result; + +import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@AllArgsConstructor +@NoArgsConstructor +@Data +@Builder +@JsonInclude(value = JsonInclude.Include.NON_ABSENT) +public class ThreeDsResultRequest { + + private String threeDsServerTransId; + +} diff --git a/src/main/java/com/rbkmoney/threeds/server/domain/result/ThreeDsResultResponse.java b/src/main/java/com/rbkmoney/threeds/server/domain/result/ThreeDsResultResponse.java new file mode 100644 index 0000000..4524d15 --- /dev/null +++ b/src/main/java/com/rbkmoney/threeds/server/domain/result/ThreeDsResultResponse.java @@ -0,0 +1,19 @@ +package com.rbkmoney.threeds.server.domain.result; + +import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@AllArgsConstructor +@NoArgsConstructor +@Data +@Builder +@JsonInclude(value = JsonInclude.Include.NON_ABSENT) +public class ThreeDsResultResponse { + + private String eci; + private String authenticationValue; + +} diff --git a/src/main/java/com/rbkmoney/threeds/server/domain/root/emvco/RReq.java b/src/main/java/com/rbkmoney/threeds/server/domain/root/emvco/RReq.java index b224bc8..c281dca 100644 --- a/src/main/java/com/rbkmoney/threeds/server/domain/root/emvco/RReq.java +++ b/src/main/java/com/rbkmoney/threeds/server/domain/root/emvco/RReq.java @@ -1,5 +1,6 @@ package com.rbkmoney.threeds.server.domain.root.emvco; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -15,6 +16,7 @@ import com.rbkmoney.threeds.server.domain.transaction.TransactionStatus; import com.rbkmoney.threeds.server.domain.transaction.TransactionStatusReason; import com.rbkmoney.threeds.server.domain.whitelist.WhiteListStatus; import com.rbkmoney.threeds.server.domain.whitelist.WhiteListStatusSource; +import com.rbkmoney.threeds.server.dto.ChallengeFlowTransactionInfo; import com.rbkmoney.threeds.server.serialization.EnumWrapper; import com.rbkmoney.threeds.server.serialization.ListWrapper; import com.rbkmoney.threeds.server.serialization.deserializer.*; @@ -76,4 +78,7 @@ public class RReq extends Message { @JsonSerialize(using = WhiteListStatusSourceSerializer.class) private EnumWrapper whiteListStatusSource; + @JsonIgnore + private ChallengeFlowTransactionInfo challengeFlowTransactionInfo; + } diff --git a/src/main/java/com/rbkmoney/threeds/server/domain/root/proprietary/PGcq.java b/src/main/java/com/rbkmoney/threeds/server/domain/root/proprietary/PGcq.java index 45fff61..916b218 100644 --- a/src/main/java/com/rbkmoney/threeds/server/domain/root/proprietary/PGcq.java +++ b/src/main/java/com/rbkmoney/threeds/server/domain/root/proprietary/PGcq.java @@ -16,7 +16,8 @@ import lombok.*; * класс - костыль для тестов, который изначально не правильно работает , по идее согласно тестовой спеки , * он должен возвращать сразу лабе PGcs, и там плюс должен быть сформированный html с кодированным CReq. * но тест при такой реализации валился с их стороны хуй знает почему. - * но когда я стал отправлять этот PGcs в DS (DS не принимает изначально такой тип сообщения), DS стал возвращать Erro (что логично), + * но когда я стал отправлять этот PGcs в DS (DS не принимает изначально такой тип сообщения), + * DS стал возвращать Erro (что логично), * который 3дс потом редиректит лабе и тест успешно завершался, поэтому я оставил все как есть. */ @AllArgsConstructor diff --git a/src/main/java/com/rbkmoney/threeds/server/dto/ChallengeFlowTransactionInfo.java b/src/main/java/com/rbkmoney/threeds/server/dto/ChallengeFlowTransactionInfo.java new file mode 100644 index 0000000..ae31e77 --- /dev/null +++ b/src/main/java/com/rbkmoney/threeds/server/dto/ChallengeFlowTransactionInfo.java @@ -0,0 +1,24 @@ +package com.rbkmoney.threeds.server.dto; + +import com.rbkmoney.threeds.server.domain.acs.AcsDecConInd; +import com.rbkmoney.threeds.server.domain.device.DeviceChannel; +import lombok.Builder; +import lombok.Data; + +import java.time.LocalDateTime; + +@Data +@Builder +public class ChallengeFlowTransactionInfo { + + private String threeDsServerTransId; + private DeviceChannel deviceChannel; + private LocalDateTime decoupledAuthMaxTime; + private AcsDecConInd acsDecConInd; + private String dsProviderId; + private String messageVersion; + private String acsUrl; + private String eci; + private String authenticationValue; + +} diff --git a/src/main/java/com/rbkmoney/threeds/server/dto/ConstraintType.java b/src/main/java/com/rbkmoney/threeds/server/dto/ConstraintType.java index c2f6a6a..633699c 100644 --- a/src/main/java/com/rbkmoney/threeds/server/dto/ConstraintType.java +++ b/src/main/java/com/rbkmoney/threeds/server/dto/ConstraintType.java @@ -19,7 +19,9 @@ public enum ConstraintType { public static ConstraintType of(String value) { for (ConstraintType t : ConstraintType.values()) { - if (value.equals(t.value)) return t; + if (value.equals(t.value)) { + return t; + } } throw new IllegalArgumentException("Unknown constraint type: " + value); diff --git a/src/main/java/com/rbkmoney/threeds/server/serialization/AbstractEnumDeserializer.java b/src/main/java/com/rbkmoney/threeds/server/serialization/AbstractEnumDeserializer.java index 70b80c6..47b409a 100644 --- a/src/main/java/com/rbkmoney/threeds/server/serialization/AbstractEnumDeserializer.java +++ b/src/main/java/com/rbkmoney/threeds/server/serialization/AbstractEnumDeserializer.java @@ -18,7 +18,7 @@ public abstract class AbstractEnumDeserializer extends JsonD protected abstract T[] enumValues(); @Override - public EnumWrapper deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException { + public EnumWrapper deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException { ObjectCodec oc = jp.getCodec(); JsonNode node = oc.readTree(jp); diff --git a/src/main/java/com/rbkmoney/threeds/server/serialization/AbstractEnumSerializer.java b/src/main/java/com/rbkmoney/threeds/server/serialization/AbstractEnumSerializer.java index c13b88c..4822845 100644 --- a/src/main/java/com/rbkmoney/threeds/server/serialization/AbstractEnumSerializer.java +++ b/src/main/java/com/rbkmoney/threeds/server/serialization/AbstractEnumSerializer.java @@ -10,7 +10,8 @@ import java.io.IOException; public abstract class AbstractEnumSerializer extends JsonSerializer> { @Override - public void serialize(EnumWrapper enumWrapper, JsonGenerator jsonGenerator, SerializerProvider serializers) throws IOException { + public void serialize(EnumWrapper enumWrapper, JsonGenerator jsonGenerator, SerializerProvider serializers) + throws IOException { String value = enumWrapper.getValue().getValue(); if (value != null) { jsonGenerator.writeString(value); diff --git a/src/main/java/com/rbkmoney/threeds/server/serialization/AbstractListDeserializer.java b/src/main/java/com/rbkmoney/threeds/server/serialization/AbstractListDeserializer.java index ff003eb..c2ded26 100644 --- a/src/main/java/com/rbkmoney/threeds/server/serialization/AbstractListDeserializer.java +++ b/src/main/java/com/rbkmoney/threeds/server/serialization/AbstractListDeserializer.java @@ -17,7 +17,7 @@ public abstract class AbstractListDeserializer extends JsonDeserializer getClassType(); @Override - public ListWrapper deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException { + public ListWrapper deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException { ObjectCodec oc = jp.getCodec(); JsonNode node = oc.readTree(jp); diff --git a/src/main/java/com/rbkmoney/threeds/server/serialization/AbstractListEnumDeserializer.java b/src/main/java/com/rbkmoney/threeds/server/serialization/AbstractListEnumDeserializer.java index b71fc1f..c9f07a2 100644 --- a/src/main/java/com/rbkmoney/threeds/server/serialization/AbstractListEnumDeserializer.java +++ b/src/main/java/com/rbkmoney/threeds/server/serialization/AbstractListEnumDeserializer.java @@ -14,14 +14,15 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -public abstract class AbstractListEnumDeserializer extends JsonDeserializer>> { +public abstract class AbstractListEnumDeserializer + extends JsonDeserializer>> { protected abstract T enumValueOf(String candidate); protected abstract T[] enumValues(); @Override - public ListWrapper> deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException { + public ListWrapper> deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException { ObjectCodec oc = jp.getCodec(); JsonNode node = oc.readTree(jp); @@ -44,7 +45,7 @@ public abstract class AbstractListEnumDeserializer extends J } } - private EnumWrapper getEnumElementOfList(ObjectCodec oc, JsonNode node) throws IOException, JsonProcessingException { + private EnumWrapper getEnumElementOfList(ObjectCodec oc, JsonNode node) throws IOException { if (node.isNull()) { return null; } else if (node.isTextual()) { diff --git a/src/main/java/com/rbkmoney/threeds/server/serialization/AbstractListEnumSerializer.java b/src/main/java/com/rbkmoney/threeds/server/serialization/AbstractListEnumSerializer.java index 5b04488..fdfeecc 100644 --- a/src/main/java/com/rbkmoney/threeds/server/serialization/AbstractListEnumSerializer.java +++ b/src/main/java/com/rbkmoney/threeds/server/serialization/AbstractListEnumSerializer.java @@ -8,10 +8,15 @@ import com.rbkmoney.threeds.server.domain.Valuable; import java.io.IOException; import java.util.List; -public abstract class AbstractListEnumSerializer extends JsonSerializer>> { +public abstract class AbstractListEnumSerializer + extends JsonSerializer>> { @Override - public void serialize(ListWrapper> listWrapper, JsonGenerator jsonGenerator, SerializerProvider serializers) throws IOException { + public void serialize( + ListWrapper> listWrapper, + JsonGenerator jsonGenerator, + SerializerProvider serializers + ) throws IOException { List> values = listWrapper.getValue(); if (values != null) { jsonGenerator.writeStartArray(values.size()); diff --git a/src/main/java/com/rbkmoney/threeds/server/serialization/AbstractListSerializer.java b/src/main/java/com/rbkmoney/threeds/server/serialization/AbstractListSerializer.java index 4e0bbc7..d0b5813 100644 --- a/src/main/java/com/rbkmoney/threeds/server/serialization/AbstractListSerializer.java +++ b/src/main/java/com/rbkmoney/threeds/server/serialization/AbstractListSerializer.java @@ -11,7 +11,8 @@ import java.util.List; public abstract class AbstractListSerializer extends JsonSerializer> { @Override - public void serialize(ListWrapper listWrapper, JsonGenerator jsonGenerator, SerializerProvider serializers) throws IOException { + public void serialize(ListWrapper listWrapper, JsonGenerator jsonGenerator, SerializerProvider serializers) + throws IOException { ObjectMapper objectMapper = (ObjectMapper) jsonGenerator.getCodec(); List values = listWrapper.getValue(); diff --git a/src/main/java/com/rbkmoney/threeds/server/serialization/AbstractTemporalAccessorDeserializer.java b/src/main/java/com/rbkmoney/threeds/server/serialization/AbstractTemporalAccessorDeserializer.java index 3ffc284..077a8c9 100644 --- a/src/main/java/com/rbkmoney/threeds/server/serialization/AbstractTemporalAccessorDeserializer.java +++ b/src/main/java/com/rbkmoney/threeds/server/serialization/AbstractTemporalAccessorDeserializer.java @@ -14,12 +14,13 @@ import java.time.DateTimeException; import java.time.temporal.TemporalAccessor; @RequiredArgsConstructor -public abstract class AbstractTemporalAccessorDeserializer extends JsonDeserializer> { +public abstract class AbstractTemporalAccessorDeserializer + extends JsonDeserializer> { protected abstract T parse(String candidate); @Override - public TemporalAccessorWrapper deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException { + public TemporalAccessorWrapper deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException { ObjectCodec oc = jp.getCodec(); JsonNode node = oc.readTree(jp); diff --git a/src/main/java/com/rbkmoney/threeds/server/serialization/AbstractTemporalAccessorSerializer.java b/src/main/java/com/rbkmoney/threeds/server/serialization/AbstractTemporalAccessorSerializer.java index e89d981..b660f56 100644 --- a/src/main/java/com/rbkmoney/threeds/server/serialization/AbstractTemporalAccessorSerializer.java +++ b/src/main/java/com/rbkmoney/threeds/server/serialization/AbstractTemporalAccessorSerializer.java @@ -7,12 +7,17 @@ import com.fasterxml.jackson.databind.SerializerProvider; import java.io.IOException; import java.time.temporal.TemporalAccessor; -public abstract class AbstractTemporalAccessorSerializer extends JsonSerializer> { +public abstract class AbstractTemporalAccessorSerializer + extends JsonSerializer> { protected abstract String format(T value); @Override - public void serialize(TemporalAccessorWrapper temporalAccessorWrapper, JsonGenerator jsonGenerator, SerializerProvider serializers) throws IOException { + public void serialize( + TemporalAccessorWrapper temporalAccessorWrapper, + JsonGenerator jsonGenerator, + SerializerProvider serializers + ) throws IOException { T value = temporalAccessorWrapper.getValue(); if (value != null) { jsonGenerator.writeString(format(value)); diff --git a/src/main/java/com/rbkmoney/threeds/server/serialization/deserializer/LocalDateTimeMinuteDeserializer.java b/src/main/java/com/rbkmoney/threeds/server/serialization/deserializer/LocalDateTimeMinuteDeserializer.java index 005aa51..e3078d6 100644 --- a/src/main/java/com/rbkmoney/threeds/server/serialization/deserializer/LocalDateTimeMinuteDeserializer.java +++ b/src/main/java/com/rbkmoney/threeds/server/serialization/deserializer/LocalDateTimeMinuteDeserializer.java @@ -2,7 +2,8 @@ package com.rbkmoney.threeds.server.serialization.deserializer; import java.time.format.DateTimeFormatter; -public class LocalDateTimeMinuteDeserializer extends com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer { +public class LocalDateTimeMinuteDeserializer + extends com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer { public LocalDateTimeMinuteDeserializer() { super(DateTimeFormatter.ofPattern("yyyyMMddHHmm")); diff --git a/src/main/java/com/rbkmoney/threeds/server/serialization/deserializer/LocalDateTimeMinuteSecondDeserializer.java b/src/main/java/com/rbkmoney/threeds/server/serialization/deserializer/LocalDateTimeMinuteSecondDeserializer.java index 53cbcbb..372ff21 100644 --- a/src/main/java/com/rbkmoney/threeds/server/serialization/deserializer/LocalDateTimeMinuteSecondDeserializer.java +++ b/src/main/java/com/rbkmoney/threeds/server/serialization/deserializer/LocalDateTimeMinuteSecondDeserializer.java @@ -2,7 +2,8 @@ package com.rbkmoney.threeds.server.serialization.deserializer; import java.time.format.DateTimeFormatter; -public class LocalDateTimeMinuteSecondDeserializer extends com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer { +public class LocalDateTimeMinuteSecondDeserializer + extends com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer { public LocalDateTimeMinuteSecondDeserializer() { super(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")); diff --git a/src/main/java/com/rbkmoney/threeds/server/serialization/deserializer/ThreeDSRequestorAuthenticationIndDeserializer.java b/src/main/java/com/rbkmoney/threeds/server/serialization/deserializer/ThreeDSRequestorAuthenticationIndDeserializer.java index bc326e5..2e3f480 100644 --- a/src/main/java/com/rbkmoney/threeds/server/serialization/deserializer/ThreeDSRequestorAuthenticationIndDeserializer.java +++ b/src/main/java/com/rbkmoney/threeds/server/serialization/deserializer/ThreeDSRequestorAuthenticationIndDeserializer.java @@ -3,7 +3,8 @@ package com.rbkmoney.threeds.server.serialization.deserializer; import com.rbkmoney.threeds.server.domain.threedsrequestor.ThreeDSRequestorAuthenticationInd; import com.rbkmoney.threeds.server.serialization.AbstractEnumDeserializer; -public class ThreeDSRequestorAuthenticationIndDeserializer extends AbstractEnumDeserializer { +public class ThreeDSRequestorAuthenticationIndDeserializer + extends AbstractEnumDeserializer { @Override protected ThreeDSRequestorAuthenticationInd enumValueOf(String candidate) { diff --git a/src/main/java/com/rbkmoney/threeds/server/serialization/serializer/LocalDateTimeMinuteSecondSerializer.java b/src/main/java/com/rbkmoney/threeds/server/serialization/serializer/LocalDateTimeMinuteSecondSerializer.java index 7e4175d..92ce772 100644 --- a/src/main/java/com/rbkmoney/threeds/server/serialization/serializer/LocalDateTimeMinuteSecondSerializer.java +++ b/src/main/java/com/rbkmoney/threeds/server/serialization/serializer/LocalDateTimeMinuteSecondSerializer.java @@ -2,7 +2,8 @@ package com.rbkmoney.threeds.server.serialization.serializer; import java.time.format.DateTimeFormatter; -public class LocalDateTimeMinuteSecondSerializer extends com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer { +public class LocalDateTimeMinuteSecondSerializer + extends com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer { public LocalDateTimeMinuteSecondSerializer() { super(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")); diff --git a/src/main/java/com/rbkmoney/threeds/server/serialization/serializer/ThreeDSRequestorAuthenticationIndSerializer.java b/src/main/java/com/rbkmoney/threeds/server/serialization/serializer/ThreeDSRequestorAuthenticationIndSerializer.java index b231364..9330dc1 100644 --- a/src/main/java/com/rbkmoney/threeds/server/serialization/serializer/ThreeDSRequestorAuthenticationIndSerializer.java +++ b/src/main/java/com/rbkmoney/threeds/server/serialization/serializer/ThreeDSRequestorAuthenticationIndSerializer.java @@ -3,6 +3,7 @@ package com.rbkmoney.threeds.server.serialization.serializer; import com.rbkmoney.threeds.server.domain.threedsrequestor.ThreeDSRequestorAuthenticationInd; import com.rbkmoney.threeds.server.serialization.AbstractEnumSerializer; -public class ThreeDSRequestorAuthenticationIndSerializer extends AbstractEnumSerializer { +public class ThreeDSRequestorAuthenticationIndSerializer + extends AbstractEnumSerializer { } diff --git a/src/main/java/com/rbkmoney/threeds/server/utils/MessageTypeUtils.java b/src/main/java/com/rbkmoney/threeds/server/utils/MessageTypeUtils.java index f3c5f9b..3910e73 100644 --- a/src/main/java/com/rbkmoney/threeds/server/utils/MessageTypeUtils.java +++ b/src/main/java/com/rbkmoney/threeds/server/utils/MessageTypeUtils.java @@ -9,62 +9,62 @@ import com.rbkmoney.threeds.server.domain.root.rbkmoney.*; public class MessageTypeUtils { public static MessageType resolve(Message message) { - Class aClass = message.getClass(); - if (aClass.equals(ErroWrapper.class) || aClass.equals(Erro.class)) { + Class messageClass = message.getClass(); + if (messageClass.equals(ErroWrapper.class) || messageClass.equals(Erro.class)) { return MessageType.ERRO; } - if (aClass.equals(AReq.class)) { + if (messageClass.equals(AReq.class)) { return MessageType.AREQ; } - if (aClass.equals(ARes.class)) { + if (messageClass.equals(ARes.class)) { return MessageType.ARES; } - if (aClass.equals(PReq.class)) { + if (messageClass.equals(PReq.class)) { return MessageType.PREQ; } - if (aClass.equals(PRes.class)) { + if (messageClass.equals(PRes.class)) { return MessageType.PRES; } - if (aClass.equals(RReq.class)) { + if (messageClass.equals(RReq.class)) { return MessageType.RREQ; } - if (aClass.equals(RRes.class)) { + if (messageClass.equals(RRes.class)) { return MessageType.RRES; } - if (aClass.equals(PArq.class)) { + if (messageClass.equals(PArq.class)) { return MessageType.PARQ; } - if (aClass.equals(PArs.class)) { + if (messageClass.equals(PArs.class)) { return MessageType.PARS; } - if (aClass.equals(PGcq.class)) { + if (messageClass.equals(PGcq.class)) { return MessageType.PGCQ; } - if (aClass.equals(PGcs.class)) { + if (messageClass.equals(PGcs.class)) { return MessageType.PGCS; } - if (aClass.equals(PPrq.class)) { + if (messageClass.equals(PPrq.class)) { return MessageType.PPRQ; } - if (aClass.equals(PPrs.class)) { + if (messageClass.equals(PPrs.class)) { return MessageType.PPRS; } - if (aClass.equals(RBKMoneyAuthenticationRequest.class)) { + if (messageClass.equals(RBKMoneyAuthenticationRequest.class)) { return MessageType.RBKMONEY_AUTHENTICATION_REQUEST; } - if (aClass.equals(RBKMoneyAuthenticationResponse.class)) { + if (messageClass.equals(RBKMoneyAuthenticationResponse.class)) { return MessageType.RBKMONEY_AUTHENTICATION_RESPONSE; } - if (aClass.equals(RBKMoneyPreparationRequest.class)) { + if (messageClass.equals(RBKMoneyPreparationRequest.class)) { return MessageType.RBKMONEY_PREPARATION_REQUEST; } - if (aClass.equals(RBKMoneyPreparationResponse.class)) { + if (messageClass.equals(RBKMoneyPreparationResponse.class)) { return MessageType.RBKMONEY_PREPARATION_RESPONSE; } - if (aClass.equals(RBKMoneyGetChallengeRequest.class)) { + if (messageClass.equals(RBKMoneyGetChallengeRequest.class)) { return MessageType.RBKMONEY_GET_CHALLENGE_REQUEST; } - if (aClass.equals(RBKMoneyGetChallengeResponse.class)) { + if (messageClass.equals(RBKMoneyGetChallengeResponse.class)) { return MessageType.RBKMONEY_GET_CHALLENGE_RESPONSE; } diff --git a/src/main/resources/checkstyle/checkstyle-suppressions.xml b/src/main/resources/checkstyle/checkstyle-suppressions.xml new file mode 100644 index 0000000..9f75a9a --- /dev/null +++ b/src/main/resources/checkstyle/checkstyle-suppressions.xml @@ -0,0 +1,16 @@ + + + + + + + + + + diff --git a/src/test/java/com/rbkmoney/threeds/server/serialization/DeserializerTest.java b/src/test/java/com/rbkmoney/threeds/server/serialization/DeserializerTest.java index 5158f90..5fb87d9 100644 --- a/src/test/java/com/rbkmoney/threeds/server/serialization/DeserializerTest.java +++ b/src/test/java/com/rbkmoney/threeds/server/serialization/DeserializerTest.java @@ -46,7 +46,8 @@ public class DeserializerTest { ObjectMapper mapper = new ObjectMapper(); - Object value = mapper.readValue("{\"acctType\":\"" + actualValue + "\"}", Item.class).getAcctType().getValue().getValue(); + Object value = mapper.readValue("{\"acctType\":\"" + actualValue + "\"}", Item.class) + .getAcctType().getValue().getValue(); assertEquals(actualValue, value); } @@ -54,7 +55,8 @@ public class DeserializerTest { public void enumWrapperGarbageTest() throws IOException { ObjectMapper mapper = new ObjectMapper(); - Object value = mapper.readValue("{\"acctType\":\"" + ACTUAL_GARBAGE_VALUE + "\"}", Item.class).getAcctType().getGarbageValue(); + Object value = mapper.readValue("{\"acctType\":\"" + ACTUAL_GARBAGE_VALUE + "\"}", Item.class) + .getAcctType().getGarbageValue(); assertEquals(ACTUAL_GARBAGE_VALUE, value); }