From 83e0c40c47fa08cbf63ae1a5bc04ab65fd5750c5 Mon Sep 17 00:00:00 2001 From: Andrii Hrytsiuk Date: Wed, 14 May 2025 10:31:02 +0200 Subject: [PATCH 1/3] BEFOUND-1804: Update SSDK version 16.0.0 -> 16.0.1 --- .../example-persistence-service/pom.xml | 2 +- .../16.0.0/create-core-service/example-core-service/pom.xml | 2 +- .../16.0.0/create-openapi-client/banking-service/pom.xml | 2 +- .../16.0.0/create-openapi-spec-project/messaging-api/pom.xml | 2 +- .../create-openapi-spec-project/messaging-service/pom.xml | 2 +- .../example-integration-openapi-service/pom.xml | 2 +- .../example-integration-openapi-spec/pom.xml | 2 +- .../example-crud-service/pom.xml | 2 +- .../example-service-to-service/pom.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/pom.xml b/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/pom.xml index 8b13780..37f7450 100644 --- a/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/pom.xml +++ b/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/pom.xml @@ -9,7 +9,7 @@ service-sdk-starter-core com.backbase.buildingblocks - 16.0.0 + 16.0.1 diff --git a/service-sdk/16.0.0/create-core-service/example-core-service/pom.xml b/service-sdk/16.0.0/create-core-service/example-core-service/pom.xml index 51f6e33..9ffcbea 100644 --- a/service-sdk/16.0.0/create-core-service/example-core-service/pom.xml +++ b/service-sdk/16.0.0/create-core-service/example-core-service/pom.xml @@ -9,7 +9,7 @@ service-sdk-starter-core com.backbase.buildingblocks - 16.0.0 + 16.0.1 diff --git a/service-sdk/16.0.0/create-openapi-client/banking-service/pom.xml b/service-sdk/16.0.0/create-openapi-client/banking-service/pom.xml index 69a8d97..e929834 100644 --- a/service-sdk/16.0.0/create-openapi-client/banking-service/pom.xml +++ b/service-sdk/16.0.0/create-openapi-client/banking-service/pom.xml @@ -10,7 +10,7 @@ com.backbase.buildingblocks service-sdk-starter-core - 16.0.0 + 16.0.1 diff --git a/service-sdk/16.0.0/create-openapi-spec-project/messaging-api/pom.xml b/service-sdk/16.0.0/create-openapi-spec-project/messaging-api/pom.xml index fad4a98..6c30016 100644 --- a/service-sdk/16.0.0/create-openapi-spec-project/messaging-api/pom.xml +++ b/service-sdk/16.0.0/create-openapi-spec-project/messaging-api/pom.xml @@ -6,7 +6,7 @@ com.backbase.buildingblocks backbase-openapi-spec-starter-parent - 16.0.0 + 16.0.1 com.backbase.message diff --git a/service-sdk/16.0.0/create-openapi-spec-project/messaging-service/pom.xml b/service-sdk/16.0.0/create-openapi-spec-project/messaging-service/pom.xml index a203dc0..64efc56 100644 --- a/service-sdk/16.0.0/create-openapi-spec-project/messaging-service/pom.xml +++ b/service-sdk/16.0.0/create-openapi-spec-project/messaging-service/pom.xml @@ -10,7 +10,7 @@ com.backbase.buildingblocks service-sdk-starter-core - 16.0.0 + 16.0.1 diff --git a/service-sdk/16.0.0/create-outbound-integration-service-openapi/example-integration-openapi-service/pom.xml b/service-sdk/16.0.0/create-outbound-integration-service-openapi/example-integration-openapi-service/pom.xml index 1522c9e..a31e25c 100644 --- a/service-sdk/16.0.0/create-outbound-integration-service-openapi/example-integration-openapi-service/pom.xml +++ b/service-sdk/16.0.0/create-outbound-integration-service-openapi/example-integration-openapi-service/pom.xml @@ -10,7 +10,7 @@ com.backbase.buildingblocks service-sdk-starter-core - 16.0.0 + 16.0.1 diff --git a/service-sdk/16.0.0/create-outbound-integration-service-openapi/example-integration-openapi-spec/pom.xml b/service-sdk/16.0.0/create-outbound-integration-service-openapi/example-integration-openapi-spec/pom.xml index dbc916b..5ce0a09 100644 --- a/service-sdk/16.0.0/create-outbound-integration-service-openapi/example-integration-openapi-spec/pom.xml +++ b/service-sdk/16.0.0/create-outbound-integration-service-openapi/example-integration-openapi-spec/pom.xml @@ -6,7 +6,7 @@ com.backbase.buildingblocks backbase-openapi-spec-starter-parent - 16.0.0 + 16.0.1 com.backbase.poc diff --git a/service-sdk/16.0.0/include-persistence-crud-service-specification/example-crud-service/pom.xml b/service-sdk/16.0.0/include-persistence-crud-service-specification/example-crud-service/pom.xml index 516509b..5994ed1 100644 --- a/service-sdk/16.0.0/include-persistence-crud-service-specification/example-crud-service/pom.xml +++ b/service-sdk/16.0.0/include-persistence-crud-service-specification/example-crud-service/pom.xml @@ -9,7 +9,7 @@ service-sdk-starter-core com.backbase.buildingblocks - 16.0.0 + 16.0.1 diff --git a/service-sdk/16.0.0/service-to-service-communication/example-service-to-service/pom.xml b/service-sdk/16.0.0/service-to-service-communication/example-service-to-service/pom.xml index 2cd4e23..c93d63f 100644 --- a/service-sdk/16.0.0/service-to-service-communication/example-service-to-service/pom.xml +++ b/service-sdk/16.0.0/service-to-service-communication/example-service-to-service/pom.xml @@ -9,7 +9,7 @@ service-sdk-starter-core com.backbase.buildingblocks - 16.0.0 + 16.0.1 From cd9e9759f0ed07d492109f10493085eee426c40d Mon Sep 17 00:00:00 2001 From: Andrii Hrytsiuk Date: Wed, 14 May 2025 10:54:34 +0200 Subject: [PATCH 2/3] BEFOUND-1804: Optimize imports --- .../com/backbase/example/Application.java | 2 +- .../java/com/backbase/example/Message.java | 1 - .../example/api/ExampleController.java | 12 ++++++--- .../com/backbase/example/domain/Greeting.java | 5 +++- .../example/mapper/GreetingsMapper.java | 3 +-- .../repository/GreetingsRepository.java | 3 +-- .../example/service/GreetingsService.java | 1 - .../example/service/GreetingsServiceImpl.java | 2 +- .../db/changelog/db.changelog-1.0.0.xml | 8 +++--- .../db/changelog/db.changelog-persistence.xml | 8 +++--- .../backbase/example/ExampleControllerIT.java | 27 +++++++++---------- .../com/backbase/example/Application.java | 2 +- .../example/api/ExampleController.java | 4 +-- .../backbase/example/ExampleControllerIT.java | 18 ++++++------- .../com/backbase/banking/Application.java | 2 +- .../banking/api/ExampleController.java | 4 +-- ...ssagingServiceRestClientConfiguration.java | 3 ++- .../backbase/banking/ExampleControllerIT.java | 18 ++++++------- .../com/backbase/message/Application.java | 2 +- .../message/api/ExampleController.java | 5 ++-- .../backbase/message/ExampleControllerIT.java | 14 +++++----- .../com/backbase/example/Application.java | 2 +- .../example/api/ExampleController.java | 4 +-- .../example/client/MessageClient.java | 1 - .../example/client/MessageClientImpl.java | 9 +++---- .../com/backbase/example/model/Message.java | 1 - .../com/backbase/example/Application.java | 2 +- .../backbase/example/ExampleController.java | 3 +-- .../com/backbase/example/domain/Greeting.java | 5 +++- .../example/mapper/GreetingsMapper.java | 3 +-- .../repository/GreetingsRepository.java | 3 +-- .../example/service/GreetingsService.java | 1 - .../example/service/GreetingsServiceImpl.java | 3 +-- .../backbase/example/ExampleControllerIT.java | 22 +++++++-------- .../com/backbase/example/Application.java | 2 +- .../example/controller/ExampleController.java | 3 +-- .../com/backbase/example/domain/Greeting.java | 5 +++- .../example/mapper/GreetingsMapper.java | 3 +-- .../repository/GreetingsRepository.java | 3 +-- .../example/service/GreetingsService.java | 1 - .../example/service/GreetingsServiceImpl.java | 3 +-- .../backbase/example/ExampleControllerIT.java | 25 +++++++++-------- 42 files changed, 118 insertions(+), 130 deletions(-) diff --git a/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/java/com/backbase/example/Application.java b/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/java/com/backbase/example/Application.java index b01f872..02927b6 100644 --- a/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/java/com/backbase/example/Application.java +++ b/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/java/com/backbase/example/Application.java @@ -1,7 +1,7 @@ package com.backbase.example; -import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; diff --git a/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/java/com/backbase/example/Message.java b/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/java/com/backbase/example/Message.java index 5b706d5..8598f66 100644 --- a/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/java/com/backbase/example/Message.java +++ b/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/java/com/backbase/example/Message.java @@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; - import jakarta.annotation.Generated; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; diff --git a/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/java/com/backbase/example/api/ExampleController.java b/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/java/com/backbase/example/api/ExampleController.java index 0955898..86116cb 100644 --- a/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/java/com/backbase/example/api/ExampleController.java +++ b/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/java/com/backbase/example/api/ExampleController.java @@ -4,12 +4,16 @@ import com.backbase.example.domain.Greeting; import com.backbase.example.mapper.GreetingsMapper; import com.backbase.example.service.GreetingsService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.*; - import java.util.List; import java.util.UUID; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.RestController; @RestController public class ExampleController { diff --git a/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/java/com/backbase/example/domain/Greeting.java b/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/java/com/backbase/example/domain/Greeting.java index 01bc7fd..28a3f7e 100644 --- a/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/java/com/backbase/example/domain/Greeting.java +++ b/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/java/com/backbase/example/domain/Greeting.java @@ -1,6 +1,9 @@ package com.backbase.example.domain; -import jakarta.persistence.*; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "greetings") diff --git a/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/java/com/backbase/example/mapper/GreetingsMapper.java b/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/java/com/backbase/example/mapper/GreetingsMapper.java index 38028ee..2c45cad 100644 --- a/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/java/com/backbase/example/mapper/GreetingsMapper.java +++ b/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/java/com/backbase/example/mapper/GreetingsMapper.java @@ -2,12 +2,11 @@ import com.backbase.example.Message; import com.backbase.example.domain.Greeting; +import java.util.List; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; import org.mapstruct.factory.Mappers; -import java.util.List; - @Mapper(unmappedTargetPolicy= ReportingPolicy.ERROR) public interface GreetingsMapper { diff --git a/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/java/com/backbase/example/repository/GreetingsRepository.java b/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/java/com/backbase/example/repository/GreetingsRepository.java index 1511c66..479d9d8 100644 --- a/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/java/com/backbase/example/repository/GreetingsRepository.java +++ b/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/java/com/backbase/example/repository/GreetingsRepository.java @@ -1,11 +1,10 @@ package com.backbase.example.repository; import com.backbase.example.domain.Greeting; +import java.util.List; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; -import java.util.List; - @Repository public interface GreetingsRepository extends CrudRepository { diff --git a/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/java/com/backbase/example/service/GreetingsService.java b/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/java/com/backbase/example/service/GreetingsService.java index 790f3c2..3e6953c 100644 --- a/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/java/com/backbase/example/service/GreetingsService.java +++ b/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/java/com/backbase/example/service/GreetingsService.java @@ -1,7 +1,6 @@ package com.backbase.example.service; import com.backbase.example.domain.Greeting; - import java.util.List; public interface GreetingsService { diff --git a/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/java/com/backbase/example/service/GreetingsServiceImpl.java b/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/java/com/backbase/example/service/GreetingsServiceImpl.java index 6b4a54e..818c836 100644 --- a/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/java/com/backbase/example/service/GreetingsServiceImpl.java +++ b/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/java/com/backbase/example/service/GreetingsServiceImpl.java @@ -7,9 +7,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; -import org.springframework.transaction.annotation.Transactional; @Service @Transactional(readOnly=true) diff --git a/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/resources/db/changelog/db.changelog-1.0.0.xml b/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/resources/db/changelog/db.changelog-1.0.0.xml index f7c24c1..3f19566 100644 --- a/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/resources/db/changelog/db.changelog-1.0.0.xml +++ b/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/resources/db/changelog/db.changelog-1.0.0.xml @@ -1,11 +1,9 @@ + xmlns="http://www.liquibase.org/xml/ns/dbchangelog" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.8.xsd"> diff --git a/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/resources/db/changelog/db.changelog-persistence.xml b/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/resources/db/changelog/db.changelog-persistence.xml index f72c4f3..cd88fbd 100644 --- a/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/resources/db/changelog/db.changelog-persistence.xml +++ b/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/main/resources/db/changelog/db.changelog-persistence.xml @@ -1,11 +1,9 @@ + xmlns="http://www.liquibase.org/xml/ns/dbchangelog" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.8.xsd"> diff --git a/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/test/java/com/backbase/example/ExampleControllerIT.java b/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/test/java/com/backbase/example/ExampleControllerIT.java index a2bad70..b0259a0 100644 --- a/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/test/java/com/backbase/example/ExampleControllerIT.java +++ b/service-sdk/16.0.0/add-persistence-to-service/example-persistence-service/src/test/java/com/backbase/example/ExampleControllerIT.java @@ -1,34 +1,31 @@ package com.backbase.example; +import static org.assertj.core.api.Assertions.assertThat; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; +import java.util.List; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.http.MediaType; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.security.web.csrf.CsrfToken; import org.springframework.security.web.csrf.HttpSessionCsrfTokenRepository; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; import org.springframework.test.context.ActiveProfiles; - -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.ResultActions; -import org.springframework.http.MediaType; - -import org.junit.jupiter.api.Test; - -import java.util.List; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; /** diff --git a/service-sdk/16.0.0/create-core-service/example-core-service/src/main/java/com/backbase/example/Application.java b/service-sdk/16.0.0/create-core-service/example-core-service/src/main/java/com/backbase/example/Application.java index 37acffd..2de181c 100644 --- a/service-sdk/16.0.0/create-core-service/example-core-service/src/main/java/com/backbase/example/Application.java +++ b/service-sdk/16.0.0/create-core-service/example-core-service/src/main/java/com/backbase/example/Application.java @@ -1,7 +1,7 @@ package com.backbase.example; -import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; diff --git a/service-sdk/16.0.0/create-core-service/example-core-service/src/main/java/com/backbase/example/api/ExampleController.java b/service-sdk/16.0.0/create-core-service/example-core-service/src/main/java/com/backbase/example/api/ExampleController.java index 4dbe9a0..567d3f2 100644 --- a/service-sdk/16.0.0/create-core-service/example-core-service/src/main/java/com/backbase/example/api/ExampleController.java +++ b/service-sdk/16.0.0/create-core-service/example-core-service/src/main/java/com/backbase/example/api/ExampleController.java @@ -2,10 +2,10 @@ import com.backbase.example.Message; import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.RestController; @RestController public class ExampleController { diff --git a/service-sdk/16.0.0/create-core-service/example-core-service/src/test/java/com/backbase/example/ExampleControllerIT.java b/service-sdk/16.0.0/create-core-service/example-core-service/src/test/java/com/backbase/example/ExampleControllerIT.java index 4b9eab8..1735cff 100644 --- a/service-sdk/16.0.0/create-core-service/example-core-service/src/test/java/com/backbase/example/ExampleControllerIT.java +++ b/service-sdk/16.0.0/create-core-service/example-core-service/src/test/java/com/backbase/example/ExampleControllerIT.java @@ -1,24 +1,24 @@ package com.backbase.example; +import static org.assertj.core.api.Assertions.assertThat; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.ApplicationContext; +import org.springframework.http.MediaType; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; import org.springframework.test.context.ActiveProfiles; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.ResultActions; -import org.springframework.http.MediaType; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; /** * A wrapper annotation for use with integration tests. diff --git a/service-sdk/16.0.0/create-openapi-client/banking-service/src/main/java/com/backbase/banking/Application.java b/service-sdk/16.0.0/create-openapi-client/banking-service/src/main/java/com/backbase/banking/Application.java index 7f9fea4..6141f29 100644 --- a/service-sdk/16.0.0/create-openapi-client/banking-service/src/main/java/com/backbase/banking/Application.java +++ b/service-sdk/16.0.0/create-openapi-client/banking-service/src/main/java/com/backbase/banking/Application.java @@ -1,7 +1,7 @@ package com.backbase.banking; -import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; diff --git a/service-sdk/16.0.0/create-openapi-client/banking-service/src/main/java/com/backbase/banking/api/ExampleController.java b/service-sdk/16.0.0/create-openapi-client/banking-service/src/main/java/com/backbase/banking/api/ExampleController.java index 41fe36f..59447d6 100644 --- a/service-sdk/16.0.0/create-openapi-client/banking-service/src/main/java/com/backbase/banking/api/ExampleController.java +++ b/service-sdk/16.0.0/create-openapi-client/banking-service/src/main/java/com/backbase/banking/api/ExampleController.java @@ -4,10 +4,10 @@ import com.backbase.messaging.api.client.v2.MessageApi; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.RestController; @RestController public class ExampleController { diff --git a/service-sdk/16.0.0/create-openapi-client/banking-service/src/main/java/com/backbase/banking/config/MessagingServiceRestClientConfiguration.java b/service-sdk/16.0.0/create-openapi-client/banking-service/src/main/java/com/backbase/banking/config/MessagingServiceRestClientConfiguration.java index b042b8b..3e473b4 100644 --- a/service-sdk/16.0.0/create-openapi-client/banking-service/src/main/java/com/backbase/banking/config/MessagingServiceRestClientConfiguration.java +++ b/service-sdk/16.0.0/create-openapi-client/banking-service/src/main/java/com/backbase/banking/config/MessagingServiceRestClientConfiguration.java @@ -4,8 +4,9 @@ import com.backbase.buildingblocks.communication.http.HttpCommunicationConfiguration; import com.backbase.messaging.api.client.ApiClient; import com.backbase.messaging.api.client.v2.MessageApi; -import org.springframework.context.annotation.*; import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import org.springframework.validation.annotation.Validated; // tag::MessagingServiceRestClientConfiguration[] diff --git a/service-sdk/16.0.0/create-openapi-client/banking-service/src/test/java/com/backbase/banking/ExampleControllerIT.java b/service-sdk/16.0.0/create-openapi-client/banking-service/src/test/java/com/backbase/banking/ExampleControllerIT.java index 4804030..f437b4d 100644 --- a/service-sdk/16.0.0/create-openapi-client/banking-service/src/test/java/com/backbase/banking/ExampleControllerIT.java +++ b/service-sdk/16.0.0/create-openapi-client/banking-service/src/test/java/com/backbase/banking/ExampleControllerIT.java @@ -1,24 +1,24 @@ package com.backbase.banking; +import static org.assertj.core.api.Assertions.assertThat; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.ApplicationContext; +import org.springframework.http.MediaType; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; import org.springframework.test.context.ActiveProfiles; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.ResultActions; -import org.springframework.http.MediaType; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; /** * A wrapper annotation for use with integration tests. diff --git a/service-sdk/16.0.0/create-openapi-spec-project/messaging-service/src/main/java/com/backbase/message/Application.java b/service-sdk/16.0.0/create-openapi-spec-project/messaging-service/src/main/java/com/backbase/message/Application.java index 9f6ac28..df15d43 100644 --- a/service-sdk/16.0.0/create-openapi-spec-project/messaging-service/src/main/java/com/backbase/message/Application.java +++ b/service-sdk/16.0.0/create-openapi-spec-project/messaging-service/src/main/java/com/backbase/message/Application.java @@ -1,7 +1,7 @@ package com.backbase.message; -import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; diff --git a/service-sdk/16.0.0/create-openapi-spec-project/messaging-service/src/main/java/com/backbase/message/api/ExampleController.java b/service-sdk/16.0.0/create-openapi-spec-project/messaging-service/src/main/java/com/backbase/message/api/ExampleController.java index 763367c..7005322 100644 --- a/service-sdk/16.0.0/create-openapi-spec-project/messaging-service/src/main/java/com/backbase/message/api/ExampleController.java +++ b/service-sdk/16.0.0/create-openapi-spec-project/messaging-service/src/main/java/com/backbase/message/api/ExampleController.java @@ -2,12 +2,11 @@ import com.backbase.dbs.messaging_service.api.service.v2.MessageApi; import com.backbase.dbs.messaging_service.api.service.v2.model.MessagePostResponseBody; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.RestController; - import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; import java.util.List; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.RestController; @RestController diff --git a/service-sdk/16.0.0/create-openapi-spec-project/messaging-service/src/test/java/com/backbase/message/ExampleControllerIT.java b/service-sdk/16.0.0/create-openapi-spec-project/messaging-service/src/test/java/com/backbase/message/ExampleControllerIT.java index fec3ffb..5686b3b 100644 --- a/service-sdk/16.0.0/create-openapi-spec-project/messaging-service/src/test/java/com/backbase/message/ExampleControllerIT.java +++ b/service-sdk/16.0.0/create-openapi-spec-project/messaging-service/src/test/java/com/backbase/message/ExampleControllerIT.java @@ -1,22 +1,22 @@ package com.backbase.message; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.ApplicationContext; +import org.springframework.http.MediaType; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; import org.springframework.test.context.ActiveProfiles; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; import org.springframework.test.web.servlet.ResultActions; -import org.springframework.http.MediaType; - -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; /** * A wrapper annotation for use with integration tests. diff --git a/service-sdk/16.0.0/create-outbound-integration-service-openapi/example-integration-openapi-service/src/main/java/com/backbase/example/Application.java b/service-sdk/16.0.0/create-outbound-integration-service-openapi/example-integration-openapi-service/src/main/java/com/backbase/example/Application.java index 37acffd..2de181c 100644 --- a/service-sdk/16.0.0/create-outbound-integration-service-openapi/example-integration-openapi-service/src/main/java/com/backbase/example/Application.java +++ b/service-sdk/16.0.0/create-outbound-integration-service-openapi/example-integration-openapi-service/src/main/java/com/backbase/example/Application.java @@ -1,7 +1,7 @@ package com.backbase.example; -import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; diff --git a/service-sdk/16.0.0/create-outbound-integration-service-openapi/example-integration-openapi-service/src/main/java/com/backbase/example/api/ExampleController.java b/service-sdk/16.0.0/create-outbound-integration-service-openapi/example-integration-openapi-service/src/main/java/com/backbase/example/api/ExampleController.java index 6c4f546..c31f940 100644 --- a/service-sdk/16.0.0/create-outbound-integration-service-openapi/example-integration-openapi-service/src/main/java/com/backbase/example/api/ExampleController.java +++ b/service-sdk/16.0.0/create-outbound-integration-service-openapi/example-integration-openapi-service/src/main/java/com/backbase/example/api/ExampleController.java @@ -6,10 +6,10 @@ import com.backbase.example.client.MessageClient; import com.backbase.example.mapper.IntegrationMessageMapper; import com.backbase.example.model.Message; -import java.io.IOException; -import java.util.List; import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; +import java.io.IOException; +import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/service-sdk/16.0.0/create-outbound-integration-service-openapi/example-integration-openapi-service/src/main/java/com/backbase/example/client/MessageClient.java b/service-sdk/16.0.0/create-outbound-integration-service-openapi/example-integration-openapi-service/src/main/java/com/backbase/example/client/MessageClient.java index e976f61..1716730 100644 --- a/service-sdk/16.0.0/create-outbound-integration-service-openapi/example-integration-openapi-service/src/main/java/com/backbase/example/client/MessageClient.java +++ b/service-sdk/16.0.0/create-outbound-integration-service-openapi/example-integration-openapi-service/src/main/java/com/backbase/example/client/MessageClient.java @@ -1,7 +1,6 @@ package com.backbase.example.client; import com.backbase.example.model.Message; - import java.io.IOException; import java.util.List; diff --git a/service-sdk/16.0.0/create-outbound-integration-service-openapi/example-integration-openapi-service/src/main/java/com/backbase/example/client/MessageClientImpl.java b/service-sdk/16.0.0/create-outbound-integration-service-openapi/example-integration-openapi-service/src/main/java/com/backbase/example/client/MessageClientImpl.java index 2a0d262..8dfb596 100644 --- a/service-sdk/16.0.0/create-outbound-integration-service-openapi/example-integration-openapi-service/src/main/java/com/backbase/example/client/MessageClientImpl.java +++ b/service-sdk/16.0.0/create-outbound-integration-service-openapi/example-integration-openapi-service/src/main/java/com/backbase/example/client/MessageClientImpl.java @@ -3,15 +3,14 @@ import com.backbase.example.model.Message; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import org.springframework.boot.web.client.RestTemplateBuilder; -import org.springframework.http.HttpMethod; -import org.springframework.stereotype.Component; -import org.springframework.web.client.RestTemplate; - import java.io.IOException; import java.net.URI; import java.util.ArrayList; import java.util.List; +import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.http.HttpMethod; +import org.springframework.stereotype.Component; +import org.springframework.web.client.RestTemplate; @Component public class MessageClientImpl implements MessageClient { diff --git a/service-sdk/16.0.0/create-outbound-integration-service-openapi/example-integration-openapi-service/src/main/java/com/backbase/example/model/Message.java b/service-sdk/16.0.0/create-outbound-integration-service-openapi/example-integration-openapi-service/src/main/java/com/backbase/example/model/Message.java index da04568..fcf2987 100644 --- a/service-sdk/16.0.0/create-outbound-integration-service-openapi/example-integration-openapi-service/src/main/java/com/backbase/example/model/Message.java +++ b/service-sdk/16.0.0/create-outbound-integration-service-openapi/example-integration-openapi-service/src/main/java/com/backbase/example/model/Message.java @@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; - import jakarta.annotation.Generated; import jakarta.validation.constraints.NotNull; diff --git a/service-sdk/16.0.0/include-persistence-crud-service-specification/example-crud-service/src/main/java/com/backbase/example/Application.java b/service-sdk/16.0.0/include-persistence-crud-service-specification/example-crud-service/src/main/java/com/backbase/example/Application.java index 5e8d2f0..32e46bf 100644 --- a/service-sdk/16.0.0/include-persistence-crud-service-specification/example-crud-service/src/main/java/com/backbase/example/Application.java +++ b/service-sdk/16.0.0/include-persistence-crud-service-specification/example-crud-service/src/main/java/com/backbase/example/Application.java @@ -1,7 +1,7 @@ package com.backbase.example; -import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; diff --git a/service-sdk/16.0.0/include-persistence-crud-service-specification/example-crud-service/src/main/java/com/backbase/example/ExampleController.java b/service-sdk/16.0.0/include-persistence-crud-service-specification/example-crud-service/src/main/java/com/backbase/example/ExampleController.java index 3a2c7e2..5855cdf 100644 --- a/service-sdk/16.0.0/include-persistence-crud-service-specification/example-crud-service/src/main/java/com/backbase/example/ExampleController.java +++ b/service-sdk/16.0.0/include-persistence-crud-service-specification/example-crud-service/src/main/java/com/backbase/example/ExampleController.java @@ -6,13 +6,12 @@ import com.backbase.service.example.rest.spec.v1.MessageApi; import com.backbase.service.example.rest.spec.v1.model.Message; import com.backbase.service.example.rest.spec.v1.model.MessagePostResponseBody; +import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - @RestController public class ExampleController implements MessageApi { diff --git a/service-sdk/16.0.0/include-persistence-crud-service-specification/example-crud-service/src/main/java/com/backbase/example/domain/Greeting.java b/service-sdk/16.0.0/include-persistence-crud-service-specification/example-crud-service/src/main/java/com/backbase/example/domain/Greeting.java index 01bc7fd..28a3f7e 100644 --- a/service-sdk/16.0.0/include-persistence-crud-service-specification/example-crud-service/src/main/java/com/backbase/example/domain/Greeting.java +++ b/service-sdk/16.0.0/include-persistence-crud-service-specification/example-crud-service/src/main/java/com/backbase/example/domain/Greeting.java @@ -1,6 +1,9 @@ package com.backbase.example.domain; -import jakarta.persistence.*; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "greetings") diff --git a/service-sdk/16.0.0/include-persistence-crud-service-specification/example-crud-service/src/main/java/com/backbase/example/mapper/GreetingsMapper.java b/service-sdk/16.0.0/include-persistence-crud-service-specification/example-crud-service/src/main/java/com/backbase/example/mapper/GreetingsMapper.java index 67e7c71..87fc4ff 100644 --- a/service-sdk/16.0.0/include-persistence-crud-service-specification/example-crud-service/src/main/java/com/backbase/example/mapper/GreetingsMapper.java +++ b/service-sdk/16.0.0/include-persistence-crud-service-specification/example-crud-service/src/main/java/com/backbase/example/mapper/GreetingsMapper.java @@ -2,11 +2,10 @@ import com.backbase.example.domain.Greeting; import com.backbase.service.example.rest.spec.v1.model.Message; +import java.util.List; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import java.util.List; - @Mapper public interface GreetingsMapper { diff --git a/service-sdk/16.0.0/include-persistence-crud-service-specification/example-crud-service/src/main/java/com/backbase/example/repository/GreetingsRepository.java b/service-sdk/16.0.0/include-persistence-crud-service-specification/example-crud-service/src/main/java/com/backbase/example/repository/GreetingsRepository.java index 1511c66..479d9d8 100644 --- a/service-sdk/16.0.0/include-persistence-crud-service-specification/example-crud-service/src/main/java/com/backbase/example/repository/GreetingsRepository.java +++ b/service-sdk/16.0.0/include-persistence-crud-service-specification/example-crud-service/src/main/java/com/backbase/example/repository/GreetingsRepository.java @@ -1,11 +1,10 @@ package com.backbase.example.repository; import com.backbase.example.domain.Greeting; +import java.util.List; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; -import java.util.List; - @Repository public interface GreetingsRepository extends CrudRepository { diff --git a/service-sdk/16.0.0/include-persistence-crud-service-specification/example-crud-service/src/main/java/com/backbase/example/service/GreetingsService.java b/service-sdk/16.0.0/include-persistence-crud-service-specification/example-crud-service/src/main/java/com/backbase/example/service/GreetingsService.java index 3dc72f7..9b7cfc6 100644 --- a/service-sdk/16.0.0/include-persistence-crud-service-specification/example-crud-service/src/main/java/com/backbase/example/service/GreetingsService.java +++ b/service-sdk/16.0.0/include-persistence-crud-service-specification/example-crud-service/src/main/java/com/backbase/example/service/GreetingsService.java @@ -1,7 +1,6 @@ package com.backbase.example.service; import com.backbase.example.domain.Greeting; - import java.util.List; public interface GreetingsService { diff --git a/service-sdk/16.0.0/include-persistence-crud-service-specification/example-crud-service/src/main/java/com/backbase/example/service/GreetingsServiceImpl.java b/service-sdk/16.0.0/include-persistence-crud-service-specification/example-crud-service/src/main/java/com/backbase/example/service/GreetingsServiceImpl.java index 39ebe0a..47e5100 100644 --- a/service-sdk/16.0.0/include-persistence-crud-service-specification/example-crud-service/src/main/java/com/backbase/example/service/GreetingsServiceImpl.java +++ b/service-sdk/16.0.0/include-persistence-crud-service-specification/example-crud-service/src/main/java/com/backbase/example/service/GreetingsServiceImpl.java @@ -2,13 +2,12 @@ import com.backbase.example.domain.Greeting; import com.backbase.example.repository.GreetingsRepository; +import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.List; - @Service public class GreetingsServiceImpl implements GreetingsService { diff --git a/service-sdk/16.0.0/include-persistence-crud-service-specification/example-crud-service/src/test/java/com/backbase/example/ExampleControllerIT.java b/service-sdk/16.0.0/include-persistence-crud-service-specification/example-crud-service/src/test/java/com/backbase/example/ExampleControllerIT.java index a10cf3a..b0a28f9 100644 --- a/service-sdk/16.0.0/include-persistence-crud-service-specification/example-crud-service/src/test/java/com/backbase/example/ExampleControllerIT.java +++ b/service-sdk/16.0.0/include-persistence-crud-service-specification/example-crud-service/src/test/java/com/backbase/example/ExampleControllerIT.java @@ -1,32 +1,32 @@ package com.backbase.example; +import static org.assertj.core.api.Assertions.assertThat; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + import com.backbase.service.example.rest.spec.v1.model.Message; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import java.util.List; +import java.util.UUID; import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.ApplicationContext; +import org.springframework.http.MediaType; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.security.web.csrf.CsrfToken; import org.springframework.security.web.csrf.HttpSessionCsrfTokenRepository; import org.springframework.test.context.ActiveProfiles; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.ResultActions; -import org.springframework.http.MediaType; -import java.util.UUID; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; /** * A wrapper annotation for use with integration tests. diff --git a/service-sdk/16.0.0/service-to-service-communication/example-service-to-service/src/main/java/com/backbase/example/Application.java b/service-sdk/16.0.0/service-to-service-communication/example-service-to-service/src/main/java/com/backbase/example/Application.java index 5e8d2f0..32e46bf 100644 --- a/service-sdk/16.0.0/service-to-service-communication/example-service-to-service/src/main/java/com/backbase/example/Application.java +++ b/service-sdk/16.0.0/service-to-service-communication/example-service-to-service/src/main/java/com/backbase/example/Application.java @@ -1,7 +1,7 @@ package com.backbase.example; -import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; diff --git a/service-sdk/16.0.0/service-to-service-communication/example-service-to-service/src/main/java/com/backbase/example/controller/ExampleController.java b/service-sdk/16.0.0/service-to-service-communication/example-service-to-service/src/main/java/com/backbase/example/controller/ExampleController.java index 3744e0a..436ffeb 100644 --- a/service-sdk/16.0.0/service-to-service-communication/example-service-to-service/src/main/java/com/backbase/example/controller/ExampleController.java +++ b/service-sdk/16.0.0/service-to-service-communication/example-service-to-service/src/main/java/com/backbase/example/controller/ExampleController.java @@ -6,13 +6,12 @@ import com.backbase.service.example.rest.spec.v1.MessageApi; import com.backbase.service.example.rest.spec.v1.model.Message; import com.backbase.service.example.rest.spec.v1.model.MessagePostResponseBody; +import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - @RestController public class ExampleController implements MessageApi { diff --git a/service-sdk/16.0.0/service-to-service-communication/example-service-to-service/src/main/java/com/backbase/example/domain/Greeting.java b/service-sdk/16.0.0/service-to-service-communication/example-service-to-service/src/main/java/com/backbase/example/domain/Greeting.java index 01bc7fd..28a3f7e 100644 --- a/service-sdk/16.0.0/service-to-service-communication/example-service-to-service/src/main/java/com/backbase/example/domain/Greeting.java +++ b/service-sdk/16.0.0/service-to-service-communication/example-service-to-service/src/main/java/com/backbase/example/domain/Greeting.java @@ -1,6 +1,9 @@ package com.backbase.example.domain; -import jakarta.persistence.*; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "greetings") diff --git a/service-sdk/16.0.0/service-to-service-communication/example-service-to-service/src/main/java/com/backbase/example/mapper/GreetingsMapper.java b/service-sdk/16.0.0/service-to-service-communication/example-service-to-service/src/main/java/com/backbase/example/mapper/GreetingsMapper.java index 4ca35da..de6ad0d 100644 --- a/service-sdk/16.0.0/service-to-service-communication/example-service-to-service/src/main/java/com/backbase/example/mapper/GreetingsMapper.java +++ b/service-sdk/16.0.0/service-to-service-communication/example-service-to-service/src/main/java/com/backbase/example/mapper/GreetingsMapper.java @@ -2,11 +2,10 @@ import com.backbase.example.domain.Greeting; import com.backbase.service.example.rest.spec.v1.model.Message; +import java.util.List; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import java.util.List; - @Mapper public interface GreetingsMapper { diff --git a/service-sdk/16.0.0/service-to-service-communication/example-service-to-service/src/main/java/com/backbase/example/repository/GreetingsRepository.java b/service-sdk/16.0.0/service-to-service-communication/example-service-to-service/src/main/java/com/backbase/example/repository/GreetingsRepository.java index 1511c66..479d9d8 100644 --- a/service-sdk/16.0.0/service-to-service-communication/example-service-to-service/src/main/java/com/backbase/example/repository/GreetingsRepository.java +++ b/service-sdk/16.0.0/service-to-service-communication/example-service-to-service/src/main/java/com/backbase/example/repository/GreetingsRepository.java @@ -1,11 +1,10 @@ package com.backbase.example.repository; import com.backbase.example.domain.Greeting; +import java.util.List; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; -import java.util.List; - @Repository public interface GreetingsRepository extends CrudRepository { diff --git a/service-sdk/16.0.0/service-to-service-communication/example-service-to-service/src/main/java/com/backbase/example/service/GreetingsService.java b/service-sdk/16.0.0/service-to-service-communication/example-service-to-service/src/main/java/com/backbase/example/service/GreetingsService.java index e214782..9ce90f3 100644 --- a/service-sdk/16.0.0/service-to-service-communication/example-service-to-service/src/main/java/com/backbase/example/service/GreetingsService.java +++ b/service-sdk/16.0.0/service-to-service-communication/example-service-to-service/src/main/java/com/backbase/example/service/GreetingsService.java @@ -1,7 +1,6 @@ package com.backbase.example.service; import com.backbase.example.domain.Greeting; - import java.util.List; public interface GreetingsService { diff --git a/service-sdk/16.0.0/service-to-service-communication/example-service-to-service/src/main/java/com/backbase/example/service/GreetingsServiceImpl.java b/service-sdk/16.0.0/service-to-service-communication/example-service-to-service/src/main/java/com/backbase/example/service/GreetingsServiceImpl.java index 2b57565..37d004e 100644 --- a/service-sdk/16.0.0/service-to-service-communication/example-service-to-service/src/main/java/com/backbase/example/service/GreetingsServiceImpl.java +++ b/service-sdk/16.0.0/service-to-service-communication/example-service-to-service/src/main/java/com/backbase/example/service/GreetingsServiceImpl.java @@ -4,13 +4,12 @@ import com.backbase.example.mapper.GreetingsMapper; import com.backbase.example.repository.GreetingsRepository; import com.backbase.integration.example.client.v1.MessageApi; +import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.List; - @Service public class GreetingsServiceImpl implements GreetingsService { diff --git a/service-sdk/16.0.0/service-to-service-communication/example-service-to-service/src/test/java/com/backbase/example/ExampleControllerIT.java b/service-sdk/16.0.0/service-to-service-communication/example-service-to-service/src/test/java/com/backbase/example/ExampleControllerIT.java index 2aafd6e..edc7432 100644 --- a/service-sdk/16.0.0/service-to-service-communication/example-service-to-service/src/test/java/com/backbase/example/ExampleControllerIT.java +++ b/service-sdk/16.0.0/service-to-service-communication/example-service-to-service/src/test/java/com/backbase/example/ExampleControllerIT.java @@ -1,33 +1,32 @@ package com.backbase.example; +import static org.assertj.core.api.Assertions.assertThat; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + import com.backbase.service.example.rest.spec.v1.model.Message; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; +import java.util.List; +import java.util.UUID; import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.ApplicationContext; +import org.springframework.http.MediaType; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.security.web.csrf.CsrfToken; import org.springframework.security.web.csrf.HttpSessionCsrfTokenRepository; import org.springframework.test.context.ActiveProfiles; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.ResultActions; -import org.springframework.http.MediaType; - -import java.util.List; -import java.util.UUID; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; /** * A wrapper annotation for use with integration tests. From c40279d9ce586bd8c4e82fd0530e850b1d7e6abc Mon Sep 17 00:00:00 2001 From: Andrii Hrytsiuk Date: Wed, 14 May 2025 11:14:09 +0200 Subject: [PATCH 3/3] BEFOUND-1804: Change configuration properties prefix to comply with naming convention --- ...ssagingServiceRestClientConfiguration.java | 8 ++++---- .../service/IntegrationApiClientConfig.java | 20 ++++++++++++++++--- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/service-sdk/16.0.0/create-openapi-client/banking-service/src/main/java/com/backbase/banking/config/MessagingServiceRestClientConfiguration.java b/service-sdk/16.0.0/create-openapi-client/banking-service/src/main/java/com/backbase/banking/config/MessagingServiceRestClientConfiguration.java index 3e473b4..115f5ce 100644 --- a/service-sdk/16.0.0/create-openapi-client/banking-service/src/main/java/com/backbase/banking/config/MessagingServiceRestClientConfiguration.java +++ b/service-sdk/16.0.0/create-openapi-client/banking-service/src/main/java/com/backbase/banking/config/MessagingServiceRestClientConfiguration.java @@ -11,14 +11,14 @@ // tag::MessagingServiceRestClientConfiguration[] @Configuration -@ConfigurationProperties("backbase.communication.services.name") +@ConfigurationProperties("backbase.communication.services.messaging-service") @Validated public class MessagingServiceRestClientConfiguration extends ApiClientConfig { - public static final String MESSAGING_SERVICE_ID = "messaging-service"; + public static final String SERVICE_ID = "messaging-service"; public MessagingServiceRestClientConfiguration() { - super(MESSAGING_SERVICE_ID); + super(SERVICE_ID); } /** @@ -27,7 +27,7 @@ public MessagingServiceRestClientConfiguration() { * @return the client. */ @Bean - public MessageApi createGeneratedClassApiClient() { + public MessageApi messageApiClient() { return new MessageApi(createApiClient()); } diff --git a/service-sdk/16.0.0/service-to-service-communication/example-service-to-service/src/main/java/com/backbase/example/service/IntegrationApiClientConfig.java b/service-sdk/16.0.0/service-to-service-communication/example-service-to-service/src/main/java/com/backbase/example/service/IntegrationApiClientConfig.java index 84c1811..324b4ae 100644 --- a/service-sdk/16.0.0/service-to-service-communication/example-service-to-service/src/main/java/com/backbase/example/service/IntegrationApiClientConfig.java +++ b/service-sdk/16.0.0/service-to-service-communication/example-service-to-service/src/main/java/com/backbase/example/service/IntegrationApiClientConfig.java @@ -1,25 +1,39 @@ package com.backbase.example.service; import com.backbase.buildingblocks.communication.client.ApiClientConfig; +import com.backbase.buildingblocks.communication.http.HttpCommunicationConfiguration; import com.backbase.integration.example.client.ApiClient; import com.backbase.integration.example.client.v1.MessageApi; +import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.validation.annotation.Validated; @Configuration +@ConfigurationProperties("backbase.communication.services.messaging-integration-service") +@Validated public class IntegrationApiClientConfig extends ApiClientConfig { + public static final String SERVICE_ID = "messaging-integration-service"; + public IntegrationApiClientConfig() { - super("example-integration-service"); + super(SERVICE_ID); } + /** + * Creates a REST client. + * + * @return the client. + */ + @Bean - public MessageApi exampleIntegrationApiClient() { + public MessageApi messageIntegrationApiClient() { return new MessageApi(createaApiClient()); } private ApiClient createaApiClient() { return new ApiClient(getRestTemplate()) - .setBasePath(createBasePath()); + .setBasePath(createBasePath()) + .addDefaultHeader(HttpCommunicationConfiguration.INTERCEPTORS_ENABLED_HEADER, Boolean.TRUE.toString()); } } \ No newline at end of file