From 5d5d3c380ab36600ca0bb82fadc916d5e93c99db Mon Sep 17 00:00:00 2001
From: Andrea Cavalli <andrea@cavallium.it>
Date: Sun, 20 Dec 2020 12:13:25 +0100
Subject: [PATCH] Update to Vert.X 4.0.0

---
 pom.xml                                       | 59 ++++++++++++-------
 .../td/middle/TdClusterManager.java           | 18 +++---
 2 files changed, 46 insertions(+), 31 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2bfbf3d..b19f595 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,9 +9,11 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <revision>0-SNAPSHOT</revision>
-        <!-- required for jdk9 -->
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
+
+        <vertx.version>4.0.0</vertx.version>
+        <junit-jupiter.version>5.4.0</junit-jupiter.version>
     </properties>
     <repositories>
         <repository>
@@ -47,26 +49,51 @@
         <developerConnection>scm:git:https://git.ignuranza.net/tdlight-team/tdlib-session-container.git</developerConnection>
         <tag>HEAD</tag>
     </scm>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>io.vertx</groupId>
+                <artifactId>vertx-stack-depchain</artifactId>
+                <version>${vertx.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
-        <dependency>
-            <groupId>io.vertx</groupId>
-            <artifactId>vertx-core</artifactId>
-            <version>3.9.3</version>
-        </dependency>
         <dependency>
             <groupId>io.vertx</groupId>
             <artifactId>vertx-hazelcast</artifactId>
-            <version>3.9.3</version>
+            <version>${vertx.version}</version>
         </dependency>
         <dependency>
             <groupId>io.vertx</groupId>
-            <artifactId>vertx-reactive-streams</artifactId>
-            <version>3.9.3</version>
+            <artifactId>vertx-junit5</artifactId>
+            <version>${vertx.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${junit-jupiter.version}</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.hamcrest</groupId>
+                    <artifactId>hamcrest-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junit-jupiter.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.vertx</groupId>
             <artifactId>vertx-circuit-breaker</artifactId>
-            <version>3.9.3</version>
+            <version>${vertx.version}</version>
         </dependency>
         <dependency>
             <groupId>io.projectreactor</groupId>
@@ -120,18 +147,6 @@
             <artifactId>fastutil</artifactId>
             <version>8.3.1</version>
         </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-            <version>RELEASE</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.hamcrest</groupId>
-                    <artifactId>hamcrest-core</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
diff --git a/src/main/java/it/tdlight/tdlibsession/td/middle/TdClusterManager.java b/src/main/java/it/tdlight/tdlibsession/td/middle/TdClusterManager.java
index b6e22c3..e5068ba 100644
--- a/src/main/java/it/tdlight/tdlibsession/td/middle/TdClusterManager.java
+++ b/src/main/java/it/tdlight/tdlibsession/td/middle/TdClusterManager.java
@@ -1,13 +1,12 @@
 package it.tdlight.tdlibsession.td.middle;
 
 import com.hazelcast.config.Config;
+import com.hazelcast.config.EvictionConfig;
 import com.hazelcast.config.EvictionPolicy;
-import com.hazelcast.config.GroupConfig;
 import com.hazelcast.config.MapConfig;
-import com.hazelcast.config.MaxSizeConfig;
-import com.hazelcast.config.MaxSizeConfig.MaxSizePolicy;
+import com.hazelcast.config.MaxSizePolicy;
 import com.hazelcast.config.MergePolicyConfig;
-import com.hazelcast.config.SemaphoreConfig;
+import com.hazelcast.config.cp.SemaphoreConfig;
 import io.vertx.core.DeploymentOptions;
 import io.vertx.core.Handler;
 import io.vertx.core.Vertx;
@@ -105,10 +104,12 @@ public class TdClusterManager {
 					.setBackupCount(1)
 					.setTimeToLiveSeconds(0)
 					.setMaxIdleSeconds(0)
-					.setEvictionPolicy(EvictionPolicy.NONE)
-					.setMaxSizeConfig(new MaxSizeConfig().setMaxSizePolicy(MaxSizePolicy.PER_NODE).setSize(0))
+					.setEvictionConfig(new EvictionConfig()
+							.setMaxSizePolicy(MaxSizePolicy.PER_NODE)
+							.setEvictionPolicy(EvictionPolicy.NONE)
+							.setSize(0))
 					.setMergePolicyConfig(new MergePolicyConfig().setPolicy("com.hazelcast.map.merge.LatestUpdateMapMergePolicy")));
-			cfg.setSemaphoreConfigs(Map.of("__vertx.*", new SemaphoreConfig().setInitialPermits(1)));
+			cfg.getCPSubsystemConfig().setSemaphoreConfigs(Map.of("__vertx.*", new SemaphoreConfig().setInitialPermits(1)));
 			cfg.getNetworkConfig().getJoin().getMulticastConfig().setEnabled(false);
 			cfg.getNetworkConfig().getJoin().getAwsConfig().setEnabled(false);
 			cfg.getNetworkConfig().getJoin().getTcpIpConfig().setEnabled(true);
@@ -122,7 +123,7 @@ public class TdClusterManager {
 			cfg.setProperty("hazelcast.wait.seconds.before.join", "0");
 			cfg.setProperty("hazelcast.tcp.join.port.try.count", "5");
 			cfg.setProperty("hazelcast.socket.bind.any", "false");
-			cfg.setGroupConfig(new GroupConfig().setName("dev").setPassword("HzPasswordsAreDeprecated"));
+			cfg.setClusterName("tdlib-session-container");
 			mgr = new HazelcastClusterManager(cfg);
 			vertxOptions.setClusterManager(mgr);
 			vertxOptions.getEventBusOptions().setConnectTimeout(120000);
@@ -139,7 +140,6 @@ public class TdClusterManager {
 		} else {
 			mgr = null;
 			vertxOptions.setClusterManager(null);
-			vertxOptions.getEventBusOptions().setClustered(false);
 		}
 
 		return Mono