Polishing.

Refine object creation based on common element type to preserve comparison.

Author: mp911de

src/main/java/org/springframework/data/domain/DoubleVector.java

@@ -16,6 +16,7 @@
 package org.springframework.data.domain;
 
 import java.util.Arrays;
+import java.util.Collection;
 
 import org.springframework.util.ObjectUtils;
 
@@ -44,6 +45,20 @@ static Vector copy(double[] v) {
 		return new DoubleVector(copy);
 	}
 
+	/**
+	 * Copy the given numeric values and wrap within a Vector.
+	 */
+	static Vector copy(Collection<Number> v) {
+
+		double[] copy = new double[v.size()];
+		int i = 0;
+		for (Number number : v) {
+			copy[i++] = number.doubleValue();
+		}
+
+		return new DoubleVector(copy);
+	}
+
 	@Override
 	public Class<Double> getType() {
 		return Double.TYPE;

src/main/java/org/springframework/data/domain/FloatVector.java

@@ -16,6 +16,7 @@
 package org.springframework.data.domain;
 
 import java.util.Arrays;
+import java.util.Collection;
 
 import org.springframework.util.ObjectUtils;
 
@@ -44,6 +45,20 @@ static Vector copy(float[] v) {
 		return new FloatVector(copy);
 	}
 
+	/**
+	 * Copy the given numeric values and wrap within a Vector.
+	 */
+	static Vector copy(Collection<Number> v) {
+
+		float[] copy = new float[v.size()];
+		int i = 0;
+		for (Number number : v) {
+			copy[i++] = number.floatValue();
+		}
+
+		return new FloatVector(copy);
+	}
+
 	@Override
 	public Class<Float> getType() {
 		return Float.TYPE;

src/main/java/org/springframework/data/domain/Vector.java

@@ -18,6 +18,7 @@
 import java.util.Collection;
 
 import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
 
 /**
  * A vector is a fixed-length array of non-null numeric values. Vectors are represent a point in a multidimensional
@@ -66,28 +67,24 @@ static Vector of(double... values) {
 
 	/**
 	 * Creates a new {@link Vector} from the given number {@code values}. Vector values are duplicated to avoid capturing
-	 * a mutable array instance and to prevent mutability.
+	 * a mutable collection instance and to prevent mutability.
 	 *
 	 * @param values number vector values.
 	 * @return the {@link Vector} for the given vector values.
 	 */
-	static Vector of(Number... values) {
+	static Vector of(Collection<Number> values) {
 
 		Assert.notNull(values, "Vector values must not be null");
 
-		return NumberVector.copy(values);
-	}
+		Class<?> cet = CollectionUtils.findCommonElementType(values);
 
-	/**
-	 * Creates a new {@link Vector} from the given number {@code values}. Vector values are duplicated to avoid capturing
-	 * a mutable collection instance and to prevent mutability.
-	 *
-	 * @param values number vector values.
-	 * @return the {@link Vector} for the given vector values.
-	 */
-	static Vector of(Collection<Number> values) {
+		if (cet == Double.class) {
+			return DoubleVector.copy(values);
+		}
 
-		Assert.notNull(values, "Vector values must not be null");
+		if (cet == Float.class) {
+			return FloatVector.copy(values);
+		}
 
 		return NumberVector.copy(values);
 	}

src/test/java/org/springframework/data/domain/NumberVectorUnitTests.java

@@ -17,6 +17,8 @@
 
 import static org.assertj.core.api.Assertions.*;
 
+import java.util.Arrays;
+
 import org.junit.jupiter.api.Test;
 
 /**
@@ -26,41 +28,41 @@
  */
 class NumberVectorUnitTests {
 
-	Number[] values = new Number[] { 1.1, 2.2, 3.3, 4.4, 5.5 };
-	Number[] floats = new Number[] { (float) 1.1d, (float) 2.2d, (float) 3.3d, (float) 4.4d, (float) 5.5d };
+	Number[] values = new Number[] { 1.1, 2.2, 3.3, 4.4, 5.5, 6.6f };
+	Number[] floats = new Number[] { (float) 1.1d, (float) 2.2d, (float) 3.3d, (float) 4.4d, (float) 5.5, 6.6 };
 
 	@Test // GH-3193
 	void shouldCreateVector() {
 
-		Vector vector = Vector.of(values);
+		Vector vector = Vector.of(Arrays.asList(values));
 
-		assertThat(vector.size()).isEqualTo(5);
-		assertThat(vector.getType()).isEqualTo(Double.class);
+		assertThat(vector.size()).isEqualTo(6);
+		assertThat(vector.getType()).isEqualTo(Number.class);
 	}
 
 	@Test // GH-3193
 	void shouldCopyVectorValues() {
 
-		Vector vector = Vector.of(values);
+		Vector vector = Vector.of(Arrays.asList(values));
 
 		assertThat(vector.getSource()).isNotSameAs(vector).isEqualTo(values);
 	}
 
 	@Test // GH-3193
 	void shouldRenderToString() {
 
-		Vector vector = Vector.of(values);
+		Vector vector = Vector.of(Arrays.asList(values));
 
-		assertThat(vector).hasToString("N[1.1, 2.2, 3.3, 4.4, 5.5]");
+		assertThat(vector).hasToString("N[1.1, 2.2, 3.3, 4.4, 5.5, 6.6]");
 	}
 
 	@Test // GH-3193
 	void shouldCompareVector() {
 
-		Vector vector = Vector.of(values);
+		Vector vector = Vector.of(Arrays.asList(values));
 
-		assertThat(vector).isEqualTo(Vector.of(values));
-		assertThat(vector).hasSameHashCodeAs(Vector.of(values));
+		assertThat(vector).isEqualTo(Vector.of(Arrays.asList(values)));
+		assertThat(vector).hasSameHashCodeAs(Vector.of(Arrays.asList(values)));
 	}
 
 	@Test // GH-3193
@@ -74,7 +76,7 @@ void sourceShouldReturnSource() {
 	@Test // GH-3193
 	void shouldCreateFloatArray() {
 
-		Vector vector = Vector.of(values);
+		Vector vector = Vector.of(Arrays.asList(values));
 
 		float[] values = new float[this.floats.length];
 		for (int i = 0; i < values.length; i++) {
@@ -87,7 +89,7 @@ void shouldCreateFloatArray() {
 	@Test // GH-3193
 	void shouldCreateDoubleArray() {
 
-		Vector vector = Vector.of(values);
+		Vector vector = Vector.of(Arrays.asList(values));
 
 		double[] values = new double[this.values.length];
 		for (int i = 0; i < values.length; i++) {