spring api changes

griffio · Jul 9, 2023 · 300cd2e · 300cd2e
1 parent 8e6d7ba
commit 300cd2e
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 15 deletions.
diff --git a/src/main/kotlin/griffio/kollchap/demo/DungeonRoom.kt b/src/main/kotlin/griffio/kollchap/demo/DungeonRoom.kt
@@ -1,9 +1,9 @@
 package griffio.kollchap.demo
 
 import com.fasterxml.jackson.annotation.JsonIgnore
-import javax.persistence.Column
-import javax.persistence.Entity
-import javax.validation.constraints.NotBlank
+import jakarta.persistence.Entity
+import jakarta.persistence.Column
+import jakarta.validation.constraints.NotBlank
 
 @Entity(name = "room")
 class DungeonRoom(

diff --git a/src/main/kotlin/griffio/kollchap/demo/GameCharacter.kt b/src/main/kotlin/griffio/kollchap/demo/GameCharacter.kt
@@ -1,14 +1,14 @@
 package griffio.kollchap.demo
 
 import com.fasterxml.jackson.annotation.JsonIgnore
-import javax.persistence.Entity
-import javax.validation.constraints.Min
-import javax.validation.constraints.NotBlank
-import javax.validation.constraints.NotNull
+import jakarta.persistence.Entity
+import jakarta.validation.constraints.Min
+import jakarta.validation.constraints.NotBlank
+import jakarta.validation.constraints.NotNull
 
 import org.hibernate.validator.constraints.Range
-import javax.persistence.Embeddable
-import javax.persistence.Embedded
+import jakarta.persistence.Embeddable
+import jakarta.persistence.Embedded
 
 enum class GameCharacterAlignment {
     Chaotic,

diff --git a/src/main/kotlin/griffio/kollchap/demo/MappedIdentity.kt b/src/main/kotlin/griffio/kollchap/demo/MappedIdentity.kt
@@ -6,7 +6,7 @@ import org.springframework.data.util.ProxyUtils
 import org.springframework.lang.Nullable
 import java.io.Serializable
 import java.util.*
-import javax.persistence.*
+import jakarta.persistence.*
 
 @MappedSuperclass
 abstract class MappedIdentity<PK : Serializable> : Persistable<PK> {

diff --git a/src/test/kotlin/griffio/kollchap/demo/ConstrainedFields.kt b/src/test/kotlin/griffio/kollchap/demo/ConstrainedFields.kt
@@ -6,7 +6,7 @@ import org.springframework.restdocs.payload.PayloadDocumentation
 import org.springframework.restdocs.snippet.Attributes
 
 /**
- * Utility for extracting javax.validator annotations into a restdocs "constraints" custom attribute
+ * Utility for extracting jakarta.validator annotations into a restdocs "constraints" custom attribute
  * see resources/org/springframework/restdocs/templates/request-fields.snippet
  */
 class ConstrainedFields constructor(input: Class<*>) {

diff --git a/src/test/kotlin/griffio/kollchap/demo/DemoApplicationTests.kt b/src/test/kotlin/griffio/kollchap/demo/DemoApplicationTests.kt
@@ -20,7 +20,7 @@ import org.springframework.test.web.servlet.MockMvc
 import org.springframework.test.web.servlet.result.MockMvcResultHandlers
 import org.springframework.test.web.servlet.result.MockMvcResultMatchers
 import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
-import javax.servlet.RequestDispatcher
+import jakarta.servlet.RequestDispatcher
 
 @SpringBootTest(classes = [Application::class])
 @AutoConfigureRestDocs

diff --git a/src/test/kotlin/griffio/kollchap/demo/DemoRoomTests.kt b/src/test/kotlin/griffio/kollchap/demo/DemoRoomTests.kt
@@ -14,8 +14,7 @@ import org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.*
 import org.springframework.restdocs.payload.FieldDescriptor
 import org.springframework.restdocs.payload.JsonFieldType
 import org.springframework.restdocs.payload.PayloadDocumentation.*
-import org.springframework.restdocs.request.RequestDocumentation.parameterWithName
-import org.springframework.restdocs.request.RequestDocumentation.requestParameters
+import org.springframework.restdocs.request.RequestDocumentation.*
 import org.springframework.test.web.servlet.MockMvc
 import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
 
@@ -136,7 +135,7 @@ class DemoRoomTests(
         mvc.perform(get("/rooms/search/keys?key=1").accept(MediaTypes.HAL_JSON))
             .andExpect(status().isOk).andDo(
                 document(
-                    "room-keys-example", requestParameters(
+                    "room-keys-example", queryParameters(
                         parameterWithName("key").description("The room to retrieve using the map key"),
                     )
                 )