Marked as Immutable; Method signature changes (as in Specification);

Generics clean up
vincentlejeune · Mar 24, 2013 · 93657fa · 93657fa
1 parent e153c0a
commit 93657fa
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 24 deletions.
diff --git a/src/main/java/pl/ais/commons/domain/specification/mail/ValidEmailSpecification.java b/src/main/java/pl/ais/commons/domain/specification/mail/ValidEmailSpecification.java
@@ -1,5 +1,6 @@
 package pl.ais.commons.domain.specification.mail;
 
+import javax.annotation.concurrent.Immutable;
 import javax.mail.internet.AddressException;
 import javax.mail.internet.InternetAddress;
 
@@ -11,23 +12,28 @@
  * @author Warlock, AIS.PL
  * @since 1.0.1
  */
-public final class ValidEmailSpecification implements Specification<String> {
+@Immutable
+public final class ValidEmailSpecification implements Specification<CharSequence> {
 
     /**
      * Defines singleton instance of {@link ValidEmailSpecification}.
      */
-    public static final Specification<String> INSTANCE = new ValidEmailSpecification();
+    @SuppressWarnings("rawtypes")
+    public static final Specification INSTANCE = new ValidEmailSpecification();
 
     /**
      * {@inheritDoc}
      */
     @Override
-    public boolean isSatisfiedBy(final String candidate) {
-        boolean result = true;
-        try {
-            new InternetAddress(candidate).validate();
-        } catch (final AddressException exception) {
-            result = false;
+    public <T extends CharSequence> boolean isSatisfiedBy(final T candidate) {
+        boolean result = false;
+        if (null != candidate) {
+            try {
+                new InternetAddress(candidate.toString()).validate();
+                result = true;
+            } catch (final AddressException exception) {
+                // Ignore ...
+            }
         }
         return result;
     }

diff --git a/src/main/java/pl/ais/commons/domain/specification/simple/BlankSpecification.java b/src/main/java/pl/ais/commons/domain/specification/simple/BlankSpecification.java
@@ -1,5 +1,7 @@
 package pl.ais.commons.domain.specification.simple;
 
+import javax.annotation.concurrent.Immutable;
+
 import pl.ais.commons.domain.specification.Specification;
 
 /**
@@ -9,28 +11,31 @@
  * @author Warlock, AIS.PL
  * @since 1.0.1
  */
+@Immutable
 public final class BlankSpecification implements Specification<CharSequence> {
 
     /**
      * Defines singleton instance of {@link BlankSpecification}.
      */
-    public static final Specification<CharSequence> INSTANCE = new BlankSpecification();
+    @SuppressWarnings("rawtypes")
+    public static final Specification INSTANCE = new BlankSpecification();
 
     /**
      * {@inheritDoc}
      */
     @Override
-    public boolean isSatisfiedBy(final CharSequence candidate) {
+    public <T extends CharSequence> boolean isSatisfiedBy(final T candidate) {
         final int length;
         boolean result = true;
         if ((null != candidate) && (0 < (length = candidate.length()))) {
             for (int i = 0; i < length; i++) {
-                if (false == Character.isWhitespace(candidate.charAt(i))) {
+                if (!Character.isWhitespace(candidate.charAt(i))) {
                     result = false;
                     break;
                 }
             }
         }
         return result;
     }
+
 }
diff --git a/src/main/java/pl/ais/commons/domain/specification/simple/EmptySpecification.java b/src/main/java/pl/ais/commons/domain/specification/simple/EmptySpecification.java
@@ -3,6 +3,8 @@
 import java.util.Collection;
 import java.util.Map;
 
+import javax.annotation.concurrent.Immutable;
+
 import pl.ais.commons.domain.specification.Specification;
 
 /**
@@ -13,11 +15,12 @@
  *     candidate having neither of the above types (including {@code null}) will never satisfy this specification.
  * </p>
  *
- * @param <T> determines the type of candidate
+ * @param <C> determines the type of candidate
  * @author Warlock, AIS.PL
  * @since 1.0.1
  */
-public final class EmptySpecification<T> implements Specification<T> {
+@Immutable
+public final class EmptySpecification<C> implements Specification<C> {
 
     /**
      * Defines singleton instance of {@link EmptySpecification}.
@@ -30,7 +33,7 @@ public final class EmptySpecification<T> implements Specification<T> {
      */
     @SuppressWarnings("rawtypes")
     @Override
-    public boolean isSatisfiedBy(final T candidate) {
+    public <T extends C> boolean isSatisfiedBy(final T candidate) {
         boolean result = false;
         processing: {
             if (candidate instanceof Collection) {

diff --git a/src/main/java/pl/ais/commons/domain/specification/simple/IsEqualSpecification.java b/src/main/java/pl/ais/commons/domain/specification/simple/IsEqualSpecification.java
@@ -1,26 +1,28 @@
 package pl.ais.commons.domain.specification.simple;
 
 import javax.annotation.Nullable;
+import javax.annotation.concurrent.Immutable;
 
 import pl.ais.commons.domain.specification.Specification;
 
 /**
  * Specification implementation satisfied by candidates equal to some predefined value.
  *
- * @param <T> determines the type of candidate
+ * @param <C> determines the type of candidate
  * @author Warlock, AIS.PL
  * @since 1.0.1
  */
-public final class IsEqualSpecification<T> implements Specification<T> {
+@Immutable
+public final class IsEqualSpecification<C> implements Specification<C> {
 
-    private final T value;
+    private final C value;
 
     /**
      * Constructs new instance.
      *
      * @param value the value
      */
-    public IsEqualSpecification(@Nullable final T value) {
+    public IsEqualSpecification(@Nullable final C value) {
         super();
         this.value = value;
     }
@@ -29,7 +31,7 @@ public IsEqualSpecification(@Nullable final T value) {
      * {@inheritDoc}
      */
     @Override
-    public boolean isSatisfiedBy(final T candidate) {
+    public <T extends C> boolean isSatisfiedBy(final T candidate) {
         boolean result;
         if (null == value) {
             result = (null == candidate);

diff --git a/src/main/java/pl/ais/commons/domain/specification/simple/RegexSpecification.java b/src/main/java/pl/ais/commons/domain/specification/simple/RegexSpecification.java
@@ -2,6 +2,8 @@
 
 import java.util.regex.Pattern;
 
+import javax.annotation.concurrent.Immutable;
+
 import pl.ais.commons.domain.specification.Specification;
 
 /**
@@ -10,7 +12,8 @@
  * @author Warlock, AIS.PL
  * @since 1.0.1
  */
-public class RegexSpecification implements Specification<CharSequence> {
+@Immutable
+public final class RegexSpecification implements Specification<CharSequence> {
 
     private final Pattern pattern;
 
@@ -28,7 +31,7 @@ public RegexSpecification(final String regex) {
      * {@inheritDoc}
      */
     @Override
-    public boolean isSatisfiedBy(final CharSequence candidate) {
+    public <T extends CharSequence> boolean isSatisfiedBy(final T candidate) {
         return (null != candidate) && pattern.matcher(candidate).matches();
     }
 }
diff --git a/src/main/java/pl/ais/commons/domain/specification/simple/TrueSpecification.java b/src/main/java/pl/ais/commons/domain/specification/simple/TrueSpecification.java
@@ -1,15 +1,18 @@
 package pl.ais.commons.domain.specification.simple;
 
+import javax.annotation.concurrent.Immutable;
+
 import pl.ais.commons.domain.specification.Specification;
 
 /**
  * Specification implementation satisfied by any candidate.
  *
- * @param <T> determines the type of candidate
+ * @param <C> determines the type of candidate
  * @author Warlock, AIS.PL
  * @since 1.0.1
  */
-public final class TrueSpecification<T> implements Specification<T> {
+@Immutable
+public final class TrueSpecification<C> implements Specification<C> {
 
     /**
      * Defines singleton instance of {@link TrueSpecification}.
@@ -21,7 +24,7 @@ public final class TrueSpecification<T> implements Specification<T> {
      * {@inheritDoc}
      */
     @Override
-    public boolean isSatisfiedBy(final T candidate) {
+    public <T extends C> boolean isSatisfiedBy(final T candidate) {
         return true;
     }