Merge pull request #37 from admin-ch/renovate/core-sdk

Author: gstoehl27

ch-covidcertificate-backend-verification-check/ch-covidcertificate-backend-verification-check-ws/pom.xml

@@ -74,7 +74,7 @@
         <dependency>
             <groupId>ch.admin.bag.covidcertificate</groupId>
             <artifactId>sdk-core</artifactId>
-            <version>3.0.4</version>
+            <version>3.1.0</version>
         </dependency>
 
         <dependency>

ch-covidcertificate-backend-verification-check/ch-covidcertificate-backend-verification-check-ws/src/main/java/ch/admin/bag/covidcertificate/backend/verification/check/ws/verification/TestData.kt

@@ -35,8 +35,6 @@ object TestData {
 
             ruleSet ?: RuleSet(
                 emptyList(),
-                emptyList(),
-                ModeRules(emptyList(), emptyList(), emptyList(), ""),
                 emptyMap(),
                 0L
             )

ch-covidcertificate-backend-verification-check/ch-covidcertificate-backend-verification-check-ws/src/main/java/ch/admin/bag/covidcertificate/backend/verification/check/ws/verification/VerificationService.java

@@ -252,11 +252,11 @@ private RuleSet getNationalRules() throws URISyntaxException {
         logger.info("downloaded {} rules", rules.size());
 
         return new RuleSet(
-                displayRules,
                 rules,
-                sdkModeRules,
                 intermediateRuleSet.getValueSets(),
-                intermediateRuleSet.getValidDuration());
+                intermediateRuleSet.getValidDuration(),
+                displayRules,
+                sdkModeRules);
     }
 
     private RequestEntity<Void> getRequestEntity(String endpoint, Map<String, String> params)
@@ -343,7 +343,7 @@ private VerificationState getOutdatedTrustListState(VerificationState originalSt
                 signatureState,
                 new CheckRevocationState.INVALID(TRUST_LIST_OUTDATED),
                 new CheckNationalRulesState.INVALID(
-                        NationalRulesError.UNKNOWN_RULE_FAILED, TRUST_LIST_OUTDATED),
+                        NationalRulesError.UNKNOWN_RULE_FAILED, false, TRUST_LIST_OUTDATED),
                 null);
     }
 

ch-covidcertificate-backend-verification-check/ch-covidcertificate-backend-verification-check-ws/src/main/java/ch/admin/bag/covidcertificate/backend/verification/check/ws/verification/VerifyWrapper.kt

@@ -15,7 +15,7 @@ object VerifyWrapper {
             certificateHolder: CertificateHolder,
             trustList: TrustList
     ): VerificationState = runBlocking {
-        certificateVerifier.verify(certificateHolder, trustList, trustList.ruleSet.modeRules.activeModes.map { it.id }.toSet(), VerificationType.WALLET)
+        certificateVerifier.verify(certificateHolder, trustList, trustList.ruleSet.modeRules?.activeModes?.map { it.id }?.toSet()?: emptySet(), VerificationType.WALLET)
     }
 
     @JvmStatic

ch-covidcertificate-backend-verification-check/ch-covidcertificate-backend-verification-check-ws/src/test/java/ch/admin/bag/covidcertificate/backend/verification/check/ws/util/VerificationServiceTest.java

@@ -104,11 +104,12 @@ void getRulesTest() throws URISyntaxException, IOException, InterruptedException
             ch.admin.bag.covidcertificate.sdk.core.models.trustlist.ModeRules sdkModeRules = new ch.admin.bag.covidcertificate.sdk.core.models.trustlist.ModeRules(intermediateModeRules.getActiveModes(), intermediateModeRules.getWalletActiveModes(), intermediateModeRules.getVerifierActiveModes(), intermediateModeRules.getLogic());
             logger.info("downloaded {} rules", rules.size());
             RuleSet ruleSet = new RuleSet(
-                    displayRules,
                     rules,
-                    sdkModeRules,
                     intermediateRuleSet.getValueSets(),
-                    intermediateRuleSet.getValidDuration());
+                    intermediateRuleSet.getValidDuration(),
+                    displayRules,
+                    sdkModeRules
+                    );
             assertNotNull(ruleSet);
         }
     }