Skip to content

Fixed a bug in #512. #533

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jan 7, 2022
Merged

Fixed a bug in #512. #533

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
844ce35
In order to reduce processing costs, not rewrite if not necessary.
k163377 Jan 3, 2022
b01c4bd
Fix the call would fail if callable.isAccessible was false.
k163377 Jan 3, 2022
c0a58ab
Fix the call would fail if the companion object was private.
k163377 Jan 3, 2022
3428cd3
Fix test case
k163377 Jan 3, 2022
5eca9cd
add comments
k163377 Jan 4, 2022
b19c44f
formatting
k163377 Jan 4, 2022
c9df362
Merge remote-tracking branch 'origin/2.13' into github512/fix
dinomite Jan 5, 2022
9aa88e5
Fixed to public
k163377 Jan 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/kotlin/com/fasterxml/jackson/module/kotlin/ConstructorValueCreator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ internal class ConstructorValueCreator<T>(override val callable: KFunction<T>) :
override val accessible: Boolean = callable.isAccessible

init {
callable.isAccessible = true
if (!accessible) callable.isAccessible = true
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would you add a note here or in the class comment as to why isAccessible is being forced to true?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.
5eca9cd

}
}
8 changes: 6 additions & 2 deletions src/main/kotlin/com/fasterxml/jackson/module/kotlin/MethodValueCreator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,18 @@ internal class MethodValueCreator<T> private constructor(
// abort, we have some unknown case here
if (!possibleCompanion.isCompanion) return null

val initialCallableAccessible = callable.isAccessible
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good name 👍

if (!initialCallableAccessible) callable.isAccessible = true

val (companionObjectInstance: Any, accessible: Boolean) = try {
// throws ex
val instance = possibleCompanion.objectInstance!!

// If an instance of the companion object can be obtained, accessibility depends on the KFunction
instance to callable.isAccessible
instance to initialCallableAccessible
} catch (ex: IllegalAccessException) {
// fallback for when an odd access exception happens through Kotlin reflection
possibleCompanion.java.enclosingClass.fields
possibleCompanion.java.enclosingClass.declaredFields
.firstOrNull { it.type.kotlin.isCompanion }
?.let {
it.isAccessible = true
Expand Down
4 changes: 2 additions & 2 deletions src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/ParameterNameTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,8 @@ class TestJacksonWithKotlin {

private class StateObjectWithFactoryOnNamedCompanion private constructor (override val name: String, override val age: Int, override val primaryAddress: String, override val wrongName: Boolean, override val createdDt: Date) : TestFields {
var factoryUsed: Boolean = false
companion object Named {
@JvmStatic @JsonCreator fun create(@JsonProperty("name") nameThing: String, @JsonProperty("age") age: Int, @JsonProperty("primaryAddress") primaryAddress: String, @JsonProperty("renamed") wrongName: Boolean, @JsonProperty("createdDt") createdDt: Date): StateObjectWithFactoryOnNamedCompanion {
private companion object Named {
@JvmStatic @JsonCreator private fun create(@JsonProperty("name") nameThing: String, @JsonProperty("age") age: Int, @JsonProperty("primaryAddress") primaryAddress: String, @JsonProperty("renamed") wrongName: Boolean, @JsonProperty("createdDt") createdDt: Date): StateObjectWithFactoryOnNamedCompanion {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would you split this over lines (if you're using IntelliJ, ⌥⏎ then select Put parameters on separate lines):

image

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All lines that were exceeding 120 characters in length depending on the parameter were modified to break lines.
b19c44f

val obj = StateObjectWithFactoryOnNamedCompanion(nameThing, age, primaryAddress, wrongName, createdDt)
obj.factoryUsed = true
return obj
Expand Down