relevant interfaces etc.

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/ContactDiaryElement.kt

@@ -6,12 +6,12 @@ interface ContactDiaryElement {
 
     val createdAt: Instant
 
-    val persons: List<Person>?
-    val locations: List<Location>?
+    val defaultPeople: List<DefaultPerson>
+    val defaultLocations: List<DefaultLocation>
 
     val numberOfPersons: Int?
-        get() = persons?.size
+        get() = defaultPeople?.size
 
     val numberOfLocations: Int?
-        get() = locations?.size
+        get() = defaultLocations?.size
 }

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/ContactDiaryEntry.kt → Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryElement.kt

@@ -2,8 +2,8 @@ package de.rki.coronawarnapp.contactdiary.model
 
 import java.time.Instant
 
-data class ContactDiaryEntry(
-    val person: List<Person>?,
-    val location: List<Location>?,
+data class DefaultContactDiaryElement(
+    val defaultPeople: List<DefaultPerson>,
+    val defaultLocation: List<DefaultLocation>,
     val dateAddedEntry: Instant?
 )

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultLocation.kt

+package de.rki.coronawarnapp.contactdiary.model
+
+data class DefaultLocation(
+    val locationName: String
+)

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultPerson.kt

+package de.rki.coronawarnapp.contactdiary.model
+
+data class DefaultPerson(
+    val completeName: String
+)

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/Location.kt

 package de.rki.coronawarnapp.contactdiary.model
 
-data class Location(
-    val locationName: String
-)
+import java.time.Instant
+
+interface Location {
+    val createdAt: Instant
+    val location: Location
+}

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/Person.kt

 package de.rki.coronawarnapp.contactdiary.model
 
-data class Person(
-    val completeName: String
-)
+import java.time.Instant
+
+interface Person {
+    val createdAt: Instant
+    val person: Person
+}