resolve: Avoid presenting duplicate capabilities to the resolver #4409
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
The referenced folders could need quoting. Signed-off-by: BJ Hargrave <bj@bjhargrave.com>
Signed-off-by: BJ Hargrave <bj@bjhargrave.com>
Signed-off-by: BJ Hargrave <bj@bjhargrave.com>
They are written as List<Long> to resource indexes and read back in that way. By being consistent in using Long, we get consistent results for equals and hashCode on capabilities. This is important to the resolve context to avoid duplicate resources being shown to the resolver. Signed-off-by: BJ Hargrave <bj@bjhargrave.com>
We use addFile to add hashes to the package capability. This is consistent with indexing and other repository types and ensures we get consistent behavior of equals and hashCode on capabilities for comparison in the resolve context to avoid presenting duplicate capabilities to the resolver. Signed-off-by: BJ Hargrave <bj@bjhargrave.com>
The XMLResourceParser used Bnd Version and the ResourceBuilder used OSGi Version. So we can fail to compare some version values. So we are now consistent which enables proper capability behavior of equals and hashCode to enable the resolve context to not expose the resolver to duplicate capabilities. Signed-off-by: BJ Hargrave <bj@bjhargrave.com>
Based upon the previous commits to fix equals and hashCode behavior of capabilities, we now avoid duplicate capabilities in the values supplied to the resolver. Fixes #4382 Signed-off-by: BJ Hargrave <bj@bjhargrave.com>
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.
Multiple repositories can reference the same resources. For example an index generated in maven can refer to files in the local maven repo and the ImplicitFileSetRepository can also reference them. These repositories are constructed in different ways and they were not consistent. And we ended up with capabilities from each repository which should have been equals (and same hashCode) but were not. Bnd Versions cannot be compared with OSGi Versions. bnd.hashes attributes were not consistently present. Integers cannot be compared with Longs.
So this PR fixes these issues to avoid presenting equivalent capabilities to the resolver which horrible confused it.
Fixes #4382