updated to SSDK 18.0.1;

updated dependency versions; added m10y support;
Backbase · Oct 29, 2024 · c4b78c5 · c4b78c5
1 parent 8e9f831
commit c4b78c5
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 38 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,50 +5,37 @@
     <parent>
         <groupId>com.backbase.buildingblocks</groupId>
         <artifactId>service-sdk-starter-core</artifactId>
-        <version>17.0.0</version>
+        <version>18.0.1</version>
     </parent>
 
     <groupId>com.backbase.testing</groupId>
     <artifactId>event-emitter</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Backbase :: Testing Components :: Events Emitter</name>
 
     <properties>
         <archunit.skip>true</archunit.skip>
-        <action-service.version>1.1.5</action-service.version>
+        <action-service.version>1.1.7</action-service.version>
 
         <!--EVENTS-->
-        <transaction-management.version>1.114</transaction-management.version>
+        <transaction-management.version>4.2</transaction-management.version>
         <limit.version>1.0.48</limit.version>
-        <messages-service.version>1.2.13</messages-service.version>
-        <financial-insights.version>1.61</financial-insights.version>
-        <payment-order-service.version>1.3.92</payment-order-service.version>
-        <contact-manager.version>2.0.6</contact-manager.version>
-        <pocket-tailor.version>0.5</pocket-tailor.version>
-        <audit-spec.version>7.0.0</audit-spec.version>
+        <messages-service.version>4.0.5</messages-service.version>
+        <financial-insights.version>1.94.5</financial-insights.version>
+        <payment-order-service.version>1.4.62.2</payment-order-service.version>
+        <contact-manager.version>5.0.6</contact-manager.version>
+        <pocket-tailor.version>0.11.2</pocket-tailor.version>
+        <audit-spec.version>9.0.3</audit-spec.version>
 
         <java.version>21</java.version>
         <api.target>${project.build.directory}/downloaded-api</api.target>
         <specs.repo.url>https://repo.backbase.com/specs/</specs.repo.url>
-        <json-path-assert.version>2.2.0</json-path-assert.version>
-        <camel-version>2.22.0</camel-version>
-        <mapstruct.version>1.5.5.Final</mapstruct.version>
-        <org-quartz.version>2.3.2</org-quartz.version>
-        <log4j.version>2.17.1</log4j.version>
-        <velocity-tools-generic.version>3.0</velocity-tools-generic.version>
-        <velocity-engine-core.version>2.1</velocity-engine-core.version>
-        <spring-dbunit.version>1.3.0</spring-dbunit.version>
-        <awaitility.version>4.0.1</awaitility.version>
-        <apache-commons-beanutils.version>1.9.4</apache-commons-beanutils.version>
-        <hamcrest-date.version>2.0.7</hamcrest-date.version>
-        <dbunit.version>2.6.0</dbunit.version>
-        <boat.version>0.17.30</boat.version>
-        <swagger-core-annotations.version>2.2.19</swagger-core-annotations.version>
-        <jackson-databind-nullable.version>0.2.1</jackson-databind-nullable.version>
-        <wagon.plugin.version>2.0.0</wagon.plugin.version>
-        <testcontainers.version>1.17.6</testcontainers.version>
+        <mapstruct.version>1.6.2</mapstruct.version>
         <lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version>
+        <swagger-core-annotations.version>2.2.25</swagger-core-annotations.version>
+        <jackson-databind-nullable.version>0.2.6</jackson-databind-nullable.version>
+        <testcontainers.version>1.20.3</testcontainers.version>
 
         <sonar.jacoco.reportPaths>target/coverage-reports/jacoco.exec,target/coverage-reports/jacoco-it.exec</sonar.jacoco.reportPaths>
         <sonar.sources>src/main/java,pom.xml</sonar.sources>
@@ -83,6 +70,14 @@
             <groupId>com.backbase.buildingblocks</groupId>
             <artifactId>spring-cloud-stream-binder-jms-activemq</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.backbase.buildingblocks</groupId>
+            <artifactId>multi-tenancy</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.backbase.buildingblocks</groupId>
+            <artifactId>multi-tenancy-liquibase</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.backbase.buildingblocks</groupId>
             <artifactId>api</artifactId>
@@ -117,7 +112,6 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>${log4j.version}</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>

diff --git a/src/main/java/com/backbase/eo/testing/events/emitter/EventEmittingController.java b/src/main/java/com/backbase/eo/testing/events/emitter/EventEmittingController.java
@@ -1,8 +1,8 @@
 package com.backbase.eo.testing.events.emitter;
 
-import com.backbase.buildingblocks.backend.communication.context.OriginatorContext;
 import com.backbase.buildingblocks.backend.communication.event.EnvelopedEvent;
 import com.backbase.buildingblocks.backend.communication.event.proxy.EventBus;
+import com.backbase.buildingblocks.backend.internalrequest.UserRequestContext;
 import com.backbase.buildingblocks.persistence.model.Event;
 import com.backbase.buildingblocks.presentation.errors.BadRequestException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -88,9 +88,9 @@ private EnvelopedEvent buildEventPayload(String eventId, String body, String req
         Reflections reflections = new Reflections("com.backbase");
         Set<Class<? extends Event>> availableEvents = reflections.getSubTypesOf(Event.class);
 
-        OriginatorContext originatorContext = new OriginatorContext();
-        originatorContext.setRequestUuid(requestUuid);
-        originatorContext.setCreationTime(Instant.EPOCH.toEpochMilli());
+        UserRequestContext userRequestContext = new UserRequestContext();
+        userRequestContext.setRequestUuid(requestUuid);
+        userRequestContext.setRequestTime(Instant.EPOCH.toEpochMilli());
 
         Object testObject = availableEvents.stream()
             .filter(clazz -> clazz.getName().equalsIgnoreCase(eventId))
@@ -109,7 +109,7 @@ private EnvelopedEvent buildEventPayload(String eventId, String body, String req
             }).orElseThrow(() -> new BadRequestException("Unknown event"));
 
         EnvelopedEvent envelopedEvent = new EnvelopedEvent();
-        envelopedEvent.setOriginatorContext(originatorContext);
+        envelopedEvent.setUserRequestContext(userRequestContext);
         envelopedEvent.setEvent(testObject);
 
         return envelopedEvent;

diff --git a/src/main/java/com/backbase/eo/testing/events/emitter/RawEmittingController.java b/src/main/java/com/backbase/eo/testing/events/emitter/RawEmittingController.java
@@ -3,9 +3,9 @@
 import static java.util.Collections.emptyEnumeration;
 import static java.util.Optional.ofNullable;
 
-import com.backbase.buildingblocks.backend.communication.context.OriginatorContext;
 import com.backbase.buildingblocks.backend.communication.event.EnvelopedEvent;
 import com.backbase.buildingblocks.backend.communication.event.scs.EventMessageProcessor;
+import com.backbase.buildingblocks.backend.internalrequest.UserRequestContext;
 import com.backbase.eo.testing.events.configuration.EventEmitterConfiguration;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
@@ -56,12 +56,12 @@ public class RawEmittingController {
     )
     public ResponseEntity<Void> emitEvent(HttpServletRequest request, @RequestBody RawEventPayload payload) {
 
-        OriginatorContext originatorContext = new OriginatorContext();
-        originatorContext.setRequestUuid(payload.getRequestId());
-        originatorContext.setCreationTime(payload.getCreationTime());
+        UserRequestContext userRequestContext = new UserRequestContext();
+        userRequestContext.setRequestUuid(payload.getRequestId());
+        userRequestContext.setRequestTime(payload.getCreationTime());
 
         EnvelopedEvent envelopedEvent = new EnvelopedEvent();
-        envelopedEvent.setOriginatorContext(originatorContext);
+        envelopedEvent.setUserRequestContext(userRequestContext);
         envelopedEvent.setEvent(payload.getBody());
 
         MessageBuilder eventMessageBuilder = MessageBuilder.withPayload(payload.getBody()).setHeader("bbEventType", payload.getEventType());