SLING-8523 : Duplicate OSGI configs after upgrade #4
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
Upgrade resulting in duplicate factory configs for cases where alais is null
|
@cziegeler , please review |
cziegeler
reviewed
Jun 22, 2019
|
|
||
| final String factoryPid = alias.substring(0, pos - 1); | ||
| final String pid = oldId.substring(factoryPid.length() + 1); | ||
| String factoryIdString = oldId.substring(0,oldId.lastIndexOf('.')+1); // keep it +1 to have last dot intact so that we always have even dots in the string |
There was a problem hiding this comment.
you could store lastIndexOf in an int variable and reuse it below
cziegeler
reviewed
Jun 22, 2019
| final String pid = oldId.substring(factoryPid.length() + 1); | ||
| String factoryIdString = oldId.substring(0,oldId.lastIndexOf('.')+1); // keep it +1 to have last dot intact so that we always have even dots in the string | ||
| factoryPid = oldId.substring(0,getMiddleDotSplitIndex(factoryIdString,'.')); | ||
| pid = oldId.substring(oldId.lastIndexOf('.')+1,oldId.length()); |
There was a problem hiding this comment.
substring(int) is enough, if you only specify the start it goes until the of the string
|
@cziegeler , Thanks for the review, added a test case to cover the new code and incorporated your code comments. Please merge. |
Added cleanup for existing duplicate configs generated before this Patch
cziegeler
approved these changes
Jun 24, 2019
|
|
||
| return new String[] { factoryPid, pid }; | ||
| } | ||
|
|
||
| private int getMiddleDotSplitIndex(final String strId, char dot){ |
There was a problem hiding this comment.
This method is only invoked with the second param being a ".", so you only need one param and can use a constant for "." below
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.
Upgrade resulting in duplicate factory configs for cases where alais is null