Make from-ref-name optional, because old Nessie-API clients to not su…

…pport it (#1930)
projectnessie · Sep 9, 2021 · 9e5fd2b · 9e5fd2b
1 parent bd2c474
commit 9e5fd2b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/model/src/main/java/org/projectnessie/model/Merge.java b/model/src/main/java/org/projectnessie/model/Merge.java
@@ -20,7 +20,9 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import javax.annotation.Nullable;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
 import org.eclipse.microprofile.openapi.annotations.enums.SchemaType;
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
 import org.eclipse.microprofile.openapi.annotations.media.SchemaProperty;
@@ -43,7 +45,8 @@ public interface Merge {
   @JsonFormat(pattern = Validation.HASH_REGEX)
   String getFromHash();
 
-  @NotBlank
+  @Nullable
+  @Size(min = 1) // TODO migrate to @NotBlank once all Nessie-0.9-API clients are "gone"
   @JsonFormat(pattern = Validation.REF_NAME_REGEX)
   String getFromRefName();
 

diff --git a/model/src/main/java/org/projectnessie/model/Transplant.java b/model/src/main/java/org/projectnessie/model/Transplant.java
@@ -21,7 +21,7 @@
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import java.util.List;
-import javax.validation.constraints.NotBlank;
+import javax.annotation.Nullable;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import org.eclipse.microprofile.openapi.annotations.enums.SchemaType;
@@ -46,7 +46,8 @@ public interface Transplant {
   @Size(min = 1)
   List<String> getHashesToTransplant();
 
-  @NotBlank
+  @Nullable
+  @Size(min = 1) // TODO migrate to @NotBlank once all Nessie-0.9-API clients are "gone"
   @JsonFormat(pattern = Validation.REF_NAME_REGEX)
   String getFromRefName();