opexdev · Marchosiax · Jan 22, 2022 · Dec 19, 2021 · Jan 19, 2022
diff --git a/Deployment/nginx.conf b/Deployment/nginx.conf
@@ -31,10 +31,6 @@ http {
         server websocket:8097;
     }
 
-    upstream docker-payment {
-        server payment:9995;
-    }
-
     proxy_set_header   Host $host;
     proxy_set_header   X-Real-IP $remote_addr;
     proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -82,11 +78,6 @@ http {
             rewrite ^/storage/(.*)$ /$1 break;
         }
 
-        location /payment {
-            proxy_pass http://docker-payment;
-            rewrite ^/payment(.*)$ $1 break;
-        }
-
         location /stream {
             proxy_pass http://docker-websocket;
             # WS config

diff --git a/accountant/accountant-app/src/main/resources/application.yml b/accountant/accountant-app/src/main/resources/application.yml
@@ -8,6 +8,7 @@ spring:
     name: opex-accountant
   main:
     allow-bean-definition-overriding: false
+    allow-circular-references: true
   kafka:
     bootstrap-servers: 192.168.178.29:9092
     consumer:

diff --git a/accountant/accountant-ports/accountant-wallet-proxy/pom.xml b/accountant/accountant-ports/accountant-wallet-proxy/pom.xml
@@ -15,10 +15,6 @@
     <name>accountant-wallet-proxy</name>
     <description>Opex wallet proxy</description>
 
-    <properties>
-        <spring-cloud.version>2020.0.2</spring-cloud.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>

diff --git a/api/api-app/src/main/resources/application.yml b/api/api-app/src/main/resources/application.yml
@@ -8,6 +8,7 @@ spring:
     name: opex-api
   main:
     allow-bean-definition-overriding: false
+    allow-circular-references: true
   kafka:
     bootstrap-servers: 192.168.178.29:9092
     consumer:

diff --git a/api/api-core/src/main/kotlin/co/nilin/opex/api/core/spi/BlockchainGatewayProxy.kt b/api/api-core/src/main/kotlin/co/nilin/opex/api/core/spi/BlockchainGatewayProxy.kt
@@ -5,7 +5,7 @@ import co.nilin.opex.api.core.inout.DepositDetails
 
 interface BlockchainGatewayProxy {
 
-    suspend fun assignAddress(uuid: String, currency: String): AssignResponse
+    suspend fun assignAddress(uuid: String, currency: String): AssignResponse?
 
     suspend fun getDepositDetails(refs: List<String>): List<DepositDetails>
 

diff --git a/api/api-ports/api-binance-rest/pom.xml b/api/api-ports/api-binance-rest/pom.xml
@@ -15,10 +15,6 @@
     <name>api-binance-rest</name>
     <description>Api Binance Rest</description>
 
-    <properties>
-        <spring-cloud.version>2020.0.2</spring-cloud.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>

diff --git a/...nance-rest/src/main/kotlin/co/nilin/opex/api/ports/binance/controller/WalletController.kt b/...nance-rest/src/main/kotlin/co/nilin/opex/api/ports/binance/controller/WalletController.kt
@@ -39,7 +39,7 @@ class WalletController(
         @CurrentSecurityContext securityContext: SecurityContext
     ): AssignAddressResponse {
         val response = bcGatewayProxy.assignAddress(securityContext.jwtAuthentication().name, coin)
-        val address = if (response.addresses.isNotEmpty()) response.addresses[0] else null
+        val address = if (response?.addresses?.isNotEmpty() == true) response.addresses[0] else null
         return AssignAddressResponse(address?.address ?: "", coin, "", "")
     }
 

diff --git a/...-rest/src/main/kotlin/co/nilin/opex/api/ports/binance/proxy/BlockchainGatewayProxyImpl.kt b/...-rest/src/main/kotlin/co/nilin/opex/api/ports/binance/proxy/BlockchainGatewayProxyImpl.kt
@@ -33,7 +33,7 @@ class BlockchainGatewayProxyImpl(private val client: WebClient) : BlockchainGate
     @Value("\${app.opex-bc-gateway.url}")
     private lateinit var baseUrl: String
 
-    override suspend fun assignAddress(uuid: String, currency: String): AssignResponse {
+    override suspend fun assignAddress(uuid: String, currency: String): AssignResponse? {
         logger.info("calling bc-gateway assign")
         return client.post()
             .uri(URI.create("$baseUrl/address/assign"))
@@ -42,7 +42,7 @@ class BlockchainGatewayProxyImpl(private val client: WebClient) : BlockchainGate
             .body(Mono.just(AssignAddressRequest(uuid, currency)))
             .retrieve()
             .onStatus({ t -> t.isError }, { it.createException() })
-            .bodyToMono(typeRef<AssignResponse>())
+            .bodyToMono(AssignResponse::class.java)
             .awaitSingleOrNull()
     }
 

diff --git a/bc-gateway/bc-gateway-app/pom.xml b/bc-gateway/bc-gateway-app/pom.xml
@@ -14,10 +14,6 @@
     <name>bc-gateway-app</name>
     <description>Blockchain gateway app of Opex</description>
 
-    <properties>
-        <spring-cloud.version>2020.0.2</spring-cloud.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>

diff --git a/bc-gateway/bc-gateway-app/src/main/resources/application-docker.yml b/bc-gateway/bc-gateway-app/src/main/resources/application-docker.yml
@@ -17,8 +17,3 @@ spring:
       host: ${CONSUL_HOST}
       port: 8500
 
-app:
-  auth:
-    cert-url: lb://opex-auth/auth/realms/opex/protocol/openid-connect/certs
-  wallet:
-    url: lb://opex-wallet
diff --git a/bc-gateway/bc-gateway-app/src/main/resources/application.yml b/bc-gateway/bc-gateway-app/src/main/resources/application.yml
@@ -31,3 +31,8 @@ logging:
     org.apache.kafka: DEBUG
 
 swagger.authUrl: https://api.opex.dev
+app:
+  auth:
+    cert-url: lb://opex-auth/auth/realms/opex/protocol/openid-connect/certs
+  wallet:
+    url: lb://opex-wallet
diff --git a/bc-gateway/bc-gateway-core/pom.xml b/bc-gateway/bc-gateway-core/pom.xml
@@ -15,7 +15,7 @@
     <description>Blockchain gateway core of Opex</description>
 
     <properties>
-        <mockito-kotlin.version>3.2.0</mockito-kotlin.version>
+        <mockito-kotlin.version>4.0.0</mockito-kotlin.version>
     </properties>
 
     <dependencies>
@@ -48,6 +48,7 @@
             <groupId>org.mockito.kotlin</groupId>
             <artifactId>mockito-kotlin</artifactId>
             <version>${mockito-kotlin.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>co.nilin.opex.utility.error</groupId>

diff --git a/...way-core/src/test/kotlin/co/nilin/opex/bcgateway/core/service/ChainSyncServiceImplTest.kt b/...way-core/src/test/kotlin/co/nilin/opex/bcgateway/core/service/ChainSyncServiceImplTest.kt
@@ -75,7 +75,7 @@ internal class ChainSyncServiceImplTest {
             syncService.startSyncWithChain()
 
             //then
-            verifyZeroInteractions(
+            verifyNoMoreInteractions(
                 chainEndpointProxyFinder,
                 chainSyncRecordHandler,
                 walletSyncRecordHandler,

diff --git a/eventlog/eventlog-app/src/main/resources/application.yml b/eventlog/eventlog-app/src/main/resources/application.yml
@@ -1,5 +1,7 @@
 server.port: 8090
 spring:
+  main:
+    allow-circular-references: true
   kafka:
     bootstrap-servers: localhost:9092
     consumer:

diff --git a/matching-engine/matching-engine-app/src/main/resources/application.yml b/matching-engine/matching-engine-app/src/main/resources/application.yml
@@ -2,6 +2,7 @@ server.port: 8092
 spring:
   main:
     allow-bean-definition-overriding: false
+    allow-circular-references: true
   kafka:
     bootstrap-servers: localhost:9092
     consumer:

diff --git a/...main/kotlin/co/nilin/opex/matching/engine/ports/kafka/listener/config/OrderKafkaConfig.kt b/...main/kotlin/co/nilin/opex/matching/engine/ports/kafka/listener/config/OrderKafkaConfig.kt
@@ -97,7 +97,7 @@ class OrderKafkaConfig {
         val containerProps = ContainerProperties(*topics)
         containerProps.messageListener = orderKafkaListener
         val container = KafkaMessageListenerContainer(consumerFactory, containerProps)
-        container.beanName = "OrderKafkaListenerContainer"
+        container.setBeanName("OrderKafkaListenerContainer")
         container.start()
     }
 
@@ -109,7 +109,7 @@ class OrderKafkaConfig {
         val containerProps = ContainerProperties(Pattern.compile("events_.*"))
         containerProps.messageListener = eventListener
         val container = ConcurrentMessageListenerContainer(consumerFactory, containerProps)
-        container.beanName = "EventKafkaListenerContainer"
+        container.setBeanName("EventKafkaListenerContainer")
         container.start()
     }
 

diff --git a/matching-gateway/matching-gateway-app/pom.xml b/matching-gateway/matching-gateway-app/pom.xml
@@ -14,10 +14,6 @@
     <name>matching-gateway-app</name>
     <description>Matching gateway running app Opex</description>
 
-    <properties>
-        <spring-cloud.version>2020.0.2</spring-cloud.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>

diff --git a/matching-gateway/matching-gateway-app/src/main/resources/application-docker.yml b/matching-gateway/matching-gateway-app/src/main/resources/application-docker.yml
@@ -19,8 +19,3 @@ spring:
         instance-id: ${spring.application.name}:${server.port}
         healthCheckInterval: 20s
         prefer-ip-address: true
-app:
-  accountant:
-    url: lb://opex-accountant
-  auth:
-    cert-url: lb://opex-auth/auth/realms/opex/protocol/openid-connect/certs
diff --git a/matching-gateway/matching-gateway-app/src/main/resources/application.yml b/matching-gateway/matching-gateway-app/src/main/resources/application.yml
@@ -22,8 +22,9 @@ spring:
         instance-id: ${spring.application.name}:${server.port}
         healthCheckInterval: 20s
         prefer-ip-address: true
+swagger.authUrl: https://api.opex.dev
 app:
   accountant:
     url: lb://opex-accountant
-
-swagger.authUrl: https://api.opex.dev
+  auth:
+    cert-url: lb://opex-auth/auth/realms/opex/protocol/openid-connect/certs
diff --git a/pom.xml b/pom.xml
@@ -10,9 +10,10 @@
     <version>1.0-SNAPSHOT</version>
 
     <properties>
-        <java.version>1.8</java.version>
-        <kotlin.version>1.4.31</kotlin.version>
-        <spring.version>2.4.4</spring.version>
+        <java.version>13</java.version>
+        <kotlin.version>1.6.0</kotlin.version>
+        <spring.version>2.6.2</spring.version>
+        <spring-cloud.version>2021.0.0</spring-cloud.version>
         <skip.unit.tests>false</skip.unit.tests>
     </properties>
 
@@ -59,11 +60,6 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-starter-consul-all</artifactId>
-                <version>3.0.4</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/storage/storage-app/pom.xml b/storage/storage-app/pom.xml
@@ -13,10 +13,6 @@
     <artifactId>storage-app</artifactId>
     <name>storage-app</name>
 
-    <properties>
-        <spring-cloud.version>2020.0.2</spring-cloud.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlinx</groupId>
@@ -62,6 +58,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
         </dependency>
+        <dependency>
+            <groupId>net.minidev</groupId>
+            <artifactId>json-smart</artifactId>
+            <version>2.4.7</version>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>

diff --git a/storage/storage-app/src/main/resources/application-docker.yml b/storage/storage-app/src/main/resources/application-docker.yml
@@ -2,12 +2,4 @@ spring:
   cloud:
     consul:
       host: ${CONSUL_HOST}
-  main:
-    allow-bean-definition-overriding: true
 
-app:
-  cors:
-    allowed-hosts: https://opex.dev, http://localhost:3000
-    allowed-patterns: http://192.168.*
-  auth:
-    cert-url: lb://opex-auth/auth/realms/opex/protocol/openid-connect/certs
diff --git a/user-management/keycloak-gateway/pom.xml b/user-management/keycloak-gateway/pom.xml
@@ -17,11 +17,9 @@
     <properties>
         <maven.compiler.target>13</maven.compiler.target>
         <maven.compiler.source>13</maven.compiler.source>
-        <java.version>13</java.version>
         <keycloak.version>12.0.4</keycloak.version>
         <keycloak.resteasy.version>3.13.2.Final</keycloak.resteasy.version>
         <infinispan.version>11.0.10.Final</infinispan.version>
-        <spring-cloud.version>2020.0.2</spring-cloud.version>
     </properties>
 
     <dependencies>

diff --git a/user-management/pom.xml b/user-management/pom.xml
@@ -9,6 +9,11 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
 
+    <properties>
+        <spring.version>2.4.4</spring.version>
+        <spring-cloud.version>2020.0.2</spring-cloud.version>
+    </properties>
+
     <groupId>co.nilin.opex.auth</groupId>
     <artifactId>user-management</artifactId>
     <name>user-management</name>

diff --git a/wallet/wallet-app/pom.xml b/wallet/wallet-app/pom.xml
@@ -14,12 +14,6 @@
     <name>wallet-app</name>
     <description>Wallet management app of Opex</description>
 
-    <properties>
-        <java.version>1.8</java.version>
-        <kotlin.version>1.4.31</kotlin.version>
-        <spring-cloud.version>2020.0.2</spring-cloud.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -100,6 +94,11 @@
             <groupId>co.nilin.opex.utility.interceptors</groupId>
             <artifactId>interceptors</artifactId>
         </dependency>
+        <dependency>
+            <groupId>net.minidev</groupId>
+            <artifactId>json-smart</artifactId>
+            <version>2.4.7</version>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>

diff --git a/wallet/wallet-app/src/main/resources/application.yml b/wallet/wallet-app/src/main/resources/application.yml
@@ -4,6 +4,7 @@ spring:
     name: opex-wallet
   main:
     allow-bean-definition-overriding: false
+    allow-circular-references: true
   kafka:
     bootstrap-servers: localhost:2181
     consumer:

diff --git a/websocket/websocket-app/pom.xml b/websocket/websocket-app/pom.xml
@@ -14,10 +14,6 @@
     <name>websocket-app</name>
     <description>Websocket app</description>
 
-    <properties>
-        <spring-cloud.version>2020.0.2</spring-cloud.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

diff --git a/websocket/websocket-app/src/main/resources/application-docker.yml b/websocket/websocket-app/src/main/resources/application-docker.yml
@@ -11,8 +11,3 @@ spring:
     consul:
       host: ${CONSUL_HOST}
       port: 8500
-  main:
-    allow-bean-definition-overriding: true
-app:
-  auth:
-    cert-url: http://auth:8083/auth/realms/opex/protocol/openid-connect/certs
diff --git a/websocket/websocket-app/src/main/resources/application.yml b/websocket/websocket-app/src/main/resources/application.yml
@@ -5,6 +5,7 @@ spring:
     name: opex-websocket
   main:
     allow-bean-definition-overriding: false
+    allow-circular-references: true
   kafka:
     bootstrap-servers: 192.168.178.29:9092
     consumer:

diff --git a/...c/main/kotlin/co/nilin/opex/websocket/ports/kafka/listener/config/WebSocketKafkaConfig.kt b/...c/main/kotlin/co/nilin/opex/websocket/ports/kafka/listener/config/WebSocketKafkaConfig.kt
@@ -72,7 +72,7 @@ class WebSocketKafkaConfig {
         val containerProps = ContainerProperties(Pattern.compile("richTrade"))
         containerProps.messageListener = tradeListener
         val container = ConcurrentMessageListenerContainer(consumerFactory, containerProps)
-        container.beanName = "WebsocketTradeKafkaListenerContainer"
+        container.setBeanName("WebsocketTradeKafkaListenerContainer")
         container.start()
     }
 
@@ -82,7 +82,7 @@ class WebSocketKafkaConfig {
         val containerProps = ContainerProperties(Pattern.compile("richOrder"))
         containerProps.messageListener = orderListener
         val container = ConcurrentMessageListenerContainer(consumerFactory, containerProps)
-        container.beanName = "WebsocketOrderKafkaListenerContainer"
+        container.setBeanName("WebsocketOrderKafkaListenerContainer")
         container.start()
     }