Skip to content

Backport Refactor changes to 2.x#1092

Merged
monusingh-1 merged 2 commits intoopensearch-project:2.xfrom
monusingh-1:backport_to_2.x_1087
Jul 25, 2023
Merged

Backport Refactor changes to 2.x#1092
monusingh-1 merged 2 commits intoopensearch-project:2.xfrom
monusingh-1:backport_to_2.x_1087

Conversation

@monusingh-1
Copy link
Copy Markdown
Collaborator

@monusingh-1 monusingh-1 commented Jul 24, 2023

Description

Changes made in this PR
#1066
#814
#1087

Issues Resolved

[List any issues this PR will resolve]

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • 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.

Keep up with core changes
opensearch-project/OpenSearch#8157
move from common to core.common

Change kotlin.version "1.8.21" as
Class 'org.opensearch.commons.utils.OpenForTesting' was compiled with "1.8.21" version of Kotlin. Ref

Set following to use 1.6 as 1.8.21 is not available yet. Checked that other OpenSearch plugins are also doing the same.
Set kotlinx-coroutines-core to 1.6.0
set kotlinx-coroutines-test to 1.6.0

Added else in when statements as from Kotlin 1.7 version onward exhaustive list is mandatory.
'when' expression must be exhaustive, add necessary 'else' branch

---------

Signed-off-by: monusingh-1 <msnghgw@amazon.com>
@monusingh-1 monusingh-1 marked this pull request as ready for review July 24, 2023 05:04
@codecov
Copy link
Copy Markdown

codecov Bot commented Jul 24, 2023

Codecov Report

Merging #1092 (986729f) into 2.x (51cf593) will increase coverage by 0.50%.
The diff coverage is 48.38%.

❗ Current head 986729f differs from pull request most recent head 9c02576. Consider uploading reports for the commit 9c02576 to get more accurate results

@@             Coverage Diff              @@
##                2.x    #1092      +/-   ##
============================================
+ Coverage     74.96%   75.47%   +0.50%     
+ Complexity     1040     1027      -13     
============================================
  Files           141      141              
  Lines          4770     4763       -7     
  Branches        534      521      -13     
============================================
+ Hits           3576     3595      +19     
+ Misses          856      836      -20     
+ Partials        338      332       -6     
Impacted Files Coverage Δ
...org/opensearch/replication/ReplicationException.kt 11.11% <ø> (ø)
...in/org/opensearch/replication/ReplicationPlugin.kt 90.60% <ø> (ø)
.../autofollow/AutoFollowClusterManagerNodeRequest.kt 48.00% <ø> (ø)
...low/TransportAutoFollowClusterManagerNodeAction.kt 69.38% <ø> (ø)
...ction/autofollow/UpdateAutoFollowPatternRequest.kt 54.43% <ø> (ø)
...ch/replication/action/changes/GetChangesRequest.kt 100.00% <ø> (ø)
...h/replication/action/changes/GetChangesResponse.kt 100.00% <ø> (ø)
...cation/action/changes/TransportGetChangesAction.kt 90.47% <ø> (+26.98%) ⬆️
...n/index/ReplicateIndexClusterManagerNodeRequest.kt 50.00% <ø> (ø)
.../replication/action/index/ReplicateIndexRequest.kt 62.35% <ø> (ø)
... and 76 more

... and 4 files with indirect coverage changes

@monusingh-1 monusingh-1 enabled auto-merge (squash) July 24, 2023 08:53
@monusingh-1 monusingh-1 merged commit 46403eb into opensearch-project:2.x Jul 25, 2023
@monusingh-1 monusingh-1 deleted the backport_to_2.x_1087 branch November 2, 2023 12:55
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.

3 participants