Remove usage of @OverridesAttribute.List

Java 8 supports specifying repeated annotations, so there's no need to use this any more.
tamir-michaeli · Feb 2, 2022 · 981bdec · 981bdec
1 parent 775d096
commit 981bdec
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/dropwizard-validation/src/main/java/io/dropwizard/validation/DataSizeRange.java b/dropwizard-validation/src/main/java/io/dropwizard/validation/DataSizeRange.java
@@ -38,10 +38,8 @@
     @OverridesAttribute(constraint = MaxDataSize.class, name = "value")
     long max() default Long.MAX_VALUE;
 
-    @OverridesAttribute.List({
-        @OverridesAttribute(constraint = MinDataSize.class, name = "unit"),
-        @OverridesAttribute(constraint = MaxDataSize.class, name = "unit")
-    })
+    @OverridesAttribute(constraint = MinDataSize.class, name = "unit")
+    @OverridesAttribute(constraint = MaxDataSize.class, name = "unit")
     DataSizeUnit unit() default DataSizeUnit.BYTES;
 
     String message() default "must be between {min} {unit} and {max} {unit}";

diff --git a/dropwizard-validation/src/main/java/io/dropwizard/validation/DurationRange.java b/dropwizard-validation/src/main/java/io/dropwizard/validation/DurationRange.java
@@ -35,10 +35,8 @@
     @OverridesAttribute(constraint = MaxDuration.class, name = "value")
     long max() default Long.MAX_VALUE;
 
-    @OverridesAttribute.List({
-        @OverridesAttribute(constraint = MinDuration.class, name = "unit"),
-        @OverridesAttribute(constraint = MaxDuration.class, name = "unit")
-    })
+    @OverridesAttribute(constraint = MinDuration.class, name = "unit")
+    @OverridesAttribute(constraint = MaxDuration.class, name = "unit")
     TimeUnit unit() default TimeUnit.SECONDS;
 
     String message() default "must be between {min} {unit} and {max} {unit}";

diff --git a/dropwizard-validation/src/main/java/io/dropwizard/validation/SizeRange.java b/dropwizard-validation/src/main/java/io/dropwizard/validation/SizeRange.java
@@ -38,10 +38,8 @@
     @OverridesAttribute(constraint = MaxSize.class, name = "value")
     long max() default Long.MAX_VALUE;
 
-    @OverridesAttribute.List({
-        @OverridesAttribute(constraint = MinSize.class, name = "unit"),
-        @OverridesAttribute(constraint = MaxSize.class, name = "unit")
-    })
+    @OverridesAttribute(constraint = MinSize.class, name = "unit")
+    @OverridesAttribute(constraint = MaxSize.class, name = "unit")
     SizeUnit unit() default SizeUnit.BYTES;
 
     String message() default "must be between {min} {unit} and {max} {unit}";