Update missing XML fields in AndOperator, Expiration and RuleFilter

api/src/main/java/io/minio/messages/AndOperator.java

@@ -31,6 +31,12 @@ public class AndOperator {
   @Convert(PrefixConverter.class)
   private String prefix;
 
+  @Element(name = "ObjectSizeLessThan", required = false)
+  private Integer objectSizeLessThan;
+
+  @Element(name = "ObjectSizeGreaterThan", required = false)
+  private Integer objectSizeGreaterThan;
+
   @ElementMap(
       attribute = false,
       entry = "Tag",
@@ -67,10 +73,50 @@ public AndOperator(
     this.tags = (tags != null) ? Collections.unmodifiableMap(tags) : null;
   }
 
+  public AndOperator(
+      @Nullable @Element(name = "Prefix", required = false) String prefix,
+      @Nullable @Element(name = "ObjectSizeLessThan", required = false) Integer objectSizeLessThan,
+      @Nullable @Element(name = "ObjectSizeGreaterThan", required = false)
+          Integer objectSizeGreaterThan,
+      @Nullable
+          @ElementMap(
+              attribute = false,
+              entry = "Tag",
+              inline = true,
+              key = "Key",
+              value = "Value",
+              required = false)
+          Map<String, String> tags) {
+    if (prefix == null && tags == null) {
+      throw new IllegalArgumentException("At least Prefix or Tags must be set");
+    }
+
+    if (tags != null) {
+      for (String key : tags.keySet()) {
+        if (key.isEmpty()) {
+          throw new IllegalArgumentException("Tags must not contain empty key");
+        }
+      }
+    }
+
+    this.prefix = prefix;
+    this.objectSizeLessThan = objectSizeLessThan;
+    this.objectSizeGreaterThan = objectSizeGreaterThan;
+    this.tags = (tags != null) ? Collections.unmodifiableMap(tags) : null;
+  }
+
   public String prefix() {
     return this.prefix;
   }
 
+  public Integer objectSizeLessThan() {
+    return this.objectSizeLessThan;
+  }
+
+  public Integer objectSizeGreaterThan() {
+    return this.objectSizeGreaterThan;
+  }
+
   public Map<String, String> tags() {
     return this.tags;
   }

api/src/main/java/io/minio/messages/Expiration.java

@@ -27,11 +27,16 @@ public class Expiration extends DateDays {
   @Element(name = "ExpiredObjectDeleteMarker", required = false)
   private Boolean expiredObjectDeleteMarker;
 
+  @Element(name = "ExpiredObjectAllVersions", required = false)
+  private Boolean expiredObjectAllVersions;
+
   public Expiration(
       @Nullable @Element(name = "Date", required = false) ResponseDate date,
       @Nullable @Element(name = "Days", required = false) Integer days,
       @Nullable @Element(name = "ExpiredObjectDeleteMarker", required = false)
-          Boolean expiredObjectDeleteMarker) {
+          Boolean expiredObjectDeleteMarker,
+      @Nullable @Element(name = "ExpiredObjectAllVersions", required = false)
+          Boolean expiredObjectAllVersions) {
     if (expiredObjectDeleteMarker != null) {
       if (date != null || days != null) {
         throw new IllegalArgumentException(
@@ -45,13 +50,31 @@ public Expiration(
     }
 
     this.expiredObjectDeleteMarker = expiredObjectDeleteMarker;
+    this.expiredObjectAllVersions = expiredObjectAllVersions;
   }
 
   public Expiration(ZonedDateTime date, Integer days, Boolean expiredObjectDeleteMarker) {
-    this(date == null ? null : new ResponseDate(date), days, expiredObjectDeleteMarker);
+    this(date == null ? null : new ResponseDate(date), days, expiredObjectDeleteMarker, null);
+  }
+
+  public Expiration(
+      ZonedDateTime date,
+      Integer days,
+      Boolean expiredObjectDeleteMarker,
+      Boolean expiredObjectAllVersions) {
+    this(
+        date == null ? null : new ResponseDate(date),
+        days,
+        expiredObjectDeleteMarker,
+        expiredObjectAllVersions);
   }
 
   public Boolean expiredObjectDeleteMarker() {
     return expiredObjectDeleteMarker;
   }
+
+  /** Allow setting ILM rule for removing all versions of expired objects from command line. */
+  public Boolean expiredObjectAllVersions() {
+    return expiredObjectAllVersions;
+  }
 }

api/src/main/java/io/minio/messages/RuleFilter.java

@@ -38,6 +38,12 @@ public class RuleFilter {
   @Element(name = "Tag", required = false)
   private Tag tag;
 
+  @Element(name = "ObjectSizeLessThan", required = false)
+  private Integer objectSizeLessThan;
+
+  @Element(name = "ObjectSizeGreaterThan", required = false)
+  private Integer objectSizeGreaterThan;
+
   public RuleFilter(
       @Nullable @Element(name = "And", required = false) AndOperator andOperator,
       @Nullable @Element(name = "Prefix", required = false) String prefix,
@@ -51,6 +57,24 @@ public RuleFilter(
     }
   }
 
+  public RuleFilter(
+      @Nullable @Element(name = "And", required = false) AndOperator andOperator,
+      @Nullable @Element(name = "Prefix", required = false) String prefix,
+      @Nullable @Element(name = "ObjectSizeLessThan", required = false) Integer objectSizeLessThan,
+      @Nullable @Element(name = "ObjectSizeGreaterThan", required = false)
+          Integer objectSizeGreaterThan,
+      @Nullable @Element(name = "Tag", required = false) Tag tag) {
+    if (andOperator != null ^ prefix != null ^ tag != null) {
+      this.andOperator = andOperator;
+      this.prefix = prefix;
+      this.tag = tag;
+      this.objectSizeLessThan = objectSizeLessThan;
+      this.objectSizeGreaterThan = objectSizeGreaterThan;
+    } else {
+      throw new IllegalArgumentException("Only one of And, Prefix or Tag must be set");
+    }
+  }
+
   public RuleFilter(@Nonnull AndOperator andOperator) {
     this.andOperator = Objects.requireNonNull(andOperator, "And operator must not be null");
   }
@@ -74,4 +98,12 @@ public String prefix() {
   public Tag tag() {
     return this.tag;
   }
+
+  public Integer objectSizeLessThan() {
+    return this.objectSizeLessThan;
+  }
+
+  public Integer objectSizeGreaterThan() {
+    return this.objectSizeGreaterThan;
+  }
 }