7903788: preparation towards json configuration for jextract tool

src/main/java/org/openjdk/jextract/json/JSONObjects.java

@@ -28,7 +28,6 @@
 import java.lang.reflect.Modifier;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.RecordComponent;
-import java.lang.reflect.WildcardType;
 import java.lang.reflect.Type;
 import java.io.File;
 import java.net.MalformedURLException;
@@ -128,7 +127,7 @@ public static JSONObject from(Record record) {
         Class<? extends Record> cls = record.getClass();
         Map<String, JSONValue> props = new LinkedHashMap<>();
         for (RecordComponent rc : cls.getRecordComponents()) {
-            props.put(rc.getName(), getRecordProperty(record, rc));
+            props.put(rc.getName(), getRecordComponentValue(record, rc));
         }
 
         return new JSONObject(props);
@@ -356,19 +355,7 @@ private static Type getSecondTypeArgument(ParameterizedType pt) {
 
     private static Type getNthTypeArgument(ParameterizedType pt, int n) {
         Type[] typeArgs = pt.getActualTypeArguments();
-        Type nthType = typeArgs.length > n ? typeArgs[n] : Object.class;
-        if (nthType instanceof WildcardType wt) {
-            Type[] upper = wt.getUpperBounds();
-            Type[] lower = wt.getLowerBounds();
-            if (upper.length > 0) {
-                nthType = upper[0];
-            } else if (lower.length > 0) {
-                nthType = lower[0];
-            } else {
-                nthType = Object.class;
-            }
-        }
-        return nthType;
+        return typeArgs.length > n ? typeArgs[n] : Object.class;
     }
 
     // record helpers
@@ -387,7 +374,7 @@ private static Constructor<? extends Record> getRecordConstructor(Class<? extend
     }
 
     // get the Record component value as a JSONValue
-    private static JSONValue getRecordProperty(Record record, RecordComponent rc) {
+    private static JSONValue getRecordComponentValue(Record record, RecordComponent rc) {
         Object value = null;
         try {
             value = rc.getAccessor().invoke(record);