DS-2259: Database - fix database settings initialization and increase statement timeout.

Signed-off-by: mchrza <maximilian.chrzan@here.com>

Author: mchrza

xyz-jobs/xyz-job-steps/src/main/java/com/here/xyz/jobs/steps/execution/db/Database.java

@@ -55,7 +55,7 @@
 import software.amazon.awssdk.services.rds.model.DBCluster;
 
 public class Database extends ExecutionResource {
-  private static final int STATEMENT_TIMEOUT = 895; //seconds - has to greater than the query timeouts
+  private static final int STATEMENT_TIMEOUT = 895; //seconds - has to be greater than the query timeout
   private static final int DB_CHECKOUT_TIMEOUT_MS = 20_000;
   private static final int DB_ACQUIRE_RETRY_DELAY_MS = 5_000;
   private static final int DB_ACQUIRE_RETRY_ATTEMPTS = 10;
@@ -112,20 +112,20 @@ static void closeAll() {
 
   DatabaseSettings getDatabaseSettings() {
     if (dbSettings == null)
-      dbSettings = applyRuntimeDbSettings(new RestrictedDatabaseSettings(getName(), connectorDbSettingsMap)
-          .withApplicationName("JobFramework"));
+      dbSettings = applyRuntimeDbSettings(new RestrictedDatabaseSettings(getName(), connectorDbSettingsMap));
     return dbSettings;
   }
 
-  private static <T extends DatabaseSettings> T applyRuntimeDbSettings(T settings) {
+  private static DatabaseSettings applyRuntimeDbSettings(DatabaseSettings settings) {
     settings
         .withStatementTimeoutSeconds(STATEMENT_TIMEOUT)
         .withDbCheckoutTimeout(DB_CHECKOUT_TIMEOUT_MS)
         .withDbAcquireRetryDelay(DB_ACQUIRE_RETRY_DELAY_MS)
         .withDbAcquireRetryAttempts(DB_ACQUIRE_RETRY_ATTEMPTS)
         .withDbAcquireIncrement(DB_ACQUIRE_INCREMENT)
         .withDbMaxPoolSize(DB_MAX_POOL_SIZE)
-        .withScriptResourcePaths(SCRIPT_RESOURCE_PATHS);
+        .withScriptResourcePaths(SCRIPT_RESOURCE_PATHS)
+        .withApplicationName("JobFramework");
     return settings;
   }