strengthen tests, use awaitability

Author: marregui

modules/hivemq-edge-module-databases/src/main/java/com/hivemq/edge/adapters/databases/DatabaseConnection.java

@@ -22,6 +22,7 @@
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.Properties;
@@ -31,18 +32,19 @@ public class DatabaseConnection {
     private final @NotNull HikariConfig config;
     private @Nullable HikariDataSource ds;
 
-    public DatabaseConnection(final @NotNull DatabaseType dbType,
-                              final @NotNull String server,
-                              final @NotNull Integer port,
-                              final @NotNull String database,
-                              final @NotNull String username,
-                              final @NotNull String password,
-                              final int connectionTimeout,
-                              final boolean encrypt) {
+    public DatabaseConnection(
+            final @NotNull DatabaseType dbType,
+            final @NotNull String server,
+            final @NotNull Integer port,
+            final @NotNull String database,
+            final @NotNull String username,
+            final @NotNull String password,
+            final int connectionTimeout,
+            final boolean encrypt) {
 
         config = new HikariConfig();
 
-        switch (dbType){
+        switch (dbType) {
             case POSTGRESQL -> {
                 config.setDataSourceClassName("org.postgresql.ds.PGSimpleDataSource");
                 config.addDataSourceProperty("serverName", server);
@@ -77,7 +79,9 @@ public DatabaseConnection(final @NotNull DatabaseType dbType,
                 if (encrypt) {
                     properties.setProperty("encrypt", "true");
                     properties.setProperty("trustServerCertificate", "true"); // Trust the server certificate implicitly
-                } else properties.setProperty("encrypt", "false");
+                } else {
+                    properties.setProperty("encrypt", "false");
+                }
                 config.setDataSourceProperties(properties);
             }
         }

modules/hivemq-edge-module-databases/src/main/java/com/hivemq/edge/adapters/databases/DatabasesPollingProtocolAdapter.java

@@ -18,28 +18,22 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.hivemq.adapter.sdk.api.ProtocolAdapterInformation;
-import com.hivemq.adapter.sdk.api.config.PollingContext;
 import com.hivemq.adapter.sdk.api.factories.AdapterFactories;
 import com.hivemq.adapter.sdk.api.factories.DataPointFactory;
 import com.hivemq.adapter.sdk.api.model.ProtocolAdapterInput;
 import com.hivemq.adapter.sdk.api.model.ProtocolAdapterStartInput;
 import com.hivemq.adapter.sdk.api.model.ProtocolAdapterStartOutput;
 import com.hivemq.adapter.sdk.api.model.ProtocolAdapterStopInput;
 import com.hivemq.adapter.sdk.api.model.ProtocolAdapterStopOutput;
-import com.hivemq.adapter.sdk.api.polling.PollingInput;
-import com.hivemq.adapter.sdk.api.polling.PollingOutput;
-import com.hivemq.adapter.sdk.api.polling.PollingProtocolAdapter;
 import com.hivemq.adapter.sdk.api.polling.batch.BatchPollingInput;
 import com.hivemq.adapter.sdk.api.polling.batch.BatchPollingOutput;
 import com.hivemq.adapter.sdk.api.polling.batch.BatchPollingProtocolAdapter;
 import com.hivemq.adapter.sdk.api.state.ProtocolAdapterState;
 import com.hivemq.adapter.sdk.api.tag.Tag;
-import com.hivemq.edge.adapters.databases.config.DatabaseType;
 import com.hivemq.edge.adapters.databases.config.DatabasesAdapterConfig;
 import com.hivemq.edge.adapters.databases.config.DatabasesAdapterTag;
 import com.hivemq.edge.adapters.databases.config.DatabasesAdapterTagDefinition;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -52,15 +46,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.hivemq.adapter.sdk.api.state.ProtocolAdapterState.ConnectionStatus.STATELESS;
-
 
 public class DatabasesPollingProtocolAdapter implements BatchPollingProtocolAdapter {
 
+    public static final int TIMEOUT = 30;
     private static final @NotNull Logger log = LoggerFactory.getLogger(DatabasesPollingProtocolAdapter.class);
     private static final @NotNull ObjectMapper OBJECT_MAPPER = new ObjectMapper();
-    public static final int TIMEOUT = 30;
-
     private final @NotNull DatabasesAdapterConfig adapterConfig;
     private final @NotNull ProtocolAdapterInformation adapterInformation;
     private final @NotNull ProtocolAdapterState protocolAdapterState;
@@ -98,7 +89,8 @@ public DatabasesPollingProtocolAdapter(
 
     @Override
     public void start(
-            final @NotNull ProtocolAdapterStartInput input, final @NotNull ProtocolAdapterStartOutput output) {
+            final @NotNull ProtocolAdapterStartInput input,
+            final @NotNull ProtocolAdapterStartOutput output) {
         log.debug("Loading PostgreSQL Driver");
         try {
             Class.forName("org.postgresql.Driver");
@@ -124,7 +116,6 @@ public void start(
         }
 
 
-
         databaseConnection.connect();
 
         try {