Maximum length for instance configs should be longer - improve tests. #147
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
xvello
suggested changes
Aug 4, 2017
| @@ -415,7 +425,16 @@ public void doIteration() { | |||
|
|
|||
| public boolean addConfig(String name, YamlParser config) { | |||
| // named groups not supported with Java6: "(?<check>.{1,30})_(?<version>\\d{0,30})" | |||
There was a problem hiding this comment.
Should that comment be updated?
| String patternText = AUTO_DISCOVERY_PREFIX+"_(.{1," + AD_MAX_NAME_LEN + | ||
| "})_(\\d{0,"+ AD_MAX_MAG_INSTANCES +"})"; | ||
|
|
||
| Pattern pattern = Pattern.compile(patternText); | ||
|
|
||
| Matcher matcher = pattern.matcher(name); | ||
| if (!matcher.find()) { |
There was a problem hiding this comment.
I'd love to have debug output here too, in case it were to happen
| @@ -45,6 +46,9 @@ | |||
| private static final String AD_LEGACY_CONFIG_SEP = "#### SERVICE-DISCOVERY ####"; | |||
| private static final String AD_CONFIG_TERM = "#### AUTO-DISCOVERY TERM ####"; | |||
| private static final String AD_LEGACY_CONFIG_TERM = "#### SERVICE-DISCOVERY TERM ####"; | |||
| private static final int AD_MAX_NAME_LEN = 80; | |||
| private static final int AD_MAX_MAG_INSTANCES = (int)Math.log10(1000) + 1; | |||
There was a problem hiding this comment.
That's a bit cryptic, I'd go with 4 // 1000 instances ought to be enough for anyone
xvello
approved these changes
Aug 7, 2017
| @@ -414,19 +424,30 @@ public void doIteration() { | |||
| } | |||
|
|
|||
| public boolean addConfig(String name, YamlParser config) { | |||
| // named groups not supported with Java6: "(?<check>.{1,30})_(?<version>\\d{0,30})" | |||
| Pattern pattern = Pattern.compile(AUTO_DISCOVERY_PREFIX+"(.{1,30})_(\\d{0,30})"); | |||
| // named groups not supported with Java6: "(?<check>.{1,80})_(?<version>\\d{0,80})" | |||
There was a problem hiding this comment.
I think it's (?<version>\\d{0,4}) right, using AD_MAX_MAG_INSTANCES?
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.
No description provided.