events api with spring webflux #140

isuru89 · Apr 15, 2024 · 2f28986 · 2f28986
1 parent a3eae2a
commit 2f28986
Show file tree

Hide file tree

Showing 97 changed files with 888 additions and 176 deletions.
diff --git a/core/src/main/java/io/github/oasis/core/EventJson.java b/core/src/main/java/io/github/oasis/core/EventJson.java
@@ -19,6 19,7 @@
 
 package io.github.oasis.core;
 
 import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -44,6 45,7 @@ public EventJson() {
  }
 
  public EventJson(Map<String, Object> ref) {
  this.ref = ref;
  this.id = (String) ref.get(Event.ID);
  this.type = (String) ref.get(Event.EVENT_TYPE);
  this.userName = (String) ref.get(Event.USER_NAME);
@@ -53,7 55,24 @@ public EventJson(Map<String, Object> ref) {
  this.sourceId = ((Number)ref.get(Event.SOURCE_ID)).intValue();
  this.gameId = ((Number)ref.get(Event.GAME_ID)).intValue();
  this.tz = (String) ref.get((Event.TIMEZONE));
- this.ref = ref;
  }
 
  public EventJson duplicate() {
  if (this.ref != null) {
  return new EventJson(this.ref);
  }
 
  var fields = new HashMap<String, Object>();
  fields.put(Event.ID, id);
  fields.put(Event.EVENT_TYPE, type);
  fields.put(Event.USER_NAME, userName);
  fields.put(Event.SOURCE_ID, sourceId);
  fields.put(Event.GAME_ID, gameId);
  fields.put(Event.TEAM_ID, teamId);
  fields.put(Event.TIMESTAMP, ts);
  fields.put(Event.TIMEZONE, tz);
  fields.put(Event.USER_ID, userId);
  return new EventJson(fields);
  }
 
  @Override

diff --git a/core/src/main/java/io/github/oasis/core/parser/GameParserYaml.java b/core/src/main/java/io/github/oasis/core/parser/GameParserYaml.java
@@ -90,9 90,7 @@ private void parseDefinitions(Object value, GameDef gameDef, ParserContext parse
  engineMessage.setImpl(elementPluginType);
  engineMessage.setData(elementDef);
  gameDef.addRuleDefinition(engineMessage);
- } else if (def instanceof String) {
- String refPath = (String) def;
-
  } else if (def instanceof String refPath) {
  String fullPath = parserContext.manipulateFullPath(refPath);
  parserContext.pushCurrentLocation(fullPath);
  InputStream refData = parserContext.loadPath(fullPath);

diff --git a/core/src/main/java/io/github/oasis/core/utils/CacheUtils.java b/core/src/main/java/io/github/oasis/core/utils/CacheUtils.java
@@ -28,11 28,11 @@
 /**
  * @author Isuru Weerarathna
  */
-public final class CacheUtils {
 public interface CacheUtils {
 
- private static final String DOT = ".";
  static final String DOT = ".";
 
- public static String getSourceCacheKey(String sourceToken) {
  static String getSourceCacheKey(String sourceToken) {
  return ID.EVENT_API_CACHE_SOURCES_KEY DOT sourceToken;
  }
 

diff --git a/core/src/main/java/io/github/oasis/core/utils/ReflectionUtils.java b/core/src/main/java/io/github/oasis/core/utils/ReflectionUtils.java
@@ -32,6 32,7 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.*;
 import java.util.prefs.Preferences;
 import java.util.stream.Collectors;
 
 public final class ReflectionUtils {

diff --git a/...s/kafka-stream/src/main/java/io/github/oasis/ext/kafkastream/runners/TestTransaction.java b/...s/kafka-stream/src/main/java/io/github/oasis/ext/kafkastream/runners/TestTransaction.java
@@ -0,0 1,8 @@
 package io.github.oasis.ext.kafkastream.runners;
 
 public class TestTransaction {
 
 
 
 
 }
diff --git a/services/events-api/Dockerfile → services/events-api-old/Dockerfile b/services/events-api/Dockerfile → services/events-api-old/Dockerfile
diff --git a/services/events-api-old/pom.xml b/services/events-api-old/pom.xml
@@ -0,0 1,162 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  <parent>
  <artifactId>oasis-services</artifactId>
  <groupId>io.github.oasis</groupId>
  <version>1.0-SNAPSHOT</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
  <artifactId>events-api</artifactId>
 
  <dependencies>
  <dependency>
  <groupId>io.vertx</groupId>
  <artifactId>vertx-web</artifactId>
  <version>${vertx.version}</version>
  </dependency>
  <dependency>
  <groupId>io.vertx</groupId>
  <artifactId>vertx-auth-common</artifactId>
  <version>${vertx.version}</version>
  </dependency>
  <dependency>
  <groupId>io.vertx</groupId>
  <artifactId>vertx-service-proxy</artifactId>
  <version>${vertx.version}</version>
  </dependency>
  <dependency>
  <groupId>io.vertx</groupId>
  <artifactId>vertx-config</artifactId>
  <version>${vertx.version}</version>
  </dependency>
  <dependency>
  <groupId>io.vertx</groupId>
  <artifactId>vertx-config-yaml</artifactId>
  <version>${vertx.version}</version>
  </dependency>
  <dependency>
  <groupId>io.vertx</groupId>
  <artifactId>vertx-redis-client</artifactId>
  <version>${vertx.version}</version>
  </dependency>
  <dependency>
  <groupId>io.github.oasis</groupId>
  <artifactId>oasis-ext-kafkastream</artifactId>
  <version>${project.version}</version>
  </dependency>
  <dependency>
  <groupId>ch.qos.logback</groupId>
  <artifactId>logback-classic</artifactId>
  <version>${logback.version}</version>
  </dependency>
  <dependency>
  <groupId>io.vertx</groupId>
  <artifactId>vertx-codegen</artifactId>
  <version>${vertx.version}</version>
  <classifier>processor</classifier>
  <scope>provided</scope>
  </dependency>
  <dependency>
  <groupId>io.vertx</groupId>
  <artifactId>vertx-junit5</artifactId>
  <version>${vertx.version}</version>
  <scope>test</scope>
  </dependency>
  <dependency>
  <groupId>io.vertx</groupId>
  <artifactId>vertx-web-client</artifactId>
  <version>${vertx.version}</version>
  </dependency>
  <dependency>
  <groupId>org.wiremock</groupId>
  <artifactId>wiremock</artifactId>
  <version>3.3.1</version>
  <scope>test</scope>
  </dependency>
  <dependency>
  <groupId>net.bytebuddy</groupId>
  <artifactId>byte-buddy</artifactId>
  <version>1.14.11</version>
  <scope>test</scope>
  </dependency>
  <dependency>
  <groupId>io.netty</groupId>
  <artifactId>netty-all</artifactId>
  <version>4.1.104.Final</version>
  </dependency>
  <dependency>
  <groupId>org.redisson</groupId>
  <artifactId>redisson</artifactId>
  <version>${redisson.version}</version>
  <scope>test</scope>
  </dependency>
 
  <dependency>
  <groupId>org.testcontainers</groupId>
  <artifactId>testcontainers</artifactId>
  <version>${testcontainers.version}</version>
  <scope>test</scope>
  </dependency>
  <dependency>
  <groupId>org.testcontainers</groupId>
  <artifactId>junit-jupiter</artifactId>
  <version>${testcontainers.version}</version>
  <scope>test</scope>
  </dependency>
  <dependency>
  <groupId>com.redis.testcontainers</groupId>
  <artifactId>testcontainers-redis</artifactId>
  <version>1.6.4</version>
  <scope>test</scope>
  </dependency>
  </dependencies>
 
  <build>
  <finalName>oasis-events-api</finalName>
  <plugins>
  <plugin>
  <artifactId>maven-compiler-plugin</artifactId>
  <configuration>
  <annotationProcessors>
  <annotationProcessor>io.vertx.codegen.CodeGenProcessor</annotationProcessor>
  </annotationProcessors>
  <generatedSourcesDirectory>${project.basedir}/src/main/generated</generatedSourcesDirectory>
  <compilerArgs>
  <arg>-Acodegen.output=${project.basedir}/src/main</arg>
  </compilerArgs>
  </configuration>
  </plugin>
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-clean-plugin</artifactId>
  <version>3.0.0</version>
  <configuration>
  <filesets>
  <fileset>
  <directory>${project.basedir}/src/main/generated</directory>
  </fileset>
  </filesets>
  </configuration>
  </plugin>
  <plugin>
  <artifactId>maven-dependency-plugin</artifactId>
  </plugin>
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-jar-plugin</artifactId>
  <configuration>
  <archive>
  <manifest>
  <mainClass>io.github.oasis.services.events.Main</mainClass>
  </manifest>
  </archive>
  </configuration>
  </plugin>
  </plugins>
  </build>
 
 </project>
diff --git a/...thub/oasis/services/events/Constants.java → ...thub/oasis/services/events/Constants.java b/...thub/oasis/services/events/Constants.java → ...thub/oasis/services/events/Constants.java
diff --git a/...thub/oasis/services/events/EventsApi.java → ...thub/oasis/services/events/EventsApi.java b/...thub/oasis/services/events/EventsApi.java → ...thub/oasis/services/events/EventsApi.java
diff --git a/...io/github/oasis/services/events/Main.java → ...io/github/oasis/services/events/Main.java b/...io/github/oasis/services/events/Main.java → ...io/github/oasis/services/events/Main.java
diff --git a/...sis/services/events/auth/AuthService.java → ...sis/services/events/auth/AuthService.java b/...sis/services/events/auth/AuthService.java → ...sis/services/events/auth/AuthService.java
diff --git a/...ervices/events/auth/EventAuthHandler.java → ...ervices/events/auth/EventAuthHandler.java b/...ervices/events/auth/EventAuthHandler.java → ...ervices/events/auth/EventAuthHandler.java
diff --git a/...rvices/events/auth/EventAuthProvider.java → ...rvices/events/auth/EventAuthProvider.java b/...rvices/events/auth/EventAuthProvider.java → ...rvices/events/auth/EventAuthProvider.java
diff --git a/.../services/events/auth/PublicKeyCache.java → .../services/events/auth/PublicKeyCache.java b/.../services/events/auth/PublicKeyCache.java → .../services/events/auth/PublicKeyCache.java
diff --git a/...is/services/events/auth/package-info.java → ...is/services/events/auth/package-info.java b/...is/services/events/auth/package-info.java → ...is/services/events/auth/package-info.java
diff --git a/...ervices/events/client/AdminApiClient.java → ...ervices/events/client/AdminApiClient.java b/...ervices/events/client/AdminApiClient.java → ...ervices/events/client/AdminApiClient.java
diff --git a/...ervices/events/client/AdminConstants.java → ...ervices/events/client/AdminConstants.java b/...ervices/events/client/AdminConstants.java → ...ervices/events/client/AdminConstants.java
diff --git a/...rvices/events/client/CachedApiClient.java → ...rvices/events/client/CachedApiClient.java b/...rvices/events/client/CachedApiClient.java → ...rvices/events/client/CachedApiClient.java
diff --git a/...ervices/events/client/ClientVerticle.java → ...ervices/events/client/ClientVerticle.java b/...ervices/events/client/ClientVerticle.java → ...ervices/events/client/ClientVerticle.java
diff --git a/...oasis/services/events/db/DataService.java → ...oasis/services/events/db/DataService.java b/...oasis/services/events/db/DataService.java → ...oasis/services/events/db/DataService.java
diff --git a/.../services/events/db/RedisAuthService.java → .../services/events/db/RedisAuthService.java b/.../services/events/db/RedisAuthService.java → .../services/events/db/RedisAuthService.java
diff --git a/...asis/services/events/db/RedisService.java → ...asis/services/events/db/RedisService.java b/...asis/services/events/db/RedisService.java → ...asis/services/events/db/RedisService.java
diff --git a/.../services/events/db/RedisServiceImpl.java → .../services/events/db/RedisServiceImpl.java b/.../services/events/db/RedisServiceImpl.java → .../services/events/db/RedisServiceImpl.java
diff --git a/...sis/services/events/db/RedisSettings.java → ...sis/services/events/db/RedisSettings.java b/...sis/services/events/db/RedisSettings.java → ...sis/services/events/db/RedisSettings.java
diff --git a/...sis/services/events/db/RedisVerticle.java → ...sis/services/events/db/RedisVerticle.java b/...sis/services/events/db/RedisVerticle.java → ...sis/services/events/db/RedisVerticle.java
diff --git a/...asis/services/events/db/package-info.java → ...asis/services/events/db/package-info.java b/...asis/services/events/db/package-info.java → ...asis/services/events/db/package-info.java
diff --git a/...dispatcher/AbstractDispatcherService.java → ...dispatcher/AbstractDispatcherService.java b/...dispatcher/AbstractDispatcherService.java → ...dispatcher/AbstractDispatcherService.java
diff --git a/...s/dispatcher/DispatcherAsyncVerticle.java → ...s/dispatcher/DispatcherAsyncVerticle.java b/...s/dispatcher/DispatcherAsyncVerticle.java → ...s/dispatcher/DispatcherAsyncVerticle.java
diff --git a/.../events/dispatcher/DispatcherFactory.java → .../events/dispatcher/DispatcherFactory.java b/.../events/dispatcher/DispatcherFactory.java → .../events/dispatcher/DispatcherFactory.java
diff --git a/...events/dispatcher/DispatcherVerticle.java → ...events/dispatcher/DispatcherVerticle.java b/...events/dispatcher/DispatcherVerticle.java → ...events/dispatcher/DispatcherVerticle.java
diff --git a/...ts/dispatcher/EventDispatcherService.java → ...ts/dispatcher/EventDispatcherService.java b/...ts/dispatcher/EventDispatcherService.java → ...ts/dispatcher/EventDispatcherService.java
diff --git a/...atcher/WrappedAsyncDispatcherService.java → ...atcher/WrappedAsyncDispatcherService.java b/...atcher/WrappedAsyncDispatcherService.java → ...atcher/WrappedAsyncDispatcherService.java
diff --git a/.../dispatcher/WrappedDispatcherService.java → .../dispatcher/WrappedDispatcherService.java b/.../dispatcher/WrappedDispatcherService.java → .../dispatcher/WrappedDispatcherService.java
diff --git a/...vices/events/dispatcher/package-info.java → ...vices/events/dispatcher/package-info.java b/...vices/events/dispatcher/package-info.java → ...vices/events/dispatcher/package-info.java
diff --git a/...oasis/services/events/http/Constants.java → ...oasis/services/events/http/Constants.java b/...oasis/services/events/http/Constants.java → ...oasis/services/events/http/Constants.java
diff --git a/...rvices/events/http/EventErrorHandler.java → ...rvices/events/http/EventErrorHandler.java b/...rvices/events/http/EventErrorHandler.java → ...rvices/events/http/EventErrorHandler.java
diff --git a/...es/events/http/EventIntegrityHandler.java → ...es/events/http/EventIntegrityHandler.java b/...es/events/http/EventIntegrityHandler.java → ...es/events/http/EventIntegrityHandler.java
diff --git a/...ices/events/http/HttpServiceVerticle.java → ...ices/events/http/HttpServiceVerticle.java b/...ices/events/http/HttpServiceVerticle.java → ...ices/events/http/HttpServiceVerticle.java
diff --git a/...ts/http/routers/AbstractEventHandler.java → ...ts/http/routers/AbstractEventHandler.java b/...ts/http/routers/AbstractEventHandler.java → ...ts/http/routers/AbstractEventHandler.java
diff --git a/...vices/events/http/routers/CacheRoute.java → ...vices/events/http/routers/CacheRoute.java b/...vices/events/http/routers/CacheRoute.java → ...vices/events/http/routers/CacheRoute.java
diff --git a/...ces/events/http/routers/PayloadUtils.java → ...ces/events/http/routers/PayloadUtils.java b/...ces/events/http/routers/PayloadUtils.java → ...ces/events/http/routers/PayloadUtils.java
diff --git a/...rvices/events/http/routers/PingRoute.java → ...rvices/events/http/routers/PingRoute.java b/...rvices/events/http/routers/PingRoute.java → ...rvices/events/http/routers/PingRoute.java
diff --git a/...ents/http/routers/PutBulkEventsRoute.java → ...ents/http/routers/PutBulkEventsRoute.java b/...ents/http/routers/PutBulkEventsRoute.java → ...ents/http/routers/PutBulkEventsRoute.java
diff --git a/...es/events/http/routers/PutEventRoute.java → ...es/events/http/routers/PutEventRoute.java b/...es/events/http/routers/PutEventRoute.java → ...es/events/http/routers/PutEventRoute.java
diff --git a/...vices/events/model/ApiKeyCredentials.java → ...vices/events/model/ApiKeyCredentials.java b/...vices/events/model/ApiKeyCredentials.java → ...vices/events/model/ApiKeyCredentials.java
diff --git a/...ervices/events/model/EventApiConfigs.java → ...ervices/events/model/EventApiConfigs.java b/...ervices/events/model/EventApiConfigs.java → ...ervices/events/model/EventApiConfigs.java
diff --git a/...sis/services/events/model/EventProxy.java → ...sis/services/events/model/EventProxy.java b/...sis/services/events/model/EventProxy.java → ...sis/services/events/model/EventProxy.java
diff --git a/...is/services/events/model/EventSource.java → ...is/services/events/model/EventSource.java b/...is/services/events/model/EventSource.java → ...is/services/events/model/EventSource.java
diff --git a/...oasis/services/events/model/UserInfo.java → ...oasis/services/events/model/UserInfo.java b/...oasis/services/events/model/UserInfo.java → ...oasis/services/events/model/UserInfo.java
diff --git a/...s/services/events/model/package-info.java → ...s/services/events/model/package-info.java b/...s/services/events/model/package-info.java → ...s/services/events/model/package-info.java
diff --git a/services/events-api-old/src/main/resources/defaults.yml b/services/events-api-old/src/main/resources/defaults.yml
@@ -0,0 1,70 @@
 http:
  port: 8050
  ssl: false
 
  # Set this to true, if you want to disable event integrity check against valid event sources registered
  # through admin api. By default, this will be set to false and it means, event integrity will be enforced.
  # Setting this to true, will still want to register a event source in admin api for authentication purpose.
  # Beware: Disabling integrity check should be done only if you can guarantee that this event api will
  # never be exposed as a public api. Otherwise, external users may send events which causes the
  # bad impact to the integrity of game play.
  skipEventIntegrityCheck: false
 
 oasis:
 
  adminApi:
  baseUrl: "http://localhost:8010/api"
 
  eventSourceGet: "/admin/event-source"
  playerGet: "/players"
 
  # authentication details of admin api
  apiKey: "eventapi"
  secretKey: "eventapi"
 
 
  eventstream:
  impl: "oasis:io.github.oasis.ext.kafkastream.KafkaStreamFactory"
  configs:
  brokerUrls: "localhost:9092"
 
  maxConsumerThreadPoolSize: 4
 
  gameEventsConsumer:
  # groupId = ""
 
  # If not specified, this will take engine id
  # instanceId = ""
 
  # These props will directly feed to Kafka property configs
  # Check kafka consumer documentation for supported props.
  props:
  #"max.poll.records": 10,
  #"session.timeout.ms": 86400000
 
  broadcastConsumer:
  # groupId = ""
 
  # These props will directly feed to Kafka property configs
  # Check kafka consumer documentation for supported props.
  props:
 
  dispatcherConfigs:
  props:
 
  engineEventConsumer:
  props:
 
  cache:
  impl: "oasis:io.github.oasis.services.events.db.RedisVerticle"
  configs:
  connectionString: "redis://localhost:6379"
  maxPoolSize: 16
  maxWaitingHandlers: 16
 
  # expiration seconds for once cached event source data.
  # Better to have a ttl based on your domain.
  # Longer TTLs will suffer from event source updates in admin api.
  # Shorter TTLs will suffer from unnecessary invocations to admin api.
  # If this value is not set, no expiration will set for cached entries.
  eventSourcesTTL: 900
diff --git a/...events-api/src/main/resources/logback.xml → ...ts-api-old/src/main/resources/logback.xml b/...events-api/src/main/resources/logback.xml → ...ts-api-old/src/main/resources/logback.xml
diff --git a/...ervices/events/AbstractEventPushTest.java → ...ervices/events/AbstractEventPushTest.java b/...ervices/events/AbstractEventPushTest.java → ...ervices/events/AbstractEventPushTest.java
diff --git a/...b/oasis/services/events/AbstractTest.java → ...b/oasis/services/events/AbstractTest.java b/...b/oasis/services/events/AbstractTest.java → ...b/oasis/services/events/AbstractTest.java
diff --git a/...services/events/BulkEventPublishTest.java → ...services/events/BulkEventPublishTest.java b/...services/events/BulkEventPublishTest.java → ...services/events/BulkEventPublishTest.java
diff --git a/...ces/events/IntegrityDisableCheckTest.java → ...ces/events/IntegrityDisableCheckTest.java b/...ces/events/IntegrityDisableCheckTest.java → ...ces/events/IntegrityDisableCheckTest.java
diff --git a/...is/services/events/PayloadFormatTest.java → ...is/services/events/PayloadFormatTest.java b/...is/services/events/PayloadFormatTest.java → ...is/services/events/PayloadFormatTest.java
diff --git a/...services/events/PayloadIntegrityTest.java → ...services/events/PayloadIntegrityTest.java b/...services/events/PayloadIntegrityTest.java → ...services/events/PayloadIntegrityTest.java
diff --git a/...ithub/oasis/services/events/PingTest.java → ...ithub/oasis/services/events/PingTest.java b/...ithub/oasis/services/events/PingTest.java → ...ithub/oasis/services/events/PingTest.java
diff --git a/...ub/oasis/services/events/PublishTest.java → ...ub/oasis/services/events/PublishTest.java b/...ub/oasis/services/events/PublishTest.java → ...ub/oasis/services/events/PublishTest.java
diff --git a/...b/oasis/services/events/SecurityTest.java → ...b/oasis/services/events/SecurityTest.java b/...b/oasis/services/events/SecurityTest.java → ...b/oasis/services/events/SecurityTest.java
diff --git a/...sis/services/events/UnauthorizedTest.java → ...sis/services/events/UnauthorizedTest.java b/...sis/services/events/UnauthorizedTest.java → ...sis/services/events/UnauthorizedTest.java
diff --git a/...nts/dispatcher/DispatcherFactoryTest.java → ...nts/dispatcher/DispatcherFactoryTest.java b/...nts/dispatcher/DispatcherFactoryTest.java → ...nts/dispatcher/DispatcherFactoryTest.java
diff --git a/...ts/dispatcher/ExternalDispatcherTest.java → ...ts/dispatcher/ExternalDispatcherTest.java b/...ts/dispatcher/ExternalDispatcherTest.java → ...ts/dispatcher/ExternalDispatcherTest.java
diff --git a/...s/events/utils/TestDispatcherFactory.java → ...s/events/utils/TestDispatcherFactory.java b/...s/events/utils/TestDispatcherFactory.java → ...s/events/utils/TestDispatcherFactory.java
diff --git a/...s/events/utils/TestDispatcherService.java → ...s/events/utils/TestDispatcherService.java b/...s/events/utils/TestDispatcherService.java → ...s/events/utils/TestDispatcherService.java
diff --git a/.../events/utils/TestDispatcherVerticle.java → .../events/utils/TestDispatcherVerticle.java b/.../events/utils/TestDispatcherVerticle.java → .../events/utils/TestDispatcherVerticle.java
diff --git a/...events/utils/TestRedisDeployVerticle.java → ...events/utils/TestRedisDeployVerticle.java b/...events/utils/TestRedisDeployVerticle.java → ...events/utils/TestRedisDeployVerticle.java
diff --git a/...asis/services/events/utils/TestUtils.java → ...asis/services/events/utils/TestUtils.java b/...asis/services/events/utils/TestUtils.java → ...asis/services/events/utils/TestUtils.java
diff --git a/...s-api/src/test/resources/application.conf → ...i-old/src/test/resources/application.conf b/...s-api/src/test/resources/application.conf → ...i-old/src/test/resources/application.conf
diff --git a/...events-api/src/test/resources/logback.xml → ...ts-api-old/src/test/resources/logback.xml b/...events-api/src/test/resources/logback.xml → ...ts-api-old/src/test/resources/logback.xml
diff --git a/...-api/src/test/resources/test-defaults.yml → ...-old/src/test/resources/test-defaults.yml b/...-api/src/test/resources/test-defaults.yml → ...-old/src/test/resources/test-defaults.yml