Remove usage of deprecated APIs

fmbenhassine · fmbenhassine · commit 370d2f3bc03b · 2020-11-08T22:16:26.000+01:00
diff --git a/easy-random-bean-validation/src/main/java/org/jeasy/random/validation/SizeAnnotationHandler.java b/easy-random-bean-validation/src/main/java/org/jeasy/random/validation/SizeAnnotationHandler.java
@@ -34,6 +34,7 @@
 import javax.validation.constraints.Size;
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.Collection;
@@ -119,8 +120,8 @@ public Randomizer<?> getRandomizer(Field field) {
                     map = (Map<Object, Object>) getEmptyImplementationForMapInterface(fieldType);
                 } else {
                     try {
-                        map = (Map<Object, Object>) fieldType.newInstance();
-                    } catch (InstantiationException | IllegalAccessException e) {
+                        map = (Map<Object, Object>) fieldType.getDeclaredConstructor().newInstance();
+                    } catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
                         if (fieldType.isAssignableFrom(EnumMap.class)) {
                             if (isParameterizedType(fieldGenericType)) {
                                 Type type = ((ParameterizedType) fieldGenericType).getActualTypeArguments()[0];
diff --git a/easy-random-bean-validation/src/test/java/org/jeasy/random/validation/BeanValidationTest.java b/easy-random-bean-validation/src/test/java/org/jeasy/random/validation/BeanValidationTest.java
@@ -77,13 +77,13 @@ void generatedValuesShouldBeValidAccordingToValidationConstraints() {
 
         assertThat(bean.getBirthdayLocalDateTime()).isBefore(LocalDateTime.now());// @Past LocalDateTime birthdayLocalDateTime;
 
-        assertThat(bean.getPastOrPresent()).isBeforeOrEqualsTo(new Date());// @PastOrPresent Date pastOrPresent;
+        assertThat(bean.getPastOrPresent()).isBeforeOrEqualTo(new Date());// @PastOrPresent Date pastOrPresent;
 
         assertThat(bean.getEventDate()).isInTheFuture();// @Future Date eventDate;
 
         assertThat(bean.getEventLocalDateTime()).isAfter(LocalDateTime.now());// @Future LocalDateTime eventLocalDateTime;
 
-        assertThat(bean.getFutureOrPresent()).isAfterOrEqualsTo(new Date());// @FutureOrPresent Date eventDate;
+        assertThat(bean.getFutureOrPresent()).isAfterOrEqualTo(new Date());// @FutureOrPresent Date eventDate;
 
         assertThat(bean.getPositive()).isGreaterThan(0);// @Positive int positive;
 
@@ -147,13 +147,13 @@ void generatedValuesShouldBeValidAccordingToValidationConstraintsOnMethod() {
 
         assertThat(bean.getBirthdayLocalDateTime()).isBefore(LocalDateTime.now());// @Past LocalDateTime birthdayLocalDateTime;
 
-        assertThat(bean.getPastOrPresent()).isBeforeOrEqualsTo(new Date());// @PastOrPresent Date pastOrPresent;
+        assertThat(bean.getPastOrPresent()).isBeforeOrEqualTo(new Date());// @PastOrPresent Date pastOrPresent;
 
         assertThat(bean.getEventDate()).isInTheFuture();// @Future Date eventDate;
 
         assertThat(bean.getEventLocalDateTime()).isAfter(LocalDateTime.now());// @Future LocalDateTime eventLocalDateTime;
 
-        assertThat(bean.getFutureOrPresent()).isAfterOrEqualsTo(new Date());// @FutureOrPresent Date eventDate;
+        assertThat(bean.getFutureOrPresent()).isAfterOrEqualTo(new Date());// @FutureOrPresent Date eventDate;
 
         assertThat(bean.getPositive()).isGreaterThan(0);// @Positive int positive;
 
@@ -292,7 +292,7 @@ class Discount {
         }
 
         CustomRandomizerRegistry registry = new CustomRandomizerRegistry();
-        registry.registerRandomizer(BigDecimal.class, new BigDecimalRangeRandomizer(new Double(5d), new Double(10d), Integer.valueOf(3)));
+        registry.registerRandomizer(BigDecimal.class, new BigDecimalRangeRandomizer(Double.valueOf(5d), Double.valueOf(10d), Integer.valueOf(3)));
         registry.registerRandomizer(Integer.class, new IntegerRangeRandomizer(5, 10));
         EasyRandomParameters parameters = new EasyRandomParameters()
                 .randomizerRegistry(registry);
diff --git a/easy-random-core/src/main/java/org/jeasy/random/MapPopulator.java b/easy-random-core/src/main/java/org/jeasy/random/MapPopulator.java
@@ -27,6 +27,7 @@
 import org.jeasy.random.randomizers.range.IntegerRangeRandomizer;
 
 import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.EnumMap;
@@ -61,8 +62,8 @@ class MapPopulator {
             map = (Map<Object, Object>) getEmptyImplementationForMapInterface(fieldType);
         } else {
             try {
-                map = (Map<Object, Object>) fieldType.newInstance();
-            } catch (InstantiationException | IllegalAccessException e) {
+                map = (Map<Object, Object>) fieldType.getDeclaredConstructor().newInstance();
+            } catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
                 // Creating EnumMap with objenesis by-passes the constructor with keyType which leads to CCE at insertion time
                 if (fieldType.isAssignableFrom(EnumMap.class)) {
                     if (isParameterizedType(fieldGenericType)) {
diff --git a/easy-random-core/src/main/java/org/jeasy/random/ObjenesisObjectFactory.java b/easy-random-core/src/main/java/org/jeasy/random/ObjenesisObjectFactory.java
@@ -72,9 +72,7 @@ public <T> T createInstance(Class<T> type, RandomizerContext context) {
     private <T> T createNewInstance(final Class<T> type) {
         try {
             Constructor<T> noArgConstructor = type.getDeclaredConstructor();
-            if (!noArgConstructor.isAccessible()) {
-                noArgConstructor.setAccessible(true);
-            }
+            noArgConstructor.trySetAccessible();
             return noArgConstructor.newInstance();
         } catch (Exception exception) {
             return objenesis.newInstance(type);
diff --git a/easy-random-core/src/main/java/org/jeasy/random/util/ReflectionUtils.java b/easy-random-core/src/main/java/org/jeasy/random/util/ReflectionUtils.java
@@ -149,8 +149,7 @@ public static void setProperty(final Object object, final Field field, final Obj
      * @throws IllegalAccessException if the property cannot be set
      */
     public static void setFieldValue(final Object object, final Field field, final Object value) throws IllegalAccessException {
-        boolean access = field.isAccessible();
-        field.setAccessible(true);
+        boolean access = field.trySetAccessible();
         field.set(object, value);
         field.setAccessible(access);
     }
@@ -164,8 +163,7 @@ public static void setFieldValue(final Object object, final Field field, final O
      * @throws IllegalAccessException if field cannot be accessed
      */
     public static Object getFieldValue(final Object object, final Field field) throws IllegalAccessException {
-        boolean access = field.isAccessible();
-        field.setAccessible(true);
+        boolean access = field.trySetAccessible();
         Object value = field.get(object);
         field.setAccessible(access);
         return value;
@@ -492,8 +490,8 @@ public static Collection<?> createEmptyCollectionForType(Class<?> fieldType, int
         rejectUnsupportedTypes(fieldType);
         Collection<?> collection;
         try {
-            collection = (Collection<?>) fieldType.newInstance();
-        } catch (InstantiationException | IllegalAccessException e) {
+            collection = (Collection<?>) fieldType.getDeclaredConstructor().newInstance();
+        } catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
             if (fieldType.equals(ArrayBlockingQueue.class)) {
                 collection = new ArrayBlockingQueue<>(initialSize);
             } else {
@@ -600,8 +598,8 @@ public static <T> Randomizer<T> newInstance(final Class<T> type, final Randomize
                     return (Randomizer<T>) matchingConstructor.get().newInstance(convertArguments(randomizerArguments));
                 }
             }
-            return (Randomizer<T>) type.newInstance();
-        } catch (IllegalAccessException | InvocationTargetException | InstantiationException e) {
+            return (Randomizer<T>) type.getDeclaredConstructor().newInstance();
+        } catch (IllegalAccessException | InvocationTargetException | InstantiationException | NoSuchMethodException e) {
             throw new ObjectCreationException(format("Could not create Randomizer of type: %s with constructor arguments: %s", type, Arrays.toString(randomizerArguments)), e);
         }
     }
diff --git a/easy-random-core/src/test/java/org/jeasy/random/parameters/SeedParameterTests.java b/easy-random-core/src/test/java/org/jeasy/random/parameters/SeedParameterTests.java
@@ -54,7 +54,7 @@ void generatedObjectShouldBeAlwaysTheSameForTheSameSeed() {
 
         // Then
         assertThat(actualString).isEqualTo(expectedString);
-        assertThat(actualPerson).isEqualToIgnoringNullFields(expectedPerson);
+        assertThat(actualPerson).isEqualByComparingTo(expectedPerson);
         assertThat(actualInts).isEqualTo(expectedInts);
     }
 
diff --git a/easy-random-core/src/test/java/org/jeasy/random/randomizers/range/DateRangeRandomizerTest.java b/easy-random-core/src/test/java/org/jeasy/random/randomizers/range/DateRangeRandomizerTest.java
@@ -79,7 +79,7 @@ void whenSpecifiedMinDateIsNull_thenShouldUseDefaultMinValue() {
         Date randomDate = randomizer.getRandomValue();
 
         // Then
-        assertThat(randomDate).isBeforeOrEqualsTo(maxDate);
+        assertThat(randomDate).isBeforeOrEqualTo(maxDate);
     }
 
     @Test
@@ -91,7 +91,7 @@ void whenSpecifiedMaxDateIsNull_thenShouldUseDefaultMaxValue() {
         Date randomDate = randomizer.getRandomValue();
 
         // Then
-        assertThat(randomDate).isAfterOrEqualsTo(minDate);
+        assertThat(randomDate).isAfterOrEqualTo(minDate);
     }
 
 }
diff --git a/easy-random-core/src/test/java/org/jeasy/random/randomizers/range/SqlDateRangeRandomizerTest.java b/easy-random-core/src/test/java/org/jeasy/random/randomizers/range/SqlDateRangeRandomizerTest.java
@@ -79,7 +79,7 @@ void whenSpecifiedMinDateIsNull_thenShouldUseDefaultMinValue() {
         Date randomDate = randomizer.getRandomValue();
 
         // Then
-        assertThat(randomDate).isBeforeOrEqualsTo(maxDate);
+        assertThat(randomDate).isBeforeOrEqualTo(maxDate);
     }
 
     @Test
@@ -91,7 +91,7 @@ void whenSpecifiedMaxDateIsNull_thenShouldUseDefaultMaxValue() {
         Date randomDate = randomizer.getRandomValue();
 
         // Then
-        assertThat(randomDate).isAfterOrEqualsTo(minDate);
+        assertThat(randomDate).isAfterOrEqualTo(minDate);
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ void generatedObjectShouldBeAlwaysTheSameForTheSameSeed() {`
`54`	`54`
`55`	`55`	`// Then`
`56`	`56`	`assertThat(actualString).isEqualTo(expectedString);`
`57`		`- assertThat(actualPerson).isEqualToIgnoringNullFields(expectedPerson);`
	`57`	`+ assertThat(actualPerson).isEqualByComparingTo(expectedPerson);`
`58`	`58`	`assertThat(actualInts).isEqualTo(expectedInts);`
`59`	`59`	`}`
`60`	`60`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ void whenSpecifiedMinDateIsNull_thenShouldUseDefaultMinValue() {`
`79`	`79`	`Date randomDate = randomizer.getRandomValue();`
`80`	`80`
`81`	`81`	`// Then`
`82`		`- assertThat(randomDate).isBeforeOrEqualsTo(maxDate);`
	`82`	`+ assertThat(randomDate).isBeforeOrEqualTo(maxDate);`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`@Test`
`@@ -91,7 +91,7 @@ void whenSpecifiedMaxDateIsNull_thenShouldUseDefaultMaxValue() {`
`91`	`91`	`Date randomDate = randomizer.getRandomValue();`
`92`	`92`
`93`	`93`	`// Then`
`94`		`- assertThat(randomDate).isAfterOrEqualsTo(minDate);`
	`94`	`+ assertThat(randomDate).isAfterOrEqualTo(minDate);`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`}`