Skip to content

Commit 4e1f300

Browse files
ctruedenctrueden
committed
Nil: Remove 'get' from type accessor method
1 parent 764298e commit 4e1f300

File tree

36 files changed

+278
-284
lines changed

36 files changed

+278
-284
lines changed

‎scijava-function/templates/main/java/org/scijava/function/Globals.list‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ nilNames = ```
6666
```
6767
typeArgs = ```
6868
{ arity ->
69-
String.join(', ', nilNames(arity).stream().map{a -> "${a}.getType()"}.collect())
69+
String.join(', ', nilNames(arity).stream().map{a -> "${a}.type()"}.collect())
7070
}
7171
```
7272
typeParamsList = ```

‎scijava-function/templates/main/java/org/scijava/function/Inplaces.list‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ matchParams = ```
6363
```
6464
typeArgs = ```
6565
{ arity, io ->
66-
String.join(', ', basicParamsList(arity, io).stream().map{a -> "${a}.getType()"}.collect())
66+
String.join(', ', basicParamsList(arity, io).stream().map{a -> "${a}.type()"}.collect())
6767
}
6868
```
6969
allMutableMutateParams = ```

‎scijava-ops-api/src/main/java/org/scijava/ops/api/OpBuilder.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public Producer<?> producer() {
129129
final Nil<Producer<Object>> specialType = new Nil<>() {
130130

131131
@Override
132-
public Type getType() {
132+
public Type type() {
133133
return Types.parameterize(Producer.class, new Type[] { Object.class });
134134
}
135135
};
@@ -798,9 +798,9 @@ public Producer<O> producer() {
798798
final Nil<Producer<O>> specialType = new Nil<>() {
799799

800800
@Override
801-
public Type getType() {
801+
public Type type() {
802802
return Types.parameterize(Producer.class, new Type[] { outType
803-
.getType() });
803+
.type() });
804804
}
805805
};
806806
return env.op(opName, specialType, new Nil<?>[0], outType,
@@ -20928,8 +20928,8 @@ private static <T> T matchFunctionHelper(final OpEnvironment env,
2092820928
{
2092920929
final Type[] types = new Type[inTypes.length + 1];
2093020930
for (int i = 0; i < inTypes.length; i++)
20931-
types[i] = inTypes[i].getType();
20932-
types[types.length - 1] = outType.getType();
20931+
types[i] = inTypes[i].type();
20932+
types[types.length - 1] = outType.type();
2093320933
final Type specialType = Types.parameterize(opClass, types);
2093420934
return (T) env.op(opName, Nil.of(specialType), inTypes, outType);
2093520935
}
@@ -20941,8 +20941,8 @@ private static <T> T matchFunctionHelper(final OpEnvironment env,
2094120941
{
2094220942
final Type[] types = new Type[inTypes.length + 1];
2094320943
for (int i = 0; i < inTypes.length; i++)
20944-
types[i] = inTypes[i].getType();
20945-
types[types.length - 1] = outType.getType();
20944+
types[i] = inTypes[i].type();
20945+
types[types.length - 1] = outType.type();
2094620946
final Type specialType = Types.parameterize(opClass, types);
2094720947
return (T) env.op(opName, Nil.of(specialType), inTypes, outType, hints);
2094820948
}
@@ -21653,8 +21653,8 @@ private static <T> T matchComputerHelper(final OpEnvironment env,
2165321653
{
2165421654
final Type[] types = new Type[inTypes.length + 1];
2165521655
for (int i = 0; i < inTypes.length; i++)
21656-
types[i] = inTypes[i].getType();
21657-
types[types.length - 1] = outType.getType();
21656+
types[i] = inTypes[i].type();
21657+
types[types.length - 1] = outType.type();
2165821658
final Type specialType = Types.parameterize(opClass, types);
2165921659
final Nil<?>[] nils = new Nil[inTypes.length + 1];
2166021660
System.arraycopy(inTypes, 0, nils, 0, inTypes.length);
@@ -21669,8 +21669,8 @@ private static <T> T matchComputerHelper(final OpEnvironment env,
2166921669
{
2167021670
final Type[] types = new Type[inTypes.length + 1];
2167121671
for (int i = 0; i < inTypes.length; i++)
21672-
types[i] = inTypes[i].getType();
21673-
types[types.length - 1] = outType.getType();
21672+
types[i] = inTypes[i].type();
21673+
types[types.length - 1] = outType.type();
2167421674
final Type specialType = Types.parameterize(opClass, types);
2167521675
final Nil<?>[] nils = new Nil[inTypes.length + 1];
2167621676
System.arraycopy(inTypes, 0, nils, 0, inTypes.length);
@@ -27812,7 +27812,7 @@ private static <T> T matchInplaceHelper(final OpEnvironment env,
2781227812
{
2781327813
final Type[] types = new Type[inTypes.length];
2781427814
for (int i = 0; i < inTypes.length; i++)
27815-
types[i] = inTypes[i].getType();
27815+
types[i] = inTypes[i].type();
2781627816
final Type specialType = Types.parameterize(opClass, types);
2781727817
return (T) env.op(opName, Nil.of(specialType), inTypes, outType);
2781827818
}
@@ -27824,7 +27824,7 @@ private static <T> T matchInplaceHelper(final OpEnvironment env,
2782427824
{
2782527825
final Type[] types = new Type[inTypes.length];
2782627826
for (int i = 0; i < inTypes.length; i++)
27827-
types[i] = inTypes[i].getType();
27827+
types[i] = inTypes[i].type();
2782827828
final Type specialType = Types.parameterize(opClass, types);
2782927829
return (T) env.op(opName, Nil.of(specialType), inTypes, outType, hints);
2783027830
}

‎scijava-ops-api/src/main/java/org/scijava/ops/api/OpInstance.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,17 +77,17 @@ public boolean equals(Object that) {
7777
OpInstance<?> thatInstance = (OpInstance<?>) that;
7878
boolean infosEqual = infoTree().equals(thatInstance.infoTree());
7979
boolean objectsEqual = op().equals(thatInstance.op());
80-
boolean typesEqual = getType().equals(thatInstance.getType());
80+
boolean typesEqual = type().equals(thatInstance.type());
8181
return infosEqual && objectsEqual && typesEqual;
8282
}
8383

8484
@Override
8585
public int hashCode() {
86-
return Objects.hash(infoTree(), op(), getType());
86+
return Objects.hash(infoTree(), op(), type());
8787
}
8888

8989
@Override
90-
public Type getType() {
90+
public Type type() {
9191
return reifiedType;
9292
}
9393

‎scijava-ops-api/src/main/java/org/scijava/ops/api/OpRequest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,9 @@ class PartialOpRequest implements OpRequest {
167167
PartialOpRequest(String name, Nil<?>[] args, Nil<?> outType) {
168168
this.name = name;
169169
this.args = args == null ? null : Arrays.stream(args) //
170-
.map(nil -> nil == null ? null : nil.getType()) //
170+
.map(nil -> nil == null ? null : nil.type()) //
171171
.toArray(Type[]::new);
172-
this.outType = outType == null ? null : outType.getType();
172+
this.outType = outType == null ? null : outType.type();
173173
}
174174

175175
@Override

‎scijava-ops-api/src/main/java/org/scijava/ops/api/RichOp.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ default T op() {
7070
*/
7171

7272
@Override
73-
default Type getType() {
74-
return instance().getType();
73+
default Type type() {
74+
return instance().type();
7575
}
7676

7777
/**

‎scijava-ops-api/templates/main/java/org/scijava/ops/api/Globals.list‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ nilNames = ```
6666
```
6767
typeArgs = ```
6868
{ arity ->
69-
String.join(', ', nilNames(arity).stream().map{a -> "${a}.getType()"}.collect())
69+
String.join(', ', nilNames(arity).stream().map{a -> "${a}.type()"}.collect())
7070
}
7171
```
7272
typeParamsList = ```

‎scijava-ops-api/templates/main/java/org/scijava/ops/api/OpBuilder.vm‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public class OpBuilder {
102102
final Nil<Producer<Object>> specialType = new Nil<>() {
103103

104104
@Override
105-
public Type getType() {
105+
public Type type() {
106106
return Types.parameterize(Producer.class, new Type[] {
107107
Object.class });
108108
}
@@ -261,9 +261,8 @@ public class OpBuilder {
261261
final Nil<Producer<O>> specialType = new Nil<>() {
262262

263263
@Override
264-
public Type getType() {
265-
return Types.parameterize(Producer.class, new Type[] { outType
266-
.getType() });
264+
public Type type() {
265+
return Types.parameterize(Producer.class, new Type[] { outType.type() });
267266
}
268267
};
269268
return env.op(opName, specialType, new Nil<?>[0], outType, OpBuilder.this.hints);
@@ -863,8 +862,8 @@ public class OpBuilder {
863862
{
864863
final Type[] types = new Type[inTypes.length + 1];
865864
for (int i = 0; i < inTypes.length; i++)
866-
types[i] = inTypes[i].getType();
867-
types[types.length - 1] = outType.getType();
865+
types[i] = inTypes[i].type();
866+
types[types.length - 1] = outType.type();
868867
final Type specialType = Types.parameterize(opClass, types);
869868
return (T) env.op(opName, Nil.of(specialType), inTypes, outType);
870869
}
@@ -875,8 +874,8 @@ public class OpBuilder {
875874
{
876875
final Type[] types = new Type[inTypes.length + 1];
877876
for (int i = 0; i < inTypes.length; i++)
878-
types[i] = inTypes[i].getType();
879-
types[types.length - 1] = outType.getType();
877+
types[i] = inTypes[i].type();
878+
types[types.length - 1] = outType.type();
880879
final Type specialType = Types.parameterize(opClass, types);
881880
return (T) env.op(opName, Nil.of(specialType), inTypes, outType, hints);
882881
}
@@ -916,8 +915,8 @@ public class OpBuilder {
916915
{
917916
final Type[] types = new Type[inTypes.length + 1];
918917
for (int i = 0; i < inTypes.length; i++)
919-
types[i] = inTypes[i].getType();
920-
types[types.length - 1] = outType.getType();
918+
types[i] = inTypes[i].type();
919+
types[types.length - 1] = outType.type();
921920
final Type specialType = Types.parameterize(opClass, types);
922921
final Nil<?>[] nils = new Nil[inTypes.length + 1];
923922
System.arraycopy(inTypes, 0, nils, 0, inTypes.length);
@@ -930,8 +929,8 @@ public class OpBuilder {
930929
{
931930
final Type[] types = new Type[inTypes.length + 1];
932931
for (int i = 0; i < inTypes.length; i++)
933-
types[i] = inTypes[i].getType();
934-
types[types.length - 1] = outType.getType();
932+
types[i] = inTypes[i].type();
933+
types[types.length - 1] = outType.type();
935934
final Type specialType = Types.parameterize(opClass, types);
936935
final Nil<?>[] nils = new Nil[inTypes.length + 1];
937936
System.arraycopy(inTypes, 0, nils, 0, inTypes.length);
@@ -979,7 +978,7 @@ public class OpBuilder {
979978
{
980979
final Type[] types = new Type[inTypes.length];
981980
for (int i = 0; i < inTypes.length; i++)
982-
types[i] = inTypes[i].getType();
981+
types[i] = inTypes[i].type();
983982
final Type specialType = Types.parameterize(opClass, types);
984983
return (T) env.op(opName, Nil.of(specialType), inTypes, outType);
985984
}
@@ -990,7 +989,7 @@ public class OpBuilder {
990989
{
991990
final Type[] types = new Type[inTypes.length];
992991
for (int i = 0; i < inTypes.length; i++)
993-
types[i] = inTypes[i].getType();
992+
types[i] = inTypes[i].type();
994993
final Type specialType = Types.parameterize(opClass, types);
995994
return (T) env.op(opName, Nil.of(specialType), inTypes, outType, hints);
996995
}

‎scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpDescriptionGenerator.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -220,13 +220,13 @@ else if (m.getIOType() == CONTAINER) {
220220

221221
private static <T> String describeType(OpEnvironment env, Nil<T> from) {
222222
Type specialType = Types.parameterize(Function.class, new Type[] { Types
223-
.parameterize(Nil.class, new Type[] { from.getType() }), String.class });
223+
.parameterize(Nil.class, new Type[] { from.type() }), String.class });
224224
@SuppressWarnings("unchecked")
225225
Nil<Function<Nil<T>, String>> specialTypeNil =
226226
(Nil<Function<Nil<T>, String>>) Nil.of(specialType);
227227
try {
228228
Type nilFromType = Types.parameterize(Nil.class, new Type[] { from
229-
.getType() });
229+
.type() });
230230
Hints h = new Hints( //
231231
BaseOpHints.Adaptation.FORBIDDEN, //
232232
BaseOpHints.Conversion.FORBIDDEN, //
@@ -237,7 +237,7 @@ private static <T> String describeType(OpEnvironment env, Nil<T> from) {
237237
return op.apply(from);
238238
}
239239
catch (OpMatchingException e) {
240-
return Types.raw(from.getType()).getSimpleName();
240+
return Types.raw(from.type()).getSimpleName();
241241
}
242242
}
243243

‎scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpEnvironment.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -228,11 +228,11 @@ public InfoTree treeFromInfo(OpInfo info, Nil<?> specialType, Hints hints) {
228228
public <T> T opFromInfoChain(final InfoTree tree, final Nil<T> specialType,
229229
Hints hints)
230230
{
231-
if (!(specialType.getType() instanceof ParameterizedType))
231+
if (!(specialType.type() instanceof ParameterizedType))
232232
throw new IllegalArgumentException("TODO");
233233
@SuppressWarnings("unchecked")
234234
OpInstance<T> instance = (OpInstance<T>) tree.newInstance(specialType
235-
.getType());
235+
.type());
236236
var conditions = MatchingConditions.from( //
237237
new InfoMatchingOpRequest(tree.info(), Nil.of(tree.info().opType())), //
238238
hints //
@@ -384,7 +384,7 @@ private <T> RichOp<T> findOp(final String opName, final Nil<T> specialType,
384384
final Nil<?>[] inTypes, final Nil<?> outType, Hints hints)
385385
{
386386
final OpRequest request = DefaultOpRequest.fromTypes(opName, specialType
387-
.getType(), outType != null ? outType.getType() : null, toTypes(inTypes));
387+
.type(), outType != null ? outType.type() : null, toTypes(inTypes));
388388

389389
var conditions = MatchingConditions.from(request, hints);
390390
try {
@@ -457,7 +457,7 @@ private <T> OpInstance<T> findOp(final OpInfo info, final Nil<T> specialType,
457457
private Type[] toTypes(Nil<?>... nils) {
458458
return Arrays.stream(nils) //
459459
.filter(Objects::nonNull) //
460-
.map(Nil::getType) //
460+
.map(Nil::type) //
461461
.toArray(Type[]::new);
462462
}
463463

@@ -554,7 +554,7 @@ private <T> RichOp<T> wrapOp(OpInstance<T> instance,
554554
", then you must define a new OpWrapper for that class!");
555555
}
556556
// obtain the generic type of the Op w.r.t. the Wrapper class
557-
Type reifiedSuperType = Types.getExactSuperType(instance.getType(),
557+
Type reifiedSuperType = Types.getExactSuperType(instance.type(),
558558
wrapper);
559559
// wrap the Op
560560
final OpWrapper<T> opWrapper = (OpWrapper<T>) wrappers.get(Types.raw(
@@ -567,7 +567,7 @@ private <T> RichOp<T> wrapOp(OpInstance<T> instance,
567567
}
568568
catch (NullPointerException e) {
569569
throw new IllegalArgumentException("No wrapper exists for " + Types.raw(
570-
instance.getType()).toString() + ".");
570+
instance.type()).toString() + ".");
571571
}
572572
}
573573

@@ -657,7 +657,7 @@ private List<RichOp<?>> resolveOpDependencies(OpInfo info,
657657
dependencyChains.add(wrapOp(instance, conditions));
658658
// refine current type variable knowledge
659659
GenericAssignability //
660-
.inferTypeVariables(request.type(), instance.getType()) //
660+
.inferTypeVariables(request.type(), instance.type()) //
661661
.forEach(dependencyTypeVarAssigns::putIfAbsent);
662662

663663
}

0 commit comments

Comments
 (0)