Skip to content

minor code improvements #276

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

Merged
hypfvieh merged 1 commit into from
Jan 20, 2025
Merged

minor code improvements #276

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
3 changes: 2 additions & 1 deletion dbus-java-core/src/main/java/org/freedesktop/dbus/Container.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@
import java.lang.reflect.Field;
import java.lang.reflect.Type;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;

/**
* This class is the super class of both Structs and Tuples
* and holds common methods.
*/
public abstract class Container {
private static final Map<Type, Type[]> TYPE_CACHE = new HashMap<>();
private static final Map<Type, Type[]> TYPE_CACHE = new ConcurrentHashMap<>();
private Object[] parameters = null;

Container() {
Expand Down
10 changes: 7 additions & 3 deletions dbus-java-core/src/main/java/org/freedesktop/dbus/Marshalling.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
* Contains static methods for marshalling values.
*/
public final class Marshalling {

private static final String[] EMPTY_STRING_ARRAY = new String[0];
private static final Type[] EMPTY_TYPE_ARRAY = new Type[0];

/** Used as initial and incremental size of StringBuffer array when resolving DBusTypes recursively. */
private static final int INITIAL_BUFFER_SZ = 10;

Expand Down Expand Up @@ -289,7 +293,7 @@ private static String[] recursiveGetDBusType(StringBuffer[] _out, Type _dataType
for (Type t : ts) {
Collections.addAll(vs, recursiveGetDBusType(_out, t, false, _level + 1));
}
return vs.toArray(new String[0]);
return vs.toArray(EMPTY_STRING_ARRAY);
} else {
throw new DBusException("Exporting non-exportable parameterized type " + _dataType);
}
Expand Down Expand Up @@ -385,7 +389,7 @@ public static int getJavaType(String _dbusType, List<Type> _resultValue, int _li

List<Type> contained = new ArrayList<>();
getJavaType(_dbusType.substring(idx + 1, structIdx - 1), contained, -1);
_resultValue.add(new DBusStructType(contained.toArray(new Type[0])));
_resultValue.add(new DBusStructType(contained.toArray(EMPTY_TYPE_ARRAY)));
idx = structIdx - 1; //-1 because j already points to the next signature char
break;
case ArgumentType.ARRAY:
Expand Down Expand Up @@ -577,7 +581,7 @@ static Object deSerializeParameter(Object _parameter, Type _type, AbstractConnec
if (_type instanceof Class && ((Class<?>) _type).isArray() && ((Class<?>) _type).getComponentType().equals(Type.class) && parameter instanceof String) {
List<Type> rv = new ArrayList<>();
getJavaType((String) parameter, rv, -1);
parameter = rv.toArray(new Type[0]);
parameter = rv.toArray(EMPTY_TYPE_ARRAY);
}

// its an object path, get/create the proxy
Expand Down
95 changes: 49 additions & 46 deletions dbus-java-core/src/main/java/org/freedesktop/dbus/RemoteInvocationHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,56 +45,59 @@ public RemoteObject getRemote() {

@Override
public Object invoke(Object _proxy, Method _method, Object[] _args) throws Throwable {
if (_method.getName().equals("isRemote")) {
return true;
} else if (_method.getName().equals("getObjectPath")) {
return remote.getObjectPath();
} else if (_method.getName().equals("clone")) {
return null;
} else if (_method.getName().equals("equals")) {
try {
if (1 == _args.length) {
return _args[0] != null && remote.equals(((RemoteInvocationHandler) Proxy.getInvocationHandler(_args[0])).remote);
switch (_method.getName()) {
case "isRemote":
return true;
case "getObjectPath":
return remote.getObjectPath();
case "clone":
return null;
case "equals":
try {
if (1 == _args.length) {
return _args[0] != null && remote.equals(((RemoteInvocationHandler) Proxy.getInvocationHandler(_args[0])).remote);
}
} catch (IllegalArgumentException _exIa) {
return Boolean.FALSE;
}
} catch (IllegalArgumentException _exIa) {
return Boolean.FALSE;
}
} else if (_method.getName().equals("finalize")) {
return null;
} else if (_method.getName().equals("getClass")) {
return DBusInterface.class;
} else if (_method.getName().equals("hashCode")) {
return remote.hashCode();
} else if (_method.getName().equals("notify")) {
synchronized (remote) {
remote.notify();
}
return null;
} else if (_method.getName().equals("notifyAll")) {
synchronized (remote) {
remote.notifyAll();
}
return null;
} else if (_method.getName().equals("wait")) {
synchronized (remote) {
if (_args.length == 0) {
remote.wait();
} else if (_args.length == 1 && _args[0] instanceof Long l) {
remote.wait(l);
} else if (_args.length == 2 && _args[0] instanceof Long l && _args[1] instanceof Integer i) {
remote.wait(l, i);
case "finalize":
return null;
case "getClass":
return DBusInterface.class;
case "hashCode":
return remote.hashCode();
case "notify":
synchronized (remote) {
remote.notify();
}
if (_args.length <= 2) {
return null;
return null;
case "notifyAll":
synchronized (remote) {
remote.notifyAll();
}
return null;
case "wait":
synchronized (remote) {
if (_args.length == 0) {
remote.wait();
} else if (_args.length == 1 && _args[0] instanceof Long l) {
remote.wait(l);
} else if (_args.length == 2 && _args[0] instanceof Long l && _args[1] instanceof Integer i) {
remote.wait(l, i);
}
if (_args.length <= 2) {
return null;
}
}
case "toString":
return remote.toString();
default:
if (_method.isAnnotationPresent(DBusBoundProperty.class)) {
return PropRefRemoteHandler.handleDBusBoundProperty(conn, remote, _method, _args);
}
}
} else if (_method.getName().equals("toString")) {
return remote.toString();
} else if (_method.isAnnotationPresent(DBusBoundProperty.class)) {
return PropRefRemoteHandler.handleDBusBoundProperty(conn, remote, _method, _args);
}

return executeRemoteMethod(remote, _method, conn, CALL_TYPE_SYNC, null, _args);
return executeRemoteMethod(remote, _method, conn, CALL_TYPE_SYNC, null, _args);
}
}

public static Object convertRV(Object[] _rp, Method _m, AbstractConnection _conn) throws DBusException {
Expand Down
3 changes: 2 additions & 1 deletion dbus-java-core/src/main/java/org/freedesktop/dbus/bin/DBusDaemon.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ public class DBusDaemon extends Thread implements Closeable {

private static final String DBUS_BUSPATH = "/org/freedesktop/DBus";
private static final String DBUS_BUSNAME = "org.freedesktop.DBus";
private static final String[] EMPTY_STRING_ARRAY = new String[0];

private static final Logger LOGGER =
LoggerFactory.getLogger(DBusDaemon.class);
Expand Down Expand Up @@ -458,7 +459,7 @@ public String Hello() {
public String[] ListNames() {
String[] ns;
Set<String> nss = names.keySet();
ns = nss.toArray(new String[0]);
ns = nss.toArray(EMPTY_STRING_ARRAY);
return ns;
}

Expand Down
3 changes: 2 additions & 1 deletion dbus-java-core/src/main/java/org/freedesktop/dbus/connections/impl/DirectConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
* </p>
*/
public class DirectConnection extends AbstractConnection {
private static final Class[] EMPTY_CLASS_ARRAY = new Class[0];
private final Logger logger = LoggerFactory.getLogger(getClass());
private final String machineId;

Expand Down Expand Up @@ -86,7 +87,7 @@ <T extends DBusInterface> T dynamicProxy(String _path, Class<T> _type) throws DB
}

RemoteObject ro = new RemoteObject(null, _path, _type, false);
DBusInterface newi = (DBusInterface) Proxy.newProxyInstance(ifcs.get(0).getClassLoader(), ifcs.toArray(new Class[0]), new RemoteInvocationHandler(this, ro));
DBusInterface newi = (DBusInterface) Proxy.newProxyInstance(ifcs.get(0).getClassLoader(), ifcs.toArray(EMPTY_CLASS_ARRAY), new RemoteInvocationHandler(this, ro));
getImportedObjects().put(newi, ro);
return (T) newi;
} catch (Exception _ex) {
Expand Down
2 changes: 0 additions & 2 deletions dbus-java-core/src/main/java/org/freedesktop/dbus/utils/PrimitiveUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,6 @@ public static boolean isCompatiblePrimitiveOrWrapper(Class<?> _clz1, Class<?> _c

if (_clz1 == _clz2) {
return true;
} else if (_clz1.isPrimitive() && _clz2.isPrimitive() && _clz1 == _clz2) {
return true;
} else if (_clz1.isPrimitive()) {
Class<?> wrappedType = PRIMITIVE_TO_WRAPPER.get(_clz1);
return wrappedType == _clz2;
Expand Down