From 65f5ffeb2c25ef39cbcc49e71b8f3221c609ac15 Mon Sep 17 00:00:00 2001 From: Bala FA Date: Sun, 10 Jul 2022 02:53:19 +0530 Subject: [PATCH] Revert "Allow null filter in LifecycleRule (#1344)" (#1345) This reverts commit f8de495589a23c2898f66aa2b476ce678c5814e9. There is a bug in `mc ilm export` not showing empty filter. Signed-off-by: Bala.FA --- api/src/main/java/io/minio/messages/LifecycleRule.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/src/main/java/io/minio/messages/LifecycleRule.java b/api/src/main/java/io/minio/messages/LifecycleRule.java index c91773835..ab338ca3a 100644 --- a/api/src/main/java/io/minio/messages/LifecycleRule.java +++ b/api/src/main/java/io/minio/messages/LifecycleRule.java @@ -55,7 +55,7 @@ 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, @@ -81,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;