Clean up warnings in KotlinJsonAdapter #899
Merged
Conversation
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
Didn't use it on a couple other places where readability would suffer
IntelliJ thinks this is a better approach
rharter
approved these changes
Sep 5, 2019
| @@ -186,18 +189,18 @@ class KotlinJsonAdapterFactory : JsonAdapter.Factory { | |||
| // Fall back to a reflective adapter when the generated adapter is not found. | |||
| } | |||
|
|
|||
| if (rawType.isLocalClass) { | |||
| throw IllegalArgumentException("Cannot serialize local class or object expression ${rawType.name}") | |||
| require(!rawType.isLocalClass) { | |||
There was a problem hiding this comment.
Love this! Is this new in 1.3.50? I just discovered it the other day.
JakeWharton
reviewed
Sep 5, 2019
| if (binding == null && !parameter.isOptional) { | ||
| throw IllegalArgumentException("No property for required constructor ${parameter}") | ||
| } | ||
| require(!(binding == null && !parameter.isOptional)) { "No property for required constructor $parameter" } |
There was a problem hiding this comment.
Suggested change
| require(!(binding == null && !parameter.isOptional)) { "No property for required constructor $parameter" } | |
| require(binding != null || parameter.isOptional) { "No property for required constructor $parameter" } |
There was a problem hiding this comment.
Will fix in a follow-up, didn't know you were doing a pass before merging 😬
| @@ -210,13 +213,15 @@ class KotlinJsonAdapterFactory : JsonAdapter.Factory { | |||
| val parameter = parametersByName[property.name] | |||
|
|
|||
| if (Modifier.isTransient(property.javaField?.modifiers ?: 0)) { | |||
| @Suppress("ReplaceGuardClauseWithFunctionCall") // More readable this way | |||
There was a problem hiding this comment.
Down below you replaced a similar one
| if (parameter != null && !parameter.isOptional) { | ||
| throw IllegalArgumentException( | ||
| "No default value for transient constructor $parameter") | ||
| } | ||
| continue | ||
| } | ||
|
|
||
| @Suppress("ReplaceGuardClauseWithFunctionCall") // More readable this way |
There was a problem hiding this comment.
Isn't it just parameter == null || parameter.type == property.returnType? That's not bad...
There was a problem hiding this comment.
Not quite - the null smartcast no longer works when this is done too. On mobile but in one of these I think it was fine, but in the other it meant nullchecking it's mention in the message
ZacSweers
added a commit
that referenced
this pull request
Sep 8, 2019
Followup fixes from the previous PR
ZacSweers
added a commit
that referenced
this pull request
Sep 8, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Misc idiomatic cleanups, nothing functional changing