Skip to content

Commit 97caf74

Browse files
garydgregorygarydgregory
committed
Fix generics warnings
1 parent 88586d6 commit 97caf74

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@
461461
<properties>
462462
<!-- LANG-1265: allow tests to access private fields/methods of java.base classes via reflection -->
463463
<!-- LANG-1667: allow tests to access private fields/methods of java.base/java.util such as ArrayList via reflection -->
464-
<extraArgs>--add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.time=ALL-UNNAMED --add-opens java.base/java.time.chrono=ALL-UNNAMED</extraArgs>
464+
<extraArgs>--add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.time=ALL-UNNAMED --add-opens java.base/java.time.chrono=ALL-UNNAMED --add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED</extraArgs>
465465
</properties>
466466
</profile>
467467
<profile>

‎src/test/java/org/apache/commons/lang3/builder/ReflectionDiffBuilderTest.java‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -274,10 +274,10 @@ void testDifferenceInInherited_field() {
274274
void testGetDiffAtomicInteger() {
275275
final AtomicInteger a = new AtomicInteger(1);
276276
final AtomicInteger b = new AtomicInteger(1);
277-
assertEquals(0, new ReflectionDiffBuilder(a, b, ToStringStyle.JSON_STYLE).build().getDiffs().size());
278-
assertEquals(0, new ReflectionDiffBuilder(a, a, ToStringStyle.JSON_STYLE).build().getDiffs().size());
277+
assertEquals(0, new ReflectionDiffBuilder<>(a, b, ToStringStyle.JSON_STYLE).build().getDiffs().size());
278+
assertEquals(0, new ReflectionDiffBuilder<>(a, a, ToStringStyle.JSON_STYLE).build().getDiffs().size());
279279
assertEquals(1,
280-
((List<Diff<?>>) new ReflectionDiffBuilder(new AtomicInteger(1), new AtomicInteger(2), ToStringStyle.JSON_STYLE).build().getDiffs()).size());
280+
((List<Diff<?>>) new ReflectionDiffBuilder<>(new AtomicInteger(1), new AtomicInteger(2), ToStringStyle.JSON_STYLE).build().getDiffs()).size());
281281
}
282282

