This repository has been archived by the owner on Aug 8, 2023. It is now read-only.
Raw expression support #12007
Merged
Raw expression support #12007
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
tobrun
suggested changes
May 28, 2018
| } | ||
|
|
||
| private static Gson getGsonInstance() { | ||
| return gson = gson != null ? gson : new Gson(); |
There was a problem hiding this comment.
what is the need for lazy initialising? Think we can directly initialise it in the field without too much overhead.
| String string = (String) object; | ||
| if (string.length() > 1 && | ||
| string.charAt(0) == '\"' && string.charAt(string.length() - 1) == '\"') { | ||
| object = string.substring(1, string.length() - 1); |
| @@ -3452,6 +3456,9 @@ private Object toValue(ExpressionLiteral expressionValue) { | |||
|
|
|||
| /** | |||
| * Returns a string representation of the object that matches the definition set in the style specification. | |||
| * <p> | |||
| * If this expression contains a coma (,) delimited literal, like 'rgba(r, g, b, a)`, | |||
| * it will be enclosed with double quotes ("). | |||
| * | |||
There was a problem hiding this comment.
need to close </p> javadoc paragraph
| stop("layer1", 2), | ||
| stop("layer2", 2.7)); | ||
| assertEquals("expressions should match", expected, raw(expected.toString())); | ||
| } |
There was a problem hiding this comment.
extract tests into separate tests methods to explain intent / track down test faillure
LukasPaczos
force-pushed
the
11158-raw-expression-support
branch
from
733b89c
to
c9d188c
Compare
LukasPaczos
commented
May 28, 2018
| if (object instanceof String) { | ||
| object = unwrapStringLiteral((String) object); | ||
| } else if (object instanceof Number) { | ||
| object = ((Number) object).floatValue(); |
There was a problem hiding this comment.
Noting, that in order to make serialization/deserialization and testing of raw expressions easier I'm converting every Number literal to a Float to keep it consistent since JSON format isn't integer-aware. This forced adjustments in a lot of test cases.
|
Ready for another round @tobrun. |
tobrun
approved these changes
May 28, 2018
tobrun
approved these changes
May 28, 2018
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Closes #11158.