Difference and Intersection were never meant to implement Semigroup.

jnape · jnape · commit 00c35f703db1 · 2018-07-28T15:22:36.000-05:00
Time for semigroup assertion helpers.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,8 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 ## [Unreleased]
-_No changes yet_
+### Changed
+- ***Breaking Change***: `Difference` and `Intersection` no longer instances of `Semigroup` and moved to `functions.builtin.fn2` package
 
 ## [3.1.0] - 2018-07-16
 ### Added
diff --git a/src/main/java/com/jnape/palatable/lambda/functions/builtin/fn2/Difference.java b/src/main/java/com/jnape/palatable/lambda/functions/builtin/fn2/Difference.java
@@ -1,8 +1,8 @@
-package com.jnape.palatable.lambda.semigroup.builtin;
+package com.jnape.palatable.lambda.functions.builtin.fn2;
 
 import com.jnape.palatable.lambda.functions.Fn1;
+import com.jnape.palatable.lambda.functions.Fn2;
 import com.jnape.palatable.lambda.functions.builtin.fn1.Distinct;
-import com.jnape.palatable.lambda.semigroup.Semigroup;
 
 import java.util.HashSet;
 
@@ -21,7 +21,7 @@
  *
  * @param <A> the {@link Iterable} element type
  */
-public final class Difference<A> implements Semigroup<Iterable<A>> {
+public final class Difference<A> implements Fn2<Iterable<A>, Iterable<A>, Iterable<A>> {
 
     private static final Difference INSTANCE = new Difference();
 
diff --git a/src/main/java/com/jnape/palatable/lambda/functions/builtin/fn2/Intersection.java b/src/main/java/com/jnape/palatable/lambda/functions/builtin/fn2/Intersection.java
@@ -1,8 +1,8 @@
-package com.jnape.palatable.lambda.semigroup.builtin;
+package com.jnape.palatable.lambda.functions.builtin.fn2;
 
 import com.jnape.palatable.lambda.functions.Fn1;
+import com.jnape.palatable.lambda.functions.Fn2;
 import com.jnape.palatable.lambda.functions.builtin.fn1.Distinct;
-import com.jnape.palatable.lambda.semigroup.Semigroup;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -19,7 +19,7 @@
  *
  * @param <A> the {@link Iterable} element type
  */
-public final class Intersection<A> implements Semigroup<Iterable<A>> {
+public final class Intersection<A> implements Fn2<Iterable<A>, Iterable<A>, Iterable<A>> {
 
     private static final Intersection INSTANCE = new Intersection();
 
diff --git a/src/test/java/com/jnape/palatable/lambda/functions/builtin/fn2/DifferenceTest.java b/src/test/java/com/jnape/palatable/lambda/functions/builtin/fn2/DifferenceTest.java
@@ -1,4 +1,4 @@
-package com.jnape.palatable.lambda.semigroup.builtin;
+package com.jnape.palatable.lambda.functions.builtin.fn2;
 
 import com.jnape.palatable.lambda.functions.Fn1;
 import com.jnape.palatable.traitor.annotations.TestTraits;
@@ -11,7 +11,7 @@
 import testsupport.traits.InfiniteIterableSupport;
 import testsupport.traits.Laziness;
 
-import static com.jnape.palatable.lambda.semigroup.builtin.Difference.difference;
+import static com.jnape.palatable.lambda.functions.builtin.fn2.Difference.difference;
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
diff --git a/src/test/java/com/jnape/palatable/lambda/functions/builtin/fn2/IntersectionTest.java b/src/test/java/com/jnape/palatable/lambda/functions/builtin/fn2/IntersectionTest.java
@@ -1,4 +1,4 @@
-package com.jnape.palatable.lambda.semigroup.builtin;
+package com.jnape.palatable.lambda.functions.builtin.fn2;
 
 import com.jnape.palatable.lambda.functions.Fn1;
 import com.jnape.palatable.traitor.annotations.TestTraits;
@@ -10,7 +10,7 @@
 import testsupport.traits.InfiniteIterableSupport;
 import testsupport.traits.Laziness;
 
-import static com.jnape.palatable.lambda.semigroup.builtin.Intersection.intersection;
+import static com.jnape.palatable.lambda.functions.builtin.fn2.Intersection.intersection;
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