283283
/*
@@ -287,13 +287,13 @@ void testGetDiffAtomicInteger() {
287287
void testGetDiffAtomicIntegerWrapper() {
288288
final AtomicIntegerWrapper a = new AtomicIntegerWrapper(1);
289289
final AtomicIntegerWrapper b = new AtomicIntegerWrapper(1);
290-
final List<Diff<?>> diffList = new ReflectionDiffBuilder(a, b, ToStringStyle.JSON_STYLE).build().getDiffs();
290+
final List<Diff<?>> diffList = new ReflectionDiffBuilder<>(a, b, ToStringStyle.JSON_STYLE).build().getDiffs();
291291
assertEquals(1, diffList.size());
292292
final Diff<?> diff = diffList.get(0);
293293
assertFalse(diffList.isEmpty(), diff.toString());
294294
assertSame(a.value, diff.getKey());
295295
assertSame(b.value, diff.getValue());
296-
assertEquals(0, ((List<Diff<?>>) new ReflectionDiffBuilder(a, a, ToStringStyle.JSON_STYLE).build().getDiffs()).size());
296+
assertEquals(0, ((List<Diff<?>>) new ReflectionDiffBuilder<>(a, a, ToStringStyle.JSON_STYLE).build().getDiffs()).size());
297297
}
298298

299299
/*
@@ -303,10 +303,10 @@ void testGetDiffAtomicIntegerWrapper() {
303303
void testGetDiffFloatWrapper() {
304304
final FloatWrapper a = new FloatWrapper(1f);
305305
final FloatWrapper b = new FloatWrapper(1f);
306-
assertEquals(0, ((List<Diff<?>>) new ReflectionDiffBuilder(a, b, ToStringStyle.JSON_STYLE).build().getDiffs()).size());
307-
assertEquals(0, ((List<Diff<?>>) new ReflectionDiffBuilder(a, a, ToStringStyle.JSON_STYLE).build().getDiffs()).size());
306+
assertEquals(0, ((List<Diff<?>>) new ReflectionDiffBuilder<>(a, b, ToStringStyle.JSON_STYLE).build().getDiffs()).size());
307+
assertEquals(0, ((List<Diff<?>>) new ReflectionDiffBuilder<>(a, a, ToStringStyle.JSON_STYLE).build().getDiffs()).size());
308308
assertEquals(1,
309-
((List<Diff<?>>) new ReflectionDiffBuilder(new FloatWrapper(1f), new FloatWrapper(2f), ToStringStyle.JSON_STYLE).build().getDiffs()).size());
309+
((List<Diff<?>>) new ReflectionDiffBuilder<>(new FloatWrapper(1f), new FloatWrapper(2f), ToStringStyle.JSON_STYLE).build().getDiffs()).size());
310310
}
311311

312312
/*
@@ -316,15 +316,15 @@ void testGetDiffFloatWrapper() {
316316
void testGetDiffFloatWrapperDeepEquals() {
317317
final FloatWrapperWrapperDeepEquals a = new FloatWrapperWrapperDeepEquals(1f);
318318
final FloatWrapperWrapperDeepEquals b = new FloatWrapperWrapperDeepEquals(1f);
319-
assertEquals(0, ((List<Diff<?>>) new ReflectionDiffBuilder(a, b, ToStringStyle.JSON_STYLE).build().getDiffs()).size());
320-
assertEquals(0, ((List<Diff<?>>) new ReflectionDiffBuilder(a, a, ToStringStyle.JSON_STYLE).build().getDiffs()).size());
321-
assertEquals(1, ((List<Diff<?>>) new ReflectionDiffBuilder(new FloatWrapperWrapperDeepEquals(1f), new FloatWrapperWrapperDeepEquals(2f),
319+
assertEquals(0, ((List<Diff<?>>) new ReflectionDiffBuilder<>(a, b, ToStringStyle.JSON_STYLE).build().getDiffs()).size());
320+
assertEquals(0, ((List<Diff<?>>) new ReflectionDiffBuilder<>(a, a, ToStringStyle.JSON_STYLE).build().getDiffs()).size());
321+
assertEquals(1, ((List<Diff<?>>) new ReflectionDiffBuilder<>(new FloatWrapperWrapperDeepEquals(1f), new FloatWrapperWrapperDeepEquals(2f),
322322
ToStringStyle.JSON_STYLE).build().getDiffs()).size());
323323
final FloatWrapperEquals fw1 = new FloatWrapperEquals(1f);
324-
assertEquals(0, ((List<Diff<?>>) new ReflectionDiffBuilder(new FloatWrapperWrapperDeepEquals(fw1), new FloatWrapperWrapperDeepEquals(fw1),
324+
assertEquals(0, ((List<Diff<?>>) new ReflectionDiffBuilder<>(new FloatWrapperWrapperDeepEquals(fw1), new FloatWrapperWrapperDeepEquals(fw1),
325325
ToStringStyle.JSON_STYLE).build().getDiffs()).size());
326326
final FloatWrapperEquals fw2 = new FloatWrapperEquals(2f);
327-
assertEquals(1, ((List<Diff<?>>) new ReflectionDiffBuilder(new FloatWrapperWrapperDeepEquals(fw1), new FloatWrapperWrapperDeepEquals(fw2),
327+
assertEquals(1, ((List<Diff<?>>) new ReflectionDiffBuilder<>(new FloatWrapperWrapperDeepEquals(fw1), new FloatWrapperWrapperDeepEquals(fw2),
328328
ToStringStyle.JSON_STYLE).build().getDiffs()).size());
329329
}
330330

@@ -335,10 +335,10 @@ void testGetDiffFloatWrapperDeepEquals() {
335335
void testGetDiffFloatWrapperEquals() {
336336
final FloatWrapperEquals a = new FloatWrapperEquals(1f);
337337
final FloatWrapperEquals b = new FloatWrapperEquals(1f);
338-
assertEquals(0, ((List<Diff<?>>) new ReflectionDiffBuilder(a, b, ToStringStyle.JSON_STYLE).build().getDiffs()).size());
339-
assertEquals(0, ((List<Diff<?>>) new ReflectionDiffBuilder(a, a, ToStringStyle.JSON_STYLE).build().getDiffs()).size());
338+
assertEquals(0, ((List<Diff<?>>) new ReflectionDiffBuilder<>(a, b, ToStringStyle.JSON_STYLE).build().getDiffs()).size());
339+
assertEquals(0, ((List<Diff<?>>) new ReflectionDiffBuilder<>(a, a, ToStringStyle.JSON_STYLE).build().getDiffs()).size());
340340
assertEquals(1,
341-
((List<Diff<?>>) new ReflectionDiffBuilder(new FloatWrapperEquals(1f), new FloatWrapperEquals(2f), ToStringStyle.JSON_STYLE).build().getDiffs())
341+
((List<Diff<?>>) new ReflectionDiffBuilder<>(new FloatWrapperEquals(1f), new FloatWrapperEquals(2f), ToStringStyle.JSON_STYLE).build().getDiffs())
342342
.size());
343343
}
344344

@@ -349,15 +349,15 @@ void testGetDiffFloatWrapperEquals() {
349349
void testGetDiffFloatWrapperWrapper() {
350350
final FloatWrapperWrapper a = new FloatWrapperWrapper(1f);
351351
final FloatWrapperWrapper b = new FloatWrapperWrapper(1f);
352-
final List<Diff<?>> diffList = new ReflectionDiffBuilder(a, b, ToStringStyle.JSON_STYLE).build().getDiffs();
352+
final List<Diff<?>> diffList = new ReflectionDiffBuilder<>(a, b, ToStringStyle.JSON_STYLE).build().getDiffs();
353353
assertEquals(1, diffList.size());
354354
final Diff<?> diff = diffList.get(0);
355355
assertFalse(diffList.isEmpty(), diff.toString());
356356
assertSame(a.value, diff.getKey());
357357
assertSame(b.value, diff.getValue());
358-
assertEquals(0, ((List<Diff<?>>) new ReflectionDiffBuilder(a, a, ToStringStyle.JSON_STYLE).build().getDiffs()).size());
358+
assertEquals(0, ((List<Diff<?>>) new ReflectionDiffBuilder<>(a, a, ToStringStyle.JSON_STYLE).build().getDiffs()).size());
359359
assertEquals(1,
360-
((List<Diff<?>>) new ReflectionDiffBuilder(new FloatWrapperWrapper(1f), new FloatWrapperWrapper(2f), ToStringStyle.JSON_STYLE)
360+
((List<Diff<?>>) new ReflectionDiffBuilder<>(new FloatWrapperWrapper(1f), new FloatWrapperWrapper(2f), ToStringStyle.JSON_STYLE)
361361
.build().getDiffs()).size());
362362
}
363363

@@ -368,25 +368,25 @@ void testGetDiffFloatWrapperWrapper() {
368368
void testGetDiffFloatWrapperWrapperEquals() {
369369
final FloatWrapperWrapperEquals a = new FloatWrapperWrapperEquals(1f);
370370
final FloatWrapperWrapperEquals b = new FloatWrapperWrapperEquals(1f);
371-
final List<Diff<?>> diffList = new ReflectionDiffBuilder(a, b, ToStringStyle.JSON_STYLE).build().getDiffs();
371+
final List<Diff<?>> diffList = new ReflectionDiffBuilder<>(a, b, ToStringStyle.JSON_STYLE).build().getDiffs();
372372
assertEquals(1, diffList.size());
373373
final Diff<?> diff = diffList.get(0);
374374
assertFalse(diffList.isEmpty(), diff.toString());
375375
assertSame(a.value, diff.getKey());
376376
assertSame(b.value, diff.getValue());
377-
assertEquals(0, ((List<Diff<?>>) new ReflectionDiffBuilder(a, a, ToStringStyle.JSON_STYLE).build().getDiffs()).size());
377+
assertEquals(0, ((List<Diff<?>>) new ReflectionDiffBuilder<>(a, a, ToStringStyle.JSON_STYLE).build().getDiffs()).size());
378378
assertEquals(1,
379-
((List<Diff<?>>) new ReflectionDiffBuilder(new FloatWrapperWrapperEquals(1f), new FloatWrapperWrapperEquals(2f), ToStringStyle.JSON_STYLE)
379+
((List<Diff<?>>) new ReflectionDiffBuilder<>(new FloatWrapperWrapperEquals(1f), new FloatWrapperWrapperEquals(2f), ToStringStyle.JSON_STYLE)
380380
.build().getDiffs()).size());
381381
final FloatWrapper fw1 = new FloatWrapper(1f);
382382
assertEquals(0,
383-
((List<Diff<?>>) new ReflectionDiffBuilder(new FloatWrapperWrapperEquals(fw1), new FloatWrapperWrapperEquals(fw1), ToStringStyle.JSON_STYLE)
383+
((List<Diff<?>>) new ReflectionDiffBuilder<>(new FloatWrapperWrapperEquals(fw1), new FloatWrapperWrapperEquals(fw1), ToStringStyle.JSON_STYLE)
384384
.build().getDiffs()).size());
385385
}
386386

387387
@Test
388388
void testGetExcludeFieldNamesEmpty() {
389-
final ReflectionDiffBuilder reflectionDiffBuilder = new ReflectionDiffBuilder(new TypeTestClass(), new TypeTestChildClass(), SHORT_STYLE);
389+
final ReflectionDiffBuilder<?> reflectionDiffBuilder = new ReflectionDiffBuilder<>(new TypeTestClass(), new TypeTestChildClass(), SHORT_STYLE);
390390
final String[] excludeFieldNames = reflectionDiffBuilder.getExcludeFieldNames();
391391
assertNotNull(excludeFieldNames);
392392
assertEquals(0, excludeFieldNames.length);

0 commit comments

Comments
 (0)