Replaced anonymous F3s with lambdas

mperry · mperry · commit 721118902a5a · 2015-08-27T21:03:33.000+10:00
diff --git a/core/src/main/java/fj/data/hlist/HList.java b/core/src/main/java/fj/data/hlist/HList.java
@@ -212,11 +212,7 @@ private HFoldr(final F3<G, V, L, R> foldRight) {
      * @return a fold instance for the empty list.
      */
     public static <G, V> HFoldr<G, V, HNil, V> hFoldr() {
-      return new HFoldr<G, V, HNil, V>(new F3<G, V, HNil, V>() {
-        public V f(final G f, final V v, final HNil hNil) {
-          return v;
-        }
-      });
+      return new HFoldr<G, V, HNil, V>((f, v, hNil) -> v);
     }
 
     /**
@@ -238,11 +234,7 @@ public V f(final G f, final V v, final HNil hNil) {
         H extends HFoldr<G, V, L, R>,
         PP extends Apply<G, P2<E, R>, RR>>
     HFoldr<G, V, HCons<E, L>, RR> hFoldr(final PP p, final H h) {
-      return new HFoldr<G, V, HCons<E, L>, RR>(new F3<G, V, HCons<E, L>, RR>() {
-        public RR f(final G f, final V v, final HCons<E, L> c) {
-          return p.apply(f, P.p(c.head(), h.foldRight(f, v, c.tail())));
-        }
-      });
+      return new HFoldr<G, V, HCons<E, L>, RR>((f, v, c) -> p.apply(f, P.p(c.head(), h.foldRight(f, v, c.tail()))));
     }
 
     /**
diff --git a/demo/src/main/java/fj/demo/test/EqualsHashCode.java b/demo/src/main/java/fj/demo/test/EqualsHashCode.java
@@ -61,11 +61,7 @@ public static void main(final String[] args) {
     final Arbitrary<Byte> arbByteR = arbitrary(arbByte.gen.map(b -> (byte)(b % 3)));
 
     // Restrictive arbitrary for String, produces from twelve (2 * 3 * 2) possible values.
-    final Arbitrary<String> arbStringR = arbitrary(arbCharacter.gen.bind(arbCharacter.gen, arbCharacter.gen, curry(new F3<Character, Character, Character, String>() {
-      public String f(final Character c1, final Character c2, final Character c3) {
-        return new String(new char[]{(char)(c1 % 2 + 'a'), (char)(c2 % 3 + 'a'), (char)(c3 % 2 + 'a')});
-      }
-    })));
+    final Arbitrary<String> arbStringR = arbitrary(arbCharacter.gen.bind(arbCharacter.gen, arbCharacter.gen, curry((c1, c2, c3) -> new String(new char[]{(char)(c1 % 2 + 'a'), (char)(c2 % 3 + 'a'), (char)(c3 % 2 + 'a')}))));
 
     // Arbitrary for MyClass that uses the restrictive arbitraries above.
     // We are using the monad pattern (bind) to make this a trivial exercise. 
