Skip to content

fix: parse java version pre-release #419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

fix: parse java version pre-release #419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 31 additions & 25 deletions src/main/java/com/cedarsoftware/io/reflect/Injector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,24 @@
/**
* High-performance field injection utility that automatically adapts to different JDK versions
* for optimal performance and compatibility.
*
*
* <p>This class uses the {@code java.version} system property to automatically detect the
* JDK version and select the most appropriate field injection strategy:</p>
*
*
* <ul>
* <li><strong>JDK 8-16:</strong> Uses {@code Field.set()} for final fields and {@code MethodHandle} for regular fields</li>
* <li><strong>JDK 17+:</strong> Uses {@code VarHandle} for improved performance and module system compatibility</li>
* </ul>
*
*
* <p>The JDK version detection and strategy selection is completely automatic and requires no
* user configuration. This ensures optimal performance across all supported JDK versions while
* maintaining compatibility with the module system introduced in JDK 9+.</p>
*
*
* <h3>System Properties Used:</h3>
* <ul>
* <li>{@code java.version} - Automatically detected by the JVM to determine injection strategy</li>
* </ul>
*
*
* @author Ken Partlow ([email protected])
* John DeRegnaucourt ([email protected])
* <br>
Expand Down Expand Up @@ -66,7 +66,7 @@ public class Injector {
private static final Class<?> VAR_HANDLE_CLASS; // although appears unused, it is intentional for caching

static {
int javaVersion = getJavaVersion();
int javaVersion = getJavaVersion(System.getProperty("java.version"));
IS_JDK17_OR_HIGHER = javaVersion >= 17;

Object lookup = null;
Expand Down Expand Up @@ -149,11 +149,11 @@ public static Injector create(Field field, String uniqueFieldName) {
if (uniqueFieldName == null || uniqueFieldName.trim().isEmpty()) {
throw new JsonIoException("Unique field name cannot be null or empty");
}

// Security: Check if field access is allowed in secure environments
String fieldName = field.getName();
Class<?> declaringClass = field.getDeclaringClass();

// Security: Validate field access permissions
try {
SecurityManager sm = System.getSecurityManager();
Expand All @@ -163,7 +163,7 @@ public static Injector create(Field field, String uniqueFieldName) {
} catch (SecurityException e) {
throw new JsonIoException("Security policy denies field access to: " + fieldName + " in class: " + declaringClass.getName(), e);
}

// Always try to make the field accessible, regardless of whether it is static.
if (!field.isAccessible()) {
try {
Expand Down Expand Up @@ -194,7 +194,7 @@ public static Injector create(Field field, String uniqueFieldName) {
} catch (SecurityException e) {
throw new JsonIoException("Security policy denies final field modification for: " + fieldName + " in class: " + declaringClass.getName(), e);
}

try {
// Security: Be cautious when modifying final fields
Field modifiersField = ReflectionUtils.getField(Field.class, "modifiers");
Expand Down Expand Up @@ -247,12 +247,12 @@ private static Injector createWithVarHandle(Field field, String uniqueFieldName)
if (declaringClass == null) {
return null;
}

Object privateLookup = PRIVATE_LOOKUP_IN_METHOD.invoke(null, declaringClass, LOOKUP);
if (privateLookup == null) {
return null;
}

Object varHandle = FIND_VAR_HANDLE_METHOD.invoke(privateLookup, declaringClass,
field.getName(), field.getType());
if (varHandle == null) {
Expand All @@ -277,7 +277,7 @@ public static Injector create(Field field, String methodName, String uniqueField
if (uniqueFieldName == null || uniqueFieldName.trim().isEmpty()) {
throw new JsonIoException("Unique field name cannot be null or empty");
}

// Security: Validate method access permissions
try {
SecurityManager sm = System.getSecurityManager();
Expand All @@ -287,7 +287,7 @@ public static Injector create(Field field, String methodName, String uniqueField
} catch (SecurityException e) {
throw new JsonIoException("Security policy denies method access for: " + methodName + " in class: " + field.getDeclaringClass().getName(), e);
}

try {
MethodType methodType = MethodType.methodType(void.class, field.getType());
MethodHandle handle = MethodHandles.lookup().findVirtual(field.getDeclaringClass(), methodName, methodType);
Expand All @@ -304,15 +304,15 @@ public void inject(Object object, Object value) {
if (object == null) {
throw new JsonIoException("Attempting to set field: " + getName() + " on null object.");
}

// Security: Validate that the object is an instance of the field's declaring class
Class<?> declaringClass = field.getDeclaringClass();
if (!declaringClass.isInstance(object)) {
throw new JsonIoException("Object is not an instance of the field's declaring class. Expected: " +
declaringClass.getName() + ", Actual: " + object.getClass().getName() +
" for field: " + getName());
throw new JsonIoException("Object is not an instance of the field's declaring class. Expected: " +
declaringClass.getName() + ", Actual: " + object.getClass().getName() +
" for field: " + getName());
}

// Security: Additional validation for system classes
String className = declaringClass.getName();
if (className.startsWith("java.lang.") || className.startsWith("java.security.")) {
Expand Down Expand Up @@ -343,7 +343,7 @@ public void inject(Object object, Object value) {
final Class<?> fieldType = field.getType();
final String fieldName = getName();
final String displayName = getDisplayName();

String msg = e.getMessage();
if (StringUtilities.hasContent(msg) && msg.contains("LinkedHashMap")) {
throw new JsonIoException("Unable to set field: " + fieldName + " using " + displayName + ".", e);
Expand Down Expand Up @@ -373,12 +373,12 @@ private void injectWithVarHandle(Object object, Object value) throws Throwable {
if (varHandle == null || VAR_HANDLE_SET_METHOD == null) {
throw new JsonIoException("Unable to set field: " + getName() + " - VarHandle not available");
}

// Security: Validate arguments before VarHandle invocation
if (object == null) {
throw new JsonIoException("Cannot inject into null object using VarHandle for field: " + getName());
}

try {
// Security: Use secure argument list creation
Object[] args = {varHandle, object, value};
Expand Down Expand Up @@ -411,18 +411,24 @@ public String getUniqueFieldName() {
/**
* Determines the Java major version by parsing the {@code java.version} system property.
* This method handles both legacy (1.8) and modern (9+) version numbering schemes.
*
*
* @return the major Java version (e.g., 8 for Java 1.8, 17 for Java 17, etc.)
*/
private static int getJavaVersion() {
String version = System.getProperty("java.version");
static int getJavaVersion(final String version) {
if (version.startsWith("1.")) {
return Integer.parseInt(version.substring(2, 3));
}
int dot = version.indexOf('.');
if (dot != -1) {
return Integer.parseInt(version.substring(0, dot));
}

int hyphen = version.indexOf('-');
if (hyphen != -1) {
// handle pre-release versions like "17-ea"
return Integer.parseInt(version.substring(0, hyphen));
}

return Integer.parseInt(version);
}
}
39 changes: 35 additions & 4 deletions src/test/java/com/cedarsoftware/io/reflect/InjectorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
package com.cedarsoftware.io.reflect;

