From 84743b4b58e01bd62c5b3e312bfc79b273300e78 Mon Sep 17 00:00:00 2001 From: Andrei Silviu Dragnea Date: Mon, 14 Mar 2022 22:22:48 +0200 Subject: [PATCH] Deprecate Fields --- .../java/org/mockito/internal/util/reflection/Fields.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/org/mockito/internal/util/reflection/Fields.java b/src/main/java/org/mockito/internal/util/reflection/Fields.java index 1e8d8dd4d5..bb57333b29 100644 --- a/src/main/java/org/mockito/internal/util/reflection/Fields.java +++ b/src/main/java/org/mockito/internal/util/reflection/Fields.java @@ -18,6 +18,7 @@ * * Code is very new and might need rework. */ +@Deprecated public abstract class Fields { /** @@ -26,6 +27,7 @@ public abstract class Fields { * @param instance Instance from which declared fields will be retrieved. * @return InstanceFields of this object instance. */ + @Deprecated public static InstanceFields allDeclaredFieldsOf(Object instance) { List instanceFields = new ArrayList<>(); for (Class clazz = instance.getClass(); @@ -42,12 +44,14 @@ public static InstanceFields allDeclaredFieldsOf(Object instance) { * @param instance Instance from which declared fields will be retrieved. * @return InstanceFields of this object instance. */ + @Deprecated public static InstanceFields declaredFieldsOf(Object instance) { List instanceFields = new ArrayList<>(); instanceFields.addAll(instanceFieldsIn(instance, instance.getClass().getDeclaredFields())); return new InstanceFields(instance, instanceFields); } + @Deprecated private static List instanceFieldsIn(Object instance, Field[] fields) { List instanceDeclaredFields = new ArrayList<>(); for (Field field : fields) { @@ -64,6 +68,7 @@ private static List instanceFieldsIn(Object instance, Field[] fie * @return The filter. */ @SuppressWarnings({"unchecked", "vararg"}) + @Deprecated public static Predicate annotatedBy( final Class... annotations) { return instanceField -> { @@ -83,6 +88,7 @@ public static Predicate annotatedBy( * * @return The filter. */ + @Deprecated private static Predicate nullField() { return instanceField -> !instanceField.isNull(); } @@ -92,10 +98,12 @@ private static Predicate nullField() { * * @return The filter. */ + @Deprecated public static Predicate syntheticField() { return instanceField -> !instanceField.isSynthetic(); } + @Deprecated public static class InstanceFields { private final Object instance;