Qr code not nullable (DEV) (#3516)

* not nullable * merge conflict
corona-warn-app · Jun 23, 2021 · cc3b5fb · cc3b5fb
1 parent 321691e
commit cc3b5fb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.../rki/coronawarnapp/covidcertificate/recovery/core/storage/RecoveryCertificateContainer.kt b/.../rki/coronawarnapp/covidcertificate/recovery/core/storage/RecoveryCertificateContainer.kt
@@ -22,7 +22,7 @@ data class RecoveryCertificateContainer(
 
     @delegate:Transient
     private val certificateData: DccData<RecoveryDccV1> by lazy {
-        data.recoveryCertificateQrCode!!.let {
+        data.recoveryCertificateQrCode.let {
             (
                 qrCodeExtractor.extract(
                     it,
@@ -94,7 +94,7 @@ data class RecoveryCertificateContainer(
                 get() = header.expiresAt
 
             override val qrCode: QrCodeString
-                get() = data.recoveryCertificateQrCode!!
+                get() = data.recoveryCertificateQrCode
         }
     }
 }
diff --git a/...rki/coronawarnapp/covidcertificate/recovery/core/storage/StoredRecoveryCertificateData.kt b/...rki/coronawarnapp/covidcertificate/recovery/core/storage/StoredRecoveryCertificateData.kt
@@ -3,9 +3,9 @@ package de.rki.coronawarnapp.covidcertificate.recovery.core.storage
 import com.google.gson.annotations.SerializedName
 
 data class StoredRecoveryCertificateData(
-    @SerializedName("recoveryCertificateQrCode") override val recoveryCertificateQrCode: String?,
+    @SerializedName("recoveryCertificateQrCode") override val recoveryCertificateQrCode: String,
 ) : StoredRecoveryCertificate
 
 interface StoredRecoveryCertificate {
-    val recoveryCertificateQrCode: String?
+    val recoveryCertificateQrCode: String
 }
diff --git a/.../de/rki/coronawarnapp/covidcertificate/test/core/storage/types/BaseTestCertificateData.kt b/.../de/rki/coronawarnapp/covidcertificate/test/core/storage/types/BaseTestCertificateData.kt
@@ -3,7 +3,7 @@ package de.rki.coronawarnapp.covidcertificate.test.core.storage.types
 import org.joda.time.Instant
 
 /**
- * Common data for test certificates, idepdent of whether they were retrieved or scanned.
+ * Common data for test certificates, independent of whether they were retrieved or scanned.
  */
 sealed class BaseTestCertificateData {
     abstract val identifier: String