-
Notifications
You must be signed in to change notification settings - Fork 73
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fixes #331 Typed queries ignore @SerialName annotations on enum value…
…s, regression from 4.4.0
- Loading branch information
Showing
15 changed files
with
176 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 55 additions & 0 deletions
55
kmongo-serialization/src/test/kotlin/Issue328FieldIdQueryFilterSerialization.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| /* | ||
| * Copyright (C) 2016/2021 Litote | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.litote.kmongo.issues | ||
|
|
||
| import kotlinx.serialization.Contextual | ||
| import kotlinx.serialization.SerialName | ||
| import kotlinx.serialization.Serializable | ||
| import org.bson.types.ObjectId | ||
| import org.junit.Test | ||
| import org.litote.kmongo.AllCategoriesKMongoBaseTest | ||
| import org.litote.kmongo.Id | ||
| import org.litote.kmongo.MongoOperator | ||
| import org.litote.kmongo.MongoOperator.* | ||
| import org.litote.kmongo.eq | ||
| import org.litote.kmongo.id.toId | ||
| import org.litote.kmongo.json | ||
| import org.litote.kmongo.newId | ||
| import org.litote.kmongo.toId | ||
| import kotlin.test.assertEquals | ||
|
|
||
| @Serializable | ||
| data class UserSubscription( | ||
| @SerialName("_id") | ||
| @Contextual val id: Id<UserSubscription> = newId(), | ||
| @Contextual val user: Id<User> | ||
| ) | ||
|
|
||
| /** | ||
| * | ||
| */ | ||
| class Issue328FieldIdQueryFilterSerialization : AllCategoriesKMongoBaseTest<UserSubscription>() { | ||
|
|
||
| @Test | ||
| fun testSerialization() { | ||
| val json = (UserSubscription::user eq ObjectId("6244ba8b131ffc0267c9a10c").toId()).json | ||
| assertEquals("""{"user": {"$oid": "6244ba8b131ffc0267c9a10c"}}""", json) | ||
|
|
||
| val json2 = (UserSubscription::user eq "6244ba8b131ffc0267c9a10c".toId()).json | ||
| assertEquals("""{"user": "6244ba8b131ffc0267c9a10c"}""", json2) | ||
| } | ||
| } |
59 changes: 59 additions & 0 deletions
59
kmongo-serialization/src/test/kotlin/Issue331EnumSerialName.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| /* | ||
| * Copyright (C) 2016/2021 Litote | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.litote.kmongo.issues | ||
|
|
||
| import kotlinx.serialization.SerialName | ||
| import kotlinx.serialization.Serializable | ||
| import org.junit.Test | ||
| import org.litote.kmongo.AllCategoriesKMongoBaseTest | ||
| import org.litote.kmongo.eq | ||
| import org.litote.kmongo.findOne | ||
| import org.litote.kmongo.json | ||
| import kotlin.test.assertEquals | ||
| import kotlin.test.assertNotNull | ||
|
|
||
| @Serializable | ||
| data class Jedi( | ||
| @SerialName("Name") | ||
| val name: String, | ||
| val age: Int, | ||
| val rating: Rating | ||
| ) | ||
|
|
||
| @Serializable | ||
| enum class Rating { | ||
| @SerialName("Favourite") | ||
| FAVOURITE, | ||
|
|
||
| @SerialName("Hated") | ||
| HATED, | ||
| } | ||
|
|
||
| class Issue331EnumSerialName : AllCategoriesKMongoBaseTest<Jedi>() { | ||
|
|
||
| @Test | ||
| fun testSerialization() { | ||
| val json = (Jedi::rating eq Rating.FAVOURITE).json | ||
| assertEquals("""{"rating": "Favourite"}""", json) | ||
|
|
||
| col.insertOne(Jedi("Luke Skywalker", 19, Rating.FAVOURITE)) | ||
|
|
||
| val jedi1 = col.findOne(Jedi::rating eq Rating.FAVOURITE) | ||
| assertNotNull(jedi1) | ||
|
|
||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters