Move revocation.enabled to DgcProperties.

WorldHealthOrganization · Nov 30, 2023 · 42e54c0 · 42e54c0
1 parent cd72074
commit 42e54c0
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/config/DgcConfigProperties.java b/src/main/java/eu/europa/ec/dgc/gateway/config/DgcConfigProperties.java
@@ -151,6 +151,7 @@ public static class HeaderFields {
     @Setter
     public static class Revocation {
         private int deleteThreshold = 14;
+        private Boolean enabled;
     }
 
     @Getter

diff --git a/...java/eu/europa/ec/dgc/gateway/restapi/controller/CertificateRevocationListController.java b/...java/eu/europa/ec/dgc/gateway/restapi/controller/CertificateRevocationListController.java
@@ -70,7 +70,7 @@
 @RequiredArgsConstructor
 @Validated
 @Slf4j
-@ConditionalOnProperty(name = "revocation-list.controller.enabled", havingValue = "true")
+@ConditionalOnProperty(name = "dgc.revocation.enabled", havingValue = "true")
 public class CertificateRevocationListController {
 
     private final RevocationListService revocationListService;

diff --git a/src/main/java/eu/europa/ec/dgc/gateway/service/RevocationListCleanUpService.java b/src/main/java/eu/europa/ec/dgc/gateway/service/RevocationListCleanUpService.java
@@ -33,7 +33,7 @@
 @Service
 @RequiredArgsConstructor
 @Slf4j
-@ConditionalOnProperty(name = "revocation-list.controller.enabled", havingValue = "true")
+@ConditionalOnProperty(name = "dgc.revocation.enabled", havingValue = "true")
 public class RevocationListCleanUpService {
 
     private final RevocationBatchRepository revocationBatchRepository;

diff --git a/src/main/java/eu/europa/ec/dgc/gateway/service/RevocationListService.java b/src/main/java/eu/europa/ec/dgc/gateway/service/RevocationListService.java
@@ -58,7 +58,7 @@
 @Service
 @Slf4j
 @RequiredArgsConstructor
-@ConditionalOnProperty(name = "revocation-list.controller.enabled", havingValue = "true")
+@ConditionalOnProperty(name = "dgc.revocation.enabled", havingValue = "true")
 public class RevocationListService {
 
     private static final int MAX_BATCH_LIST_SIZE = 1000;

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -67,6 +67,7 @@ dgc:
       pem: X-SSL-Client-Cert
   revocation:
     delete-threshold: 14
+    enabled: false
   signer-information:
     delete-threshold: 14
   trustedCertificates:
@@ -104,10 +105,7 @@ dgc:
     apiKey: 0a0a0a0a-0a0a-0a0a-0a0a-0a0a0a0a0a0a
     url: https://api.cloudmersive.com
     enabled: false
+
 springdoc:
   api-docs:
     enabled: false
-
-revocation-list:
-  controller:
-    enabled: false
-Original file line number
+Diff line change
@@ Expand Up / @@ -151,6 +151,7 @@ public static class HeaderFields { @@
         @Setter
         public static class Revocation {
             private int deleteThreshold = 14;
+            private Boolean enabled;
         }
         @Getter
@@ Expand Down @@