Add more validation in lifecycle configuration class (#1106)

Author: balamurugana

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

@@ -16,7 +16,6 @@
 
 package io.minio.messages;
 
-import javax.annotation.Nullable;
 import org.simpleframework.xml.Element;
 import org.simpleframework.xml.Root;
 
@@ -25,16 +24,15 @@
  */
 @Root(name = "AbortIncompleteMultipartUpload")
 public class AbortIncompleteMultipartUpload {
-  @Element(name = "DaysAfterInitiation", required = false)
-  private Integer daysAfterInitiation;
+  @Element(name = "DaysAfterInitiation")
+  private int daysAfterInitiation;
 
   public AbortIncompleteMultipartUpload(
-      @Nullable @Element(name = "DaysAfterInitiation", required = false)
-          Integer daysAfterInitiation) {
+      @Element(name = "DaysAfterInitiation") int daysAfterInitiation) {
     this.daysAfterInitiation = daysAfterInitiation;
   }
 
-  public Integer daysAfterInitiation() {
+  public int daysAfterInitiation() {
     return daysAfterInitiation;
   }
 }

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

@@ -28,8 +28,12 @@ public abstract class DateDays {
   private Integer days;
 
   public DateDays(ResponseDate date, Integer days) {
-    this.date = date;
-    this.days = days;
+    if (date != null ^ days != null) {
+      this.date = date;
+      this.days = days;
+    } else {
+      throw new IllegalArgumentException("Only one of date or days must be set");
+    }
   }
 
   public ZonedDateTime date() {

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

@@ -55,13 +55,24 @@ public LifecycleRule(
       @Nullable @Element(name = "AbortIncompleteMultipartUpload", required = false)
           AbortIncompleteMultipartUpload abortIncompleteMultipartUpload,
       @Nullable @Element(name = "Expiration", required = false) Expiration expiration,
-      @Nullable @Element(name = "Filter", required = false) RuleFilter filter,
+      @Nonnull @Element(name = "Filter", required = false) RuleFilter filter,
       @Nullable @Element(name = "ID", required = false) String id,
       @Nullable @Element(name = "NoncurrentVersionExpiration", required = false)
           NoncurrentVersionExpiration noncurrentVersionExpiration,
       @Nullable @Element(name = "NoncurrentVersionTransition", required = false)
           NoncurrentVersionTransition noncurrentVersionTransition,
       @Nullable @Element(name = "Transition", required = false) Transition transition) {
+    if (abortIncompleteMultipartUpload == null
+        && expiration == null
+        && noncurrentVersionExpiration == null
+        && noncurrentVersionTransition == null
+        && transition == null) {
+      throw new IllegalArgumentException(
+          "At least one of action (AbortIncompleteMultipartUpload, Expiration, "
+              + "NoncurrentVersionExpiration, NoncurrentVersionTransition or Transition) must be "
+              + "specified in a rule");
+    }
+
     if (id != null) {
       id = id.trim();
       if (id.isEmpty()) throw new IllegalArgumentException("ID must be non-empty string");
@@ -70,7 +81,7 @@ public LifecycleRule(
 
     this.abortIncompleteMultipartUpload = abortIncompleteMultipartUpload;
     this.expiration = expiration;
-    this.filter = filter;
+    this.filter = Objects.requireNonNull(filter, "Filter must not be null");
     this.id = id;
     this.noncurrentVersionExpiration = noncurrentVersionExpiration;
     this.noncurrentVersionTransition = noncurrentVersionTransition;

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

@@ -16,22 +16,21 @@
 
 package io.minio.messages;
 
-import javax.annotation.Nullable;
 import org.simpleframework.xml.Element;
 import org.simpleframework.xml.Root;
 
 /** Helper class to denote noncurrent version expiration information for {@link LifecycleRule}. */
 @Root(name = "NoncurrentVersionExpiration")
 public class NoncurrentVersionExpiration {
-  @Element(name = "NoncurrentDays", required = false)
-  private Integer noncurrentDays;
+  @Element(name = "NoncurrentDays")
+  private int noncurrentDays;
 
   public NoncurrentVersionExpiration(
-      @Nullable @Element(name = "NoncurrentDays", required = false) Integer noncurrentDays) {
+      @Element(name = "NoncurrentDays", required = false) int noncurrentDays) {
     this.noncurrentDays = noncurrentDays;
   }
 
-  public Integer noncurrentDays() {
+  public int noncurrentDays() {
     return noncurrentDays;
   }
 }

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

@@ -16,20 +16,23 @@
 
 package io.minio.messages;
 
-import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
 import org.simpleframework.xml.Element;
 import org.simpleframework.xml.Root;
 
 /** Helper class to denote noncurrent version transition information for {@link LifecycleRule}. */
 @Root(name = "NoncurrentVersionTransition")
 public class NoncurrentVersionTransition extends NoncurrentVersionExpiration {
-  @Element(name = "StorageClass", required = false)
+  @Element(name = "StorageClass")
   private String storageClass;
 
   public NoncurrentVersionTransition(
-      @Nullable @Element(name = "NoncurrentDays", required = false) Integer noncurrentDays,
-      @Nullable @Element(name = "StorageClass", required = false) String storageClass) {
+      @Element(name = "NoncurrentDays", required = false) int noncurrentDays,
+      @Nonnull @Element(name = "StorageClass", required = false) String storageClass) {
     super(noncurrentDays);
+    if (storageClass == null || storageClass.isEmpty()) {
+      throw new IllegalArgumentException("StorageClass must be provided");
+    }
     this.storageClass = storageClass;
   }
 

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

@@ -17,21 +17,25 @@
 package io.minio.messages;
 
 import java.time.ZonedDateTime;
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import org.simpleframework.xml.Element;
 import org.simpleframework.xml.Root;
 
 /** Helper class to denote transition information for {@link LifecycleRule}. */
 @Root(name = "Transition")
 public class Transition extends DateDays {
-  @Element(name = "StorageClass", required = false)
+  @Element(name = "StorageClass")
   private String storageClass;
 
   public Transition(
       @Nullable @Element(name = "Date", required = false) ResponseDate date,
       @Nullable @Element(name = "Days", required = false) Integer days,
-      @Nullable @Element(name = "StorageClass", required = false) String storageClass) {
+      @Nonnull @Element(name = "StorageClass", required = false) String storageClass) {
     super(date, days);
+    if (storageClass == null || storageClass.isEmpty()) {
+      throw new IllegalArgumentException("StorageClass must be provided");
+    }
     this.storageClass = storageClass;
   }
 

docs/API.md

@@ -857,18 +857,18 @@ rules.add(
         "rule1",
         null,
         null,
-        new Transition(null, 30, "GLACIER")));
+        new Transition((ZonedDateTime) null, 30, "GLACIER")));
 rules.add(
     new LifecycleRule(
         Status.ENABLED,
         null,
-        new Expiration(null, 365, null),
+        new Expiration((ZonedDateTime) null, 365, null),
         new RuleFilter("logs/"),
         "rule2",
         null,
         null,
         null));
-config = new LifecycleConfiguraton(rules);
+LifecycleConfiguration config = new LifecycleConfiguration(rules);
 minioClient.setBucketLifecycle(
     SetBucketLifecycleArgs.builder().bucket("my-bucketname").config(config).build());
 ```

functional/FunctionalTest.java

@@ -2905,7 +2905,14 @@ public static void getBucketLifecycle() throws Exception {
         testSetBucketLifecycle(
             bucketName,
             new LifecycleRule(
-                Status.ENABLED, null, null, new RuleFilter(""), null, null, null, null));
+                Status.ENABLED,
+                null,
+                new Expiration((ZonedDateTime) null, 365, null),
+                new RuleFilter(""),
+                null,
+                null,
+                null,
+                null));
         config =
             client.getBucketLifecycle(GetBucketLifecycleArgs.builder().bucket(bucketName).build());
         if (config == null) {