feat: Remove EDS flow

ministero-salute · Sep 22, 2023 · 3573c32 · 3573c32
1 parent 8611e85
commit 3573c32
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 29 deletions.
diff --git a/src/main/java/it/finanze/sanita/fse2/ms/gtw/rulesmanager/enums/EdsStrategyEnum.java b/src/main/java/it/finanze/sanita/fse2/ms/gtw/rulesmanager/enums/EdsStrategyEnum.java
@@ -2,6 +2,5 @@
 
 public enum EdsStrategyEnum {
     NO_EDS,
-    NO_FHIR_EDS,
     NO_EDS_WITH_LOG
 }
diff --git a/...java/it/finanze/sanita/fse2/ms/gtw/rulesmanager/scheduler/executors/base/ExecutorEDS.java b/...java/it/finanze/sanita/fse2/ms/gtw/rulesmanager/scheduler/executors/base/ExecutorEDS.java
@@ -137,14 +137,14 @@ protected ActionRes startup(String[] steps) {
     // === LISTENERS ===
     protected OnStepListener onStepFailure(Date timestamp) {
         return (name, status) -> {
-            if (bridge.getConfig().areLogsEnabled() && status == ActionRes.KO)  {
+            if (bridge.getConfig().isNoEdsWithLogs() && status == ActionRes.KO)  {
                 bridge.getLogger().error(LOG_TYPE_CONTROL, "Error while updating GTW configuration items", config.getTitle() + " - " + name, ResultLogEnum.KO, timestamp);
             }
         };
     }
     protected OnPlanListener onPlanSuccess(Date timestamp) {
         return (status) -> {
-            if (bridge.getConfig().areLogsEnabled() && status == ActionRes.OK)  {
+            if (bridge.getConfig().isNoEdsWithLogs() && status == ActionRes.OK)  {
                 bridge.getLogger().info(LOG_TYPE_CONTROL, "Successfully updated configuration items", "Update" + " - " + config.getTitle(), ResultLogEnum.OK, timestamp);
             }
         };

diff --git a/src/main/java/it/finanze/sanita/fse2/ms/gtw/rulesmanager/service/IConfigSRV.java b/src/main/java/it/finanze/sanita/fse2/ms/gtw/rulesmanager/service/IConfigSRV.java
@@ -4,11 +4,7 @@ public interface IConfigSRV {
 
 	String getEdsStrategy();
 
-	boolean isNoEds();
 
-	boolean isNoFhirEds();
-
 	boolean isNoEdsWithLogs();
 
-	boolean areLogsEnabled();
 }
diff --git a/src/main/java/it/finanze/sanita/fse2/ms/gtw/rulesmanager/service/impl/ConfigSRV.java b/src/main/java/it/finanze/sanita/fse2/ms/gtw/rulesmanager/service/impl/ConfigSRV.java
@@ -49,33 +49,13 @@ public String getEdsStrategy() {
 		return edsStrategy;
 	}
 
-	@Override
-	public boolean isNoFhirEds() {
-		// Trigger refresh if necessary
-		String out = getEdsStrategy();
-		// Evaluate
-		return StringUtils.isNotBlank(out) && EdsStrategyEnum.NO_FHIR_EDS.name().equalsIgnoreCase(out);
-	}
 
 	@Override
 	public boolean isNoEdsWithLogs() {
 		// Trigger refresh if necessary
 		String out = getEdsStrategy();
 		// Evaluate
-		return StringUtils.isNotBlank(out) && EdsStrategyEnum.NO_EDS_WITH_LOG.name().equalsIgnoreCase(out);
-	}
-
-	@Override
-	public boolean areLogsEnabled() {
-		return isNoEdsWithLogs() || isNoFhirEds();
-	}
-
-	//Se la strategy è null si setta come default no_eds (quindi non verranno emesse loggate)
-	@Override
-	public boolean isNoEds() {
-		// Trigger refresh if necessary
-		String out = getEdsStrategy();
-		// Evaluate
-		return StringUtils.isBlank(out) || EdsStrategyEnum.NO_EDS.name().equalsIgnoreCase(out);
+		return StringUtils.isNotBlank(out) || EdsStrategyEnum.NO_EDS_WITH_LOG.name().equalsIgnoreCase(out);
 	}
+
 }