2.14.1 and misc #612
Merged
2.14.1 and misc #612
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
scottf
commented
Mar 10, 2022
| @@ -65,7 +65,7 @@ public static void main(String[] args) { | |||
| * The conscrypt flag is provided for testing with the conscrypt jar. Using it through reflection is | |||
| * deprecated but allows the library to ship without a dependency. Using conscrypt should only require the | |||
| * jar plus the flag. For example, to run after building locally and using the test cert files: | |||
| * java -cp ./build/libs/jnats-2.14.0-SNAPSHOT-examples.jar:./build/libs/jnats-2.14.0-SNAPSHOT-fat.jar:<path to conscrypt.jar> \ | |||
| * java -cp ./build/libs/jnats-<version>-examples.jar:./build/libs/jnats-<version>-fat.jar:<path to conscrypt.jar> \ | |||
There was a problem hiding this comment.
Put a placeholder here so we don't have to update this every version
scottf
commented
Mar 10, 2022
| @@ -142,7 +142,7 @@ private String getComparableVersion(String vString) { | |||
| String[] v = vString.replaceAll("v", "").replaceAll("-", ".").split("\\Q.\\E"); | |||
| int at = vString.indexOf("-"); | |||
| return "" + (Integer.parseInt(v[0]) * 10000) + (Integer.parseInt(v[1]) * 100) + Integer.parseInt(v[2]) | |||
| + (at == -1 ? "" : vString.substring(at)); | |||
| + (at == -1 ? "~" : vString.substring(at)); | |||
There was a problem hiding this comment.
The tilde is the last ascii character so it this helps v0.0.0 sort "newer" than v.0.0.0-beta
scottf
commented
Mar 10, 2022
| return strEnumHash.get(value); | ||
| if (File.policy.equalsIgnoreCase(value)) { return File; } | ||
| if (Memory.policy.equalsIgnoreCase(value)) { return Memory; } | ||
| return null; |
There was a problem hiding this comment.
Half the code, one less object. I would still use the other strategy on enums with more entries
scottf
commented
Mar 10, 2022
| @@ -64,7 +64,7 @@ public void testServerVersionComparisonsWork() { | |||
| ServerInfo info235Beta2 = new ServerInfo(json.replace("1.2.3", "2.3.5-beta.2")); | |||
| assertTrue(info.isOlderThanVersion("2.3.4")); | |||
| assertTrue(info234.isOlderThanVersion("2.3.5")); | |||
| assertTrue(info235.isOlderThanVersion("2.3.5-beta.2")); | |||
| assertTrue(info235.isNewerVersionThan("2.3.5-beta.2")); | |||
There was a problem hiding this comment.
Just b/c the test passes, doesn't mean it's right :)
scottf
commented
Mar 10, 2022
| @@ -9,7 +9,7 @@ | |||
| "max_bytes": 732, | |||
| "max_age": 43000000000, | |||
| "max_msg_size": 734, | |||
| "storage": "memory", | |||
| "storage": "MeMoRy", "storageComment": "funny case used to test getting StorageType enum", | |||
There was a problem hiding this comment.
json doesn't have comments, so just add a field that is ignored
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.
All other files are a version change