From 21c6d17d4c821a8b63cca6741f99ebc702810fab Mon Sep 17 00:00:00 2001
From: "Mathieu.Vonlanthen" <mathieu.vonlanthen@unige.ch>
Date: Mon, 20 Jan 2025 15:06:14 +0100
Subject: [PATCH] refactor(ReflectionTool): remove legacy code
---
.../unige/solidify/util/ReflectionTool.java | 32 ++++++-------------
1 file changed, 9 insertions(+), 23 deletions(-)
diff --git a/solidify-util/src/main/java/ch/unige/solidify/util/ReflectionTool.java b/solidify-util/src/main/java/ch/unige/solidify/util/ReflectionTool.java
index 33158035b..574c2d395 100644
--- a/solidify-util/src/main/java/ch/unige/solidify/util/ReflectionTool.java
+++ b/solidify-util/src/main/java/ch/unige/solidify/util/ReflectionTool.java
@@ -40,26 +40,12 @@ import ch.unige.solidify.exception.SolidifyRuntimeException;
public class ReflectionTool {
private static final Logger log = LoggerFactory.getLogger(ReflectionTool.class);
- public static String getCurrentMethodName() {
- return ReflectionTool.getMethodName(3);
- }
-
- public static String getCurrentSetterVariableName() {
- final String currentMethodName = ReflectionTool.getMethodName(3);
-
- if (currentMethodName.startsWith("set") && Character.isUpperCase(currentMethodName.charAt(3))) {
- return currentMethodName.substring(3, 4).toLowerCase() + currentMethodName.substring(4);
- } else {
- return null;
- }
- }
-
public static String getSetterName(Object object, String propertyName) {
try {
Field field = ReflectionTool.getField(object, propertyName);
- Class<? extends Object> clazz = object.getClass();
+ Class<?> clazz = object.getClass();
String setterName = "set" + propertyName.substring(0, 1).toUpperCase() + propertyName.substring(1);
Method[] methods = clazz.getMethods();
if (Arrays.stream(methods).anyMatch(method -> method.getName().equals(setterName)
@@ -78,7 +64,7 @@ public class ReflectionTool {
public static Method getSetter(Object object, String propertyName) {
String setterName = ReflectionTool.getSetterName(object, propertyName);
if (setterName != null) {
- Class<? extends Object> clazz = object.getClass();
+ Class<?> clazz = object.getClass();
try {
Field field = ReflectionTool.getField(object, propertyName);
return clazz.getMethod(setterName, field.getType());
@@ -104,7 +90,7 @@ public class ReflectionTool {
* Returns the first field in the hierarchy for the specified name
*/
public static Field getField(Object object, String name) throws NoSuchFieldException {
- Class<? extends Object> clazz = object.getClass();
+ Class<?> clazz = object.getClass();
Field field = null;
while (clazz != null && field == null) {
@@ -146,13 +132,13 @@ public class ReflectionTool {
return (valueObj != null) ? valueObj.toString() : null;
}
- public static List<Class<? extends Object>> getParentClasses(Object object) {
+ public static List<Class<?>> getParentClasses(Object object) {
return ReflectionTool.getParentClasses(object, Object.class);
}
- public static List<Class<? extends Object>> getParentClasses(Object object, Class<? extends Object> higherClass) {
- List<Class<? extends Object>> classes = new ArrayList<>();
- Class<? extends Object> clazz = object.getClass();
+ public static List<Class<?>> getParentClasses(Object object, Class<?> higherClass) {
+ List<Class<?>> classes = new ArrayList<>();
+ Class<?> clazz = object.getClass();
while (clazz != null) {
classes.add(clazz);
clazz = clazz.getSuperclass();
@@ -177,8 +163,8 @@ public class ReflectionTool {
* @param <V>
*/
public static <T, V> void copyFields(T targetObject, V sourceObject, Class<? extends Object> higherSourceClass) {
- final List<Class<? extends Object>> sourceClasses = ReflectionTool.getParentClasses(sourceObject, higherSourceClass);
- for (final Class<? extends Object> sourceClass : sourceClasses) {
+ final List<Class<?>> sourceClasses = ReflectionTool.getParentClasses(sourceObject, higherSourceClass);
+ for (final Class<?> sourceClass : sourceClasses) {
final Field[] sourceClassFields = sourceClass.getDeclaredFields();
--
GitLab