jd-152: bump deps (#35)

build_utils

@@ -1 +1 @@
-Subproject commit fc6ac0f6810b77a670036f7468575c37e5f9a829
+Subproject commit 24aa772730be966667adb285a09fcb494d4f218e

pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.rbkmoney</groupId>
         <artifactId>service-parent-pom</artifactId>
-        <version>1.0.8</version>
+        <version>1.0.9</version>
     </parent>
 
     <artifactId>three-ds-server-storage</artifactId>
@@ -17,7 +17,6 @@
     <description>three-ds-server-storage</description>
 
     <properties>
-        <java.version>11</java.version>
         <server.port>8022</server.port>
         <management.port>8023</management.port>
         <exposed.ports>${server.port} ${management.port}</exposed.ports>
@@ -121,7 +120,6 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.13.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -139,7 +137,6 @@
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>
-            <version>4.0.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>

src/main/java/com/rbkmoney/threeds/server/storage/controller/PreparationFlowController.java

@@ -12,14 +12,14 @@ import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@ConditionalOnProperty(name = "rest-handler.enabled", havingValue = "true")
+@ConditionalOnProperty(name = "rest-endpoint.enabled", havingValue = "true")
 @RequiredArgsConstructor
 @Slf4j
 public class PreparationFlowController {
 
     private final PreparationFlowService preparationFlowService;
 
-    @PostMapping("/preparation")
+    @PostMapping("/three-ds-server-storage/rest/preparation-flow")
     @ResponseStatus(HttpStatus.OK)
     public void preparationHandler(@RequestBody PreparationRequest request) {
         log.info("Init RBKMoney preparation flow, providerId={}", request.getProviderId());

src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -1,7 +1,7 @@
 {
   "hints": [
     {
-      "name": "rest-handler.enabled",
+      "name": "rest-endpoint.enabled",
       "values": [
         {
           "value": "true",

src/main/resources/application.yml

@@ -31,7 +31,7 @@ management:
 
 spring:
   application:
-    name: @project.name@
+    name: '@project.name@'
   output:
     ansi:
       enabled: always
@@ -63,5 +63,5 @@ client:
 asyncConfig:
   enabled: true
 
-rest-handler:
+rest-endpoint:
   enabled: false

src/test/java/com/rbkmoney/threeds/server/storage/controller/PreparationFlowControllerNotFoundTest.java

@@ -15,7 +15,7 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-@TestPropertySource(properties = "rest-handler.enabled=false")
+@TestPropertySource(properties = "rest-endpoint.enabled=false")
 @AutoConfigureMockMvc
 public class PreparationFlowControllerNotFoundTest extends AbstractConfigWithoutDao {
 

src/test/java/com/rbkmoney/threeds/server/storage/controller/PreparationFlowControllerWithRestHandlerTest.java

@@ -15,7 +15,7 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-@TestPropertySource(properties = "rest-handler.enabled=true")
+@TestPropertySource(properties = "rest-endpoint.enabled=true")
 @AutoConfigureMockMvc
 public class PreparationFlowControllerWithRestHandlerTest extends AbstractConfigWithoutDao {
 
@@ -36,7 +36,7 @@ public class PreparationFlowControllerWithRestHandlerTest extends AbstractConfig
         preparationRequest.setProviderId("visa");
 
         MockHttpServletRequestBuilder request = MockMvcRequestBuilders
-                .post("/preparation")
+                .post("/three-ds-server-storage/rest/preparation-flow")
                 .contentType(MediaType.APPLICATION_JSON)
                 .accept(MediaType.APPLICATION_JSON)
                 .content(objectMapper.writeValueAsBytes(preparationRequest));