tidy up Condition a bit, and prevent sub-classing.

scarytom · scarytom · commit 5881969bc4e4 · 2012-05-17T20:41:08.000+01:00
diff --git a/hamcrest-core/src/main/java/org/hamcrest/Condition.java b/hamcrest-core/src/main/java/org/hamcrest/Condition.java
@@ -17,9 +17,12 @@ public interface Step<I, O> {
         Condition<O> apply(I value, Description mismatch);
     }
 
-    public boolean matching(Matcher<T> match) { return matching(match, ""); }
+    private Condition() { }
+
     public abstract boolean matching(Matcher<T> match, String message);
     public abstract <U> Condition<U> and(Step<? super T, U> mapping);
+
+    public final boolean matching(Matcher<T> match) { return matching(match, ""); }
     public final <U> Condition<U> then(Step<? super T, U> mapping) { return and(mapping); }
 
     @SuppressWarnings("unchecked")
@@ -28,25 +31,35 @@ public static <T> Condition<T> notMatched() {
     }
 
     public static <T> Condition<T> matched(final T theValue, final Description mismatch) {
-        return new Condition<T>() {
-            @Override
-            public boolean matching(Matcher<T> matcher, String message) {
-                if (matcher.matches(theValue)) {
-                    return true;
-                }
-                mismatch.appendText(message);
-                matcher.describeMismatch(theValue, mismatch);
-                return false;
-            }
+        return new Matched<T>(theValue, mismatch);
+    }
+
+    private static final class Matched<T> extends Condition<T> {
+        private final T theValue;
+        private final Description mismatch;
 
-            @Override
-            public <U> Condition<U> and(Step<? super T, U> next) {
-                return next.apply(theValue, mismatch);
+        private Matched(T theValue, Description mismatch) {
+            this.theValue = theValue;
+            this.mismatch = mismatch;
+        }
+
+        @Override
+        public boolean matching(Matcher<T> matcher, String message) {
+            if (matcher.matches(theValue)) {
+                return true;
             }
-        };
+            mismatch.appendText(message);
+            matcher.describeMismatch(theValue, mismatch);
+            return false;
+        }
+
+        @Override
+        public <U> Condition<U> and(Step<? super T, U> next) {
+            return next.apply(theValue, mismatch);
+        }
     }
 
-    private static class NotMatched<T> extends Condition<T> {
+    private static final class NotMatched<T> extends Condition<T> {
         @Override public boolean matching(Matcher<T> match, String message) { return false; }
 
         @Override public <U> Condition<U> and(Step<? super T, U> mapping) {
