Disable Download of ValueSets, CountryLists, BusinessRules based on e…

…nabled flag within the application.yml configuration file (#27)
eu-digital-green-certificates · Sep 21, 2021 · b7f72d1 · b7f72d1
1 parent b0be8f4
commit b7f72d1
Show file tree

Hide file tree

Showing 2 changed files with 83 additions and 45 deletions.
diff --git a/src/main/java/eu/europa/ec/dgc/businessrule/service/GatewayDataDownloadServiceImpl.java b/src/main/java/eu/europa/ec/dgc/businessrule/service/GatewayDataDownloadServiceImpl.java
@@ -31,16 +31,19 @@
 import lombok.extern.slf4j.Slf4j;
 import net.javacrumbs.shedlock.spring.annotation.SchedulerLock;
 import net.minidev.json.JSONArray;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Profile;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-
 /**
- * A service to download the valuesets, business rules and country list from the digital covid certificate gateway.
+ * A service to download the valuesets, business rules and country list from the
+ * digital covid certificate gateway.
  */
 @Slf4j
 @RequiredArgsConstructor
+@ConditionalOnProperty("dgc.gateway.connector.enabled")
 @Component
 @Profile("!btp")
 public class GatewayDataDownloadServiceImpl implements GatewayDataDownloadService {
@@ -57,75 +60,107 @@ public class GatewayDataDownloadServiceImpl implements GatewayDataDownloadServic
 
     private final CountryListService countryListService;
 
+    @Value("${dgc.valueSetsDownload.enabled}")
+    private boolean valueSetsDownloadEnabled;
+
+    @Value("${dgc.countryListDownload.enabled}")
+    private boolean countryListDownloadEnabled;
+
+    @Value("${dgc.businessRulesDownload.enabled}")
+    private boolean businessRulesDownloadEnabled;
+
     @Override
     @Scheduled(fixedDelayString = "${dgc.businessRulesDownload.timeInterval}")
-    @SchedulerLock(name = "GatewayDataDownloadService_downloadBusinessRules", lockAtLeastFor = "PT0S",
-        lockAtMostFor = "${dgc.businessRulesDownload.lockLimit}")
+    @SchedulerLock(name = "GatewayDataDownloadService_downloadBusinessRules", 
+                   lockAtLeastFor = "PT0S", 
+                   lockAtMostFor = "${dgc.businessRulesDownload.lockLimit}")
     public void downloadBusinessRules() {
         List<BusinessRuleItem> ruleItems;
-
-        log.info("Business rules download started");
-
-        try {
-            ruleItems = businessRuleService.createBusinessRuleItemList(dgcRuleConnector.getValidationRules().flat());
-        } catch (NoSuchAlgorithmException e) {
-            log.error("Failed to hash business rules on download.",e);
-            return;
-        }
-
-        if (!ruleItems.isEmpty()) {
-            businessRuleService.updateBusinessRules(ruleItems);
+
+
+        if (businessRulesDownloadEnabled) {
+            log.info("Business rules download started");
+
+            try {
+                ruleItems = businessRuleService
+                        .createBusinessRuleItemList(dgcRuleConnector.getValidationRules().flat());
+            } catch (NoSuchAlgorithmException e) {
+                log.error("Failed to hash business rules on download.", e);
+                return;
+            }
+
+            if (!ruleItems.isEmpty()) {
+                businessRuleService.updateBusinessRules(ruleItems);
+            } else {
+                log.warn("The download of the business rules seems to fail, as the download connector "
+                        + "returns an empty business rules list.-> No data was changed.");
+            }
+
+            log.info("Business rules finished");
         } else {
-            log.warn("The download of the business rules seems to fail, as the download connector "
-                + "returns an empty business rules list.-> No data was changed.");
+            log.info("Business rules download disabled");
         }
 
-        log.info("Business rules finished");
     }
 
     @Override
     @Scheduled(fixedDelayString = "${dgc.valueSetsDownload.timeInterval}")
-    @SchedulerLock(name = "GatewayDataDownloadService_downloadValueSets", lockAtLeastFor = "PT0S",
-        lockAtMostFor = "${dgc.valueSetsDownload.lockLimit}")
+    @SchedulerLock(name = "GatewayDataDownloadService_downloadValueSets", 
+                   lockAtLeastFor = "PT0S", 
+                   lockAtMostFor = "${dgc.valueSetsDownload.lockLimit}")
     public void downloadValueSets() {
-        List<ValueSetItem> valueSetItems;
-        log.info("Valuesets download started");
-
-        try {
-            valueSetItems = valueSetService.createValueSetItemListFromMap(dgcValueSetConnector.getValueSets());
-        } catch (NoSuchAlgorithmException e) {
-            log.error("Failed to hash business rules on download.",e);
-            return;
-        }
 
-        if (!valueSetItems.isEmpty()) {
-            valueSetService.updateValueSets(valueSetItems);
+        if (valueSetsDownloadEnabled) {
+            List<ValueSetItem> valueSetItems;
+            log.info("Valuesets download started");
+
+            try {
+                valueSetItems = valueSetService.createValueSetItemListFromMap(dgcValueSetConnector.getValueSets());
+            } catch (NoSuchAlgorithmException e) {
+                log.error("Failed to hash business rules on download.", e);
+                return;
+            }
+
+            if (!valueSetItems.isEmpty()) {
+                valueSetService.updateValueSets(valueSetItems);
+            } else {
+                log.warn("The download of the value sets seems to fail, as the download connector "
+                        + "returns an empty value sets list.-> No data was changed.");
+            }
+
+            log.info("Valuesets download finished");
         } else {
-            log.warn("The download of the value sets seems to fail, as the download connector "
-                + "returns an empty value sets list.-> No data was changed.");
+            log.info("Valuesets download disaabled");
         }
 
-        log.info("Valuesets download finished");
     }
 
     @Override
     @Scheduled(fixedDelayString = "${dgc.countryListDownload.timeInterval}")
-    @SchedulerLock(name = "GatewayDataDownloadService_downloadCountryList", lockAtLeastFor = "PT0S",
-        lockAtMostFor = "${dgc.countryListDownload.lockLimit}")
+    @SchedulerLock(name = "GatewayDataDownloadService_downloadCountryList", 
+                   lockAtLeastFor = "PT0S", 
+                   lockAtMostFor = "${dgc.countryListDownload.lockLimit}")
     public void downloadCountryList() {
-        log.info("Country list download started");
+
+        if (countryListDownloadEnabled) {
+
+            log.info("Country list download started");
+
+            List<String> countryList = dgcCountryListConnector.getCountryList();
 
-        List<String> countryList = dgcCountryListConnector.getCountryList();
+            if (!countryList.isEmpty()) {
+                String countryListJsonStr = JSONArray.toJSONString(countryList);
+                countryListService.updateCountryList(countryListJsonStr);
+            } else {
+                log.warn("The download of the country list seems to fail, as the download connector "
+                        + "returns an empty country list.-> No data was changed.");
+            }
 
-        if (!countryList.isEmpty()) {
-            String countryListJsonStr = JSONArray.toJSONString(countryList);
-            countryListService.updateCountryList(countryListJsonStr);
+            log.info("Country list download finished");
         } else {
-            log.warn("The download of the country list seems to fail, as the download connector "
-                + "returns an empty country list.-> No data was changed.");
+            log.info("Country list download disabled");
         }
 
-        log.info("Country list download finished");
     }
 
 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -65,12 +65,15 @@ springdoc:
 dgc:
   allowedCorsUrls: https://dgc-gateway.example.com
   businessRulesDownload:
+    enabled: true
     timeInterval: 1800000
     lockLimit: 3600000
   valueSetsDownload:
+    enabled: true
     timeInterval: 1800000
     lockLimit: 3600000
   countryListDownload:
+    enabled: true
     timeInterval: 1800000
     lockLimit: 3600000
   gateway: