Merge pull request #260 from Backbase/ssdk-16-sb-3-update

SSDK version update - 16.0.1
Backbase · Nov 2, 2023 · d093a2b · d093a2b
2 parents fa371cd + c9c0dfc
commit d093a2b
Show file tree

Hide file tree

Showing 55 changed files with 208 additions and 167 deletions.
diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml
@@ -44,8 +44,8 @@ jobs:
             }]
       - run: mvn --batch-mode --update-snapshots verify
         name: Build and test project
-      - run: mkdir staging && cp services/product/target/*.war staging
-        name: Move and upload the war
+      - run: mkdir staging && cp services/product/target/*.jar staging
+        name: Move and upload the jar
       - uses: actions/upload-artifact@v2
         with:
           name: Package

diff --git a/api/pom.xml b/api/pom.xml
@@ -6,14 +6,14 @@
     <parent>
         <groupId>com.backbase.buildingblocks</groupId>
         <artifactId>backbase-openapi-spec-starter-parent</artifactId>
-        <version>15.2.0</version>
+        <version>16.0.1</version>
         <relativePath/>
     </parent>
 
     <groupId>com.backbase.goldensample</groupId>
     <artifactId>api</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
 
     <modules>
         <module>product-api</module>
@@ -24,7 +24,7 @@
 
     <properties>
         <frontend-plugin.version>1.12.1</frontend-plugin.version>
-        <boat-maven-plugin.version>0.16.6</boat-maven-plugin.version>
+        <boat-maven-plugin.version>0.17.24</boat-maven-plugin.version>
     </properties>
 
     <build>

diff --git a/api/product-api/pom.xml b/api/product-api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.backbase.goldensample</groupId>
         <artifactId>api</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <name>Backbase :: product-api</name>

diff --git a/api/review-service-api/pom.xml b/api/review-service-api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.backbase.goldensample</groupId>
         <artifactId>api</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <name>Backbase :: review-service-api</name>

diff --git a/api/review-service-api/src/main/resources/v1/schemas/definitions.yaml b/api/review-service-api/src/main/resources/v1/schemas/definitions.yaml
@@ -1,13 +1,13 @@
 components:
   schemas:
     Review:
-      $ref: ../v1/schemas/review.yaml
+      $ref: review.yaml
     ReviewList:
-      $ref: ../v1/schemas/review-list.yaml
+      $ref: review-list.yaml
     ReviewId:
-      $ref: ../v1/schemas/review-id.yaml
+      $ref: review-id.yaml
     Additions:
-      $ref: ../lib/schemas/additions.yaml
+      $ref: ../../lib/schemas/additions.yaml
 
   responses:
     200ReviewList:

diff --git a/api/review-service-api/src/main/resources/v2/schemas/definitions.yaml b/api/review-service-api/src/main/resources/v2/schemas/definitions.yaml
@@ -1,13 +1,13 @@
 components:
   schemas:
     Review:
-      $ref: ../v2/schemas/review.yaml
+      $ref: review.yaml
     ReviewList:
-      $ref: ../v2/schemas/review-list.yaml
+      $ref: review-list.yaml
     ReviewId:
-      $ref: ../v2/schemas/review-id.yaml
+      $ref: review-id.yaml
     Additions:
-      $ref: ../lib/schemas/additions.yaml
+      $ref: ../../lib/schemas/additions.yaml
 
   responses:
     200ReviewList:

diff --git a/api/store-client-api/pom.xml b/api/store-client-api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.backbase.goldensample</groupId>
         <artifactId>api</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <name>Backbase :: store-client-api</name>

diff --git a/api/store-integration-enricher-api/pom.xml b/api/store-integration-enricher-api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.backbase.goldensample</groupId>
         <artifactId>api</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <name>Backbase :: store-integration-enricher-api</name>

diff --git a/charts/pom.xml b/charts/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.backbase.goldensample</groupId>
         <artifactId>backbase-golden-sample</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>charts</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <name>backbase-golden-sample-chart</name>
     <description>Demo project for Backbase Backend Best Practices</description>
     <packaging>pom</packaging>

diff --git a/database/pom.xml b/database/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.backbase.goldensample</groupId>
         <artifactId>backbase-golden-sample</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>database</artifactId>

diff --git a/database/product-db/pom.xml b/database/product-db/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.backbase.goldensample</groupId>
         <artifactId>database</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>product-db</artifactId>

diff --git a/database/review-db/pom.xml b/database/review-db/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.backbase.goldensample</groupId>
         <artifactId>database</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>review-db</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -10,13 +10,13 @@
     <parent>
         <artifactId>service-sdk-starter-core</artifactId>
         <groupId>com.backbase.buildingblocks</groupId>
-        <version>15.2.0</version>
+        <version>16.0.1</version>
         <relativePath />
     </parent>
 
     <groupId>com.backbase.goldensample</groupId>
     <artifactId>backbase-golden-sample</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <name>backbase-golden-example</name>
     <description>Demo project for Backbase Backend Best Practices</description>
     <packaging>pom</packaging>

diff --git a/services/pom.xml b/services/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>com.backbase.goldensample</groupId>
         <artifactId>backbase-golden-sample</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>services</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -20,11 +20,9 @@
 
     <properties>
         <properties-maven-plugin.version>1.0.0</properties-maven-plugin.version>
-        <testcontainers.version>1.17.6</testcontainers.version>
-        <boat-maven-plugin.version>0.16.6</boat-maven-plugin.version>
+        <testcontainers.version>1.19.1</testcontainers.version>
+        <boat-maven-plugin.version>0.17.24</boat-maven-plugin.version>
         <jqno.equalsverifier.version>3.14.1</jqno.equalsverifier.version>
-        <jackson-databind-nullable.version>0.2.6</jackson-databind-nullable.version>
-        <swagger-annotations.version>1.6.10</swagger-annotations.version>
         <docker.repo.project>experimental/golden-sample</docker.repo.project>
     </properties>
 
@@ -35,11 +33,6 @@
                 <artifactId>equalsverifier</artifactId>
                 <version>${jqno.equalsverifier.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.openapitools</groupId>
-                <artifactId>jackson-databind-nullable</artifactId>
-                <version>${jackson-databind-nullable.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.projectlombok</groupId>
                 <artifactId>lombok-mapstruct-binding</artifactId>
@@ -57,15 +50,10 @@
                 <version>${mssql-jdbc.version}</version>
             </dependency>
             <dependency>
-                <groupId>mysql</groupId>
-                <artifactId>mysql-connector-java</artifactId>
+                <groupId>com.mysql</groupId>
+                <artifactId>mysql-connector-j</artifactId>
                 <version>${mysql.version}</version>
             </dependency>
-            <dependency>
-                <groupId>io.swagger</groupId>
-                <artifactId>swagger-annotations</artifactId>
-                <version>${swagger-annotations.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.testcontainers</groupId>
                 <artifactId>testcontainers-bom</artifactId>

diff --git a/services/product/pom.xml b/services/product/pom.xml
@@ -5,16 +5,16 @@
     <parent>
         <groupId>com.backbase.goldensample</groupId>
         <artifactId>services</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>product</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>war</packaging>
+    <version>2.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
     <name>Backbase :: product-service</name>
 
     <properties>
-    	<pact.version>4.5.6</pact.version>
+    	<pact.version>4.6.1</pact.version>
     </properties>
 
     <dependencies>
@@ -87,6 +87,10 @@
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.swagger.core.v3</groupId>
+            <artifactId>swagger-annotations</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -109,8 +113,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-kahadb-store</artifactId>
+            <groupId>com.backbase.buildingblocks</groupId>
+            <artifactId>bb-activemq-broker</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -154,8 +158,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -369,8 +373,8 @@
             <id>local</id>
             <dependencies>
                 <dependency>
-                    <groupId>mysql</groupId>
-                    <artifactId>mysql-connector-java</artifactId>
+                    <groupId>com.mysql</groupId>
+                    <artifactId>mysql-connector-j</artifactId>
                 </dependency>
             </dependencies>
         </profile>
@@ -385,8 +389,8 @@
                     <artifactId>mssql-jdbc</artifactId>
                 </dependency>
                 <dependency>
-                    <groupId>mysql</groupId>
-                    <artifactId>mysql-connector-java</artifactId>
+                    <groupId>com.mysql</groupId>
+                    <artifactId>mysql-connector-j</artifactId>
                 </dependency>
             </dependencies>
         </profile>

diff --git a/.../src/main/java/com/backbase/goldensample/product/api/ProductIntegrationApiController.java b/.../src/main/java/com/backbase/goldensample/product/api/ProductIntegrationApiController.java
@@ -5,7 +5,7 @@
 import com.backbase.product.api.integration.v1.ProductIntegrationApi;
 import com.backbase.product.api.service.v1.model.Product;
 import com.backbase.product.api.service.v1.model.ProductId;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;

diff --git a/...duct/src/main/java/com/backbase/goldensample/product/api/ProductServiceApiController.java b/...duct/src/main/java/com/backbase/goldensample/product/api/ProductServiceApiController.java
@@ -7,7 +7,7 @@
 import com.backbase.product.api.service.v1.model.Product;
 import com.backbase.product.api.service.v1.model.ProductId;
 import java.util.List;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;

diff --git a/.../java/com/backbase/goldensample/product/config/IdentityStrategyOverrideConfiguration.java b/.../java/com/backbase/goldensample/product/config/IdentityStrategyOverrideConfiguration.java
@@ -1,6 +1,6 @@
 package com.backbase.goldensample.product.config;
 
-import javax.persistence.GenerationType;
+import jakarta.persistence.GenerationType;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;

diff --git a/...duct/src/main/java/com/backbase/goldensample/product/config/WebSecurityConfiguration.java b/...duct/src/main/java/com/backbase/goldensample/product/config/WebSecurityConfiguration.java
@@ -1,19 +1,21 @@
 package com.backbase.goldensample.product.config;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.validation.annotation.Validated;
 
 @Validated
 @EnableWebSecurity
 @Configuration
 @ConditionalOnProperty(prefix = "security", name = "disabled")
-class WebSecurityConfiguration extends WebSecurityConfigurerAdapter {
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        http.csrf().disable();
+public class WebSecurityConfiguration {
+    @Bean
+    public SecurityFilterChain emptySecurityFilterChain(HttpSecurity http) throws Exception {
+        http.csrf((csrf) -> csrf.disable());
+        return http.build();
     }
 }
diff --git a/services/product/src/main/java/com/backbase/goldensample/product/mapper/ProductMapper.java b/services/product/src/main/java/com/backbase/goldensample/product/mapper/ProductMapper.java
@@ -1,5 +1,8 @@
 package com.backbase.goldensample.product.mapper;
 
+import static org.mapstruct.NullValuePropertyMappingStrategy.IGNORE;
+import static org.mapstruct.ReportingPolicy.ERROR;
+
 import com.backbase.goldensample.product.persistence.ProductEntity;
 import com.backbase.product.api.service.v1.model.Product;
 import com.backbase.product.event.spec.v1.ProductCreatedEvent;
@@ -8,9 +11,10 @@
 import java.util.List;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
-import org.mapstruct.NullValuePropertyMappingStrategy;
 
-@Mapper(componentModel = "spring", nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)
+@Mapper(componentModel = "spring",
+    nullValuePropertyMappingStrategy = IGNORE,
+    unmappedTargetPolicy = ERROR)
 public interface ProductMapper {
 
   @Mapping(source = "id", target = "productId")
@@ -20,6 +24,7 @@ public interface ProductMapper {
   ProductCreatedEvent entityToCreatedEvent(ProductEntity entity);
 
   @Mapping(source = "id", target = "productId")
+  @Mapping(target = "deleteDate", ignore = true)
   ProductDeletedEvent entityToDeletedEvent(ProductEntity entity);
 
   @Mapping(source = "productId", target = "id")

diff --git a/...oduct/src/main/java/com/backbase/goldensample/product/persistence/MapToJsonConverter.java b/...oduct/src/main/java/com/backbase/goldensample/product/persistence/MapToJsonConverter.java
@@ -7,8 +7,8 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.IOException;
 import java.util.Map;
-import javax.persistence.AttributeConverter;
-import javax.persistence.Converter;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.StringUtils;