Bladeren bron

Merge pull request #11 from csmith/master

Remove deprecated method.
pull/12/head
Greg Holmes 9 jaren geleden
bovenliggende
commit
6ca670829a

+ 0
- 13
src/com/dmdirc/util/validators/ValidatorChain.java Bestand weergeven

@@ -21,7 +21,6 @@
21 21
  */
22 22
 package com.dmdirc.util.validators;
23 23
 
24
-import java.util.Arrays;
25 24
 import java.util.Collections;
26 25
 import java.util.List;
27 26
 
@@ -37,18 +36,6 @@ public class ValidatorChain<A> implements Validator<A> {
37 36
      */
38 37
     private final List<Validator<A>> validatorList;
39 38
 
40
-    /**
41
-     * Creates a new validator chain containing the specified validators.
42
-     *
43
-     * @param validators The validators to be used in this chain.
44
-     * @deprecated Use a builder or pass a list to avoid unchecked warnings.
45
-     */
46
-    @SuppressWarnings("unchecked")
47
-    @Deprecated
48
-    public ValidatorChain(final Validator<A>... validators) {
49
-        validatorList = Arrays.asList(validators);
50
-    }
51
-
52 39
     /**
53 40
      * Creates a new validator chain containing the specified validators.
54 41
      *

+ 4
- 2
test/com/dmdirc/util/validators/ValidatorChainTest.java Bestand weergeven

@@ -23,7 +23,9 @@
23 23
 package com.dmdirc.util.validators;
24 24
 
25 25
 import org.junit.Test;
26
-import static org.junit.Assert.*;
26
+
27
+import static org.junit.Assert.assertFalse;
28
+import static org.junit.Assert.assertTrue;
27 29
 
28 30
 public class ValidatorChainTest {
29 31
 
@@ -33,7 +35,7 @@ public class ValidatorChainTest {
33 35
                 .addValidator(new NotEmptyValidator())
34 36
                 .addValidator(new RegexStringValidator("[a-z]*", "abc"))
35 37
                 .build();
36
-        
38
+
37 39
         assertTrue(chain.validate("").isFailure());
38 40
         assertTrue(chain.validate("__").isFailure());
39 41
         assertFalse(chain.validate("abc").isFailure());

Laden…
Annuleren
Opslaan