Browse Source

Merge pull request #11 from csmith/master

Remove deprecated method.
pull/12/head
Greg Holmes 9 years ago
parent
commit
6ca670829a

+ 0
- 13
src/com/dmdirc/util/validators/ValidatorChain.java View File

21
  */
21
  */
22
 package com.dmdirc.util.validators;
22
 package com.dmdirc.util.validators;
23
 
23
 
24
-import java.util.Arrays;
25
 import java.util.Collections;
24
 import java.util.Collections;
26
 import java.util.List;
25
 import java.util.List;
27
 
26
 
37
      */
36
      */
38
     private final List<Validator<A>> validatorList;
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
      * Creates a new validator chain containing the specified validators.
40
      * Creates a new validator chain containing the specified validators.
54
      *
41
      *

+ 4
- 2
test/com/dmdirc/util/validators/ValidatorChainTest.java View File

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

Loading…
Cancel
Save