Up libs (#38)

.github/settings.yml

@@ -0,0 +1,2 @@
+# These settings are synced to GitHub by https://probot.github.io/apps/settings/
+_extends: .github

.github/workflows/basic-linters.yml

@@ -0,0 +1,10 @@
+name: Vality basic linters
+
+on:
+  pull_request:
+    branches:
+      - "*"
+
+jobs:
+  lint:
+    uses: valitydev/base-workflows/.github/workflows/basic-linters.yml@v1

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: Maven Build Artifact
+name: Build Maven Artifact
 
 on:
   pull_request:
@@ -7,6 +7,4 @@ on:
 
 jobs:
   build:
-    uses: valitydev/java-workflow/.github/workflows/maven-service-build.yml@v1
+    uses: valitydev/java-workflow/.github/workflows/maven-service-build.yml@v2
-    with:
-      ignore-coverage: true

.github/workflows/deploy.yml

@@ -4,11 +4,10 @@ on:
   push:
     branches:
       - 'master'
-      - 'main'
 
 jobs:
-  deploy:
+  build-and-deploy:
-    uses: valitydev/java-workflow/.github/workflows/maven-service-deploy.yml@v1
+    uses: valitydev/java-workflow/.github/workflows/maven-service-deploy.yml@v2
     secrets:
       github-token: ${{ secrets.GITHUB_TOKEN }}
-      mm-webhook-url: ${{ secrets.MATTERMOST_WEBHOOK_URL }}
+      mm-webhook-url: ${{ secrets.MATTERMOST_WEBHOOK_URL }}

.github/workflows/settings.yml

@@ -0,0 +1,2 @@
+# These settings are synced to GitHub by https://probot.github.io/apps/settings/
+_extends: .github

pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>dev.vality</groupId>
         <artifactId>service-parent-pom</artifactId>
-        <version>1.0.18</version>
+        <version>2.0.4</version>
     </parent>
 
     <artifactId>fraudbusters-mg-connector</artifactId>
@@ -25,8 +25,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <machinegun-proto.version>1.21-e4784ab</machinegun-proto.version>
-        <fraudbusters-proto.version>1.109-fa34434</fraudbusters-proto.version>
+        <fraudbusters-proto.version>1.111-913e879</fraudbusters-proto.version>
-        <fistful-proto.version>1.143-711814e</fistful-proto.version>
+        <fistful-proto.version>1.177-88e69a5</fistful-proto.version>
     </properties>
 
     <dependencies>
@@ -34,18 +34,22 @@
         <dependency>
             <groupId>dev.vality.woody</groupId>
             <artifactId>woody-thrift</artifactId>
+            <version>2.0.8</version>
         </dependency>
         <dependency>
             <groupId>dev.vality</groupId>
             <artifactId>shared-resources</artifactId>
+            <version>2.1.0</version>
         </dependency>
         <dependency>
             <groupId>dev.vality.geck</groupId>
             <artifactId>serializer</artifactId>
+            <version>1.0.2</version>
         </dependency>
         <dependency>
             <groupId>dev.vality</groupId>
             <artifactId>damsel</artifactId>
+            <version>1.646-7762f6c</version>
         </dependency>
         <dependency>
             <groupId>dev.vality</groupId>
@@ -108,6 +112,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
+            <version>1.18.32</version>
         </dependency>
         <dependency>
             <groupId>org.apache.kafka</groupId>
@@ -206,6 +211,11 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+                <version>3.7.1</version>
+            </plugin>
         </plugins>
     </build>
 </project>

src/main/java/dev/vality/fraudbusters/mg/connector/converter/FistfulResourceToDomainResourceConverter.java

@@ -29,7 +29,7 @@ public class FistfulResourceToDomainResourceConverter
         } else if (fistfulResource.isSetCryptoWallet()) {
             CryptoWallet cryptoWallet = new CryptoWallet()
                     .setId(fistfulResource.getCryptoWallet().getCryptoWallet().getId())
-                    .setCurrency(fistfulResource.getCryptoWallet().getCryptoWallet().getCurrency().name());
+                    .setCurrency(fistfulResource.getCryptoWallet().getCryptoWallet().getCurrency().id);
             resource.setCryptoWallet(cryptoWallet);
         } else if (fistfulResource.isSetDigitalWallet()) {
             DigitalWallet digitalWallet = new DigitalWallet()

src/main/resources/application.yml

@@ -1,11 +1,11 @@
 server:
-  port: '@server.port@'
+  port: '${server.port}'
 
 management:
   security:
     flag: false
   server:
-    port: '@management.port@'
+    port: '${management.port}'
   metrics:
     export:
       statsd:
@@ -27,7 +27,7 @@ management:
 
 spring:
   application:
-    name: '@project.name@'
+    name: '${project.name}'
   output:
     ansi:
       enabled: always
@@ -45,7 +45,7 @@ spring:
         fixed.rate.timeout.ms: 60000
 
 info:
-  version: '@project.version@'
+  version: '${project.version}'
   stage: dev
 
 service:

src/test/java/dev/vality/fraudbusters/mg/connector/mapper/impl/WithdrawalBeanUtils.java

@@ -24,7 +24,7 @@ public class WithdrawalBeanUtils {
                         .setBin(InvoiceTestConstant.CARD_BIN)
                         .setCategory(InvoiceTestConstant.CARD_CATEGORY)
                         .setIssuerCountry(Residence.PAN)
-                        .setPaymentSystem(new PaymentSystemRef(LegacyBankCardPaymentSystem.mastercard.name()))
+                        .setPaymentSystem(new PaymentSystemRef("asd"))
                         .setToken(InvoiceTestConstant.CARD_TOKEN_PROVIDER)
                         .setMaskedPan(InvoiceTestConstant.CARD_MASKED_PAN)
                         .setCardType(CardType.debit)

src/test/java/dev/vality/fraudbusters/mg/connector/utils/BuildUtils.java

@@ -30,8 +30,7 @@ public class BuildUtils {
                 .setBin(InvoiceTestConstant.CARD_BIN)
                 .setCategory(InvoiceTestConstant.CARD_CATEGORY)
                 .setIssuerCountry(Residence.PAN)
-                .setPaymentSystem(new dev.vality.fistful.base.PaymentSystemRef(
+                .setPaymentSystem(new dev.vality.fistful.base.PaymentSystemRef("mastercard"))
-                        dev.vality.fistful.base.LegacyBankCardPaymentSystem.mastercard.name()))
                 .setToken(InvoiceTestConstant.CARD_TOKEN_PROVIDER)
                 .setMaskedPan(InvoiceTestConstant.CARD_MASKED_PAN)
                 .setCardType(CardType.debit)
@@ -41,7 +40,7 @@ public class BuildUtils {
     public static dev.vality.fistful.base.CryptoWallet buildFistfulCryptoWallet() {
         dev.vality.fistful.base.CryptoWallet cryptoWallet = new dev.vality.fistful.base.CryptoWallet();
         cryptoWallet.setId("id");
-        cryptoWallet.setCurrency(dev.vality.fistful.base.CryptoCurrency.bitcoin);
+        cryptoWallet.setCurrency(new dev.vality.fistful.base.CryptoCurrencyRef("bitcoin"));
         return cryptoWallet;
     }
 
@@ -342,9 +341,10 @@ public class BuildUtils {
             String paymentId,
             InvoicePaymentStatus paymentStatus,
             MockTBaseProcessor thriftBaseProcessor) throws IOException {
-        return thriftBaseProcessor.process(
+        dev.vality.damsel.domain.InvoicePayment process = thriftBaseProcessor.process(
                 new dev.vality.damsel.domain.InvoicePayment(),
-                new TBaseHandler<>(dev.vality.damsel.domain.InvoicePayment.class))
+                new TBaseHandler<>(dev.vality.damsel.domain.InvoicePayment.class));
+        return process
                 .setCreatedAt("2016-03-22T06:12:27Z")
                 .setId(paymentId)
                 .setOwnerId(partyId)