Change model classes to be data classes and remove unused annotations

Aalto-LeTech · Aug 23, 2024 · 22f3528 · 22f3528
1 parent 0558ff6
commit 22f3528
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 14 deletions.
diff --git a/src/main/kotlin/fi/aalto/cs/apluscourses/model/Course.kt b/src/main/kotlin/fi/aalto/cs/apluscourses/model/Course.kt
@@ -13,7 +13,7 @@ import io.ktor.http.*
  * @param exerciseModules Mapping of exercise IDs to modules. The keys are exercise IDs, and the values are maps from language codes to module names. Note that some exercises use modules that are not in the course configuration file, so the modules may not be in [Course.getModules].
  * @param resourceUrls URLs of resources related to the course. The keys are the names of the resources and the values are the URLs.
  */
-class Course(
+data class Course(
     val id: Long,
     val name: String,
     val htmlUrl: String,

diff --git a/src/main/kotlin/fi/aalto/cs/apluscourses/model/exercise/SubmissionFileInfo.kt b/src/main/kotlin/fi/aalto/cs/apluscourses/model/exercise/SubmissionFileInfo.kt
@@ -1,8 +1,5 @@
 package fi.aalto.cs.apluscourses.model.exercise
 
-import kotlinx.serialization.Serializable
-
-@Serializable
 data class SubmissionFileInfo(
     val fileName: String,
     val url: String

diff --git a/src/main/kotlin/fi/aalto/cs/apluscourses/model/exercise/SubmissionInfo.kt b/src/main/kotlin/fi/aalto/cs/apluscourses/model/exercise/SubmissionInfo.kt
@@ -1,9 +1,7 @@
 package fi.aalto.cs.apluscourses.model.exercise
 
 import fi.aalto.cs.apluscourses.api.APlusApi
-import kotlinx.serialization.Serializable
 
-@Serializable
 data class SubmissionInfo(val files: Map<String, List<SubmittableFile>>) {
 //    private val files: Map<String, List<SubmittableFile>> = files
 

diff --git a/src/main/kotlin/fi/aalto/cs/apluscourses/model/exercise/SubmissionResult.kt b/src/main/kotlin/fi/aalto/cs/apluscourses/model/exercise/SubmissionResult.kt
@@ -2,9 +2,7 @@ package fi.aalto.cs.apluscourses.model.exercise
 
 import com.intellij.openapi.project.Project
 import fi.aalto.cs.apluscourses.api.APlusApi
-import kotlinx.serialization.Serializable
 
-@Serializable
 data class SubmissionResult(
     val id: Long,
     val url: String,

diff --git a/src/main/kotlin/fi/aalto/cs/apluscourses/model/exercise/SubmittableFile.kt b/src/main/kotlin/fi/aalto/cs/apluscourses/model/exercise/SubmittableFile.kt
@@ -1,6 +1,3 @@
 package fi.aalto.cs.apluscourses.model.exercise
 
-import kotlinx.serialization.Serializable
-
-@Serializable
 data class SubmittableFile(val key: String, val name: String)
diff --git a/src/main/kotlin/fi/aalto/cs/apluscourses/model/news/NewsItem.kt b/src/main/kotlin/fi/aalto/cs/apluscourses/model/news/NewsItem.kt
@@ -5,7 +5,7 @@ import java.time.ZonedDateTime
 import java.time.format.DateTimeFormatter
 import java.time.format.FormatStyle
 
-class NewsItem(
+data class NewsItem(
     val id: Long,
     val title: String,
     val body: String,

diff --git a/src/main/kotlin/fi/aalto/cs/apluscourses/model/news/NewsList.kt b/src/main/kotlin/fi/aalto/cs/apluscourses/model/news/NewsList.kt
@@ -1,6 +1,6 @@
 package fi.aalto.cs.apluscourses.model.news
 
-class NewsList(val news: List<NewsItem> = emptyList()) {
+data class NewsList(val news: List<NewsItem> = emptyList()) {
     fun setAllRead() {
         news.forEach { newsItem: NewsItem -> newsItem.isRead = true }
     }

diff --git a/src/main/kotlin/fi/aalto/cs/apluscourses/model/people/User.kt b/src/main/kotlin/fi/aalto/cs/apluscourses/model/people/User.kt
@@ -6,7 +6,7 @@ package fi.aalto.cs.apluscourses.model.people
  * @property aplusId The A+ ID of the user.
  * @property staffCourses List of course IDs that the user is a staff member of.
  */
-class User(
+data class User(
     val userName: String,
     val studentId: String,
     val aplusId: Long,