API 1.0.23 ExerciseTree parent_id delete, kotlin, spring boot 2.4

src/main/kotlin/com/aitrainer/api/model/ExerciseTree.kt

@@ -13,7 +13,6 @@ data class ExerciseTree (
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     val treeId: Long = 0,
 
-    @get: NonNull  var parentId: Int,
     @get: NotBlank var name: String = "",
     @get: NotBlank var imageUrl: String = "",
     @get: NonNull  var active: Boolean?

src/main/kotlin/com/aitrainer/api/model/User.kt

@@ -9,8 +9,7 @@ data class User (
     var password: String = "",
     var firebaseUid: String = ""
 ) {
-    @OptIn(UnstableDefault::class)
     fun fromJson(json: String): User {
-        return Json.parse(serializer(), json)
+        return Json.decodeFromString(serializer(), json)
     }
 }

src/main/resources/application-dev.properties

@@ -1,4 +1,5 @@
-spring.profiles.active=dev
+spring.config.activate.on-profile=dev
+spring.config.use-legacy-processing = true
 ## Spring DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties)
 #spring.datasource.url = jdbc:mysql://localhost:3306/aitrainer?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&useSSL=false
 spring.datasource.url = jdbc:mysql://localhost:3306/aitrainer2?serverTimezone=CET&useSSL=false&characterEncoding=UTF-8&allowMultiQueries=true

src/main/resources/application-prod.properties

@@ -1,4 +1,5 @@
-spring.profiles.active=prod
+spring.config.activate.on-profile=prod
+spring.config.use-legacy-processing = true
 ## Spring DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties)
 spring.datasource.url = jdbc:mysql://62.171.188.119:33060/aitrainer?serverTimezone=CET&useSSL=false&characterEncoding=UTF-8&allowPublicKeyRetrieval=true&allowMultiQueries=true
 spring.datasource.username = aitrainer
@@ -16,6 +17,6 @@ logging.config=classpath:logback-spring.xml
 logging.file=logs
 
 # if the database structure has been changed, increment this version number
-application.version=1.0.22
+application.version=1.0.23
 
 jwt.secret=aitrainer

src/main/resources/application-test.properties

@@ -1,4 +1,5 @@
 spring.profiles.active=test
+spring.config.use-legacy-processing = true
 ## Spring DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties)
 #spring.datasource.url = jdbc:mysql://localhost:3306/aitrainer?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&useSSL=false
 spring.datasource.url = jdbc:mysql://mysql:3306/aitrainer?serverTimezone=CET&useSSL=false&characterEncoding=UTF-8&allowPublicKeyRetrieval=true&allowMultiQueries=true

src/main/resources/application-testmac.properties

@@ -1,4 +1,5 @@
-spring.profiles.active=testmac
+spring.config.activate.on-profile=testmac
+spring.config.use-legacy-processing = true
 ## Spring DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties)
 #spring.datasource.url = jdbc:mysql://localhost:3306/aitrainer?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&useSSL=false
 spring.datasource.url = jdbc:mysql://127.0.0.1:3306/aitrainer2?serverTimezone=CET&useSSL=false&characterEncoding=UTF-8&allowPublicKeyRetrieval=true&allowMultiQueries=true

src/main/resources/application.properties

@@ -1,4 +1,5 @@
-spring.profiles.active=dev,test,prod,prodtest
+#spring.config.activate.on-profile=dev,test,prod,prodtest
+spring.config.use-legacy-processing = true
 ## Spring DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties)
 #spring.datasource.url = jdbc:mysql://localhost:3306/aitrainer?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&useSSL=false
 spring.datasource.url = jdbc:mysql://localhost:3306/aitrainer2?serverTimezone=CET&useSSL=false&characterEncoding=UTF-8&allowMultiQueries=true
@@ -16,6 +17,6 @@ logging.config=classpath:logback-spring.xml
 logging.file=logs
 
 # if the database structure has been changed, increment this version number
-application.version=1.0.22
+application.version=1.0.23
 
 jwt.secret=aitrainer

src/test/kotlin/com/aitrainer/api/test/ExerciseTreeParentsTest.kt

@@ -1,12 +1,8 @@
 package com.aitrainer.api.test
 
-
-import com.aitrainer.api.controller.ExerciseTreeController
 import com.aitrainer.api.controller.ExerciseTreeParentsController
-import com.aitrainer.api.model.ExerciseTree
 import com.aitrainer.api.model.ExerciseTreeParents
 import com.aitrainer.api.repository.ExerciseTreeParentsRepository
-import com.aitrainer.api.repository.ExerciseTreeRepository
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
@@ -39,7 +35,7 @@ class ExerciseTreeParentsTest {
 
         assertTrue(responseEntity.body!!.isNotEmpty())
         val exerciseTreeParentList = responseEntity.body!!
-        assertEquals(exerciseTreeParentList.size, 27)
+        assertEquals(exerciseTreeParentList.size, 17)
         assertEquals(exerciseTreeParentList[4].exerciseTreeParentId, 3)
         assertEquals(exerciseTreeParentList[4].exerciseTreeChildId, 7)
 

src/test/kotlin/com/aitrainer/api/test/ExerciseTreeTest.kt

@@ -27,6 +27,6 @@ class ExerciseTreeTest {
 
         val exerciseTreeItem = responseEntity.body!![0]
         assertEquals(exerciseTreeItem.name, "Cardio")
-        assertEquals(responseEntity.body!![1].translations[0].name, "Erő")
+        assertEquals(responseEntity.body!![1].translations[0].name, "Erő!")
     }
 }