From 4d613efc339d135a0b771e10c2fbfeeeb6df28e7 Mon Sep 17 00:00:00 2001 From: Jose Date: Sun, 16 Mar 2025 03:12:02 +0100 Subject: [PATCH] Fixed errors in Business Logic API and finished it. --- .../server/DataLayerAPIVerticle.java | 31 ++++++++++++++--- .../contaminus/server/MainVerticle.java | 34 +++---------------- .../contaminus/util/RestClientUtil.java | 2 -- 3 files changed, 31 insertions(+), 36 deletions(-) diff --git a/backend/src/main/java/net/miarma/contaminus/server/DataLayerAPIVerticle.java b/backend/src/main/java/net/miarma/contaminus/server/DataLayerAPIVerticle.java index 819b21a..c42cdd8 100644 --- a/backend/src/main/java/net/miarma/contaminus/server/DataLayerAPIVerticle.java +++ b/backend/src/main/java/net/miarma/contaminus/server/DataLayerAPIVerticle.java @@ -9,7 +9,9 @@ import com.google.gson.GsonBuilder; import io.vertx.core.AbstractVerticle; import io.vertx.core.Promise; +import io.vertx.core.Vertx; import io.vertx.core.http.HttpMethod; +import io.vertx.core.json.JsonObject; import io.vertx.ext.web.Router; import io.vertx.ext.web.RoutingContext; import io.vertx.ext.web.handler.BodyHandler; @@ -33,14 +35,27 @@ public class DataLayerAPIVerticle extends AbstractVerticle { private ConfigManager configManager; private final Gson gson = new GsonBuilder().serializeNulls().create(); - public DataLayerAPIVerticle(JDBCPool pool) { - this.pool = pool; - this.configManager = ConfigManager.getInstance(); + @SuppressWarnings("deprecation") + public DataLayerAPIVerticle() { + this.configManager = ConfigManager.getInstance(); + String jdbcUrl = configManager.getJdbcUrl(); + String dbUser = configManager.getStringProperty("db.user"); + String dbPwd = configManager.getStringProperty("db.pwd"); + Integer poolSize = configManager.getIntProperty("db.poolSize"); + + JsonObject dbConfig = new JsonObject() + .put("url", jdbcUrl) + .put("user", dbUser) + .put("password", dbPwd) + .put("max_pool_size", poolSize != null ? poolSize : 10); + + this.pool = JDBCPool.pool(Vertx.vertx(), dbConfig);; } @Override public void start(Promise startPromise) { Constants.LOGGER.info("šŸ“” Iniciando DataLayerAPIVerticle..."); + dbManager = DatabaseManager.getInstance(pool); Router router = Router.router(vertx); @@ -88,7 +103,15 @@ public class DataLayerAPIVerticle extends AbstractVerticle { .requestHandler(router) .listen(configManager.getDataApiPort(), configManager.getHost()); - startPromise.complete(); + pool.query("SELECT 1").execute(ar -> { + if (ar.succeeded()) { + Constants.LOGGER.info("šŸŸ¢ Connected to DB"); + startPromise.complete(); + } else { + Constants.LOGGER.error("šŸ”“ Failed to connect to DB: " + ar.cause()); + startPromise.fail(ar.cause()); + } + }); } private void getAllGroups(RoutingContext context) { diff --git a/backend/src/main/java/net/miarma/contaminus/server/MainVerticle.java b/backend/src/main/java/net/miarma/contaminus/server/MainVerticle.java index 831e8dd..4948383 100644 --- a/backend/src/main/java/net/miarma/contaminus/server/MainVerticle.java +++ b/backend/src/main/java/net/miarma/contaminus/server/MainVerticle.java @@ -6,8 +6,6 @@ import java.io.InputStream; import java.nio.file.Files; import java.nio.file.StandardCopyOption; -import io.vertx.core.json.JsonObject; -import io.vertx.jdbcclient.JDBCPool; import io.vertx.core.AbstractVerticle; import io.vertx.core.DeploymentOptions; import io.vertx.core.Launcher; @@ -18,29 +16,13 @@ import net.miarma.contaminus.common.Constants; public class MainVerticle extends AbstractVerticle { private ConfigManager configManager; - private JDBCPool pool; public static void main(String[] args) { Launcher.executeCommand("run", MainVerticle.class.getName()); } - @SuppressWarnings("deprecation") private void init() { - configManager = ConfigManager.getInstance(); - - String jdbcUrl = configManager.getJdbcUrl(); - String dbUser = configManager.getStringProperty("db.user"); - String dbPwd = configManager.getStringProperty("db.pwd"); - Integer poolSize = configManager.getIntProperty("db.poolSize"); - - JsonObject dbConfig = new JsonObject() - .put("url", jdbcUrl) - .put("user", dbUser) - .put("password", dbPwd) - .put("max_pool_size", poolSize != null ? poolSize : 10); - - pool = JDBCPool.pool(vertx, dbConfig); - + this.configManager = ConfigManager.getInstance(); initializeDirectories(); copyDefaultConfig(); } @@ -72,17 +54,9 @@ public class MainVerticle extends AbstractVerticle { try { System.setProperty("java.util.logging.manager", "org.jboss.logmanager.LogManager"); init(); - pool.query("SELECT 1").execute(ar -> { - if (ar.succeeded()) { - Constants.LOGGER.info("šŸŸ¢ Connected to DB"); - deployVerticles(startPromise); - } else { - Constants.LOGGER.error("šŸ”“ Failed to connect to DB: " + ar.cause()); - startPromise.fail(ar.cause()); - } - }); + deployVerticles(startPromise); } catch (Exception e) { - System.err.println("šŸ”“ Error starting the application: " + e); + Constants.LOGGER.error("šŸ”“ Error starting the application: " + e); startPromise.fail(e); } } @@ -91,7 +65,7 @@ public class MainVerticle extends AbstractVerticle { final DeploymentOptions options = new DeploymentOptions(); options.setThreadingModel(ThreadingModel.WORKER); - vertx.deployVerticle(new DataLayerAPIVerticle(pool), options, result -> { + vertx.deployVerticle(new DataLayerAPIVerticle(), options, result -> { if (result.succeeded()) { Constants.LOGGER.info("šŸŸ¢ DatabaseVerticle desplegado"); Constants.LOGGER.info("\tšŸ”— API URL: " + configManager.getHost() diff --git a/backend/src/main/java/net/miarma/contaminus/util/RestClientUtil.java b/backend/src/main/java/net/miarma/contaminus/util/RestClientUtil.java index 5900625..9831bd4 100644 --- a/backend/src/main/java/net/miarma/contaminus/util/RestClientUtil.java +++ b/backend/src/main/java/net/miarma/contaminus/util/RestClientUtil.java @@ -33,8 +33,6 @@ public class RestClientUtil { public void getRequest(Integer port, String host, String resource, Class classType, Promise promise) { client.getAbs(host + ":" + port + resource).send(elem -> { if (elem.succeeded()) { - System.out.println(host + ":" + port + resource); - System.out.println(elem.result().bodyAsString()); promise.complete(gson.fromJson(elem.result().bodyAsString(), classType)); } else { promise.fail(elem.cause());