Up 3 1 7

.github/workflows/build.yml

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

.github/workflows/deploy.yml

@@ -4,12 +4,13 @@
   push:
     branches:
       - 'master'
-      - 'main'
-      - 'epic/**'
+      - 'ft/up-woody'
 
 jobs:
   build-and-deploy:
-    uses: valitydev/java-workflow/.github/workflows/maven-service-deploy.yml@v2
+    uses: valitydev/java-workflow/.github/workflows/maven-service-deploy.yml@v3
+    with:
+      ignore-coverage: true
     secrets:
       github-token: ${{ secrets.GITHUB_TOKEN }}
       mm-webhook-url: ${{ secrets.MATTERMOST_WEBHOOK_URL }}

pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>dev.vality</groupId>
         <artifactId>service-parent-pom</artifactId>
-        <version>2.1.5</version>
+        <version>3.1.7</version>
     </parent>
 
     <artifactId>proxy-mocketbank</artifactId>
@@ -24,7 +24,6 @@
         <server.rest.endpoint>mocketbank</server.rest.endpoint>
         <exposed.ports>${server.port} ${server.rest.port} ${management.port}</exposed.ports>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <cds-proto.version>1.64-74a763b</cds-proto.version>
         <scrooge.proto.version>1.16-b0d5cf2</scrooge.proto.version>
     </properties>
 
@@ -80,17 +79,25 @@
             <artifactId>commons-text</artifactId>
             <version>1.10.0</version>
         </dependency>
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.github.javafaker</groupId>
+            <artifactId>javafaker</artifactId>
+            <version>1.0.2</version>
+        </dependency>
 
         <!-- vality -->
         <dependency>
             <groupId>dev.vality</groupId>
             <artifactId>damsel</artifactId>
-            <version>1.597-bfedcb9</version>
         </dependency>
         <dependency>
             <groupId>dev.vality</groupId>
             <artifactId>cds-proto</artifactId>
-            <version>1.66-01353ce</version>
+            <version>1.71-b3db02c</version>
         </dependency>
         <dependency>
             <groupId>dev.vality</groupId>
@@ -109,7 +116,7 @@
         <dependency>
             <groupId>dev.vality</groupId>
             <artifactId>adapter-common-lib</artifactId>
-            <version>1.2.13</version>
+            <version>3.0.0</version>
         </dependency>
         <dependency>
             <groupId>dev.vality</groupId>

src/main/java/dev/vality/proxy/mocketbank/configuration/RestClientConfig.java

@@ -0,0 +1,89 @@
+package dev.vality.proxy.mocketbank.configuration;
+
+import dev.vality.proxy.mocketbank.configuration.properties.RestTemplateProperties;
+import lombok.RequiredArgsConstructor;
+import org.apache.hc.client5.http.classic.HttpClient;
+import org.apache.hc.client5.http.config.ConnectionConfig;
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
+import org.apache.hc.client5.http.ssl.DefaultClientTlsStrategy;
+import org.apache.hc.core5.http.io.SocketConfig;
+import org.apache.hc.core5.util.Timeout;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.client.ClientHttpRequestFactory;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
+import org.springframework.web.client.RestClient;
+
+import javax.net.ssl.SSLContext;
+import java.security.NoSuchAlgorithmException;
+import java.util.concurrent.TimeUnit;
+
+@RequiredArgsConstructor
+@Configuration
+public class RestClientConfig {
+
+    private final RestTemplateProperties httpProperties;
+
+    @Bean
+    public RestClient restClient(ClientHttpRequestFactory requestFactory) {
+        return RestClient.builder()
+                .requestFactory(requestFactory)
+                .build();
+    }
+
+    @Bean
+    public HttpComponentsClientHttpRequestFactory requestFactory(HttpClient httpClient) {
+        final var requestFactory = new HttpComponentsClientHttpRequestFactory();
+        requestFactory.setHttpClient(httpClient);
+        return requestFactory;
+    }
+
+    @Bean
+    public SSLContext sslContext() throws NoSuchAlgorithmException {
+        return SSLContext.getDefault();
+    }
+
+    @Bean
+    public PoolingHttpClientConnectionManager connectionManager(SSLContext sslContext) {
+        return PoolingHttpClientConnectionManagerBuilder.create()
+                .setTlsSocketStrategy(
+                        DefaultClientTlsStrategy.createDefault()
+                )
+                .setDefaultSocketConfig(
+                        SocketConfig.custom()
+                                .setSoTimeout(Timeout.ofMilliseconds(httpProperties.getRequestTimeout()))
+                                .build()
+                )
+                .setDefaultConnectionConfig(
+                        ConnectionConfig.custom()
+                                .setConnectTimeout(Timeout.ofMilliseconds(httpProperties.getConnectionTimeout()))
+                                .build()
+                )
+                .setMaxConnTotal(httpProperties.getMaxTotalPooling())
+                .setMaxConnPerRoute(httpProperties.getDefaultMaxPerRoute())
+                .build();
+    }
+
+    @Bean
+    public RequestConfig requestConfig() {
+        return RequestConfig.custom()
+                .setConnectionRequestTimeout(httpProperties.getRequestTimeout(), TimeUnit.MILLISECONDS)
+                .setResponseTimeout(httpProperties.getConnectionTimeout(), TimeUnit.MILLISECONDS)
+                .build();
+    }
+
+    @Bean
+    public CloseableHttpClient httpClient(PoolingHttpClientConnectionManager connectionManager,
+                                          RequestConfig requestConfig) {
+        return HttpClients.custom()
+                .setConnectionManager(connectionManager)
+                .setDefaultRequestConfig(requestConfig)
+                .disableAutomaticRetries()
+                .setConnectionManagerShared(true)
+                .build();
+    }
+}

src/main/java/dev/vality/proxy/mocketbank/configuration/TomcatEmbeddedConfiguration.java

@@ -10,11 +10,11 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.filter.OncePerRequestFilter;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 @Configuration

src/main/java/dev/vality/proxy/mocketbank/configuration/properties/AdapterMockBankProperties.java

@@ -6,7 +6,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.validation.annotation.Validated;
 
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
 
 @Getter
 @Setter

src/main/java/dev/vality/proxy/mocketbank/configuration/properties/AdapterMockMpiProperties.java

@@ -6,7 +6,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.validation.annotation.Validated;
 
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
 
 @Getter
 @Setter

src/main/java/dev/vality/proxy/mocketbank/configuration/properties/CdsClientStorageProperties.java

@@ -7,7 +7,7 @@
 import org.springframework.core.io.Resource;
 import org.springframework.validation.annotation.Validated;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 @Configuration
 @ConfigurationProperties(prefix = "cds.client.storage")

src/main/java/dev/vality/proxy/mocketbank/configuration/properties/HellgateClientStorageProperties.java

@@ -7,7 +7,7 @@
 import org.springframework.core.io.Resource;
 import org.springframework.validation.annotation.Validated;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 @Configuration
 @ConfigurationProperties(prefix = "hellgate.client.storage")

src/main/java/dev/vality/proxy/mocketbank/configuration/properties/RestTemplateProperties.java

@@ -6,7 +6,7 @@
 import org.springframework.stereotype.Component;
 import org.springframework.validation.annotation.Validated;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 @Getter
 @Setter

src/main/java/dev/vality/proxy/mocketbank/configuration/properties/TimerProperties.java

@@ -6,7 +6,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.validation.annotation.Validated;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 @Getter
 @Setter