Gallardo7761/contaminus
Archived
1
0
Fork 0
Code Pull Requests Activity

Fixed errors in Business Logic API and finished it.

Browse Source
This commit is contained in:
Jose
2025-03-16 03:12:02 +01:00
parent 103ba113f6
commit 4d613efc33
3 changed files with 31 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
backend/src/main/java/net/miarma/contaminus/server/DataLayerAPIVerticle.java
View File

@@ -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;
@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<Void> 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());
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) {

32
backend/src/main/java/net/miarma/contaminus/server/MainVerticle.java
View File

@@ -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());
}
});
} 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()

2
backend/src/main/java/net/miarma/contaminus/util/RestClientUtil.java
View File

@@ -33,8 +33,6 @@ public class RestClientUtil {
public <T> void getRequest(Integer port, String host, String resource, Class<T> classType, Promise<T> 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());