Remove Supplier from checkValidity signature

gselzer · ctrueden · commit 5a09cbd47c3f · 2022-07-01T16:47:11.000-05:00
We only use this method in one place, and we are just creating that
Supplier in the method call. Let's just remove it.
diff --git a/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/FunctionalParameters.java b/scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/FunctionalParameters.java
@@ -12,6 +12,7 @@
 import org.scijava.ops.engine.util.internal.AnnotationUtils;
 import org.scijava.struct.FunctionalMethodType;
 import org.scijava.struct.ItemIO;
+import org.scijava.struct.Structs;
 import org.scijava.types.Types;
 
 public class FunctionalParameters {
@@ -38,7 +39,7 @@ public static void parseFunctionalParameters(
 		for (SynthesizedParameterMember<?> m : fmtMembers) {
 			final Type itemType = m.getType();
 	
-			final boolean valid = org.scijava.struct.Structs.checkValidity(m, () -> m.getKey(), Types.raw(itemType), false,
+			final boolean valid = Structs.checkValidity(m, m.getKey(), Types.raw(itemType), false,
 				problems);
 			if (!valid) continue;
 			items.add(m);
diff --git a/scijava/scijava-struct/src/main/java/org/scijava/struct/Structs.java b/scijava/scijava-struct/src/main/java/org/scijava/struct/Structs.java
@@ -69,7 +69,7 @@ public static void checkModifiers(String message, final ArrayList<ValidityProble
 		}
 	}
 
-	public static boolean checkValidity(Member<?> m, Supplier<String> name, Class<?> type,
+	public static boolean checkValidity(Member<?> m, String name, Class<?> type,
 		boolean isFinal, ArrayList<ValidityProblem> problems)
 	{
 		boolean valid = true;
@@ -81,7 +81,7 @@ public static boolean checkValidity(Member<?> m, Supplier<String> name, Class<?>
 			// will be written to, but immutable parameters cannot be changed in
 			// such a manner, so it makes no sense to label them as such.
 			final String error = "Immutable " + m.getIOType() + " parameter: " +
-				name.get() + " (" + type.getName() + " is immutable)";
+				name + " (" + type.getName() + " is immutable)";
 			problems.add(new ValidityProblem(error));
 			valid = false;
 		}

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public static void checkModifiers(String message, final ArrayList<ValidityProble`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`72`		`- public static boolean checkValidity(Member<?> m, Supplier<String> name, Class<?> type,`
	`72`	`+ public static boolean checkValidity(Member<?> m, String name, Class<?> type,`
`73`	`73`	`boolean isFinal, ArrayList<ValidityProblem> problems)`
`74`	`74`	`{`
`75`	`75`	`boolean valid = true;`
`@@ -81,7 +81,7 @@ public static boolean checkValidity(Member<?> m, Supplier<String> name, Class<?>`
`81`	`81`	`// will be written to, but immutable parameters cannot be changed in`
`82`	`82`	`// such a manner, so it makes no sense to label them as such.`
`83`	`83`	`final String error = "Immutable " + m.getIOType() + " parameter: " +`
`84`		`- name.get() + " (" + type.getName() + " is immutable)";`
	`84`	`+ name + " (" + type.getName() + " is immutable)";`
`85`	`85`	`problems.add(new ValidityProblem(error));`
`86`	`86`	`valid = false;`
`87`	`87`	`}`