import com.cedarsoftware.io.JsonIoException;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;

import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;

import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
import com.cedarsoftware.io.JsonIoException;

import org.junit.jupiter.api.Test;

class InjectorTests {

Expand Down Expand Up @@ -56,4 +57,34 @@ void injectWithVarHandle_whenVarHandleMissing_throwsException() throws Exception
assertThat(cause).isInstanceOf(JsonIoException.class);
assertThat(cause.getMessage()).contains("VarHandle not available");
}

@Test
void getJavaVersion_legacyVersion_returns8() {
assertThat(Injector.getJavaVersion("1.8.0_321")).isEqualTo(8);
}

@Test
void getJavaVersion_modernVersion_returns17() {
assertThat(Injector.getJavaVersion("17.0.2")).isEqualTo(17);
}

@Test
void getJavaVersion_singleDigitVersion_returns11() {
assertThat(Injector.getJavaVersion("11")).isEqualTo(11);
}

@Test
void getJavaVersion_malformedVersion_throwsException() {
assertThrows(NumberFormatException.class, () -> Injector.getJavaVersion("foo.bar"));
}

@Test
void getJavaVersion_shortLegacyVersion_returns8() {
assertThat(Injector.getJavaVersion("1.8")).isEqualTo(8);
}

@Test
void getJavaVersion_preReleaseVersion_returns17() {
assertThat(Injector.getJavaVersion("17-ea")).isEqualTo(17);
}
}