Clean up the Types class

ctrueden · ctrueden · commit 3246b69e31dd · 2024-05-24T15:20:28.000-05:00
* Remove 'get' prefix from type calculation methods.
* Move all private methods down to "Helper methods" section.
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpEnvironment.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpEnvironment.java
@@ -554,7 +554,7 @@ private <T> RichOp<T> wrapOp(OpInstance<T> instance,
 					", then you must define a new OpWrapper for that class!");
 			}
 			// obtain the generic type of the Op w.r.t. the Wrapper class
-			Type reifiedSuperType = Types.getExactSuperType(instance.type(),
+			Type reifiedSuperType = Types.exactSuperType(instance.type(),
 				wrapper);
 			// wrap the Op
 			final OpWrapper<T> opWrapper = (OpWrapper<T>) wrappers.get(Types.raw(
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/OpCandidate.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/OpCandidate.java
@@ -102,7 +102,7 @@ public OpCandidate(final OpEnvironment env, final OpRequest request,
 	public static Type getReifiedType(OpRequest request, OpInfo info,
 		Map<TypeVariable<?>, Type> typeVarAssigns)
 	{
-		Type exactSuperType = Types.getExactSuperType(info.opType(), Types.raw(
+		Type exactSuperType = Types.exactSuperType(info.opType(), Types.raw(
 			request.type()));
 		return Types.mapVarToTypes(exactSuperType, typeVarAssigns);
 	}
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/convert/ConvertedOpInfo.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/convert/ConvertedOpInfo.java
@@ -585,7 +585,7 @@ private static Type[] typesFromOpType(Class<?> opType, Method fMethod,
 		Class<?> declaringClass = fMethod.getDeclaringClass();
 		Type genericDeclaringClass = Types.parameterizeRaw(declaringClass);
 		Type genericClass = Types.parameterizeRaw(opType);
-		Type superGenericClass = Types.getExactSuperType(genericClass,
+		Type superGenericClass = Types.exactSuperType(genericClass,
 			declaringClass);
 		GenericAssignability.inferTypeVariables(new Type[] {
 			genericDeclaringClass }, new Type[] { superGenericClass }, map);
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/InfoMatchingOpRequest.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/InfoMatchingOpRequest.java
@@ -65,7 +65,7 @@ public InfoMatchingOpRequest(OpInfo info, Nil<?> specialType) {
 		this.name = info.names().get(0);
 		Type from = specialType.type();
 		Type to = info.opType();
-		this.type = Types.getExactSuperType(to, Types.raw(from));
+		this.type = Types.exactSuperType(to, Types.raw(from));
 		if (this.type instanceof ParameterizedType) {
 			if (!GenericAssignability.checkGenericAssignability(from,
 				(ParameterizedType) this.type, this.map, true))
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/RuntimeSafeMatchingRoutine.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/RuntimeSafeMatchingRoutine.java
@@ -189,7 +189,7 @@ private boolean inputsMatch(final OpCandidate candidate,
 		final Type[] reqArgTypes = candidate.paddedArgs();
 		final Type reqType = candidate.getRequest().type();
 		final Type infoType = candidate.opInfo().opType();
-		Type implementedInfoType = Types.getExactSuperType(infoType, Types.raw(
+		Type implementedInfoType = Types.exactSuperType(infoType, Types.raw(
 			reqType));
 		if (!(implementedInfoType instanceof ParameterizedType)) {
 			throw new UnsupportedOperationException(
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/ClassParameterMemberParser.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/ClassParameterMemberParser.java
@@ -97,7 +97,7 @@ public List<SynthesizedParameterMember<?>> parse(Class<?> source,
 	private Method getDeclaredOpMethod(Class<?> c) throws NoSuchMethodException {
 		// NB this is the functional method w.r.t. the interface, not w.r.t. the Op
 		Method fMethod = FunctionalInterfaces.functionalMethodOf(c);
-		Type[] paramTypes = Types.getExactParameterTypes(fMethod, c);
+		Type[] paramTypes = Types.exactParamTypes(fMethod, c);
 		Class<?>[] rawParamTypes = Arrays.stream(paramTypes).map(t -> Types.raw(t))
 			.toArray(Class[]::new);
 		try {
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/FunctionalParameters.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/FunctionalParameters.java
@@ -112,7 +112,7 @@ public static List<FunctionalMethodType> findFunctionalMethodTypes(
 
 		List<FunctionalMethodType> out = new ArrayList<>();
 		int i = 0;
-		for (Type t : Types.getExactParameterTypes(functionalMethod,
+		for (Type t : Types.exactParamTypes(functionalMethod,
 			paramfunctionalType))
 		{
 			final ItemIO ioType;
@@ -125,7 +125,7 @@ else if (AnnotationUtils.getMethodParameterAnnotation(functionalMethod, i,
 			i++;
 		}
 
-		Type returnType = Types.getExactReturnType(functionalMethod,
+		Type returnType = Types.exactReturnType(functionalMethod,
 			paramfunctionalType);
 		if (!returnType.equals(void.class)) {
 			out.add(new FunctionalMethodType(returnType, ItemIO.OUTPUT));
diff --git a/scijava-types/src/main/java/org/scijava/types/Types.java b/scijava-types/src/main/java/org/scijava/types/Types.java
diff --git a/scijava-types/src/main/java/org/scijava/types/infer/GenericAssignability.java b/scijava-types/src/main/java/org/scijava/types/infer/GenericAssignability.java

Original file line number	Diff line number	Diff line change
`@@ -554,7 +554,7 @@ private <T> RichOp<T> wrapOp(OpInstance<T> instance,`
`554`	`554`	`", then you must define a new OpWrapper for that class!");`
`555`	`555`	`}`
`556`	`556`	`// obtain the generic type of the Op w.r.t. the Wrapper class`
`557`		`- Type reifiedSuperType = Types.getExactSuperType(instance.type(),`
	`557`	`+ Type reifiedSuperType = Types.exactSuperType(instance.type(),`
`558`	`558`	`wrapper);`
`559`	`559`	`// wrap the Op`
`560`	`560`	`final OpWrapper<T> opWrapper = (OpWrapper<T>) wrappers.get(Types.raw(`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ public OpCandidate(final OpEnvironment env, final OpRequest request,`
`102`	`102`	`public static Type getReifiedType(OpRequest request, OpInfo info,`
`103`	`103`	`Map<TypeVariable<?>, Type> typeVarAssigns)`
`104`	`104`	`{`
`105`		`- Type exactSuperType = Types.getExactSuperType(info.opType(), Types.raw(`
	`105`	`+ Type exactSuperType = Types.exactSuperType(info.opType(), Types.raw(`
`106`	`106`	`request.type()));`
`107`	`107`	`return Types.mapVarToTypes(exactSuperType, typeVarAssigns);`
`108`	`108`	`}`