From 13301ae17f10dbe1ef025f1ce3226c54bae99034 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Mon, 11 Mar 2024 16:24:31 +0100 Subject: [PATCH] Migliorati controlli per creazione query update --- .../java/it/integry/ems/utility/UtilityDebug.java | 14 ++++++++++++++ .../controller/SystemMigrationController.java | 3 +++ .../ems/system/service/SystemMigrationService.java | 1 - 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ems-core/src/main/java/it/integry/ems/utility/UtilityDebug.java b/ems-core/src/main/java/it/integry/ems/utility/UtilityDebug.java index 9f545ca125..8cb27ee531 100644 --- a/ems-core/src/main/java/it/integry/ems/utility/UtilityDebug.java +++ b/ems-core/src/main/java/it/integry/ems/utility/UtilityDebug.java @@ -3,6 +3,8 @@ package it.integry.ems.utility; import it.integry.ems.settings.Model.SettingsModel; import org.springframework.web.context.ContextLoader; +import java.util.Map; + public class UtilityDebug { private static final String INTEGRY_DOMAIN = "STUDIO-ML"; @@ -22,5 +24,17 @@ public class UtilityDebug { settingsModel.getDefaultProfile().equalsIgnoreCase("STUDIO-ML"); } + public static boolean isIntegryServerDev() { + String computerName = getComputerName(); + + return computerName.equalsIgnoreCase("SERVERDEV"); + } + + private static String getComputerName() { + Map env = System.getenv(); + if (env.containsKey("COMPUTERNAME")) return env.get("COMPUTERNAME"); + else return env.getOrDefault("HOSTNAME", "Unknown Computer"); + } + } diff --git a/ems-engine/src/main/java/it/integry/ems/system/controller/SystemMigrationController.java b/ems-engine/src/main/java/it/integry/ems/system/controller/SystemMigrationController.java index 60cf47af7c..8b4efaf1c1 100644 --- a/ems-engine/src/main/java/it/integry/ems/system/controller/SystemMigrationController.java +++ b/ems-engine/src/main/java/it/integry/ems/system/controller/SystemMigrationController.java @@ -26,6 +26,9 @@ public class SystemMigrationController { if (!UtilityDebug.isDebugExecution()) throw new Exception("Puoi eseguire questa procedura solo in ambiente DEBUG!"); + if (UtilityDebug.isIntegryServerDev()) + throw new Exception("Non puoi eseguire questa azione su SERVERDEV!"); + final String[] split = objectsToCreate.split("\\|"); final List querySyntaxFromExistingObjects = systemMigrationService.createQuerySyntaxFromExistingObjects(split); diff --git a/ems-engine/src/main/java/it/integry/ems/system/service/SystemMigrationService.java b/ems-engine/src/main/java/it/integry/ems/system/service/SystemMigrationService.java index c78af8ac90..417ad31998 100644 --- a/ems-engine/src/main/java/it/integry/ems/system/service/SystemMigrationService.java +++ b/ems-engine/src/main/java/it/integry/ems/system/service/SystemMigrationService.java @@ -92,7 +92,6 @@ public class SystemMigrationService { "\n" + "\n"); - //HERE for (SqlObjectDTO sqlObject : sqlObjects) { String typeName = sqlObject.getType().toString().toLowerCase();