Rename 'EqualityTransformingBuilder' to 'EqualityTransformingCollectionBuilder'

Author: nicolaiparlog

…ansform/EqualityTransformingBuilder.java …ualityTransformingCollectionBuilder.javasrc/main/java/org/codefx/libfx/collection/transform/EqualityTransformingBuilder.java renamed to src/main/java/org/codefx/libfx/collection/transform/EqualityTransformingCollectionBuilder.java src/main/java/org/codefx/libfx/collection/transform/EqualityTransformingBuilder.java renamed to src/main/java/org/codefx/libfx/collection/transform/EqualityTransformingCollectionBuilder.java

@@ -35,13 +35,13 @@
  * @param <E>
  *            the type of elements maintained by the created set or keys by the created map.
  */
-public class EqualityTransformingBuilder<E> {
+public class EqualityTransformingCollectionBuilder<E> {
 
 	private final Class<? super E> outerKeyTypeToken;
 	private BiPredicate<? super E, ? super E> equals;
 	private ToIntFunction<? super E> hash;
 
-	private EqualityTransformingBuilder(Class<? super E> outerKeyTypeToken) {
+	private EqualityTransformingCollectionBuilder(Class<? super E> outerKeyTypeToken) {
 		this.outerKeyTypeToken = outerKeyTypeToken;
 		// note that the methods from 'Objects' already implement the contract for null-safety
 		// imposed by the transforming set and map
@@ -65,8 +65,8 @@ private EqualityTransformingBuilder(Class<? super E> outerKeyTypeToken) {
 	 *            the type of elements contained in the set created by the builder
 	 * @return a new builder
 	 */
-	public static <E> EqualityTransformingBuilder<E> forUnspecifiedKeyType() {
-		return new EqualityTransformingBuilder<>(Object.class);
+	public static <E> EqualityTransformingCollectionBuilder<E> forUnspecifiedKeyType() {
+		return new EqualityTransformingCollectionBuilder<>(Object.class);
 	}
 
 	/**
@@ -80,17 +80,17 @@ public static <E> EqualityTransformingBuilder<E> forUnspecifiedKeyType() {
 	 *            a type token for the elements contained in the set created by the builder
 	 * @return a new builder
 	 */
-	public static <E> EqualityTransformingBuilder<E> forKeyType(Class<? super E> keyTypeToken) {
+	public static <E> EqualityTransformingCollectionBuilder<E> forKeyType(Class<? super E> keyTypeToken) {
 		Objects.requireNonNull(keyTypeToken, "The argument 'keyTypeToken' must not be null.");
-		return new EqualityTransformingBuilder<>(keyTypeToken);
+		return new EqualityTransformingCollectionBuilder<>(keyTypeToken);
 	}
 
 	/**
 	 * @param equals
 	 *            a function determining equality of keys; might be called with null keys
 	 * @return this builder
 	 */
-	public EqualityTransformingBuilder<E> withEqualsHandlingNull(BiPredicate<? super E, ? super E> equals) {
+	public EqualityTransformingCollectionBuilder<E> withEqualsHandlingNull(BiPredicate<? super E, ? super E> equals) {
 		Objects.requireNonNull(equals, "The argument 'equals' must not be null.");
 		this.equals = equals;
 		return this;
@@ -101,7 +101,7 @@ public EqualityTransformingBuilder<E> withEqualsHandlingNull(BiPredicate<? super
 	 *            a function determining equality of keys; will not be called with null keys
 	 * @return this builder
 	 */
-	public EqualityTransformingBuilder<E> withEquals(BiPredicate<? super E, ? super E> equals) {
+	public EqualityTransformingCollectionBuilder<E> withEquals(BiPredicate<? super E, ? super E> equals) {
 		Objects.requireNonNull(equals, "The argument 'equals' must not be null.");
 		return withEqualsHandlingNull(makeNullSafe(equals));
 	}
@@ -122,7 +122,7 @@ public EqualityTransformingBuilder<E> withEquals(BiPredicate<? super E, ? super
 	 *            a function computing the hash code of a key; might be called with null keys
 	 * @return this builder
 	 */
-	public EqualityTransformingBuilder<E> withHashHandlingNull(ToIntFunction<? super E> hash) {
+	public EqualityTransformingCollectionBuilder<E> withHashHandlingNull(ToIntFunction<? super E> hash) {
 		Objects.requireNonNull(hash, "The argument 'hash' must not be null.");
 		this.hash = hash;
 		return this;
@@ -133,7 +133,7 @@ public EqualityTransformingBuilder<E> withHashHandlingNull(ToIntFunction<? super
 	 *            a function computing the hash code of a key; will not be called with null keys
 	 * @return this builder
 	 */
-	public EqualityTransformingBuilder<E> withHash(ToIntFunction<? super E> hash) {
+	public EqualityTransformingCollectionBuilder<E> withHash(ToIntFunction<? super E> hash) {
 		Objects.requireNonNull(hash, "The argument 'hash' must not be null.");
 		return withHashHandlingNull(makeNullSafe(hash));
 	}

src/main/java/org/codefx/libfx/collection/transform/EqualityTransformingMap.java

@@ -11,7 +11,7 @@
  * <p>
  * It does so by storing the entries in an inner map and providing a transforming view on them. See the
  * {@link org.codefx.libfx.collection.transform package} documentation for general comments on that. Note that instances
- * of {@code EqualityTransformingMap}s are created with a {@link EqualityTransformingBuilder builder}.
+ * of {@code EqualityTransformingMap}s are created with a {@link EqualityTransformingCollectionBuilder builder}.
  * <p>
  * This implementation mitigates the type safety problems by optionally using a token of the (outer) key type to check
  * instances against them. This solves some of the critical situations but not all of them. In those other cases

src/main/java/org/codefx/libfx/collection/transform/EqualityTransformingSet.java

@@ -11,7 +11,7 @@
  * <p>
  * It does so by storing the entries in an inner set and providing a transforming view on them. See the
  * {@link org.codefx.libfx.collection.transform package} documentation for general comments on that. Note that instances
- * of {@code EqualityTransformingSet}s are created with a {@link EqualityTransformingBuilder builder}.
+ * of {@code EqualityTransformingSet}s are created with a {@link EqualityTransformingCollectionBuilder builder}.
  * <p>
  * This implementation mitigates the type safety problems by optionally using a token of the outer type to check
  * instances against them. This solves some of the critical situations but not all of them. In those other cases

src/test/java/org/codefx/libfx/collection/transform/EqualityTransformingMapTest.java

@@ -105,7 +105,7 @@ public static class LengthBasedEqualityAndHashCodeTests {
 		@Before
 		@SuppressWarnings("javadoc")
 		public void createMap() {
-			testedMap = EqualityTransformingBuilder
+			testedMap = EqualityTransformingCollectionBuilder
 					.forKeyType(String.class)
 					.withEquals(equals)
 					.withHash(hash)
@@ -168,7 +168,7 @@ public Iterable<Entry<String, Integer>> order(List<Entry<String, Integer>> inser
 		@Override
 		@SuppressWarnings("unchecked")
 		public Map<String, Integer> create(Object... entries) {
-			Map<String, Integer> transformingMap = EqualityTransformingBuilder
+			Map<String, Integer> transformingMap = EqualityTransformingCollectionBuilder
 					.forKeyType(String.class)
 					.withEquals(equals)
 					.withHash(hash)

src/test/java/org/codefx/libfx/collection/transform/EqualityTransformingSetTest.java

@@ -102,7 +102,7 @@ public static class LengthBasedEqualityAndHashCodeTests {
 		@Before
 		@SuppressWarnings("javadoc")
 		public void createSet() {
-			testedSet = EqualityTransformingBuilder
+			testedSet = EqualityTransformingCollectionBuilder
 					.forKeyType(String.class)
 					.withEquals(equals)
 					.withHash(hash)
@@ -131,7 +131,7 @@ public TransformingSetGenerator(BiPredicate<String, String> equals, ToIntFunctio
 
 		@Override
 		public Set<String> create(Object... elements) {
-			Set<String> transformingSet = EqualityTransformingBuilder
+			Set<String> transformingSet = EqualityTransformingCollectionBuilder
 					.forKeyType(String.class)
 					.withEquals(equals)
 					.withHash(hash)