From d1004559e1345b1ade2ef32fec41c759657b27eb Mon Sep 17 00:00:00 2001
From: Brandon Schmitt <BrandonSchmitt@users.noreply.github.com>
Date: Wed, 18 Feb 2026 15:13:59 +0100
Subject: [PATCH] Use more pattern matching in Marshalling class

While this is mostly just syntactic sugar, there is a slight difference in the deSerializeParameters method.
Before, if the first type was a subclass of Tuple, the method fetched its type name to then look up the class for that name. However, the class was already loaded and present. So, looking it up again should be a no-op.
Reusing the existing clz variable here also prevents a problem in situations with multiple class loaders (e.g. OSGi) where it's not guaranteed that the class can be found by its name.
---
 .../java/org/freedesktop/dbus/Marshalling.java    | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/Marshalling.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/Marshalling.java
index b8801214..547647c9 100644
--- a/dbus-java-core/src/main/java/org/freedesktop/dbus/Marshalling.java
+++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/Marshalling.java
@@ -299,21 +299,21 @@ private static String[] recursiveGetDBusType(StringBuffer[] _out, Type _dataType
         } else if (_dataType instanceof Class<?> dataTypeClazz) {
 
             if (dataTypeClazz.isArray()) {
-                if (Type.class.equals(((Class<?>) _dataType).getComponentType())) {
+                if (Type.class.equals(dataTypeClazz.getComponentType())) {
                     _out[_level].append((char) ArgumentType.SIGNATURE);
                 } else {
                     _out[_level].append((char) ArgumentType.ARRAY);
-                    String[] s = recursiveGetDBusType(_out, ((Class<?>) _dataType).getComponentType(), false, _level + 1);
+                    String[] s = recursiveGetDBusType(_out, dataTypeClazz.getComponentType(), false, _level + 1);
                     if (s.length != 1) {
                         throw new DBusException(ERROR_MULTI_VALUED_ARRAY);
                     }
                     _out[_level].append(s[0]);
                 }
-            } else if (Struct.class.isAssignableFrom((Class<?>) _dataType)) {
+            } else if (Struct.class.isAssignableFrom(dataTypeClazz)) {
                 _out[_level].append((char) ArgumentType.STRUCT1);
                 Type[] ts = Container.getTypeCache(_dataType);
                 if (null == ts) {
-                    Field[] fs = ((Class<?>) _dataType).getDeclaredFields();
+                    Field[] fs = dataTypeClazz.getDeclaredFields();
                     ts = new Type[fs.length];
                     for (Field f : fs) {
                         Position p = f.getAnnotation(Position.class);
@@ -642,7 +642,7 @@ static Object deSerializeParameter(Object _parameter, Type _type, AbstractConnec
                 type2 = pt.getActualTypeArguments()[0];
             } else if (_type instanceof GenericArrayType gat) {
                 type2 = gat.getGenericComponentType();
-            } else if (_type instanceof Class<?> clz && ((Class<?>) _type).isArray()) {
+            } else if (_type instanceof Class<?> clz && clz.isArray()) {
                 type2 = clz.getComponentType();
             } else {
                 type2 = null;
@@ -674,7 +674,7 @@ static Object deSerializeParameter(Object _parameter, Type _type, AbstractConnec
                 }
                 Object o = Array.newInstance(cc, 0);
                 parameter = ArrayFrob.convert(parameter, o.getClass());
-            } else if (_type instanceof Class<?> clz && ((Class<?>) _type).isArray()) {
+            } else if (_type instanceof Class<?> clz && clz.isArray()) {
                 Class<?> cc = clz.getComponentType();
                 if ((cc.equals(Float.class) || cc.equals(Float.TYPE)) && parameter instanceof double[] dbArr) {
                     float[] tmp2 = new float[dbArr.length];
@@ -741,8 +741,7 @@ public static Object[] deSerializeParameters(Object[] _parameters, Type[] _types
 
         if (types.length == 1 && types[0] instanceof Class<?> clz) {
             if (Tuple.class.isAssignableFrom(clz)) {
-                String typeName = types[0].getTypeName();
-                Constructor<?>[] constructors = Class.forName(typeName).getDeclaredConstructors();
+                Constructor<?>[] constructors = clz.getDeclaredConstructors();
                 if (constructors.length != 1) {
                     throw new DBusException("Error deserializing message: "
                             + "We had a Tuple type but wrong number of constructors for this Tuple. "