Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removes all ImmutableOpenMap references #2726

Conversation

DarshitChanpura
Copy link
Member

Continutation of #2715 #2725

Check List

- [ ] New functionality includes testing
- [ ] New functionality has been documented

  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@DarshitChanpura DarshitChanpura changed the title Removes a missed reference for ImmutableOpenMap Removes all ImmutableOpenMap references Apr 27, 2023
@DarshitChanpura
Copy link
Member Author

CI issues will be resolved once a maven artifact is available with the latest ImmutableOpenMap change. I see that an artifact was pushed to https://aws.oss.sonatype.org/content/repositories/snapshots/org/opensearch/opensearch-core/3.0.0-SNAPSHOT/ but I'm not sure why the CI is still failing since we use sonatype as a repo for artifacts.

@@ -32,7 +33,7 @@ class GetSettingsResponseContainsIndicesMatcher extends TypeSafeDiagnosingMatche
@Override
protected boolean matchesSafely(GetSettingsResponse response, Description mismatchDescription) {

final ImmutableOpenMap<String, Settings> indexToSettings = response.getIndexToSettings();
final Map<String, Settings> indexToSettings = response.getIndexToSettings();
for (String index : expectedIndices) {
if (!indexToSettings.containsKey(index)) {
mismatchDescription
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Below this line I think you need to change the call from .keys() to .keySet()

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ahh..good catch!

@DarshitChanpura DarshitChanpura force-pushed the removes-immutableOpenMap-reference branch from 626583a to 2ae6795 Compare April 27, 2023 18:13
@codecov-commenter
Copy link

codecov-commenter commented Apr 28, 2023

Codecov Report

Merging #2726 (2ae6795) into main (6997f97) will increase coverage by 0.06%.
The diff coverage is n/a.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@             Coverage Diff              @@
##               main    #2726      +/-   ##
============================================
+ Coverage     61.47%   61.54%   +0.06%     
- Complexity     3397     3398       +1     
============================================
  Files           272      272              
  Lines         18740    18740              
  Branches       3284     3284              
============================================
+ Hits          11521    11533      +12     
+ Misses         5620     5610      -10     
+ Partials       1599     1597       -2     

see 4 files with indirect coverage changes

@stephen-crawford stephen-crawford merged commit 739074d into opensearch-project:main Apr 28, 2023
MaciejMierzwa pushed a commit to MaciejMierzwa/security that referenced this pull request Jun 13, 2023
MaciejMierzwa pushed a commit to MaciejMierzwa/security that referenced this pull request Jun 13, 2023
samuelcostae pushed a commit to samuelcostae/security that referenced this pull request Jun 19, 2023
cwperks pushed a commit to cwperks/security that referenced this pull request Jun 27, 2023
cwperks added a commit that referenced this pull request Jun 27, 2023
* Resolve ImmutableOpenMap issue from core refactor (#2715)

* Switch from ImmutableOpenMap to Map in AliasExistsMatcher (#2725)

* Remove references to ObjectObjectCursor

Signed-off-by: Craig Perkins <[email protected]>

* Switch from ImmutableOpenMap to Map in AliasExistsMatcher (#2725)

* Remove references to ObjectObjectCursor

Signed-off-by: Craig Perkins <[email protected]>

* Removes a missed reference for ImmutableOpenMap (#2726)

Signed-off-by: Darshit Chanpura <[email protected]>

* Update ClusterInfoHolder

Signed-off-by: Craig Perkins <[email protected]>

* Run spotlessApply

Signed-off-by: Craig Perkins <[email protected]>

---------

Signed-off-by: Craig Perkins <[email protected]>
Signed-off-by: Darshit Chanpura <[email protected]>
Co-authored-by: Stephen Crawford <[email protected]>
Co-authored-by: Darshit Chanpura <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants