Member: Remove 'get' from getter methods

ctrueden · ctrueden · commit dfc8cf19794b · 2024-05-22T20:06:43.000-05:00
diff --git a/scijava-ops-api/src/main/java/org/scijava/ops/api/OpInfo.java b/scijava-ops-api/src/main/java/org/scijava/ops/api/OpInfo.java
@@ -75,7 +75,7 @@ default List<Member<?>> inputs() {
 	/** Gets the types of the op's input parameters. */
 	default List<Type> inputTypes() {
 		return inputs().stream() //
-			.map(Member::getType) //
+			.map(Member::type) //
 			.collect(Collectors.toList());
 	}
 
@@ -98,7 +98,7 @@ default Member<?> output() {
 
 	/** Gets the op's output parameter, if there is <b>exactly</b> one. */
 	default Type outputType() {
-		return output().getType();
+		return output().type();
 	}
 
 	/** The op's priority. */
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpDescriptionGenerator.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpDescriptionGenerator.java
@@ -195,7 +195,7 @@ else if (m.getIOType() == CONTAINER) {
 				sb.append("@CONTAINER ");
 			}
 			// describe member type
-			sb.append(describeType(env, Nil.of(m.getType())));
+			sb.append(describeType(env, Nil.of(m.type())));
 			if (!m.isRequired()) {
 				sb.append(" = null");
 			}
@@ -212,7 +212,7 @@ else if (m.getIOType() == CONTAINER) {
 			sb.append("None");
 		}
 		else {
-			sb.append(describeType(env, Nil.of(output.getType())));
+			sb.append(describeType(env, Nil.of(output.type())));
 		}
 		// return concatenation
 		return sb.toString();
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
@@ -663,7 +663,7 @@ private List<RichOp<?>> resolveOpDependencies(OpInfo info,
 			}
 			catch (final OpMatchingException e) {
 				String message = DependencyMatchingException.message(info
-					.implementationName(), dependency.getKey(), request);
+					.implementationName(), dependency.key(), request);
 				if (e instanceof DependencyMatchingException) {
 					throw new DependencyMatchingException(message,
 						(DependencyMatchingException) e);
@@ -678,7 +678,7 @@ private OpRequest inferOpRequest(OpDependencyMember<?> dependency,
 		Map<TypeVariable<?>, Type> typeVarAssigns)
 	{
 		final Type mappedDependencyType = Types.mapVarToTypes(new Type[] {
-			dependency.getType() }, typeVarAssigns)[0];
+			dependency.type() }, typeVarAssigns)[0];
 		final String dependencyName = dependency.getDependencyName();
 		return inferOpRequest(mappedDependencyType, dependencyName, typeVarAssigns);
 	}
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/adapt/AdaptationInfoTreeGenerator.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/adapt/AdaptationInfoTreeGenerator.java
@@ -77,10 +77,10 @@ public InfoTree generate(OpEnvironment env, String signature,
 		// TODO: The op type is wrong!
 		Map<TypeVariable<?>, Type> typeVarAssigns = new HashMap<>();
 		if (!Types.isAssignable(originalInfo.opType(), adaptorTree.info().inputs()
-			.get(0).getType(), typeVarAssigns)) throw new IllegalArgumentException(
+			.get(0).type(), typeVarAssigns)) throw new IllegalArgumentException(
 				"The adaptor cannot be used on Op " + originalInfo);
 		Type adaptedOpType = Types.substituteTypeVariables(adaptorTree.info()
-			.output().getType(), typeVarAssigns);
+			.output().type(), typeVarAssigns);
 		OpInfo adaptedInfo = new OpAdaptationInfo(originalInfo, adaptedOpType,
 			adaptorTree);
 		return new InfoTree(adaptedInfo, originalTree.dependencies());
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/adapt/AdaptationMatchingRoutine.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/adapt/AdaptationMatchingRoutine.java
@@ -104,7 +104,7 @@ public OpCandidate findMatch(MatchingConditions conditions, OpMatcher matcher,
 		List<Exception> matchingExceptions = new ArrayList<>();
 		List<DependencyMatchingException> depExceptions = new ArrayList<>();
 		for (final OpInfo adaptor : env.infos("engine.adapt")) {
-			Type adaptTo = adaptor.output().getType();
+			Type adaptTo = adaptor.output().type();
 			Map<TypeVariable<?>, Type> map = new HashMap<>();
 			// make sure that the adaptor outputs the correct type
 			if (!adaptOpOutputSatisfiesReqTypes(adaptTo, map, conditions.request()))
@@ -145,7 +145,7 @@ public OpCandidate findMatch(MatchingConditions conditions, OpMatcher matcher,
 					}).collect(Collectors.toList());
 				// And return the Adaptor, wrapped up into an OpCandidate
 				Type adapterOpType = Types.substituteTypeVariables(adaptor.output()
-					.getType(), map);
+					.type(), map);
 				InfoTree adaptorChain = new InfoTree(adaptor, depTrees);
 				OpAdaptationInfo adaptedInfo = new OpAdaptationInfo(srcCandidate
 					.opInfo(), adapterOpType, adaptorChain);
@@ -206,14 +206,14 @@ private OpRequest inferOpRequest(OpDependencyMember<?> dependency,
 		Map<TypeVariable<?>, Type> typeVarAssigns)
 	{
 		final Type mappedDependencyType = Types.mapVarToTypes(new Type[] {
-			dependency.getType() }, typeVarAssigns)[0];
+			dependency.type() }, typeVarAssigns)[0];
 		final String dependencyName = dependency.getDependencyName();
 		final OpRequest inferred = inferOpRequest(mappedDependencyType,
 			dependencyName, typeVarAssigns);
 		if (inferred != null) return inferred;
 		throw new OpMatchingException("Could not infer functional " +
 			"method inputs and outputs of Op dependency field: " + dependency
-				.getKey());
+				.key());
 	}
 
 	private boolean adaptOpOutputSatisfiesReqTypes(Type adaptTo,
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
@@ -225,7 +225,7 @@ public String implementationName() {
 		for (Member<?> m : struct()) {
 			if (m.isInput() || m.isOutput()) {
 				sb.append("_");
-				sb.append(Conversions.getClassName(m.getType()));
+				sb.append(Conversions.getClassName(m.type()));
 			}
 		}
 		return sb.toString();
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/DefaultOpClassInfo.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/impl/DefaultOpClassInfo.java
@@ -158,10 +158,10 @@ public StructInstance<?> createOpInstance(List<?> dependencies) {
 				// dependency.
 				throw new IllegalStateException(
 					"Exception trying to inject Op dependency field.\n" +
-						"\tOp dependency field to resolve: " + dependencyMember.getKey() +
+						"\tOp dependency field to resolve: " + dependencyMember.key() +
 						"\n" + "\tFound Op to inject: " + dependencies.get(i).getClass()
 							.getName() + //
-						"\n" + "\tField signature: " + dependencyMember.getType(), ex);
+						"\n" + "\tField signature: " + dependencyMember.type(), ex);
 			}
 		}
 		return struct().createInstance(op);
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
@@ -75,7 +75,7 @@ public InfoMatchingOpRequest(OpInfo info, Nil<?> specialType) {
 			if (!Types.isAssignable(from, this.type, this.map))
 				throw new IllegalArgumentException();
 		}
-		args = info.inputs().stream().map(m -> mappedType(m.getType(), this.map))
+		args = info.inputs().stream().map(m -> mappedType(m.type(), this.map))
 			.toArray(Type[]::new);
 		outType = mappedType(info.outputType(), this.map);
 	}
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
@@ -198,7 +198,7 @@ private boolean inputsMatch(final OpCandidate candidate,
 		Type[] implTypeParams = ((ParameterizedType) implementedInfoType)
 			.getActualTypeArguments();
 		Type[] candidateArgTypes = candidate.opInfo().struct().members().stream()//
-			.map(member -> member.isInput() ? member.getType() : null) //
+			.map(member -> member.isInput() ? member.type() : null) //
 			.toArray(Type[]::new);
 		for (int i = 0; i < implTypeParams.length; i++) {
 			if (candidateArgTypes[i] == null) implTypeParams[i] = null;
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/reduce/AbstractInfoReducer.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/reduce/AbstractInfoReducer.java
@@ -54,7 +54,7 @@ public ReducedOpInfo reduce(OpInfo info, int numReductions) {
 		int reducedArity = originalArity - numReductions;
 		Class<?> reducedRawType = ofArity(reducedArity);
 		Type[] inputTypes = info.inputTypes().toArray(Type[]::new);
-		Type outputType = info.output().getType();
+		Type outputType = info.output().type();
 		Type[] newTypes = new Type[reducedArity + 1];
 		if (reducedArity >= 0) System.arraycopy(inputTypes, 0, newTypes, 0,
 			reducedArity);
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/reduce/ReductionUtils.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/reduce/ReductionUtils.java
@@ -158,7 +158,7 @@ private static String className(ReducedOpInfo reducedInfo) {
 	private static String memberNames(ReducedOpInfo reducedInfo) {
 		Stream<String> memberNames = //
 			Streams.concat(reducedInfo.inputTypes().stream(), //
-				Stream.of(reducedInfo.output().getType())) //
+				Stream.of(reducedInfo.output().type())) //
 				.map(type -> getClassName(Types.raw(type)));
 		Iterable<String> iterableNames = (Iterable<String>) memberNames::iterator;
 		return String.join("_", iterableNames);
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/AnnotatedOpDependencyMember.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/AnnotatedOpDependencyMember.java
@@ -117,7 +117,7 @@ public Hints hints() {
 	// -- Member methods --
 
 	@Override
-	public String getKey() {
+	public String key() {
 		if (!keyGenerated) generateKey();
 		return key;
 	}
@@ -129,7 +129,7 @@ private synchronized void generateKey() {
 	}
 
 	@Override
-	public String getDescription() {
+	public String description() {
 		if (!descriptionGenerated) generateDescription();
 		return description;
 	}
@@ -141,7 +141,7 @@ private synchronized void generateDescription() {
 	}
 
 	@Override
-	public Type getType() {
+	public Type type() {
 		return type;
 	}
 }
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/ConvertedParameterMember.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/ConvertedParameterMember.java
@@ -62,17 +62,17 @@ public static <M> ConvertedParameterMember<M> from(Member<M> original,
 	}
 
 	@Override
-	public String getKey() {
-		return original.getKey();
+	public String key() {
+		return original.key();
 	}
 
 	@Override
-	public String getDescription() {
-		return original.getDescription();
+	public String description() {
+		return original.description();
 	}
 
 	@Override
-	public Type getType() {
+	public Type type() {
 		return newType;
 	}
 
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/FunctionalMethodType.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/FunctionalMethodType.java
@@ -50,7 +50,7 @@ public FunctionalMethodType(final Type type, final ItemIO itemIO) {
 	}
 
 	public FunctionalMethodType(final Member<?> member) {
-		this(member.getType(), member.getIOType());
+		this(member.type(), member.getIOType());
 	}
 
 	public Type type() {
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
@@ -65,15 +65,15 @@ public static void parseFunctionalParameters(
 			fmts);
 
 		for (SynthesizedParameterMember<?> m : fmtMembers) {
-			final Class<?> itemType = Types.raw(m.getType());
+			final Class<?> itemType = Types.raw(m.type());
 			if ((m.getIOType() == ItemIO.MUTABLE || m
 				.getIOType() == ItemIO.CONTAINER) && Structs.isImmutable(itemType))
 			{
 				// NB: The MUTABLE and CONTAINER types signify that the parameter
 				// will be written to, but immutable parameters cannot be changed in
 				// such a manner, so it makes no sense to label them as such.
 				throw new IllegalArgumentException("Immutable " + m.getIOType() +
-					" parameter: " + m.getKey() + " (" + itemType.getName() +
+					" parameter: " + m.key() + " (" + itemType.getName() +
 					" is immutable)");
 			}
 			items.add(m);
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/OpRetypingMemberParser.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/OpRetypingMemberParser.java
@@ -94,7 +94,7 @@ private Member<?> mapToMember(int i, FunctionalMethodType fmt) {
 		return new Member<>() {
 
 			@Override
-			public String getKey() {
+			public String key() {
 				ItemIO ioType = fmt.itemIO();
 				if (ioType == ItemIO.INPUT) return "in" + i + 1;
 				else if (ioType == ItemIO.CONTAINER) return "container";
@@ -104,7 +104,7 @@ public String getKey() {
 			}
 
 			@Override
-			public Type getType() {
+			public Type type() {
 				return fmt.type();
 			}
 
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/SynthesizedParameterMember.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/struct/SynthesizedParameterMember.java
@@ -64,17 +64,17 @@ public SynthesizedParameterMember(final FunctionalMethodType fmt,
 	// -- Member methods --
 
 	@Override
-	public String getKey() {
+	public String key() {
 		return name;
 	}
 
 	@Override
-	public String getDescription() {
+	public String description() {
 		return description;
 	}
 
 	@Override
-	public Type getType() {
+	public Type type() {
 		return fmt.type();
 	}
 
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/Infos.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/Infos.java
@@ -160,7 +160,7 @@ public static String describe(final OpInfo info) {
 		// Step 3: Inputs
 		for (var member : info.inputs()) {
 			sb.append("\n\t");
-			sb.append("> ").append(member.getKey()) //
+			sb.append("> ").append(member.key()) //
 				.append(member.isRequired() ? "" : " (optional)") //
 				.append(" : ");
 			if (member.getIOType() == ItemIO.CONTAINER) {
@@ -170,16 +170,16 @@ else if (member.getIOType() == ItemIO.MUTABLE) {
 				sb.append("@MUTABLE ");
 			}
 
-			sb.append(typeString(member.getType(), true)); //
-			if (!member.getDescription().isBlank()) {
-				sb.append("\n\t\t").append(member.getDescription().replaceAll("\n\\s*",
+			sb.append(typeString(member.type(), true)); //
+			if (!member.description().isBlank()) {
+				sb.append("\n\t\t").append(member.description().replaceAll("\n\\s*",
 					"\n\t\t"));
 			}
 		}
 		// Step 4: Output
 		Member<?> output = info.output();
 		if (output.getIOType() == ItemIO.OUTPUT) {
-			sb.append("\n\tReturns : ").append(typeString(output.getType(), true));
+			sb.append("\n\tReturns : ").append(typeString(output.type(), true));
 		}
 		return sb.toString();
 	}
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/internal/OpMethodUtils.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/util/internal/OpMethodUtils.java
@@ -145,7 +145,7 @@ public static StructInstance<?> createOpInstance(final OpInfo info,
 			Object op = Lambdas.lambdaize( //
 				Types.raw(info.opType()), //
 				handle, //
-				Infos.dependencies(info).stream().map(Member::getRawType).toArray(
+				Infos.dependencies(info).stream().map(Member::rawType).toArray(
 					Class[]::new), dependencies.toArray() //
 			);
 			return info.struct().createInstance(op);
diff --git a/scijava-ops-engine/src/main/java/org/scijava/ops/engine/yaml/impl/YAMLOpClassInfo.java b/scijava-ops-engine/src/main/java/org/scijava/ops/engine/yaml/impl/YAMLOpClassInfo.java
@@ -171,10 +171,10 @@ public StructInstance<?> createOpInstance(List<?> dependencies) {
 				// dependency.
 				throw new IllegalStateException(
 					"Exception trying to inject Op dependency field.\n" +
-						"\tOp dependency field to resolve: " + dependencyMember.getKey() +
+						"\tOp dependency field to resolve: " + dependencyMember.key() +
 						"\n" + "\tFound Op to inject: " + dependencies.get(i).getClass()
 							.getName() + //
-						"\n" + "\tField signature: " + dependencyMember.getType(), ex);
+						"\n" + "\tField signature: " + dependencyMember.type(), ex);
 			}
 		}
 		return struct().createInstance(op);
diff --git a/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/convert/ConversionTest.java b/scijava-ops-engine/src/test/java/org/scijava/ops/engine/matcher/convert/ConversionTest.java
@@ -146,8 +146,8 @@ public void testConvertedOpInfo() {
 
 		// Assert the struct types are correct
 		var members = info.struct().members();
-		assertEquals(Long[].class, members.get(0).getType());
-		assertEquals(Byte[].class, members.get(1).getType());
+		assertEquals(Long[].class, members.get(0).type());
+		assertEquals(Byte[].class, members.get(1).type());
 
 		// Assert the implementation name reflects the new parameter types
 		var expImplName = "org.scijava.ops.engine.matcher.convert.ConversionTest" +
diff --git a/scijava-struct/src/main/java/org/scijava/struct/Member.java b/scijava-struct/src/main/java/org/scijava/struct/Member.java
@@ -43,10 +43,10 @@
 public interface Member<T> {
 
 	/** Unique name of the member. */
-	String getKey();
+	String key();
 
 	/** Non-null description. The default description is an empty string */
-	default String getDescription() {
+	default String description() {
 		return "";
 	}
 
@@ -55,15 +55,15 @@ default String getDescription() {
 	 *
 	 * @see Field#getGenericType()
 	 */
-	Type getType();
+	Type type();
 
 	/**
-	 * Gets the {@link Class} of the member's type, or null if {@link #getType()}
+	 * Gets the {@link Class} of the member's type, or null if {@link #type()}
 	 * does not return a raw class.
 	 */
 	@SuppressWarnings("unchecked")
-	default Class<T> getRawType() {
-		return (Class<T>) Types.raw(getType());
+	default Class<T> rawType() {
+		return (Class<T>) Types.raw(type());
 	}
 
 	/** Gets the input/output type of the member. */
diff --git a/scijava-struct/src/main/java/org/scijava/struct/Struct.java b/scijava-struct/src/main/java/org/scijava/struct/Struct.java
@@ -53,7 +53,7 @@ default <C> StructInstance<C> createInstance(final C object) {
 		final LinkedHashMap<String, MemberInstance<?>> memberMap;
 		memberMap = new LinkedHashMap<>();
 		for (final Member<?> member : members()) {
-			memberMap.put(member.getKey(), member.createInstance(object));
+			memberMap.put(member.key(), member.createInstance(object));
 		}
 
 		return new StructInstance<>() {
diff --git a/scijava-struct/src/main/java/org/scijava/struct/ValueAccessibleMemberInstance.java b/scijava-struct/src/main/java/org/scijava/struct/ValueAccessibleMemberInstance.java
@@ -67,7 +67,7 @@ public T get() {
 
 	@Override
 	public void set(Object value) {
-		final Class<?> type = member().getRawType();
+		final Class<?> type = member().rawType();
 		if (!Types.isAssignable(value != null ? value.getClass() : null, type)) {
 			throw new IllegalArgumentException("value of type " + //
 				Types.name(value.getClass()) + " is not assignable to " + //
diff --git a/scijava-struct/src/test/java/org/scijava/struct/AnnotatedParameterMember.java b/scijava-struct/src/test/java/org/scijava/struct/AnnotatedParameterMember.java
diff --git a/scijava-struct/src/test/java/org/scijava/struct/DefaultMutableParameterMember.java b/scijava-struct/src/test/java/org/scijava/struct/DefaultMutableParameterMember.java
diff --git a/scijava-struct/src/test/java/org/scijava/struct/FieldParameterMember.java b/scijava-struct/src/test/java/org/scijava/struct/FieldParameterMember.java
diff --git a/scijava-struct/src/test/java/org/scijava/struct/FunctionalParameterMember.java b/scijava-struct/src/test/java/org/scijava/struct/FunctionalParameterMember.java
diff --git a/scijava-struct/src/test/java/org/scijava/struct/ParameterMember.java b/scijava-struct/src/test/java/org/scijava/struct/ParameterMember.java
diff --git a/scijava-struct/src/test/java/org/scijava/struct/StructTest.java b/scijava-struct/src/test/java/org/scijava/struct/StructTest.java

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ default List<Member<?>> inputs() {`
`75`	`75`	`/** Gets the types of the op's input parameters. */`
`76`	`76`	`default List<Type> inputTypes() {`
`77`	`77`	`return inputs().stream() //`
`78`		`- .map(Member::getType) //`
	`78`	`+ .map(Member::type) //`
`79`	`79`	`.collect(Collectors.toList());`
`80`	`80`	`}`
`81`	`81`
`@@ -98,7 +98,7 @@ default Member<?> output() {`
`98`	`98`
`99`	`99`	`/** Gets the op's output parameter, if there is <b>exactly</b> one. */`
`100`	`100`	`default Type outputType() {`
`101`		`- return output().getType();`
	`101`	`+ return output().type();`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`/** The op's priority. */`
Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ else if (m.getIOType() == CONTAINER) {`
`195`	`195`	`sb.append("@CONTAINER ");`
`196`	`196`	`}`
`197`	`197`	`// describe member type`
`198`		`- sb.append(describeType(env, Nil.of(m.getType())));`
	`198`	`+ sb.append(describeType(env, Nil.of(m.type())));`
`199`	`199`	`if (!m.isRequired()) {`
`200`	`200`	`sb.append(" = null");`
`201`	`201`	`}`
`@@ -212,7 +212,7 @@ else if (m.getIOType() == CONTAINER) {`
`212`	`212`	`sb.append("None");`
`213`	`213`	`}`
`214`	`214`	`else {`
`215`		`- sb.append(describeType(env, Nil.of(output.getType())));`
	`215`	`+ sb.append(describeType(env, Nil.of(output.type())));`
`216`	`216`	`}`
`217`	`217`	`// return concatenation`
`218`	`218`	`return sb.toString();`
Original file line number	Diff line number	Diff line change
`@@ -663,7 +663,7 @@ private List<RichOp<?>> resolveOpDependencies(OpInfo info,`
`663`	`663`	`}`
`664`	`664`	`catch (final OpMatchingException e) {`
`665`	`665`	`String message = DependencyMatchingException.message(info`
`666`		`- .implementationName(), dependency.getKey(), request);`
	`666`	`+ .implementationName(), dependency.key(), request);`
`667`	`667`	`if (e instanceof DependencyMatchingException) {`
`668`	`668`	`throw new DependencyMatchingException(message,`
`669`	`669`	`(DependencyMatchingException) e);`
`@@ -678,7 +678,7 @@ private OpRequest inferOpRequest(OpDependencyMember<?> dependency,`
`678`	`678`	`Map<TypeVariable<?>, Type> typeVarAssigns)`
`679`	`679`	`{`
`680`	`680`	`final Type mappedDependencyType = Types.mapVarToTypes(new Type[] {`
`681`		`- dependency.getType() }, typeVarAssigns)[0];`
	`681`	`+ dependency.type() }, typeVarAssigns)[0];`
`682`	`682`	`final String dependencyName = dependency.getDependencyName();`
`683`	`683`	`return inferOpRequest(mappedDependencyType, dependencyName, typeVarAssigns);`
`684`	`684`	`}`
Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,7 @@ public String implementationName() {`
`225`	`225`	`for (Member<?> m : struct()) {`
`226`	`226`	`if (m.isInput() \|\| m.isOutput()) {`
`227`	`227`	`sb.append("_");`
`228`		`- sb.append(Conversions.getClassName(m.getType()));`
	`228`	`+ sb.append(Conversions.getClassName(m.type()));`
`229`	`229`	`}`
`230`	`230`	`}`
`231`	`231`	`return sb.toString();`
Original file line number	Diff line number	Diff line change
`@@ -158,10 +158,10 @@ public StructInstance<?> createOpInstance(List<?> dependencies) {`
`158`	`158`	`// dependency.`
`159`	`159`	`throw new IllegalStateException(`
`160`	`160`	`"Exception trying to inject Op dependency field.\n" +`
`161`		`- "\tOp dependency field to resolve: " + dependencyMember.getKey() +`
	`161`	`+ "\tOp dependency field to resolve: " + dependencyMember.key() +`
`162`	`162`	`"\n" + "\tFound Op to inject: " + dependencies.get(i).getClass()`
`163`	`163`	`.getName() + //`
`164`		`- "\n" + "\tField signature: " + dependencyMember.getType(), ex);`
	`164`	`+ "\n" + "\tField signature: " + dependencyMember.type(), ex);`
`165`	`165`	`}`
`166`	`166`	`}`
`167`	`167`	`return struct().createInstance(op);`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public InfoMatchingOpRequest(OpInfo info, Nil<?> specialType) {`
`75`	`75`	`if (!Types.isAssignable(from, this.type, this.map))`
`76`	`76`	`throw new IllegalArgumentException();`
`77`	`77`	`}`
`78`		`- args = info.inputs().stream().map(m -> mappedType(m.getType(), this.map))`
	`78`	`+ args = info.inputs().stream().map(m -> mappedType(m.type(), this.map))`
`79`	`79`	`.toArray(Type[]::new);`
`80`	`80`	`outType = mappedType(info.outputType(), this.map);`
`81`	`81`	`}`