Bug fix for JDK 25. Releasing new version

Author: Roberto-Gentili

java/src/main/java/io/github/toolfactory/jvm/function/catalog/GetFieldValueFunction.java

@@ -51,16 +51,17 @@ public ForJava7(Map<Object, Object> context) {
 
 		@Override
 		public Object apply(Object target, Field field) {
-			target = Modifier.isStatic(field.getModifiers())?
+			boolean isStatic = Modifier.isStatic(field.getModifiers());
+			target = isStatic?
 				field.getDeclaringClass() :
 				target;
-			long fieldOffset = Modifier.isStatic(field.getModifiers())?
+			Long fieldOffset = isStatic?
 				unsafe.staticFieldOffset(field) :
 				unsafe.objectFieldOffset(field);
-			return retrieveFromUnsafe(target, field, fieldOffset, field.getType());
+			return getByUnsafe(target, field, fieldOffset, field.getType());
 		}
 
-		protected Object retrieveFromUnsafe(Object target, Field field, long fieldOffset, Class<?> cls) {
+		protected Object getByUnsafe(Object target, Field field, long fieldOffset, Class<?> cls) {
 			if(!cls.isPrimitive()) {
 				if (!Modifier.isVolatile(field.getModifiers())) {
 					return unsafe.getObject(target, fieldOffset);
@@ -119,10 +120,11 @@ protected Object retrieveFromUnsafe(Object target, Field field, long fieldOffset
 		}
 	}
 
-	public static class ForJava14 extends ForJava7 {
-		SetAccessibleFunction setAccessibleFunction;
-		ThrowExceptionFunction throwExceptionFunction;
-		public ForJava14(Map<Object, Object> context) {
+	public static class ForJava25 extends ForJava7 {
+		protected SetAccessibleFunction setAccessibleFunction;
+		protected ThrowExceptionFunction throwExceptionFunction;
+
+		public ForJava25(Map<Object, Object> context) {
 			super(context);
 			setAccessibleFunction = ObjectProvider.get(context).getOrBuildObject(SetAccessibleFunction.class, context);
 			throwExceptionFunction = ObjectProvider.get(context).getOrBuildObject(ThrowExceptionFunction.class, context);
@@ -131,14 +133,14 @@ public ForJava14(Map<Object, Object> context) {
 		@Override
 		public Object apply(Object target, Field field) {
 			boolean isStatic = Modifier.isStatic(field.getModifiers());
-			target = isStatic?
-				field.getDeclaringClass() :
-				target;
-			Long fieldOffset = null;
 			try {
-				fieldOffset = isStatic?
+				target = isStatic?
+					field.getDeclaringClass() :
+					target;
+				Long fieldOffset = isStatic?
 					unsafe.staticFieldOffset(field) :
 					unsafe.objectFieldOffset(field);
+				return getByUnsafe(target, field, fieldOffset,  field.getType());
 			} catch (UnsupportedOperationException exc) {
 				try {
 					setAccessibleFunction.accept(field, true);
@@ -152,7 +154,6 @@ public Object apply(Object target, Field field) {
 				}
 
 			}
-			return retrieveFromUnsafe(target, field, fieldOffset,  field.getType());
 		}
 
 	}

java/src/main/java/io/github/toolfactory/jvm/function/catalog/SetFieldValueFunction.java

@@ -64,9 +64,10 @@ public void accept(Object origTarget, Field field, Object value) {
 				throw new IllegalArgumentException(Strings.compile("Value {} is not assignable to {}", value , field.getName()));
 			}
 			Class<?> fieldDeclaringClass = field.getDeclaringClass();
+			boolean isStatic = Modifier.isStatic(field.getModifiers());
 			long fieldOffset;
 			Object target;
-			if (Modifier.isStatic(field.getModifiers())) {
+			if (isStatic) {
 				fieldOffset = unsafe.staticFieldOffset(field);
 				target = fieldDeclaringClass;
 			} else {
@@ -80,7 +81,10 @@ public void accept(Object origTarget, Field field, Object value) {
 				fieldOffset = unsafe.objectFieldOffset(field);
 
 			}
-			Class<?> cls = field.getType();
+			setByUnsafe(field, value, fieldOffset, target, field.getType());
+		}
+
+		protected void setByUnsafe(Field field, Object value, long fieldOffset, Object target, Class<?> cls) {
 			if(!cls.isPrimitive()) {
 				if (!Modifier.isVolatile(field.getModifiers())) {
 					unsafe.putObject(target, fieldOffset, value);
@@ -140,6 +144,58 @@ public void accept(Object origTarget, Field field, Object value) {
 
 	}
 
+	public static class ForJava25 extends ForJava7 {
+		protected SetAccessibleFunction setAccessibleFunction;
+		protected ThrowExceptionFunction throwExceptionFunction;
+
+		public ForJava25(Map<Object, Object> context) {
+			super(context);
+			setAccessibleFunction = ObjectProvider.get(context).getOrBuildObject(SetAccessibleFunction.class, context);
+			throwExceptionFunction = ObjectProvider.get(context).getOrBuildObject(ThrowExceptionFunction.class, context);
+		}
+
+		@Override
+		public void accept(Object origTarget, Field field, Object value) {
+			if(value != null && !Classes.isAssignableFrom(field.getType(), value.getClass())) {
+				throw new IllegalArgumentException(Strings.compile("Value {} is not assignable to {}", value , field.getName()));
+			}
+			Class<?> fieldDeclaringClass = field.getDeclaringClass();
+			boolean isStatic = Modifier.isStatic(field.getModifiers());
+			Object target;
+			if (isStatic) {
+				target = fieldDeclaringClass;
+			} else {
+				if ((target = origTarget) == null) {
+					throw new IllegalArgumentException("Target object is null");
+				}
+				Class<?> targetObjectClass = target.getClass();
+	 			if (!Classes.isAssignableFrom(fieldDeclaringClass, targetObjectClass)) {
+					throw new IllegalArgumentException("Target object class " + targetObjectClass + " is not assignable to " + fieldDeclaringClass);
+				}
+			}
+			try {
+				Long fieldOffset;
+				if (isStatic) {
+					fieldOffset = unsafe.staticFieldOffset(field);
+				} else {
+					fieldOffset = unsafe.objectFieldOffset(field);
+				}
+				setByUnsafe(field, value, fieldOffset, target, field.getType());
+			} catch (UnsupportedOperationException exc) {
+				try {
+					setAccessibleFunction.accept(field, true);
+					if (isStatic) {
+						field.set(null, value);
+					} else {
+						field.set(target, value);
+					}
+				} catch (Throwable exc2) {
+					throwExceptionFunction.accept(exc2);
+				}
+			}
+		}
+	}
+
 
 	public interface Native extends SetFieldValueFunction{