Skip to content

Commit 3abca4e

Browse files
authored
new ClassName().getClass() -> ClassName.class (#751)
1 parent b5379ae commit 3abca4e

File tree

2 files changed

+19
-34
lines changed

2 files changed

+19
-34
lines changed

google-http-client/src/test/java/com/google/api/client/util/DataTest.java

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -306,40 +306,26 @@ static class MedXResolve<Y extends Number, X extends Y> extends Resolve<X, Integ
306306
public void testResolveWildcardTypeOrTypeVariable() throws Exception {
307307
// t
308308
TypeVariable<?> tTypeVar = (TypeVariable<?>) Resolve.class.getField("t").getGenericType();
309-
assertEquals(
310-
Number.class, resolveWildcardTypeOrTypeVariable(new Object().getClass(), tTypeVar));
311-
assertEquals(
312-
Number.class,
313-
resolveWildcardTypeOrTypeVariable(new Resolve<Boolean, Double>().getClass(), tTypeVar));
314-
assertEquals(
315-
Integer.class,
316-
resolveWildcardTypeOrTypeVariable(new IntegerResolve().getClass(), tTypeVar));
317-
assertEquals(
318-
Long.class, resolveWildcardTypeOrTypeVariable(new LongResolve().getClass(), tTypeVar));
319-
assertEquals(
320-
Double.class, resolveWildcardTypeOrTypeVariable(new DoubleResolve().getClass(), tTypeVar));
309+
assertEquals(Number.class, resolveWildcardTypeOrTypeVariable(Object.class, tTypeVar));
310+
assertEquals(Number.class, resolveWildcardTypeOrTypeVariable(Resolve.class, tTypeVar));
311+
assertEquals(Integer.class, resolveWildcardTypeOrTypeVariable(IntegerResolve.class, tTypeVar));
312+
assertEquals(Long.class, resolveWildcardTypeOrTypeVariable(LongResolve.class, tTypeVar));
313+
assertEquals(Double.class, resolveWildcardTypeOrTypeVariable(DoubleResolve.class, tTypeVar));
321314
// partially resolved
322-
assertEquals(
323-
Number.class,
324-
resolveWildcardTypeOrTypeVariable(new MedResolve<Double>().getClass(), tTypeVar));
315+
assertEquals(Number.class, resolveWildcardTypeOrTypeVariable(MedResolve.class, tTypeVar));
325316
// x
326317
TypeVariable<?> xTypeVar = (TypeVariable<?>) Resolve.class.getField("x").getGenericType();
327-
assertEquals(
328-
Object.class, resolveWildcardTypeOrTypeVariable(new Object().getClass(), xTypeVar));
318+
assertEquals(Object.class, resolveWildcardTypeOrTypeVariable(Object.class, xTypeVar));
329319
assertEquals(
330320
Boolean.class,
331321
Types.getArrayComponentType(
332-
resolveWildcardTypeOrTypeVariable(new ArrayResolve().getClass(), xTypeVar)));
322+
resolveWildcardTypeOrTypeVariable(ArrayResolve.class, xTypeVar)));
333323
assertEquals(
334324
Collection.class,
335325
Types.getRawClass(
336326
(ParameterizedType)
337-
resolveWildcardTypeOrTypeVariable(
338-
new ParameterizedResolve().getClass(), xTypeVar)));
339-
assertEquals(
340-
Number.class,
341-
resolveWildcardTypeOrTypeVariable(
342-
new MedXResolve<Integer, Integer>().getClass(), xTypeVar));
327+
resolveWildcardTypeOrTypeVariable(ParameterizedResolve.class, xTypeVar)));
328+
assertEquals(Number.class, resolveWildcardTypeOrTypeVariable(MedXResolve.class, xTypeVar));
343329
}
344330

345331
private static Type resolveWildcardTypeOrTypeVariable(

google-http-client/src/test/java/com/google/api/client/util/TypesTest.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -115,27 +115,26 @@ static class ParameterizedResolve extends Resolve<Collection<Integer>, Integer>
115115
public void testResolveTypeVariable() throws Exception {
116116
// t
117117
TypeVariable<?> tTypeVar = (TypeVariable<?>) Resolve.class.getField("t").getGenericType();
118-
assertNull(resolveTypeVariable(new Object().getClass(), tTypeVar));
119-
assertNull(resolveTypeVariable(new Resolve<Boolean, Double>().getClass(), tTypeVar));
120-
assertEquals(Integer.class, resolveTypeVariable(new IntegerResolve().getClass(), tTypeVar));
121-
assertEquals(Long.class, resolveTypeVariable(new LongResolve().getClass(), tTypeVar));
122-
assertEquals(Double.class, resolveTypeVariable(new DoubleResolve().getClass(), tTypeVar));
118+
assertNull(resolveTypeVariable(Object.class, tTypeVar));
119+
assertNull(resolveTypeVariable(Resolve.class, tTypeVar));
120+
assertEquals(Integer.class, resolveTypeVariable(IntegerResolve.class, tTypeVar));
121+
assertEquals(Long.class, resolveTypeVariable(LongResolve.class, tTypeVar));
122+
assertEquals(Double.class, resolveTypeVariable(DoubleResolve.class, tTypeVar));
123123
// partially resolved
124124
assertEquals(
125125
MedResolve.class,
126-
((TypeVariable<?>) resolveTypeVariable(new MedResolve<Double>().getClass(), tTypeVar))
126+
((TypeVariable<?>) resolveTypeVariable(MedResolve.class, tTypeVar))
127127
.getGenericDeclaration());
128128
// x
129129
TypeVariable<?> xTypeVar = (TypeVariable<?>) Resolve.class.getField("x").getGenericType();
130-
assertNull(resolveTypeVariable(new Object().getClass(), xTypeVar));
130+
assertNull(resolveTypeVariable(Object.class, xTypeVar));
131131
assertEquals(
132132
Boolean.class,
133-
Types.getArrayComponentType(resolveTypeVariable(new ArrayResolve().getClass(), xTypeVar)));
133+
Types.getArrayComponentType(resolveTypeVariable(ArrayResolve.class, xTypeVar)));
134134
assertEquals(
135135
Collection.class,
136136
Types.getRawClass(
137-
(ParameterizedType)
138-
resolveTypeVariable(new ParameterizedResolve().getClass(), xTypeVar)));
137+
(ParameterizedType) resolveTypeVariable(ParameterizedResolve.class, xTypeVar)));
139138
}
140139

141140
private static Type resolveTypeVariable(Type context, TypeVariable<?> typeVariable) {

0 commit comments

Comments
 (0)