mirror of
https://github.com/valitydev/adapter-bank-payout-spring-boot-starter.git
synced 2024-11-06 00:45:21 +00:00
Let's make it opensource (#24)
This commit is contained in:
parent
39195dae69
commit
30a46aa1af
176
LICENSE
Normal file
176
LICENSE
Normal file
@ -0,0 +1,176 @@
|
|||||||
|
Apache License
|
||||||
|
Version 2.0, January 2004
|
||||||
|
http://www.apache.org/licenses/
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||||
|
|
||||||
|
1. Definitions.
|
||||||
|
|
||||||
|
"License" shall mean the terms and conditions for use, reproduction,
|
||||||
|
and distribution as defined by Sections 1 through 9 of this document.
|
||||||
|
|
||||||
|
"Licensor" shall mean the copyright owner or entity authorized by
|
||||||
|
the copyright owner that is granting the License.
|
||||||
|
|
||||||
|
"Legal Entity" shall mean the union of the acting entity and all
|
||||||
|
other entities that control, are controlled by, or are under common
|
||||||
|
control with that entity. For the purposes of this definition,
|
||||||
|
"control" means (i) the power, direct or indirect, to cause the
|
||||||
|
direction or management of such entity, whether by contract or
|
||||||
|
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||||
|
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||||
|
|
||||||
|
"You" (or "Your") shall mean an individual or Legal Entity
|
||||||
|
exercising permissions granted by this License.
|
||||||
|
|
||||||
|
"Source" form shall mean the preferred form for making modifications,
|
||||||
|
including but not limited to software source code, documentation
|
||||||
|
source, and configuration files.
|
||||||
|
|
||||||
|
"Object" form shall mean any form resulting from mechanical
|
||||||
|
transformation or translation of a Source form, including but
|
||||||
|
not limited to compiled object code, generated documentation,
|
||||||
|
and conversions to other media types.
|
||||||
|
|
||||||
|
"Work" shall mean the work of authorship, whether in Source or
|
||||||
|
Object form, made available under the License, as indicated by a
|
||||||
|
copyright notice that is included in or attached to the work
|
||||||
|
(an example is provided in the Appendix below).
|
||||||
|
|
||||||
|
"Derivative Works" shall mean any work, whether in Source or Object
|
||||||
|
form, that is based on (or derived from) the Work and for which the
|
||||||
|
editorial revisions, annotations, elaborations, or other modifications
|
||||||
|
represent, as a whole, an original work of authorship. For the purposes
|
||||||
|
of this License, Derivative Works shall not include works that remain
|
||||||
|
separable from, or merely link (or bind by name) to the interfaces of,
|
||||||
|
the Work and Derivative Works thereof.
|
||||||
|
|
||||||
|
"Contribution" shall mean any work of authorship, including
|
||||||
|
the original version of the Work and any modifications or additions
|
||||||
|
to that Work or Derivative Works thereof, that is intentionally
|
||||||
|
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||||
|
or by an individual or Legal Entity authorized to submit on behalf of
|
||||||
|
the copyright owner. For the purposes of this definition, "submitted"
|
||||||
|
means any form of electronic, verbal, or written communication sent
|
||||||
|
to the Licensor or its representatives, including but not limited to
|
||||||
|
communication on electronic mailing lists, source code control systems,
|
||||||
|
and issue tracking systems that are managed by, or on behalf of, the
|
||||||
|
Licensor for the purpose of discussing and improving the Work, but
|
||||||
|
excluding communication that is conspicuously marked or otherwise
|
||||||
|
designated in writing by the copyright owner as "Not a Contribution."
|
||||||
|
|
||||||
|
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||||
|
on behalf of whom a Contribution has been received by Licensor and
|
||||||
|
subsequently incorporated within the Work.
|
||||||
|
|
||||||
|
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||||
|
this License, each Contributor hereby grants to You a perpetual,
|
||||||
|
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||||
|
copyright license to reproduce, prepare Derivative Works of,
|
||||||
|
publicly display, publicly perform, sublicense, and distribute the
|
||||||
|
Work and such Derivative Works in Source or Object form.
|
||||||
|
|
||||||
|
3. Grant of Patent License. Subject to the terms and conditions of
|
||||||
|
this License, each Contributor hereby grants to You a perpetual,
|
||||||
|
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||||
|
(except as stated in this section) patent license to make, have made,
|
||||||
|
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||||
|
where such license applies only to those patent claims licensable
|
||||||
|
by such Contributor that are necessarily infringed by their
|
||||||
|
Contribution(s) alone or by combination of their Contribution(s)
|
||||||
|
with the Work to which such Contribution(s) was submitted. If You
|
||||||
|
institute patent litigation against any entity (including a
|
||||||
|
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||||
|
or a Contribution incorporated within the Work constitutes direct
|
||||||
|
or contributory patent infringement, then any patent licenses
|
||||||
|
granted to You under this License for that Work shall terminate
|
||||||
|
as of the date such litigation is filed.
|
||||||
|
|
||||||
|
4. Redistribution. You may reproduce and distribute copies of the
|
||||||
|
Work or Derivative Works thereof in any medium, with or without
|
||||||
|
modifications, and in Source or Object form, provided that You
|
||||||
|
meet the following conditions:
|
||||||
|
|
||||||
|
(a) You must give any other recipients of the Work or
|
||||||
|
Derivative Works a copy of this License; and
|
||||||
|
|
||||||
|
(b) You must cause any modified files to carry prominent notices
|
||||||
|
stating that You changed the files; and
|
||||||
|
|
||||||
|
(c) You must retain, in the Source form of any Derivative Works
|
||||||
|
that You distribute, all copyright, patent, trademark, and
|
||||||
|
attribution notices from the Source form of the Work,
|
||||||
|
excluding those notices that do not pertain to any part of
|
||||||
|
the Derivative Works; and
|
||||||
|
|
||||||
|
(d) If the Work includes a "NOTICE" text file as part of its
|
||||||
|
distribution, then any Derivative Works that You distribute must
|
||||||
|
include a readable copy of the attribution notices contained
|
||||||
|
within such NOTICE file, excluding those notices that do not
|
||||||
|
pertain to any part of the Derivative Works, in at least one
|
||||||
|
of the following places: within a NOTICE text file distributed
|
||||||
|
as part of the Derivative Works; within the Source form or
|
||||||
|
documentation, if provided along with the Derivative Works; or,
|
||||||
|
within a display generated by the Derivative Works, if and
|
||||||
|
wherever such third-party notices normally appear. The contents
|
||||||
|
of the NOTICE file are for informational purposes only and
|
||||||
|
do not modify the License. You may add Your own attribution
|
||||||
|
notices within Derivative Works that You distribute, alongside
|
||||||
|
or as an addendum to the NOTICE text from the Work, provided
|
||||||
|
that such additional attribution notices cannot be construed
|
||||||
|
as modifying the License.
|
||||||
|
|
||||||
|
You may add Your own copyright statement to Your modifications and
|
||||||
|
may provide additional or different license terms and conditions
|
||||||
|
for use, reproduction, or distribution of Your modifications, or
|
||||||
|
for any such Derivative Works as a whole, provided Your use,
|
||||||
|
reproduction, and distribution of the Work otherwise complies with
|
||||||
|
the conditions stated in this License.
|
||||||
|
|
||||||
|
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||||
|
any Contribution intentionally submitted for inclusion in the Work
|
||||||
|
by You to the Licensor shall be under the terms and conditions of
|
||||||
|
this License, without any additional terms or conditions.
|
||||||
|
Notwithstanding the above, nothing herein shall supersede or modify
|
||||||
|
the terms of any separate license agreement you may have executed
|
||||||
|
with Licensor regarding such Contributions.
|
||||||
|
|
||||||
|
6. Trademarks. This License does not grant permission to use the trade
|
||||||
|
names, trademarks, service marks, or product names of the Licensor,
|
||||||
|
except as required for reasonable and customary use in describing the
|
||||||
|
origin of the Work and reproducing the content of the NOTICE file.
|
||||||
|
|
||||||
|
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||||
|
agreed to in writing, Licensor provides the Work (and each
|
||||||
|
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||||
|
implied, including, without limitation, any warranties or conditions
|
||||||
|
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||||
|
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||||
|
appropriateness of using or redistributing the Work and assume any
|
||||||
|
risks associated with Your exercise of permissions under this License.
|
||||||
|
|
||||||
|
8. Limitation of Liability. In no event and under no legal theory,
|
||||||
|
whether in tort (including negligence), contract, or otherwise,
|
||||||
|
unless required by applicable law (such as deliberate and grossly
|
||||||
|
negligent acts) or agreed to in writing, shall any Contributor be
|
||||||
|
liable to You for damages, including any direct, indirect, special,
|
||||||
|
incidental, or consequential damages of any character arising as a
|
||||||
|
result of this License or out of the use or inability to use the
|
||||||
|
Work (including but not limited to damages for loss of goodwill,
|
||||||
|
work stoppage, computer failure or malfunction, or any and all
|
||||||
|
other commercial damages or losses), even if such Contributor
|
||||||
|
has been advised of the possibility of such damages.
|
||||||
|
|
||||||
|
9. Accepting Warranty or Additional Liability. While redistributing
|
||||||
|
the Work or Derivative Works thereof, You may choose to offer,
|
||||||
|
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||||
|
or other liability obligations and/or rights consistent with this
|
||||||
|
License. However, in accepting such obligations, You may act only
|
||||||
|
on Your own behalf and on Your sole responsibility, not on behalf
|
||||||
|
of any other Contributor, and only if You agree to indemnify,
|
||||||
|
defend, and hold each Contributor harmless for any liability
|
||||||
|
incurred by, or claims asserted against, such Contributor by reason
|
||||||
|
of your accepting any such warranty or additional liability.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
29
pom.xml
29
pom.xml
@ -5,17 +5,38 @@
|
|||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>com.rbkmoney</groupId>
|
<groupId>com.rbkmoney</groupId>
|
||||||
<artifactId>parent</artifactId>
|
<artifactId>library-parent-pom</artifactId>
|
||||||
<version>1.0.5</version>
|
<version>1.0.1</version>
|
||||||
<relativePath/>
|
<relativePath/>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>adapter-bank-payout-spring-boot-starter</artifactId>
|
<artifactId>adapter-bank-payout-spring-boot-starter</artifactId>
|
||||||
<version>1.0.10</version>
|
<version>1.0.11</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>Adapter-bank-payout-spring-boot-starter</name>
|
<name>Adapter-bank-payout-spring-boot-starter</name>
|
||||||
<description>Spring boot starter for payout adapters</description>
|
<description>Spring boot starter for payout adapters</description>
|
||||||
|
<url>https://github.com/rbkmoney/adapter-bank-payout-spring-boot-starter</url>
|
||||||
|
|
||||||
|
<licenses>
|
||||||
|
<license>
|
||||||
|
<name>The Apache Software License, Version 2.0</name>
|
||||||
|
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
|
||||||
|
</license>
|
||||||
|
</licenses>
|
||||||
|
|
||||||
|
<developers>
|
||||||
|
<developer>
|
||||||
|
<organization>RBK.money</organization>
|
||||||
|
<organizationUrl>https://rbk.money</organizationUrl>
|
||||||
|
</developer>
|
||||||
|
</developers>
|
||||||
|
|
||||||
|
<scm>
|
||||||
|
<connection>scm:git:git://github.com/rbkmoney/adapter-bank-payout-spring-boot-starter.git</connection>
|
||||||
|
<developerConnection>scm:git:ssh://github.com/rbkmoney/adapter-bank-payout-spring-boot-starter.git</developerConnection>
|
||||||
|
<url>https://github.com/rbkmoney/adapter-bank-payout-spring-boot-starter/tree/master</url>
|
||||||
|
</scm>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
@ -28,7 +49,7 @@
|
|||||||
<damsel.version>1.439-b18f037</damsel.version>
|
<damsel.version>1.439-b18f037</damsel.version>
|
||||||
<cds-proto.version>1.62-07f2b0f</cds-proto.version>
|
<cds-proto.version>1.62-07f2b0f</cds-proto.version>
|
||||||
|
|
||||||
<spring-boot.version>2.3.2.RELEASE</spring-boot.version>
|
<spring-boot.version>2.3.8.RELEASE</spring-boot.version>
|
||||||
<woody.version>[1.1.21,)</woody.version>
|
<woody.version>[1.1.21,)</woody.version>
|
||||||
<geck.version>[0.6.11,)</geck.version>
|
<geck.version>[0.6.11,)</geck.version>
|
||||||
<lombok.version>1.18.4</lombok.version>
|
<lombok.version>1.18.4</lombok.version>
|
||||||
|
@ -1,13 +1,12 @@
|
|||||||
package com.rbkmoney.adapter.bank.payout.spring.boot.starter.config.properties;
|
package com.rbkmoney.adapter.bank.payout.spring.boot.starter.config.properties;
|
||||||
|
|
||||||
|
import javax.validation.constraints.NotEmpty;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import lombok.Setter;
|
import lombok.Setter;
|
||||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
import org.springframework.validation.annotation.Validated;
|
import org.springframework.validation.annotation.Validated;
|
||||||
|
|
||||||
import javax.validation.constraints.NotEmpty;
|
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
@Setter
|
@Setter
|
||||||
@Configuration
|
@Configuration
|
||||||
|
@ -2,13 +2,12 @@ package com.rbkmoney.adapter.bank.payout.spring.boot.starter.config.properties;
|
|||||||
|
|
||||||
import com.rbkmoney.adapter.common.mapper.SimpleErrorMapping;
|
import com.rbkmoney.adapter.common.mapper.SimpleErrorMapping;
|
||||||
import com.rbkmoney.error.mapping.ErrorMapping;
|
import com.rbkmoney.error.mapping.ErrorMapping;
|
||||||
|
import java.io.IOException;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
import org.springframework.core.io.Resource;
|
import org.springframework.core.io.Resource;
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
|
|
||||||
@Configuration
|
@Configuration
|
||||||
public class ErrorMappingProperties {
|
public class ErrorMappingProperties {
|
||||||
|
@ -1,13 +1,12 @@
|
|||||||
package com.rbkmoney.adapter.bank.payout.spring.boot.starter.config.properties;
|
package com.rbkmoney.adapter.bank.payout.spring.boot.starter.config.properties;
|
||||||
|
|
||||||
|
import javax.validation.constraints.NotNull;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import lombok.Setter;
|
import lombok.Setter;
|
||||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
import org.springframework.validation.annotation.Validated;
|
import org.springframework.validation.annotation.Validated;
|
||||||
|
|
||||||
import javax.validation.constraints.NotNull;
|
|
||||||
|
|
||||||
@Configuration
|
@Configuration
|
||||||
@ConfigurationProperties("time.config")
|
@ConfigurationProperties("time.config")
|
||||||
@Validated
|
@Validated
|
||||||
|
@ -3,7 +3,6 @@ package com.rbkmoney.adapter.bank.payout.spring.boot.starter.converter;
|
|||||||
import com.rbkmoney.adapter.bank.payout.spring.boot.starter.model.EntryStateModel;
|
import com.rbkmoney.adapter.bank.payout.spring.boot.starter.model.EntryStateModel;
|
||||||
import com.rbkmoney.damsel.msgpack.Value;
|
import com.rbkmoney.damsel.msgpack.Value;
|
||||||
import com.rbkmoney.damsel.withdrawals.provider_adapter.Withdrawal;
|
import com.rbkmoney.damsel.withdrawals.provider_adapter.Withdrawal;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
public interface WithdrawalToEntryStateConverter<T extends EntryStateModel> {
|
public interface WithdrawalToEntryStateConverter<T extends EntryStateModel> {
|
||||||
|
@ -3,13 +3,13 @@ package com.rbkmoney.adapter.bank.payout.spring.boot.starter.handler;
|
|||||||
import com.rbkmoney.adapter.bank.payout.spring.boot.starter.model.EntryStateModel;
|
import com.rbkmoney.adapter.bank.payout.spring.boot.starter.model.EntryStateModel;
|
||||||
import com.rbkmoney.adapter.bank.payout.spring.boot.starter.model.ExitStateModel;
|
import com.rbkmoney.adapter.bank.payout.spring.boot.starter.model.ExitStateModel;
|
||||||
import com.rbkmoney.adapter.bank.payout.spring.boot.starter.processor.Processor;
|
import com.rbkmoney.adapter.bank.payout.spring.boot.starter.processor.Processor;
|
||||||
|
import java.util.function.Function;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.core.convert.converter.Converter;
|
import org.springframework.core.convert.converter.Converter;
|
||||||
|
|
||||||
import java.util.function.Function;
|
|
||||||
|
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
public abstract class CommonHandlerImpl<P, R, T extends EntryStateModel, X extends ExitStateModel> implements CommonHandler<T, X> {
|
public abstract class CommonHandlerImpl<P, R, T extends EntryStateModel, X extends ExitStateModel>
|
||||||
|
implements CommonHandler<T, X> {
|
||||||
|
|
||||||
private final Function<P, R> requestFunction;
|
private final Function<P, R> requestFunction;
|
||||||
private final Converter<T, P> converter;
|
private final Converter<T, P> converter;
|
||||||
|
@ -2,7 +2,6 @@ package com.rbkmoney.adapter.bank.payout.spring.boot.starter.handler;
|
|||||||
|
|
||||||
import com.rbkmoney.damsel.withdrawals.provider_adapter.GetQuoteParams;
|
import com.rbkmoney.damsel.withdrawals.provider_adapter.GetQuoteParams;
|
||||||
import com.rbkmoney.damsel.withdrawals.provider_adapter.Quote;
|
import com.rbkmoney.damsel.withdrawals.provider_adapter.Quote;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
public interface GetQuoteHandler {
|
public interface GetQuoteHandler {
|
||||||
|
@ -4,7 +4,6 @@ import com.rbkmoney.damsel.msgpack.Value;
|
|||||||
import com.rbkmoney.damsel.withdrawals.provider_adapter.Callback;
|
import com.rbkmoney.damsel.withdrawals.provider_adapter.Callback;
|
||||||
import com.rbkmoney.damsel.withdrawals.provider_adapter.CallbackResult;
|
import com.rbkmoney.damsel.withdrawals.provider_adapter.CallbackResult;
|
||||||
import com.rbkmoney.damsel.withdrawals.provider_adapter.Withdrawal;
|
import com.rbkmoney.damsel.withdrawals.provider_adapter.Withdrawal;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
public interface HandleCallbackHandler {
|
public interface HandleCallbackHandler {
|
||||||
|
@ -1,10 +1,9 @@
|
|||||||
package com.rbkmoney.adapter.bank.payout.spring.boot.starter.model;
|
package com.rbkmoney.adapter.bank.payout.spring.boot.starter.model;
|
||||||
|
|
||||||
|
import java.util.Map;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.ToString;
|
import lombok.ToString;
|
||||||
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
public class EntryStateModel {
|
public class EntryStateModel {
|
||||||
private String withdrawalId;
|
private String withdrawalId;
|
||||||
|
@ -1,12 +1,11 @@
|
|||||||
package com.rbkmoney.adapter.bank.payout.spring.boot.starter.model;
|
package com.rbkmoney.adapter.bank.payout.spring.boot.starter.model;
|
||||||
|
|
||||||
|
import java.util.Map;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Builder;
|
import lombok.Builder;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@Builder
|
@Builder
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
|
@ -3,7 +3,6 @@ package com.rbkmoney.adapter.bank.payout.spring.boot.starter.service;
|
|||||||
import com.rbkmoney.adapter.bank.payout.spring.boot.starter.model.EntryStateModel;
|
import com.rbkmoney.adapter.bank.payout.spring.boot.starter.model.EntryStateModel;
|
||||||
import com.rbkmoney.adapter.bank.payout.spring.boot.starter.model.ExitStateModel;
|
import com.rbkmoney.adapter.bank.payout.spring.boot.starter.model.ExitStateModel;
|
||||||
import com.rbkmoney.damsel.withdrawals.provider_adapter.Intent;
|
import com.rbkmoney.damsel.withdrawals.provider_adapter.Intent;
|
||||||
|
|
||||||
import java.time.Instant;
|
import java.time.Instant;
|
||||||
|
|
||||||
public interface IntentService {
|
public interface IntentService {
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
package com.rbkmoney.adapter.bank.payout.spring.boot.starter.service;
|
package com.rbkmoney.adapter.bank.payout.spring.boot.starter.service;
|
||||||
|
|
||||||
|
import static com.rbkmoney.java.damsel.utils.extractors.OptionsExtractors.extractMaxTimePolling;
|
||||||
|
|
||||||
import com.rbkmoney.adapter.bank.payout.spring.boot.starter.config.properties.TimerProperties;
|
import com.rbkmoney.adapter.bank.payout.spring.boot.starter.config.properties.TimerProperties;
|
||||||
import com.rbkmoney.adapter.bank.payout.spring.boot.starter.model.EntryStateModel;
|
import com.rbkmoney.adapter.bank.payout.spring.boot.starter.model.EntryStateModel;
|
||||||
import com.rbkmoney.adapter.bank.payout.spring.boot.starter.model.ExitStateModel;
|
import com.rbkmoney.adapter.bank.payout.spring.boot.starter.model.ExitStateModel;
|
||||||
@ -12,12 +14,9 @@ import com.rbkmoney.damsel.withdrawals.provider_adapter.Intent;
|
|||||||
import com.rbkmoney.damsel.withdrawals.provider_adapter.Success;
|
import com.rbkmoney.damsel.withdrawals.provider_adapter.Success;
|
||||||
import com.rbkmoney.error.mapping.ErrorMapping;
|
import com.rbkmoney.error.mapping.ErrorMapping;
|
||||||
import com.rbkmoney.java.damsel.utils.creators.WithdrawalsProviderAdapterPackageCreators;
|
import com.rbkmoney.java.damsel.utils.creators.WithdrawalsProviderAdapterPackageCreators;
|
||||||
import lombok.RequiredArgsConstructor;
|
|
||||||
|
|
||||||
import java.time.Instant;
|
import java.time.Instant;
|
||||||
import java.time.temporal.ChronoUnit;
|
import java.time.temporal.ChronoUnit;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
import static com.rbkmoney.java.damsel.utils.extractors.OptionsExtractors.extractMaxTimePolling;
|
|
||||||
|
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
public class IntentServiceImpl implements IntentService {
|
public class IntentServiceImpl implements IntentService {
|
||||||
@ -26,15 +25,18 @@ public class IntentServiceImpl implements IntentService {
|
|||||||
private final TimerProperties timerProperties;
|
private final TimerProperties timerProperties;
|
||||||
|
|
||||||
public Intent getFailureByCode(ExitStateModel exitStateModel) {
|
public Intent getFailureByCode(ExitStateModel exitStateModel) {
|
||||||
return Intent.finish(new FinishIntent(FinishStatus.failure(errorMapping.mapFailure(exitStateModel.getErrorCode()))));
|
return Intent
|
||||||
|
.finish(new FinishIntent(FinishStatus.failure(errorMapping.mapFailure(exitStateModel.getErrorCode()))));
|
||||||
}
|
}
|
||||||
|
|
||||||
public Intent getFailureByCodeAndDesc(ExitStateModel exitStateModel) {
|
public Intent getFailureByCodeAndDesc(ExitStateModel exitStateModel) {
|
||||||
return Intent.finish(new FinishIntent(FinishStatus.failure(errorMapping.mapFailure(exitStateModel.getErrorCode(), exitStateModel.getErrorMessage()))));
|
return Intent.finish(new FinishIntent(FinishStatus
|
||||||
|
.failure(errorMapping.mapFailure(exitStateModel.getErrorCode(), exitStateModel.getErrorMessage()))));
|
||||||
}
|
}
|
||||||
|
|
||||||
public Intent getSuccess(ExitStateModel exitStateModel) {
|
public Intent getSuccess(ExitStateModel exitStateModel) {
|
||||||
com.rbkmoney.adapter.bank.payout.spring.boot.starter.model.TransactionInfo trxInfo = exitStateModel.getNextState().getTrxInfo();
|
com.rbkmoney.adapter.bank.payout.spring.boot.starter.model.TransactionInfo trxInfo =
|
||||||
|
exitStateModel.getNextState().getTrxInfo();
|
||||||
return Intent.finish(new FinishIntent(FinishStatus.success(new Success(new TransactionInfo()
|
return Intent.finish(new FinishIntent(FinishStatus.success(new Success(new TransactionInfo()
|
||||||
.setId(trxInfo.getTrxId())
|
.setId(trxInfo.getTrxId())
|
||||||
.setExtra(trxInfo.getTrxExtra())))));
|
.setExtra(trxInfo.getTrxExtra())))));
|
||||||
|
@ -11,14 +11,20 @@ import com.rbkmoney.adapter.bank.payout.spring.boot.starter.model.ExitStateModel
|
|||||||
import com.rbkmoney.adapter.bank.payout.spring.boot.starter.validator.WithdrawalValidator;
|
import com.rbkmoney.adapter.bank.payout.spring.boot.starter.validator.WithdrawalValidator;
|
||||||
import com.rbkmoney.adapter.common.exception.UnsupportedMethodException;
|
import com.rbkmoney.adapter.common.exception.UnsupportedMethodException;
|
||||||
import com.rbkmoney.damsel.msgpack.Value;
|
import com.rbkmoney.damsel.msgpack.Value;
|
||||||
import com.rbkmoney.damsel.withdrawals.provider_adapter.*;
|
import com.rbkmoney.damsel.withdrawals.provider_adapter.AdapterSrv;
|
||||||
|
import com.rbkmoney.damsel.withdrawals.provider_adapter.Callback;
|
||||||
|
import com.rbkmoney.damsel.withdrawals.provider_adapter.CallbackResult;
|
||||||
|
import com.rbkmoney.damsel.withdrawals.provider_adapter.GetQuoteFailure;
|
||||||
|
import com.rbkmoney.damsel.withdrawals.provider_adapter.GetQuoteParams;
|
||||||
|
import com.rbkmoney.damsel.withdrawals.provider_adapter.ProcessResult;
|
||||||
|
import com.rbkmoney.damsel.withdrawals.provider_adapter.Quote;
|
||||||
|
import com.rbkmoney.damsel.withdrawals.provider_adapter.Withdrawal;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.thrift.TException;
|
import org.apache.thrift.TException;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
public class PayoutAdapterService<T extends EntryStateModel, X extends ExitStateModel> implements AdapterSrv.Iface {
|
public class PayoutAdapterService<T extends EntryStateModel, X extends ExitStateModel> implements AdapterSrv.Iface {
|
||||||
@ -32,7 +38,8 @@ public class PayoutAdapterService<T extends EntryStateModel, X extends ExitState
|
|||||||
private final HandleCallbackHandler handleCallbackHandler;
|
private final HandleCallbackHandler handleCallbackHandler;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ProcessResult processWithdrawal(Withdrawal withdrawal, Value state, Map<String, String> options) throws TException {
|
public ProcessResult processWithdrawal(Withdrawal withdrawal, Value state, Map<String, String> options)
|
||||||
|
throws TException {
|
||||||
validator.validate(withdrawal, state, options);
|
validator.validate(withdrawal, state, options);
|
||||||
T entryStateModel = withdrawalToEntryStateConverter.convert(withdrawal, state, options);
|
T entryStateModel = withdrawalToEntryStateConverter.convert(withdrawal, state, options);
|
||||||
log.info("EntryStateModel: {}", entryStateModel);
|
log.info("EntryStateModel: {}", entryStateModel);
|
||||||
@ -44,7 +51,8 @@ public class PayoutAdapterService<T extends EntryStateModel, X extends ExitState
|
|||||||
.handle(entryStateModel);
|
.handle(entryStateModel);
|
||||||
log.info("ExitStateModel: {}", exitStateModel);
|
log.info("ExitStateModel: {}", exitStateModel);
|
||||||
exitStateModel.getNextState().setStep(resolver.resolveExit(exitStateModel));
|
exitStateModel.getNextState().setStep(resolver.resolveExit(exitStateModel));
|
||||||
log.info("Step changing: {} -> {}", entryStateModel.getState().getStep(), exitStateModel.getNextState().getStep());
|
log.info("Step changing: {} -> {}", entryStateModel.getState().getStep(),
|
||||||
|
exitStateModel.getNextState().getStep());
|
||||||
return exitStateToProcessResultConverter.convert(exitStateModel);
|
return exitStateToProcessResultConverter.convert(exitStateModel);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -54,7 +62,8 @@ public class PayoutAdapterService<T extends EntryStateModel, X extends ExitState
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public CallbackResult handleCallback(Callback callback, Withdrawal withdrawal, Value value, Map<String, String> map) throws TException {
|
public CallbackResult handleCallback(Callback callback, Withdrawal withdrawal, Value value, Map<String, String> map)
|
||||||
|
throws TException {
|
||||||
return handleCallbackHandler.handleCallback(callback, withdrawal, value, map);
|
return handleCallbackHandler.handleCallback(callback, withdrawal, value, map);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,15 +1,21 @@
|
|||||||
package com.rbkmoney.adapter.bank.payout.spring.boot.starter.service;
|
package com.rbkmoney.adapter.bank.payout.spring.boot.starter.service;
|
||||||
|
|
||||||
|
import static com.rbkmoney.java.damsel.utils.verification.ProxyProviderVerification.isUndefinedResultOrUnavailable;
|
||||||
|
|
||||||
import com.rbkmoney.damsel.msgpack.Value;
|
import com.rbkmoney.damsel.msgpack.Value;
|
||||||
import com.rbkmoney.damsel.withdrawals.provider_adapter.*;
|
import com.rbkmoney.damsel.withdrawals.provider_adapter.AdapterSrv;
|
||||||
|
import com.rbkmoney.damsel.withdrawals.provider_adapter.Callback;
|
||||||
|
import com.rbkmoney.damsel.withdrawals.provider_adapter.CallbackResult;
|
||||||
|
import com.rbkmoney.damsel.withdrawals.provider_adapter.GetQuoteFailure;
|
||||||
|
import com.rbkmoney.damsel.withdrawals.provider_adapter.GetQuoteParams;
|
||||||
|
import com.rbkmoney.damsel.withdrawals.provider_adapter.ProcessResult;
|
||||||
|
import com.rbkmoney.damsel.withdrawals.provider_adapter.Quote;
|
||||||
|
import com.rbkmoney.damsel.withdrawals.provider_adapter.Withdrawal;
|
||||||
|
import java.util.Map;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.thrift.TException;
|
import org.apache.thrift.TException;
|
||||||
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
import static com.rbkmoney.java.damsel.utils.verification.ProxyProviderVerification.isUndefinedResultOrUnavailable;
|
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
public class PayoutAdapterServiceLogDecorator implements AdapterSrv.Iface {
|
public class PayoutAdapterServiceLogDecorator implements AdapterSrv.Iface {
|
||||||
@ -17,7 +23,8 @@ public class PayoutAdapterServiceLogDecorator implements AdapterSrv.Iface {
|
|||||||
private final AdapterSrv.Iface payoutAdapterService;
|
private final AdapterSrv.Iface payoutAdapterService;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ProcessResult processWithdrawal(Withdrawal withdrawal, Value state, Map<String, String> options) throws TException {
|
public ProcessResult processWithdrawal(Withdrawal withdrawal, Value state, Map<String, String> options)
|
||||||
|
throws TException {
|
||||||
String withdrawalId = withdrawal.getId();
|
String withdrawalId = withdrawal.getId();
|
||||||
log.info("processWithdrawal: start with withdrawalId {}", withdrawalId);
|
log.info("processWithdrawal: start with withdrawalId {}", withdrawalId);
|
||||||
try {
|
try {
|
||||||
@ -47,7 +54,8 @@ public class PayoutAdapterServiceLogDecorator implements AdapterSrv.Iface {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public CallbackResult handleCallback(Callback callback, Withdrawal withdrawal, Value value, Map<String, String> map) throws TException {
|
public CallbackResult handleCallback(Callback callback, Withdrawal withdrawal, Value value, Map<String, String> map)
|
||||||
|
throws TException {
|
||||||
String withdrawalId = withdrawal.getId();
|
String withdrawalId = withdrawal.getId();
|
||||||
log.info("handleCallback: start with withdrawalId {}", withdrawalId);
|
log.info("handleCallback: start with withdrawalId {}", withdrawalId);
|
||||||
try {
|
try {
|
||||||
|
@ -4,12 +4,11 @@ import com.fasterxml.jackson.databind.ObjectMapper;
|
|||||||
import com.rbkmoney.adapter.bank.payout.spring.boot.starter.model.AdapterState;
|
import com.rbkmoney.adapter.bank.payout.spring.boot.starter.model.AdapterState;
|
||||||
import com.rbkmoney.adapter.common.state.deserializer.DeserializationException;
|
import com.rbkmoney.adapter.common.state.deserializer.DeserializationException;
|
||||||
import com.rbkmoney.adapter.common.state.deserializer.Deserializer;
|
import com.rbkmoney.adapter.common.state.deserializer.Deserializer;
|
||||||
|
import java.io.IOException;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import lombok.Setter;
|
import lombok.Setter;
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
@Setter
|
@Setter
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
|
@ -3,7 +3,6 @@ package com.rbkmoney.adapter.bank.payout.spring.boot.starter.validator;
|
|||||||
import com.rbkmoney.adapter.bank.payout.spring.boot.starter.exception.ValidationException;
|
import com.rbkmoney.adapter.bank.payout.spring.boot.starter.exception.ValidationException;
|
||||||
import com.rbkmoney.damsel.msgpack.Value;
|
import com.rbkmoney.damsel.msgpack.Value;
|
||||||
import com.rbkmoney.damsel.withdrawals.provider_adapter.Withdrawal;
|
import com.rbkmoney.damsel.withdrawals.provider_adapter.Withdrawal;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
public interface WithdrawalValidator {
|
public interface WithdrawalValidator {
|
||||||
|
Loading…
Reference in New Issue
Block a user