Skip to content

Commit

Permalink
[Backport 2.x] Add default implementation to new finalizeSnapshot() i…
Browse files Browse the repository at this point in the history
…n Repository (#16141)

* Add default implementation to new finalizeSnapshot() in Repository (#16128)

Signed-off-by: Sachin Kale <sachinpkale@gmail.com>
(cherry picked from commit 9a5c7b2)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* Fix japicmp configuration by treating abstract-to-default method changes as non-breaking

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

---------

Signed-off-by: Sachin Kale <sachinpkale@gmail.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Andriy Redko <andriy.redko@aiven.io>
  • Loading branch information
3 people authored Oct 3, 2024
1 parent 81f98eb commit e2e6757
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 2 additions & 0 deletions server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,8 @@ tasks.named("sourcesJar").configure {
/** Compares the current build against a laltest released version or the version supplied through 'japicmp.compare.version' system property */
tasks.register("japicmp", me.champeau.gradle.japicmp.JapicmpTask) {
logger.info("Comparing public APIs from ${version} to ${japicmpCompareTarget}")
// See please https://github.com/siom79/japicmp/issues/201
compatibilityChangeExcludes = [ "METHOD_ABSTRACT_NOW_DEFAULT" ]
oldClasspath.from(files("${buildDir}/japicmp-target/opensearch-${japicmpCompareTarget}.jar"))
newClasspath.from(tasks.named('jar'))
onlyModified = true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ void finalizeSnapshot(
* @param repositoryUpdatePriority priority for the cluster state update task
* @param listener listener to be invoked with the new {@link RepositoryData} after completing the snapshot
*/
void finalizeSnapshot(
default void finalizeSnapshot(
ShardGenerations shardGenerations,
long repositoryStateId,
Metadata clusterMetadata,
Expand All @@ -202,7 +202,9 @@ void finalizeSnapshot(
Function<ClusterState, ClusterState> stateTransformer,
Priority repositoryUpdatePriority,
ActionListener<RepositoryData> listener
);
) {
throw new UnsupportedOperationException();
}

/**
* Deletes snapshots
Expand Down

0 comments on commit e2e6757

Please sign in to comment.