Use generics

ical4j · Jul 15, 2020 · 484305a · 484305a
1 parent 430f788
commit 484305a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 19 deletions.
diff --git a/src/main/java/net/fortuna/ical4j/model/component/VTimeZone.java b/src/main/java/net/fortuna/ical4j/model/component/VTimeZone.java
@@ -133,7 +133,7 @@ public class VTimeZone extends CalendarComponent {
 
     private static final long serialVersionUID = 5629679741050917815L;
 
-    private final Validator itipValidator = new VTimeZoneValidator();
+    private final Validator<VTimeZone> itipValidator = new VTimeZoneValidator();
 
     private final Validator<VTimeZone> validator = new ComponentValidator<>(
             new ValidationRule<>(One, TZID),
@@ -241,13 +241,7 @@ public final void validate(final boolean recurse) throws ValidationException {
 
     @Override
     public void validate(Method method) throws ValidationException {
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected Validator<CalendarComponent> getValidator(Method method) {
-        return itipValidator;
+        itipValidator.validate(this);
     }
 
     /**

diff --git a/src/main/java/net/fortuna/ical4j/validate/component/VEventValidator.java b/src/main/java/net/fortuna/ical4j/validate/component/VEventValidator.java
@@ -15,16 +15,16 @@
 public class VEventValidator extends ComponentValidator<VEvent> {
 
     private final Validator<VAlarm> itipValidator = new ComponentValidator<>(
-            new ValidationRule(One, ACTION, TRIGGER),
-            new ValidationRule(OneOrLess, DESCRIPTION, DURATION, REPEAT, SUMMARY));
+            new ValidationRule<>(One, ACTION, TRIGGER),
+            new ValidationRule<>(OneOrLess, DESCRIPTION, DURATION, REPEAT, SUMMARY));
 
     private final boolean alarmsAllowed;
 
-    public VEventValidator(ValidationRule... rules) {
+    public VEventValidator(ValidationRule<VEvent>... rules) {
         this(true, rules);
     }
 
-    public VEventValidator(boolean alarmsAllowed, ValidationRule... rules) {
+    public VEventValidator(boolean alarmsAllowed, ValidationRule<VEvent>... rules) {
         super(rules);
         this.alarmsAllowed = alarmsAllowed;
     }

diff --git a/src/main/java/net/fortuna/ical4j/validate/component/VTimeZoneValidator.java b/src/main/java/net/fortuna/ical4j/validate/component/VTimeZoneValidator.java
@@ -14,10 +14,10 @@
 public class VTimeZoneValidator extends ComponentValidator<VTimeZone> {
 
     private final Validator<Observance> itipValidator = new ComponentValidator<>(
-            new ValidationRule(One, DTSTART, TZOFFSETFROM, TZOFFSETTO),
-            new ValidationRule(OneOrLess, TZNAME));
+            new ValidationRule<>(One, DTSTART, TZOFFSETFROM, TZOFFSETTO),
+            new ValidationRule<>(OneOrLess, TZNAME));
 
-    public VTimeZoneValidator(ValidationRule... rules) {
+    public VTimeZoneValidator(ValidationRule<VTimeZone>... rules) {
         super(rules);
     }
 

diff --git a/src/main/java/net/fortuna/ical4j/validate/component/VToDoValidator.java b/src/main/java/net/fortuna/ical4j/validate/component/VToDoValidator.java
@@ -15,16 +15,16 @@
 public class VToDoValidator extends ComponentValidator<VToDo> {
 
     private final Validator<VAlarm> itipValidator = new ComponentValidator<>(
-            new ValidationRule(One, ACTION, TRIGGER),
-            new ValidationRule(OneOrLess, DESCRIPTION, DURATION, REPEAT, SUMMARY));
+            new ValidationRule<>(One, ACTION, TRIGGER),
+            new ValidationRule<>(OneOrLess, DESCRIPTION, DURATION, REPEAT, SUMMARY));
 
     private final boolean alarmsAllowed;
 
-    public VToDoValidator(ValidationRule... rules) {
+    public VToDoValidator(ValidationRule<VToDo>... rules) {
         this(true, rules);
     }
 
-    public VToDoValidator(boolean alarmsAllowed, ValidationRule... rules) {
+    public VToDoValidator(boolean alarmsAllowed, ValidationRule<VToDo>... rules) {
         super(rules);
         this.alarmsAllowed = alarmsAllowed;
     }