Skip to content

Fix imports for tests#2461

Closed
willyborankin wants to merge 1 commit intoopensearch-project:mainfrom
willyborankin:fix-rest-admin-api-wrong-imports
Closed

Fix imports for tests#2461
willyborankin wants to merge 1 commit intoopensearch-project:mainfrom
willyborankin:fix-rest-admin-api-wrong-imports

Conversation

@willyborankin
Copy link
Copy Markdown
Collaborator

@willyborankin willyborankin commented Feb 22, 2023

Description

After REST admin permissions were merged it is impossible to cherry pick the commit since
4 tests has wrong Apache HTTP imports instead of:

import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.HttpStatus;

it must be

import org.apache.http.Header;
import org.apache.http.HttpStatus;

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.

@willyborankin
Copy link
Copy Markdown
Collaborator Author

@scrawfor99 this should fix imports first and im ready to prepare a backport PR. If it is too later it is not a problem I can do it after 2.6 release

Fixed import for tests for Apache HTTP: client in tests

Signed-off-by: Andrey Pleskach <ples@aiven.io>
@willyborankin willyborankin force-pushed the fix-rest-admin-api-wrong-imports branch from 44bfaf9 to 230e571 Compare February 22, 2023 16:13
@cwperks
Copy link
Copy Markdown
Member

cwperks commented Feb 22, 2023

@willyborankin On main, the Apache HttpClient 5 is used, but in 2.x it is using v4. When creating the backport for REST admin permissions use the import from Apache HttpClient 4 for the 2.x backport. Let me know if you need any assistance with the backport, I can help create the backport if needed.

@willyborankin
Copy link
Copy Markdown
Collaborator Author

@willyborankin On main, the Apache HttpClient 5 is used, but in 2.x it is using v4. When creating the backport for REST admin permissions use the import from Apache HttpClient 4 for the 2.x backport. Let me know if you need any assistance with the backport, I can help create the backport if needed.

Got it than it is not problem. I will resolve conflicts in backport PR.
@reta explained me already how to do it.

@willyborankin willyborankin deleted the fix-rest-admin-api-wrong-imports branch March 30, 2023 09:54
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.

2 participants