Reduce number of internal constructors

Author: marcphilipp

junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassSelector.java

@@ -49,10 +49,6 @@ public class ClassSelector implements DiscoverySelector {
 
 	private Class<?> javaClass;
 
-	ClassSelector(String className) {
-		this(className, null);
-	}
-
 	ClassSelector(String className, ClassLoader classLoader) {
 		this.className = className;
 		this.classLoader = classLoader;

junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java

@@ -63,18 +63,10 @@ public class MethodSelector implements DiscoverySelector {
 	private Class<?> javaClass;
 	private Method javaMethod;
 
-	MethodSelector(String className, String methodName) {
-		this(className, methodName, (ClassLoader) null);
-	}
-
 	MethodSelector(String className, String methodName, ClassLoader classLoader) {
 		this(className, methodName, "", classLoader);
 	}
 
-	MethodSelector(String className, String methodName, String methodParameterTypes) {
-		this(className, methodName, methodParameterTypes, null);
-	}
-
 	MethodSelector(String className, String methodName, String methodParameterTypes, ClassLoader classLoader) {
 		this.classLoader = classLoader;
 		this.className = className;
@@ -236,10 +228,10 @@ public int hashCode() {
 	public String toString() {
 		// @formatter:off
 		return new ToStringBuilder(this)
-				.append("className", this.className)
-				.append("methodName", this.methodName)
-				.append("methodParameterTypes", this.methodParameterTypes)
-				.append("classLoader", this.classLoader)
+				.append("className", getClassName())
+				.append("methodName", getMethodName())
+				.append("methodParameterTypes", getMethodParameterTypes())
+				.append("classLoader", getClassLoader())
 				.toString();
 		// @formatter:on
 	}

platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassSelectorTests.java

@@ -27,16 +27,16 @@ class ClassSelectorTests extends AbstractEqualsAndHashCodeTests {
 
 	@Test
 	void equalsAndHashCode() {
-		var selector1 = new ClassSelector("org.example.TestClass");
-		var selector2 = new ClassSelector("org.example.TestClass");
-		var selector3 = new ClassSelector("org.example.X");
+		var selector1 = new ClassSelector("org.example.TestClass", null);
+		var selector2 = new ClassSelector("org.example.TestClass", null);
+		var selector3 = new ClassSelector("org.example.X", null);
 
 		assertEqualsAndHashCode(selector1, selector2, selector3);
 	}
 
 	@Test
 	void preservesOriginalExceptionWhenTryingToLoadClass() {
-		var selector = new ClassSelector("org.example.TestClass");
+		var selector = new ClassSelector("org.example.TestClass", null);
 
 		var e = assertThrows(PreconditionViolationException.class, selector::getJavaClass);
 

platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java

@@ -30,7 +30,7 @@ void equalsAndHashCode() {
 		var selector1 = new MethodSelector("TestClass", "method", "int, boolean", null);
 		var selector2 = new MethodSelector("TestClass", "method", "int, boolean", null);
 
-		assertEqualsAndHashCode(selector1, selector2, new MethodSelector("TestClass", "method", "int"));
+		assertEqualsAndHashCode(selector1, selector2, new MethodSelector("TestClass", "method", "int", null));
 		assertEqualsAndHashCode(selector1, selector2, new MethodSelector("TestClass", "method", (ClassLoader) null));
 		assertEqualsAndHashCode(selector1, selector2, new MethodSelector("TestClass", "X", "int, boolean", null));
 		assertEqualsAndHashCode(selector1, selector2, new MethodSelector("TestClass", "X", (ClassLoader) null));