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.

Sign up for GitHub

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

Jump to bottom

Fix left-over TODO from content-metadata PR #6759

Merged
merged 1 commit into from
May 6, 2023
Merged

Fix left-over TODO from content-metadata PR #6759

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 9 additions & 1 deletion api/model/src/main/java/org/projectnessie/model/MergeKeyBehavior.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.fasterxml.jackson.annotation.JsonView;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import java.util.List;
import javax.annotation.Nullable;
import org.immutables.value.Value;
import org.projectnessie.model.ser.Views;
Expand Down Expand Up @@ -68,7 +69,14 @@ public interface MergeKeyBehavior {
@jakarta.annotation.Nullable
Content getResolvedContent();

// TODO add metadata list from https://github.com/projectnessie/nessie/pull/6616
/**
* Additional information about the operation and/or content object. If and how a Nessie server
* uses and handles the information depends on the server version and type of metadata (called
* variant).
*/
@JsonInclude(Include.NON_EMPTY)
@JsonView(Views.V2.class)
List<ContentMetadata> getMetadata();

static ImmutableMergeKeyBehavior.Builder builder() {
return ImmutableMergeKeyBehavior.builder();
Expand Down