From 44fca65d903a4fb25bbecb8798c92dd5ed062046 Mon Sep 17 00:00:00 2001 From: David M Date: Mon, 12 Jan 2026 15:31:49 +0100 Subject: [PATCH] Applied improvements possible with Java 21 --- .../org/freedesktop/dbus/Marshalling.java | 26 ++++++------ .../base/DBusBoundPropertyHandler.java | 4 +- .../config/ReceivingServiceConfigBuilder.java | 10 ++--- .../dbus/connections/impl/DBusConnection.java | 4 +- .../connections/impl/DirectConnection.java | 2 +- .../freedesktop/dbus/errors/AccessDenied.java | 3 ++ .../dbus/errors/InvalidMethodArgument.java | 3 ++ .../dbus/errors/MatchRuleInvalid.java | 3 ++ .../org/freedesktop/dbus/errors/NoReply.java | 3 ++ .../freedesktop/dbus/errors/NotSupported.java | 3 ++ .../dbus/errors/PropertyReadOnly.java | 3 ++ .../dbus/errors/ServiceUnknown.java | 3 ++ .../org/freedesktop/dbus/errors/Timeout.java | 3 ++ .../dbus/errors/UnknownInterface.java | 3 ++ .../dbus/errors/UnknownMethod.java | 3 ++ .../dbus/errors/UnknownObject.java | 3 ++ .../dbus/errors/UnknownProperty.java | 3 ++ .../exceptions/AddressResolvingException.java | 3 ++ .../exceptions/AuthenticationException.java | 2 + .../ClassOutsideOfPackageException.java | 3 ++ .../exceptions/DBusConnectionException.java | 3 ++ .../dbus/exceptions/DBusException.java | 3 ++ .../exceptions/DBusExecutionException.java | 3 ++ .../DBusTypeConversationRuntimeException.java | 3 ++ .../dbus/exceptions/FatalDBusException.java | 3 ++ .../IllegalThreadPoolStateException.java | 3 ++ .../exceptions/InternalMessageException.java | 3 ++ .../InvalidBusAddressException.java | 3 ++ .../exceptions/InvalidBusNameException.java | 3 ++ .../exceptions/InvalidInterfaceSignature.java | 2 + .../InvalidObjectPathException.java | 3 ++ .../exceptions/InvalidSignalException.java | 3 ++ .../dbus/exceptions/MarshallingException.java | 3 ++ .../exceptions/MessageFormatException.java | 3 ++ .../MessageProtocolVersionException.java | 2 + .../dbus/exceptions/MessageTypeException.java | 2 + ...ssingInterfaceImplementationException.java | 3 ++ .../dbus/exceptions/NotConnected.java | 3 ++ .../exceptions/SocketClosedException.java | 2 + .../TransportConfigurationException.java | 3 ++ .../TransportRegistrationException.java | 3 ++ .../exceptions/UnknownTypeCodeException.java | 3 ++ .../dbus/matchrules/MatchRuleMatcher.java | 2 +- .../org/freedesktop/dbus/types/Variant.java | 2 +- .../dbus/bin/EmbeddedDBusDaemonTest.java | 4 +- .../dbus/connections/SASLTest.java | 2 +- .../dbus/messages/MessageTest.java | 2 +- .../dbus/test/AbstractBaseTest.java | 2 +- .../dbus/test/AbstractDBusDaemonBaseTest.java | 2 +- .../dbus/test/BaseFunctionsTest.java | 2 +- .../freedesktop/dbus/test/CollectionTest.java | 6 +-- .../freedesktop/dbus/test/ComplexTest.java | 2 +- .../dbus/test/ExportNestedTest.java | 4 +- .../dbus/test/MarshallingTest.java | 4 +- .../freedesktop/dbus/test/SignalNameTest.java | 2 +- .../freedesktop/dbus/test/TestPeer2Peer.java | 2 +- .../org/freedesktop/dbus/test/TypeTest.java | 2 +- .../dbus/test/helper/P2pTestServer.java | 2 +- .../dbus/test/helper/SampleClass.java | 6 +-- .../dbus/test/helper/SampleException.java | 3 ++ .../test/helper/cross/CrossTestClient.java | 42 +++++++++---------- .../signals/handler/ArraySignalHandler.java | 14 +++---- .../test/java/sample/issue/Issue196Test.java | 2 +- .../test/java/sample/issue/Issue244Test.java | 2 +- .../junixsocket/JUnixSocketBusAddress.java | 3 +- .../utils/generator/ClassBuilderInfo.java | 2 +- .../generator/InterfaceCodeGenerator.java | 2 +- .../utils/generator/StructTreeBuilder.java | 6 +-- .../dbus/utils/generator/TypeConverter.java | 10 ++--- .../dbus/viewer/TabbedSaveAction.java | 2 + .../generator/StructTreeBuilderTest.java | 6 +-- 71 files changed, 202 insertions(+), 92 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 17804f5a0..b8801214e 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 @@ -214,7 +214,7 @@ private static String[] recursiveGetDBusType(StringBuffer[] _out, Type _dataType throw new DBusException(ERROR_MULTI_VALUED_ARRAY); } _out[_level].append(s[0]); - } else if (_dataType instanceof Class && DBusSerializable.class.isAssignableFrom((Class) _dataType) + } else if (_dataType instanceof Class dtClazz && DBusSerializable.class.isAssignableFrom(dtClazz) || _dataType instanceof ParameterizedType pt && DBusSerializable.class.isAssignableFrom((Class) pt.getRawType())) { // it's a custom serializable type @@ -395,12 +395,12 @@ public static int getJavaType(String _dbusType, List _resultValue, int _li if (ArgumentType.DICT_ENTRY1 == _dbusType.charAt(idx + 1)) { contained = new ArrayList<>(); int javaType = getJavaType(_dbusType.substring(idx + 2), contained, 2); - _resultValue.add(new DBusMapType(contained.get(0), contained.get(1))); + _resultValue.add(new DBusMapType(contained.getFirst(), contained.get(1))); idx += javaType + 2; } else { contained = new ArrayList<>(); int javaType = getJavaType(_dbusType.substring(idx + 1), contained, 1); - _resultValue.add(new DBusListType(contained.get(0))); + _resultValue.add(new DBusListType(contained.getFirst())); idx += javaType; } break; @@ -452,7 +452,7 @@ public static int getJavaType(String _dbusType, List _resultValue, int _li case ArgumentType.DICT_ENTRY1: contained = new ArrayList<>(); int javaType = getJavaType(_dbusType.substring(idx + 1), contained, 2); - _resultValue.add(new DBusMapType(contained.get(0), contained.get(1))); + _resultValue.add(new DBusMapType(contained.getFirst(), contained.get(1))); idx += javaType + 1; break; default: @@ -577,15 +577,15 @@ static Object deSerializeParameter(Object _parameter, Type _type, AbstractConnec } // Turn a signature into a Type[] - if (_type instanceof Class && ((Class) _type).isArray() && ((Class) _type).getComponentType().equals(Type.class) && parameter instanceof String) { + if (_type instanceof Class tClazz && tClazz.isArray() && tClazz.getComponentType().equals(Type.class) && parameter instanceof String str) { List rv = new ArrayList<>(); - getJavaType((String) parameter, rv, -1); + getJavaType(str, rv, -1); parameter = rv.toArray(EMPTY_TYPE_ARRAY); } if (parameter instanceof DBusPath op) { LOGGER.trace("Parameter is DBusPath"); - if (_type instanceof Class && DBusInterface.class.isAssignableFrom((Class) _type)) { + if (_type instanceof Class tClazz && DBusInterface.class.isAssignableFrom(tClazz)) { parameter = _conn.getExportedObject(op.getSource(), op.getPath(), (Class) _type); } else { parameter = new DBusPath(op.getPath()); @@ -593,17 +593,17 @@ static Object deSerializeParameter(Object _parameter, Type _type, AbstractConnec } // its an enum, parse either as the string name or the ordinal - if (parameter instanceof String str && _type instanceof Class && Enum.class.isAssignableFrom((Class) _type)) { + if (parameter instanceof String str && _type instanceof Class tClazz && Enum.class.isAssignableFrom(tClazz)) { LOGGER.trace("Type seems to be an enum"); parameter = Enum.valueOf((Class) _type, str); } // it should be a struct. create it - if (parameter instanceof Object[] objArr && _type instanceof Class && Struct.class.isAssignableFrom((Class) _type)) { + if (parameter instanceof Object[] objArr && _type instanceof Class tClazz && Struct.class.isAssignableFrom(tClazz)) { LOGGER.trace("Creating Struct {} from {}", _type, parameter); Type[] ts = Container.getTypeCache(_type); if (ts == null) { - Field[] fs = ((Class) _type).getDeclaredFields(); + Field[] fs = tClazz.getDeclaredFields(); ts = new Type[fs.length]; for (Field f : fs) { Position p = f.getAnnotation(Position.class); @@ -617,7 +617,7 @@ static Object deSerializeParameter(Object _parameter, Type _type, AbstractConnec // recurse over struct contents parameter = deSerializeParameters(objArr, ts, _conn); - for (Constructor con : ((Class) _type).getDeclaredConstructors()) { + for (Constructor con : tClazz.getDeclaredConstructors()) { try { LOGGER.trace("Trying to create instance of {} using constructor {} with parameters: {}", _type, con, objArr); parameter = con.newInstance(objArr); @@ -778,8 +778,8 @@ public static Object[] deSerializeParameters(Object[] _parameters, Type[] _types continue; } - if (types[i] instanceof Class - && DBusSerializable.class.isAssignableFrom((Class) types[i]) + if (types[i] instanceof Class tClazz + && DBusSerializable.class.isAssignableFrom(tClazz) || types[i] instanceof ParameterizedType pt && DBusSerializable.class.isAssignableFrom((Class) pt.getRawType())) { Class dsc; diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/connections/base/DBusBoundPropertyHandler.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/connections/base/DBusBoundPropertyHandler.java index 48c3efff3..98ba41e07 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/connections/base/DBusBoundPropertyHandler.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/connections/base/DBusBoundPropertyHandler.java @@ -155,8 +155,8 @@ protected PropHandled handleGetAll(ExportedObject _exportObject, final MethodCal } catch (Throwable _ex) { getLogger().debug("Failed to invoke method call", _ex); handleException(_methodCall, - new DBusExecutionException(String.format("Error Executing Method %s.%s: %s", - _methodCall.getInterface(), _methodCall.getName(), _ex.getMessage()), _ex)); + new DBusExecutionException("Error Executing Method %s.%s: %s".formatted( + _methodCall.getInterface(), _methodCall.getName(), _ex.getMessage()), _ex)); } }); return PropHandled.HANDLED; diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/connections/config/ReceivingServiceConfigBuilder.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/connections/config/ReceivingServiceConfigBuilder.java index 386432af8..95e4a5b1c 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/connections/config/ReceivingServiceConfigBuilder.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/connections/config/ReceivingServiceConfigBuilder.java @@ -165,7 +165,7 @@ public ReceivingServiceConfigBuilder withMethodReturnThreadPriority(int _prio /** * Use virtual threads for the created signal thread(s). *

- * Default: {@value false}; + * Default: {@code false} * * @param _virtual true to use virtual threads, false to use native threads * @return this @@ -180,7 +180,7 @@ public ReceivingServiceConfigBuilder withVirtualSignalThreads(boolean _virtua /** * Use virtual threads for the created error thread(s). *

- * Default: {@value false}; + * Default: {@code false} * * @param _virtual true to use virtual threads, false to use native threads * @return this @@ -195,7 +195,7 @@ public ReceivingServiceConfigBuilder withVirtualErrorThreads(boolean _virtual /** * Use virtual threads for the created method call thread(s). *

- * Default: {@value false}; + * Default: {@code false} * * @param _virtual true to use virtual threads, false to use native threads * @return this @@ -210,7 +210,7 @@ public ReceivingServiceConfigBuilder withMethodCallSignalThreads(boolean _vir /** * Use virtual threads for the created method return thread(s). *

- * Default: {@value false}; + * Default: {@code false} * * @param _virtual true to use virtual threads, false to use native threads * @return this @@ -225,7 +225,7 @@ public ReceivingServiceConfigBuilder withVirtualMethodReturnThreads(boolean _ /** * Use virtual threads for all created thread(s). *

- * Default: {@value false}; + * Default: {@code false} * * @param _virtual true to use virtual threads, false to use native threads * @return this diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/connections/impl/DBusConnection.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/connections/impl/DBusConnection.java index 1cda58543..585e9eaa7 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/connections/impl/DBusConnection.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/connections/impl/DBusConnection.java @@ -212,7 +212,7 @@ public T dynamicProxy(String _source, String _path, Cl } RemoteObject ro = new RemoteObject(_source, _path, _type, false); - DBusInterface newi = (DBusInterface) Proxy.newProxyInstance(ifcs.get(0).getClassLoader(), + DBusInterface newi = (DBusInterface) Proxy.newProxyInstance(ifcs.getFirst().getClassLoader(), ifcs.toArray(Class[]::new), new RemoteInvocationHandler(this, ro)); getImportedObjects().put(newi, ro); @@ -302,7 +302,7 @@ public void requestBusName(String _busname) throws DBusException { * @return unique name */ public String getUniqueName() { - return doWithBusNamesAndReturn(bn -> bn.get(0)); + return doWithBusNamesAndReturn(bn -> bn.getFirst()); } /** diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/connections/impl/DirectConnection.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/connections/impl/DirectConnection.java index a0d5b61a4..53af7cf10 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/connections/impl/DirectConnection.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/connections/impl/DirectConnection.java @@ -87,7 +87,7 @@ T dynamicProxy(String _path, Class _type) throws DB } RemoteObject ro = new RemoteObject(null, _path, _type, false); - DBusInterface newi = (DBusInterface) Proxy.newProxyInstance(ifcs.get(0).getClassLoader(), ifcs.toArray(EMPTY_CLASS_ARRAY), new RemoteInvocationHandler(this, ro)); + DBusInterface newi = (DBusInterface) Proxy.newProxyInstance(ifcs.getFirst().getClassLoader(), ifcs.toArray(EMPTY_CLASS_ARRAY), new RemoteInvocationHandler(this, ro)); getImportedObjects().put(newi, ro); return (T) newi; } catch (Exception _ex) { diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/AccessDenied.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/AccessDenied.java index bd57378f0..90b877d53 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/AccessDenied.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/AccessDenied.java @@ -2,10 +2,13 @@ import org.freedesktop.dbus.exceptions.DBusExecutionException; +import java.io.Serial; + /** * Thrown if a message is denied due to a security policy */ public class AccessDenied extends DBusExecutionException { + @Serial private static final long serialVersionUID = 368173196466740803L; public AccessDenied(String _message) { diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/InvalidMethodArgument.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/InvalidMethodArgument.java index bda7a4f05..6c9d4e4aa 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/InvalidMethodArgument.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/InvalidMethodArgument.java @@ -2,10 +2,13 @@ import org.freedesktop.dbus.exceptions.DBusExecutionException; +import java.io.Serial; + /** * Thrown if a arguments passed to the method are invalid */ public class InvalidMethodArgument extends DBusExecutionException { + @Serial private static final long serialVersionUID = 2504012938615867394L; public InvalidMethodArgument(String _message) { diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/MatchRuleInvalid.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/MatchRuleInvalid.java index 8bd327dd6..bfa0e21c4 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/MatchRuleInvalid.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/MatchRuleInvalid.java @@ -2,10 +2,13 @@ import org.freedesktop.dbus.exceptions.DBusExecutionException; +import java.io.Serial; + /** * Thrown if the match rule is invalid */ public class MatchRuleInvalid extends DBusExecutionException { + @Serial private static final long serialVersionUID = 6922529529288327323L; public MatchRuleInvalid(String _message) { diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/NoReply.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/NoReply.java index b05e2a1d3..75d72b819 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/NoReply.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/NoReply.java @@ -2,10 +2,13 @@ import org.freedesktop.dbus.exceptions.DBusExecutionException; +import java.io.Serial; + /** * Thrown if there is no reply to a method call */ public class NoReply extends DBusExecutionException { + @Serial private static final long serialVersionUID = 5280031560938871837L; public NoReply(String _message) { diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/NotSupported.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/NotSupported.java index 27895ff85..8a12d5f21 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/NotSupported.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/NotSupported.java @@ -2,10 +2,13 @@ import org.freedesktop.dbus.exceptions.DBusExecutionException; +import java.io.Serial; + /** * Thrown if a called operation is not supported */ public class NotSupported extends DBusExecutionException { + @Serial private static final long serialVersionUID = -3937521136197720266L; public NotSupported(String _message) { diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/PropertyReadOnly.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/PropertyReadOnly.java index 65c4c29b6..fe14be833 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/PropertyReadOnly.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/PropertyReadOnly.java @@ -2,10 +2,13 @@ import org.freedesktop.dbus.exceptions.DBusExecutionException; +import java.io.Serial; + /** * Thrown if a attempt to edit read only property */ public class PropertyReadOnly extends DBusExecutionException { + @Serial private static final long serialVersionUID = -8493757965292570003L; public PropertyReadOnly(String _message) { diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/ServiceUnknown.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/ServiceUnknown.java index 41f2941e8..362dca656 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/ServiceUnknown.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/ServiceUnknown.java @@ -2,10 +2,13 @@ import org.freedesktop.dbus.exceptions.DBusExecutionException; +import java.io.Serial; + /** * Thrown if the requested service was not available */ public class ServiceUnknown extends DBusExecutionException { + @Serial private static final long serialVersionUID = -8634413313381034023L; public ServiceUnknown(String _message) { diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/Timeout.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/Timeout.java index 0795a9f4c..db146934b 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/Timeout.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/Timeout.java @@ -2,10 +2,13 @@ import org.freedesktop.dbus.exceptions.DBusExecutionException; +import java.io.Serial; + /** * Thrown if a operation timed out */ public class Timeout extends DBusExecutionException { + @Serial private static final long serialVersionUID = -1212844876312953745L; public Timeout(String _message) { diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/UnknownInterface.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/UnknownInterface.java index f1074e223..5b5b48544 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/UnknownInterface.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/UnknownInterface.java @@ -2,10 +2,13 @@ import org.freedesktop.dbus.exceptions.DBusExecutionException; +import java.io.Serial; + /** * Thrown if a interface does not exist */ public class UnknownInterface extends DBusExecutionException { + @Serial private static final long serialVersionUID = -6296696668185701195L; public UnknownInterface(String _message) { diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/UnknownMethod.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/UnknownMethod.java index 33995b4a3..547c4442a 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/UnknownMethod.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/UnknownMethod.java @@ -2,10 +2,13 @@ import org.freedesktop.dbus.exceptions.DBusExecutionException; +import java.io.Serial; + /** * Thrown if the method called was unknown on the remote object */ public class UnknownMethod extends DBusExecutionException { + @Serial private static final long serialVersionUID = -6712037259368315246L; public UnknownMethod(String _message) { diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/UnknownObject.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/UnknownObject.java index dafd5073f..a29f91a86 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/UnknownObject.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/UnknownObject.java @@ -2,10 +2,13 @@ import org.freedesktop.dbus.exceptions.DBusExecutionException; +import java.io.Serial; + /** * Thrown if the object was unknown on a remote connection */ public class UnknownObject extends DBusExecutionException { + @Serial private static final long serialVersionUID = 4951706443147828582L; public UnknownObject(String _message) { diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/UnknownProperty.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/UnknownProperty.java index 915afebb1..2ddd947d3 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/UnknownProperty.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/errors/UnknownProperty.java @@ -2,10 +2,13 @@ import org.freedesktop.dbus.exceptions.DBusExecutionException; +import java.io.Serial; + /** * Thrown if a property does not exist in the interface */ public class UnknownProperty extends DBusExecutionException { + @Serial private static final long serialVersionUID = 7993712944238574483L; public UnknownProperty(String _message) { diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/AddressResolvingException.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/AddressResolvingException.java index d23950c50..22d93f302 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/AddressResolvingException.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/AddressResolvingException.java @@ -1,7 +1,10 @@ package org.freedesktop.dbus.exceptions; +import java.io.Serial; + public class AddressResolvingException extends DBusExecutionException { + @Serial private static final long serialVersionUID = -1636993356304776163L; public AddressResolvingException(String _message) { diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/AuthenticationException.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/AuthenticationException.java index f5148ff93..30d22c6e5 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/AuthenticationException.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/AuthenticationException.java @@ -1,8 +1,10 @@ package org.freedesktop.dbus.exceptions; import java.io.IOException; +import java.io.Serial; public class AuthenticationException extends IOException { + @Serial private static final long serialVersionUID = 1L; public AuthenticationException(String _message, Throwable _cause) { diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/ClassOutsideOfPackageException.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/ClassOutsideOfPackageException.java index 53a5e9b3a..4bc9cb1ba 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/ClassOutsideOfPackageException.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/ClassOutsideOfPackageException.java @@ -1,10 +1,13 @@ package org.freedesktop.dbus.exceptions; +import java.io.Serial; + /** * @since 5.1.1 - 2024-11-16 * @author hypfvieh */ public class ClassOutsideOfPackageException extends DBusException { + @Serial private static final long serialVersionUID = 1L; public ClassOutsideOfPackageException(Class _clz) { diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/DBusConnectionException.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/DBusConnectionException.java index 2b024eee4..782a15323 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/DBusConnectionException.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/DBusConnectionException.java @@ -1,5 +1,7 @@ package org.freedesktop.dbus.exceptions; +import java.io.Serial; + /** * Thrown when something goes wrong with the connection to DBus.

* This includes find the connection parameter (e.g. machine-id file) or establishing the connection. @@ -8,6 +10,7 @@ * @since v3.3.0 - 2021-01-27 */ public class DBusConnectionException extends DBusException { + @Serial private static final long serialVersionUID = -1L; public DBusConnectionException() { diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/DBusException.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/DBusException.java index 39220d425..b11826343 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/DBusException.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/DBusException.java @@ -1,9 +1,12 @@ package org.freedesktop.dbus.exceptions; +import java.io.Serial; + /** * An exception within DBus. */ public class DBusException extends Exception { + @Serial private static final long serialVersionUID = -1L; /** diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/DBusExecutionException.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/DBusExecutionException.java index 7522e260c..0db147956 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/DBusExecutionException.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/DBusExecutionException.java @@ -1,10 +1,13 @@ package org.freedesktop.dbus.exceptions; +import java.io.Serial; + /** * An exception while running a remote method within DBus. */ @SuppressWarnings("checkstyle:mutableexception") public class DBusExecutionException extends RuntimeException { + @Serial private static final long serialVersionUID = 6327661667731344250L; /** diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/DBusTypeConversationRuntimeException.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/DBusTypeConversationRuntimeException.java index 832807b5c..66d2f42aa 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/DBusTypeConversationRuntimeException.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/DBusTypeConversationRuntimeException.java @@ -1,5 +1,7 @@ package org.freedesktop.dbus.exceptions; +import java.io.Serial; + /** * Exception thrown when type conversation failed. * @@ -8,6 +10,7 @@ */ public class DBusTypeConversationRuntimeException extends RuntimeException { + @Serial private static final long serialVersionUID = 1L; public DBusTypeConversationRuntimeException(String _message, Throwable _cause) { diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/FatalDBusException.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/FatalDBusException.java index 86bc3c1da..c8e72e1c2 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/FatalDBusException.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/FatalDBusException.java @@ -2,8 +2,11 @@ import org.freedesktop.dbus.interfaces.FatalException; +import java.io.Serial; + public class FatalDBusException extends DBusException implements FatalException { + @Serial private static final long serialVersionUID = -3461692622913793488L; public FatalDBusException(String _message, Throwable _cause) { diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/IllegalThreadPoolStateException.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/IllegalThreadPoolStateException.java index a6a0fba3b..21b25615e 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/IllegalThreadPoolStateException.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/IllegalThreadPoolStateException.java @@ -1,5 +1,7 @@ package org.freedesktop.dbus.exceptions; +import java.io.Serial; + /** * Thrown when a used thread pool (e.g. in ReceivingService) is in an invalid state. * @@ -8,6 +10,7 @@ */ public class IllegalThreadPoolStateException extends IllegalStateException { + @Serial private static final long serialVersionUID = 1L; public IllegalThreadPoolStateException() { diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/InternalMessageException.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/InternalMessageException.java index 4e7056153..1fb39c105 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/InternalMessageException.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/InternalMessageException.java @@ -2,7 +2,10 @@ import org.freedesktop.dbus.interfaces.NonFatalException; +import java.io.Serial; + public class InternalMessageException extends DBusExecutionException implements NonFatalException { + @Serial private static final long serialVersionUID = 1L; public InternalMessageException(String _message) { diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/InvalidBusAddressException.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/InvalidBusAddressException.java index 9270d8e16..405257fef 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/InvalidBusAddressException.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/InvalidBusAddressException.java @@ -1,5 +1,7 @@ package org.freedesktop.dbus.exceptions; +import java.io.Serial; + /** * Thrown when a invalid BusAddress should be created. * @@ -8,6 +10,7 @@ */ public class InvalidBusAddressException extends IllegalStateException { + @Serial private static final long serialVersionUID = 1L; public InvalidBusAddressException() { diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/InvalidBusNameException.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/InvalidBusNameException.java index c3a4d6b8c..d7aa6c382 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/InvalidBusNameException.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/InvalidBusNameException.java @@ -1,10 +1,13 @@ package org.freedesktop.dbus.exceptions; +import java.io.Serial; + /** * @since 5.0.0 - 2023-11-08 * @author hypfvieh */ public class InvalidBusNameException extends DBusException { + @Serial private static final long serialVersionUID = 1L; public InvalidBusNameException(String _message, Throwable _cause) { diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/InvalidInterfaceSignature.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/InvalidInterfaceSignature.java index cbfec83b6..f9e8ad58e 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/InvalidInterfaceSignature.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/InvalidInterfaceSignature.java @@ -1,5 +1,6 @@ package org.freedesktop.dbus.exceptions; +import java.io.Serial; import java.util.Collection; /** @@ -7,6 +8,7 @@ * @author hypfvieh */ public class InvalidInterfaceSignature extends DBusException { + @Serial private static final long serialVersionUID = 1L; public InvalidInterfaceSignature(Collection _invalid) { diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/InvalidObjectPathException.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/InvalidObjectPathException.java index fc5fd0463..869af280b 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/InvalidObjectPathException.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/InvalidObjectPathException.java @@ -1,10 +1,13 @@ package org.freedesktop.dbus.exceptions; +import java.io.Serial; + /** * @since 5.0.0 - 2023-11-08 * @author hypfvieh */ public class InvalidObjectPathException extends DBusException { + @Serial private static final long serialVersionUID = 1L; public InvalidObjectPathException(String _message, Throwable _cause) { diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/InvalidSignalException.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/InvalidSignalException.java index 301f03a7b..a0cbe4fc4 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/InvalidSignalException.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/InvalidSignalException.java @@ -1,10 +1,13 @@ package org.freedesktop.dbus.exceptions; +import java.io.Serial; + /** * @since 5.0.0 - 2023-11-08 * @author hypfvieh */ public class InvalidSignalException extends DBusException { + @Serial private static final long serialVersionUID = 1L; public InvalidSignalException(String _message, Throwable _cause) { diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/MarshallingException.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/MarshallingException.java index eea0e8c57..1358e9d8f 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/MarshallingException.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/MarshallingException.java @@ -2,8 +2,11 @@ import org.freedesktop.dbus.interfaces.NonFatalException; +import java.io.Serial; + public class MarshallingException extends DBusException implements NonFatalException { + @Serial private static final long serialVersionUID = 3065477360622428063L; public MarshallingException(String _message, Throwable _cause) { diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/MessageFormatException.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/MessageFormatException.java index 9769949da..43d560b8e 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/MessageFormatException.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/MessageFormatException.java @@ -2,10 +2,13 @@ import org.freedesktop.dbus.interfaces.NonFatalException; +import java.io.Serial; + /** * Thrown if a message is formatted incorrectly. */ public class MessageFormatException extends DBusException implements NonFatalException { + @Serial private static final long serialVersionUID = -4806500517504320924L; public MessageFormatException(String _message) { diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/MessageProtocolVersionException.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/MessageProtocolVersionException.java index cd42231e3..fd61ecd01 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/MessageProtocolVersionException.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/MessageProtocolVersionException.java @@ -3,9 +3,11 @@ import org.freedesktop.dbus.interfaces.FatalException; import java.io.IOException; +import java.io.Serial; public class MessageProtocolVersionException extends IOException implements FatalException { + @Serial private static final long serialVersionUID = 3107039118803575407L; public MessageProtocolVersionException(String _message) { diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/MessageTypeException.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/MessageTypeException.java index cf7c96a2e..abefd70cd 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/MessageTypeException.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/MessageTypeException.java @@ -3,8 +3,10 @@ import org.freedesktop.dbus.interfaces.NonFatalException; import java.io.IOException; +import java.io.Serial; public class MessageTypeException extends IOException implements NonFatalException { + @Serial private static final long serialVersionUID = 935695242304001622L; public MessageTypeException(String _message) { diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/MissingInterfaceImplementationException.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/MissingInterfaceImplementationException.java index e3bafb148..44f3fca0f 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/MissingInterfaceImplementationException.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/MissingInterfaceImplementationException.java @@ -2,11 +2,14 @@ import org.freedesktop.dbus.interfaces.DBusInterface; +import java.io.Serial; + /** * @since 5.1.1 - 2024-11-16 * @author hypfvieh */ public class MissingInterfaceImplementationException extends DBusException { + @Serial private static final long serialVersionUID = 1L; public MissingInterfaceImplementationException(Class _clz) { diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/NotConnected.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/NotConnected.java index 28ef1b17a..810e626c9 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/NotConnected.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/NotConnected.java @@ -2,10 +2,13 @@ import org.freedesktop.dbus.interfaces.FatalException; +import java.io.Serial; + /** * Thrown if a DBus action is called when not connected to the Bus. */ public class NotConnected extends DBusExecutionException implements FatalException { + @Serial private static final long serialVersionUID = -3566138179099398537L; public NotConnected(String _message) { diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/SocketClosedException.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/SocketClosedException.java index 791883048..1e6e7ea70 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/SocketClosedException.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/SocketClosedException.java @@ -1,6 +1,7 @@ package org.freedesktop.dbus.exceptions; import java.io.IOException; +import java.io.Serial; /** * Exception which indicates a terminated connection. @@ -9,6 +10,7 @@ * @since v4.2.2 - 2023-02-01 */ public class SocketClosedException extends IOException { + @Serial private static final long serialVersionUID = 1L; public SocketClosedException() { diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/TransportConfigurationException.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/TransportConfigurationException.java index 652bb3008..b5ea163f2 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/TransportConfigurationException.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/TransportConfigurationException.java @@ -1,6 +1,9 @@ package org.freedesktop.dbus.exceptions; +import java.io.Serial; + public class TransportConfigurationException extends Exception { + @Serial private static final long serialVersionUID = 1L; public TransportConfigurationException(String _message, Throwable _cause) { diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/TransportRegistrationException.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/TransportRegistrationException.java index b17f1dd9c..39c34ff15 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/TransportRegistrationException.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/TransportRegistrationException.java @@ -1,5 +1,7 @@ package org.freedesktop.dbus.exceptions; +import java.io.Serial; + /** * Thrown if registration of transport providers fails. * @@ -7,6 +9,7 @@ * @since v4.0.0 - 2021-09-08 */ public class TransportRegistrationException extends RuntimeException { + @Serial private static final long serialVersionUID = 1L; public TransportRegistrationException(String _message, Throwable _cause) { diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/UnknownTypeCodeException.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/UnknownTypeCodeException.java index 2439a2c47..da767affb 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/UnknownTypeCodeException.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/exceptions/UnknownTypeCodeException.java @@ -2,7 +2,10 @@ import org.freedesktop.dbus.interfaces.NonFatalException; +import java.io.Serial; + public class UnknownTypeCodeException extends DBusException implements NonFatalException { + @Serial private static final long serialVersionUID = -4688075573912580455L; public UnknownTypeCodeException(byte _code) { diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/matchrules/MatchRuleMatcher.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/matchrules/MatchRuleMatcher.java index 205cdc4f3..b93f70a5d 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/matchrules/MatchRuleMatcher.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/matchrules/MatchRuleMatcher.java @@ -203,7 +203,7 @@ static boolean matchArg0Namespace(Message _msg, String _compare) { if (dataType.isEmpty()) { return false; - } else if (dataType.get(0) instanceof Class clz && clz.isAssignableFrom(String.class)) { + } else if (dataType.getFirst() instanceof Class clz && clz.isAssignableFrom(String.class)) { Object[] parameters = _msg.getParameters(); return parameters[0] == _compare || ((String) parameters[0]).startsWith(_compare); } diff --git a/dbus-java-core/src/main/java/org/freedesktop/dbus/types/Variant.java b/dbus-java-core/src/main/java/org/freedesktop/dbus/types/Variant.java index c5b01c72e..4ca46acaa 100644 --- a/dbus-java-core/src/main/java/org/freedesktop/dbus/types/Variant.java +++ b/dbus-java-core/src/main/java/org/freedesktop/dbus/types/Variant.java @@ -87,7 +87,7 @@ public Variant(T _value, String _sig) throws IllegalArgumentException { if (ts.size() != 1) { throw new IllegalArgumentException("Can't wrap multiple or no types in a Variant: " + _sig); } - this.type = ts.get(0); + this.type = ts.getFirst(); } catch (DBusException _ex) { logger.debug("Cannot create variant", _ex); throw new IllegalArgumentException(String.format("Can''t wrap %s in an unqualified Variant (%s).", _sig, _ex.getMessage())); diff --git a/dbus-java-tests/src/test/java/org/freedesktop/dbus/bin/EmbeddedDBusDaemonTest.java b/dbus-java-tests/src/test/java/org/freedesktop/dbus/bin/EmbeddedDBusDaemonTest.java index 2ad2f9b9f..64e33a24b 100644 --- a/dbus-java-tests/src/test/java/org/freedesktop/dbus/bin/EmbeddedDBusDaemonTest.java +++ b/dbus-java-tests/src/test/java/org/freedesktop/dbus/bin/EmbeddedDBusDaemonTest.java @@ -77,7 +77,7 @@ void testStartAndConnectEmbeddedDBusDaemon() throws DBusException { } private void doWithEmbeddedDaemon(BiConsumer _handler) { - String protocolType = TransportBuilder.getRegisteredBusTypes().get(0); + String protocolType = TransportBuilder.getRegisteredBusTypes().getFirst(); String newAddress = TransportBuilder.createDynamicSession(protocolType, false); BusAddress busAddress = BusAddress.of(newAddress); @@ -103,7 +103,7 @@ private void doWithEmbeddedDaemon(BiConsumer _ha void testStartStop() throws Exception { for (int i = 0; i < 2; i++) { - String address = TransportBuilder.createDynamicSession(TransportBuilder.getRegisteredBusTypes().get(0), true); + String address = TransportBuilder.createDynamicSession(TransportBuilder.getRegisteredBusTypes().getFirst(), true); BusAddress busAddress = BusAddress.of(address); // initialize diff --git a/dbus-java-tests/src/test/java/org/freedesktop/dbus/connections/SASLTest.java b/dbus-java-tests/src/test/java/org/freedesktop/dbus/connections/SASLTest.java index 27c9b32bd..6f9cf0ca4 100644 --- a/dbus-java-tests/src/test/java/org/freedesktop/dbus/connections/SASLTest.java +++ b/dbus-java-tests/src/test/java/org/freedesktop/dbus/connections/SASLTest.java @@ -38,7 +38,7 @@ public void testCommandAuth() throws IOException { @Test public void testAnonymousAuthentication() throws DBusException { - String protocolType = TransportBuilder.getRegisteredBusTypes().get(0); + String protocolType = TransportBuilder.getRegisteredBusTypes().getFirst(); String newAddress = TransportBuilder.createDynamicSession(protocolType, false); BusAddress busAddress = BusAddress.of(newAddress); diff --git a/dbus-java-tests/src/test/java/org/freedesktop/dbus/messages/MessageTest.java b/dbus-java-tests/src/test/java/org/freedesktop/dbus/messages/MessageTest.java index 3d6ea9fb8..e70091a40 100644 --- a/dbus-java-tests/src/test/java/org/freedesktop/dbus/messages/MessageTest.java +++ b/dbus-java-tests/src/test/java/org/freedesktop/dbus/messages/MessageTest.java @@ -40,7 +40,7 @@ public void testReadMessageHeader() throws Exception { logger.debug("{} ---> {}", String.valueOf(o[0]), o[1]); } - Object[] entry1 = (Object[]) objectList.get(0); + Object[] entry1 = (Object[]) objectList.getFirst(); assertEquals((byte) 6, entry1[0]); assertEquals(":1.20", entry1[1]); diff --git a/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/AbstractBaseTest.java b/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/AbstractBaseTest.java index 5bfda450e..b52e7bd43 100644 --- a/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/AbstractBaseTest.java +++ b/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/AbstractBaseTest.java @@ -56,7 +56,7 @@ public final void logTestEnd(TestInfo _testInfo) { } protected void logTestBeginEnd(String _prefix, TestInfo _testInfo) { - if (!_testInfo.getTestMethod().isPresent() || _testInfo.getDisplayName().startsWith(_testInfo.getTestMethod().get().getName())) { + if (_testInfo.getTestMethod().isEmpty() || _testInfo.getDisplayName().startsWith(_testInfo.getTestMethod().get().getName())) { logger.info(">>>>>>>>>> {} Test: {} <<<<<<<<<<", _prefix, _testInfo.getDisplayName()); } else { logger.info(">>>>>>>>>> {} Test: {} ({}) <<<<<<<<<<", _prefix, _testInfo.getTestMethod().get().getName(), _testInfo.getDisplayName()); diff --git a/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/AbstractDBusDaemonBaseTest.java b/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/AbstractDBusDaemonBaseTest.java index 30db768fc..21583bd59 100644 --- a/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/AbstractDBusDaemonBaseTest.java +++ b/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/AbstractDBusDaemonBaseTest.java @@ -43,7 +43,7 @@ protected static void waitIfTcp() throws InterruptedException { public static void beforeAllBase() { Logger logger = LoggerFactory.getLogger(AbstractDBusDaemonBaseTest.class); if (!TransportBuilder.getRegisteredBusTypes().contains("UNIX")) { - String busType = TransportBuilder.getRegisteredBusTypes().get(0); + String busType = TransportBuilder.getRegisteredBusTypes().getFirst(); String addr = TransportBuilder.createDynamicSession(busType, true); BusAddress address = BusAddress.of(addr); diff --git a/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/BaseFunctionsTest.java b/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/BaseFunctionsTest.java index 45ff465bf..2e3363d4a 100644 --- a/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/BaseFunctionsTest.java +++ b/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/BaseFunctionsTest.java @@ -57,7 +57,7 @@ public void testSerialization() throws DBusException { SampleSerializable s = new SampleSerializable<>(1, "woo", v); s = tri2.testSerializable((byte) 12, s, 13); logger.debug("returned: " + s); - if (s.getInt() != 1 || !s.getString().equals("woo") || s.getList().size() != 3 || s.getList().get(0) != 1 + if (s.getInt() != 1 || !s.getString().equals("woo") || s.getList().size() != 3 || s.getList().getFirst() != 1 || s.getList().get(1) != 2 || s.getList().get(2) != 3) { fail("Didn't get back the same TestSerializable"); } diff --git a/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/CollectionTest.java b/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/CollectionTest.java index fe1ed674f..55dab7698 100644 --- a/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/CollectionTest.java +++ b/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/CollectionTest.java @@ -31,7 +31,7 @@ public void testNestedListsAsync() throws DBusException, InterruptedException { Thread.sleep(500L); assertIterableEquals(lli, checklistReply.getReply(), "did not get back the same as sent in async"); - assertIterableEquals(li, checklistReply.getReply().get(0)); + assertIterableEquals(li, checklistReply.getReply().getFirst()); } @Test @@ -50,7 +50,7 @@ public void testNestedListsCallback() throws DBusException, InterruptedException Thread.sleep(500L); assertIterableEquals(lli, cbHandle.getRetval(), "did not get back the same as sent in async"); - assertIterableEquals(li, cbHandle.getRetval().get(0)); + assertIterableEquals(li, cbHandle.getRetval().getFirst()); } @Test @@ -62,7 +62,7 @@ public void testNestedLists() throws DBusException { lli.add(li); List> reti = tri2.checklist(lli); - if (reti.size() != 1 || reti.get(0).size() != 1 || reti.get(0).get(0) != 1) { + if (reti.size() != 1 || reti.getFirst().size() != 1 || reti.getFirst().getFirst() != 1) { fail("Failed to check nested lists"); } } diff --git a/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/ComplexTest.java b/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/ComplexTest.java index 71f9c74c3..2e32adbf2 100644 --- a/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/ComplexTest.java +++ b/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/ComplexTest.java @@ -57,7 +57,7 @@ public void testResponse() throws DBusException, InterruptedException { /** Call the remote object and get a response. */ SampleTuple, Boolean> rv = tri2.show(234); logger.debug("Show returned: " + rv); - if (!clientconn.getUniqueName().equals(rv.getFirstValue()) || 1 != rv.getSecondValue().size() || 1953 != rv.getSecondValue().get(0) + if (!clientconn.getUniqueName().equals(rv.getFirstValue()) || 1 != rv.getSecondValue().size() || 1953 != rv.getSecondValue().getFirst() || !rv.getThirdValue()) { fail("show return value incorrect (" + rv.getFirstValue() + "," + rv.getSecondValue() + "," + rv.getThirdValue() + ")"); } diff --git a/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/ExportNestedTest.java b/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/ExportNestedTest.java index c930ced65..979f460e7 100644 --- a/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/ExportNestedTest.java +++ b/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/ExportNestedTest.java @@ -43,13 +43,13 @@ public void testExportNested() throws IOException, DBusException { assertEquals(2, partNames.size()); // all names used in child objects - assertEquals("ABC", partNames.get(0)); + assertEquals("ABC", partNames.getFirst()); assertEquals("DEF", partNames.get(1)); List parts = myObject.getParts(); assertEquals(2, parts.size()); // check the child objects - assertEquals("123", parts.get(0).getVal2()); + assertEquals("123", parts.getFirst().getVal2()); assertEquals("456", parts.get(1).getVal2()); } } diff --git a/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/MarshallingTest.java b/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/MarshallingTest.java index 84a51781b..e992e413c 100644 --- a/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/MarshallingTest.java +++ b/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/MarshallingTest.java @@ -61,7 +61,7 @@ void parseComplexMessageReturnsCorrectTypes() throws DBusException { Marshalling.getJavaType("a(oa{sv})ao", temp, -1); assertEquals(2, temp.size(), "result must contain two types"); - assertTrue(temp.get(0) instanceof DBusListType); + assertTrue(temp.getFirst() instanceof DBusListType); assertTrue(temp.get(1) instanceof DBusListType); } @@ -142,7 +142,7 @@ void testDeserializeParametersVariant() throws Exception { assertTrue(params[0] instanceof Variant, "Variant expected"); @SuppressWarnings("unchecked") Variant> mt = (Variant>) params[0]; - assertEquals(1, mt.getValue().get(0), "1 expected"); + assertEquals(1, mt.getValue().getFirst(), "1 expected"); assertEquals(2, mt.getValue().get(1), "2 expected"); assertEquals(3, mt.getValue().get(2), "3 expected"); } diff --git a/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/SignalNameTest.java b/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/SignalNameTest.java index beb5ab067..62a786890 100644 --- a/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/SignalNameTest.java +++ b/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/SignalNameTest.java @@ -28,7 +28,7 @@ public class SignalNameTest extends AbstractBaseTest { @Test void testSignalNameAlias() { assertDoesNotThrow(() -> { - String protocolType = TransportBuilder.getRegisteredBusTypes().get(0); + String protocolType = TransportBuilder.getRegisteredBusTypes().getFirst(); BusAddress busAddress = TransportBuilder. createWithDynamicSession(protocolType) .configure().build().getBusAddress(); diff --git a/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/TestPeer2Peer.java b/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/TestPeer2Peer.java index 6882a6db8..603d8efd6 100644 --- a/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/TestPeer2Peer.java +++ b/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/TestPeer2Peer.java @@ -16,7 +16,7 @@ public class TestPeer2Peer extends AbstractBaseTest { - private static final String CONNECTION_ADDRESS = TransportBuilder.createDynamicSession(TransportBuilder.getRegisteredBusTypes().get(0), false); + private static final String CONNECTION_ADDRESS = TransportBuilder.createDynamicSession(TransportBuilder.getRegisteredBusTypes().getFirst(), false); private volatile boolean finished = false; diff --git a/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/TypeTest.java b/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/TypeTest.java index 104953152..323a1543d 100644 --- a/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/TypeTest.java +++ b/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/TypeTest.java @@ -48,7 +48,7 @@ public void testArrays() throws DBusException { } assertEquals(5, is.size()); - assertEquals(-1, is.get(0).intValue()); + assertEquals(-1, is.getFirst().intValue()); assertEquals(-5, is.get(1).intValue()); assertEquals(-7, is.get(2).intValue()); assertEquals(-12, is.get(3).intValue()); diff --git a/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/helper/P2pTestServer.java b/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/helper/P2pTestServer.java index aeba2a38e..d36d568e3 100644 --- a/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/helper/P2pTestServer.java +++ b/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/helper/P2pTestServer.java @@ -124,7 +124,7 @@ public float testfloat(float[] _f) { } public static void main(String[] _args) throws Exception { - String address = TransportBuilder.createDynamicSession(TransportBuilder.getRegisteredBusTypes().get(0), false); + String address = TransportBuilder.createDynamicSession(TransportBuilder.getRegisteredBusTypes().getFirst(), false); PrintWriter w = new PrintWriter(new FileOutputStream("address")); w.println(address); w.flush(); diff --git a/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/helper/SampleClass.java b/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/helper/SampleClass.java index 5d3c17675..e5c079219 100644 --- a/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/helper/SampleClass.java +++ b/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/helper/SampleClass.java @@ -137,7 +137,7 @@ public List sampleArray(List _ss, Integer[] _is, long[] _ls) { for (String s : _ss) { logger.debug("--{}", s); } - if (_ss.size() != 5 || !"hi".equals(_ss.get(0)) || !"hello".equals(_ss.get(1)) || !"hej".equals(_ss.get(2)) || !"hey".equals(_ss.get(3)) || !"aloha".equals(_ss.get(4))) { + if (_ss.size() != 5 || !"hi".equals(_ss.getFirst()) || !"hello".equals(_ss.get(1)) || !"hej".equals(_ss.get(2)) || !"hey".equals(_ss.get(3)) || !"aloha".equals(_ss.get(4))) { fail("sampleArray, String array contents incorrect"); } logger.debug("Got an array:"); @@ -188,7 +188,7 @@ public int frobnicate(List _n, Map> _m, T _ if (_n.size() != 3) { fail("List was wrong size (expected 3, actual " + _n.size() + ")"); } - if (_n.get(0) != 2L || _n.get(1) != 5L || _n.get(2) != 71L) { + if (_n.getFirst() != 2L || _n.get(1) != 5L || _n.get(2) != 71L) { fail("List has wrong contents"); } if (!(_v instanceof Integer)) { @@ -243,7 +243,7 @@ public void throwme() throws SampleException { public SampleSerializable testSerializable(byte _b, SampleSerializable _s, int _i) { logger.debug("Recieving TestSerializable: {}", _s); if (_b != 12 || _i != 13 || !(_s.getInt() == 1) || !(_s.getString().equals("woo")) - || !(_s.getList().size() == 3) || !(_s.getList().get(0) == 1) + || !(_s.getList().size() == 3) || !(_s.getList().getFirst() == 1) || !(_s.getList().get(1) == 2) || !(_s.getList().get(2) == 3)) { fail("Error in recieving custom synchronisation"); } diff --git a/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/helper/SampleException.java b/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/helper/SampleException.java index 8ffa68f82..3e30db3f4 100644 --- a/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/helper/SampleException.java +++ b/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/helper/SampleException.java @@ -3,8 +3,11 @@ import org.freedesktop.dbus.annotations.IntrospectionDescription; import org.freedesktop.dbus.exceptions.DBusExecutionException; +import java.io.Serial; + @IntrospectionDescription("A test exception to throw over DBus") public class SampleException extends DBusExecutionException { + @Serial private static final long serialVersionUID = 1L; public SampleException(String _message) { diff --git a/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/helper/cross/CrossTestClient.java b/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/helper/cross/CrossTestClient.java index 6a8783f9d..4c275c4cc 100644 --- a/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/helper/cross/CrossTestClient.java +++ b/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/helper/cross/CrossTestClient.java @@ -193,8 +193,8 @@ public static boolean setCompareLists(List _a, List _b) { @SuppressWarnings("unchecked") public static List> primitizeRecurse(Object _a, Type _t) { List> vs = new ArrayList<>(); - if (_t instanceof ParameterizedType) { - Class c = (Class) ((ParameterizedType) _t).getRawType(); + if (_t instanceof ParameterizedType type) { + Class c = (Class) type.getRawType(); if (List.class.isAssignableFrom(c)) { Object os; if (_a instanceof List) { @@ -202,14 +202,14 @@ public static List> primitizeRecurse(Object _a, Type _t) { } else { os = _a; } - Type[] ts = ((ParameterizedType) _t).getActualTypeArguments(); + Type[] ts = type.getActualTypeArguments(); for (int i = 0; i < Array.getLength(os); i++) { vs.addAll(primitizeRecurse(Array.get(os, i), ts[0])); } } else if (Map.class.isAssignableFrom(c)) { Object[] os = ((Map) _a).keySet().toArray(); Object[] ks = ((Map) _a).values().toArray(); - Type[] ts = ((ParameterizedType) _t).getActualTypeArguments(); + Type[] ts = type.getActualTypeArguments(); for (Object element : ks) { vs.addAll(primitizeRecurse(element, ts[0])); } @@ -218,7 +218,7 @@ public static List> primitizeRecurse(Object _a, Type _t) { } } else if (Struct.class.isAssignableFrom(c)) { Object[] os = ((Struct) _a).getParameters(); - Type[] ts = ((ParameterizedType) _t).getActualTypeArguments(); + Type[] ts = type.getActualTypeArguments(); for (int i = 0; i < os.length; i++) { vs.addAll(primitizeRecurse(os[i], ts[i])); } @@ -228,8 +228,8 @@ public static List> primitizeRecurse(Object _a, Type _t) { } } else if (Variant.class.isAssignableFrom((Class) _t)) { vs.addAll(primitizeRecurse(((Variant) _a).getValue(), ((Variant) _a).getType())); - } else if (_t instanceof Class && ((Class) _t).isArray()) { - Type t2 = ((Class) _t).getComponentType(); + } else if (_t instanceof Class tClazz && tClazz.isArray()) { + Type t2 = tClazz.getComponentType(); for (int i = 0; i < Array.getLength(_a); i++) { vs.addAll(primitizeRecurse(Array.get(_a, i), t2)); } @@ -479,20 +479,20 @@ public void compareArray(String _test, Object _a, Object _b) { } boolean pass = false; - if (_a instanceof Object[]) { - pass = Arrays.equals((Object[]) _a, (Object[]) _b); - } else if (_a instanceof byte[]) { - pass = Arrays.equals((byte[]) _a, (byte[]) _b); - } else if (_a instanceof boolean[]) { - pass = Arrays.equals((boolean[]) _a, (boolean[]) _b); - } else if (_a instanceof int[]) { - pass = Arrays.equals((int[]) _a, (int[]) _b); - } else if (_a instanceof short[]) { - pass = Arrays.equals((short[]) _a, (short[]) _b); - } else if (_a instanceof long[]) { - pass = Arrays.equals((long[]) _a, (long[]) _b); - } else if (_a instanceof double[]) { - pass = Arrays.equals((double[]) _a, (double[]) _b); + if (_a instanceof Object[] objects) { + pass = Arrays.equals(objects, (Object[]) _b); + } else if (_a instanceof byte[] bytes) { + pass = Arrays.equals(bytes, (byte[]) _b); + } else if (_a instanceof boolean[] booleans) { + pass = Arrays.equals(booleans, (boolean[]) _b); + } else if (_a instanceof int[] ints) { + pass = Arrays.equals(ints, (int[]) _b); + } else if (_a instanceof short[] shorts) { + pass = Arrays.equals(shorts, (short[]) _b); + } else if (_a instanceof long[] longs) { + pass = Arrays.equals(longs, (long[]) _b); + } else if (_a instanceof double[] doubles) { + pass = Arrays.equals(doubles, (double[]) _b); } if (pass) { diff --git a/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/helper/signals/handler/ArraySignalHandler.java b/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/helper/signals/handler/ArraySignalHandler.java index 114c09205..d583590c3 100644 --- a/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/helper/signals/handler/ArraySignalHandler.java +++ b/dbus-java-tests/src/test/java/org/freedesktop/dbus/test/helper/signals/handler/ArraySignalHandler.java @@ -20,16 +20,16 @@ public void handleImpl(SampleSignals.TestArraySignal _t) { setFailed(_t.getListOfStruct().size() != 1, "Incorrect TestArraySignal array length: should be 1, actually " + _t.getListOfStruct().size()); logger.debug("Got a test array signal with Parameters: "); - for (String str : _t.getListOfStruct().get(0).getValueList()) { + for (String str : _t.getListOfStruct().getFirst().getValueList()) { logger.debug("--{}", str); } - logger.debug("{}", _t.getListOfStruct().get(0).getVariantValue().getType()); - logger.debug("{}", _t.getListOfStruct().get(0).getVariantValue().getValue()); + logger.debug("{}", _t.getListOfStruct().getFirst().getVariantValue().getType()); + logger.debug("{}", _t.getListOfStruct().getFirst().getVariantValue().getValue()); - boolean b = !(_t.getListOfStruct().get(0).getVariantValue().getValue() instanceof UInt64) || 567L != ((UInt64) _t.getListOfStruct().get(0).getVariantValue().getValue()).longValue() - || _t.getListOfStruct().get(0).getValueList().size() != 5 || !"hi".equals(_t.getListOfStruct().get(0).getValueList().get(0)) - || !"hello".equals(_t.getListOfStruct().get(0).getValueList().get(1)) || !"hej".equals(_t.getListOfStruct().get(0).getValueList().get(2)) - || !"hey".equals(_t.getListOfStruct().get(0).getValueList().get(3)) || !"aloha".equals(_t.getListOfStruct().get(0).getValueList().get(4)); + boolean b = !(_t.getListOfStruct().getFirst().getVariantValue().getValue() instanceof UInt64) || 567L != ((UInt64) _t.getListOfStruct().getFirst().getVariantValue().getValue()).longValue() + || _t.getListOfStruct().getFirst().getValueList().size() != 5 || !"hi".equals(_t.getListOfStruct().getFirst().getValueList().getFirst()) + || !"hello".equals(_t.getListOfStruct().getFirst().getValueList().get(1)) || !"hej".equals(_t.getListOfStruct().getFirst().getValueList().get(2)) + || !"hey".equals(_t.getListOfStruct().getFirst().getValueList().get(3)) || !"aloha".equals(_t.getListOfStruct().getFirst().getValueList().get(4)); setFailed(b, "Incorrect TestArraySignal parameters"); diff --git a/dbus-java-tests/src/test/java/sample/issue/Issue196Test.java b/dbus-java-tests/src/test/java/sample/issue/Issue196Test.java index a44f86f41..90355de97 100644 --- a/dbus-java-tests/src/test/java/sample/issue/Issue196Test.java +++ b/dbus-java-tests/src/test/java/sample/issue/Issue196Test.java @@ -18,7 +18,7 @@ public class Issue196Test extends AbstractBaseTest { @Test public void testCorrectInterfaceCreation() throws Exception { - String protocolType = TransportBuilder.getRegisteredBusTypes().get(0); + String protocolType = TransportBuilder.getRegisteredBusTypes().getFirst(); BusAddress busAddress = TransportBuilder.createWithDynamicSession(protocolType).configure().build() .getBusAddress(); diff --git a/dbus-java-tests/src/test/java/sample/issue/Issue244Test.java b/dbus-java-tests/src/test/java/sample/issue/Issue244Test.java index f48df4de0..9d1a0cdd7 100644 --- a/dbus-java-tests/src/test/java/sample/issue/Issue244Test.java +++ b/dbus-java-tests/src/test/java/sample/issue/Issue244Test.java @@ -18,7 +18,7 @@ public class Issue244Test extends AbstractBaseTest { @Test public void testSharedConnection() { - String busType = TransportBuilder.getRegisteredBusTypes().get(0); + String busType = TransportBuilder.getRegisteredBusTypes().getFirst(); String addr = TransportBuilder.createDynamicSession(busType, false); BusAddress clientAddress = BusAddress.of(addr); BusAddress serverAddress = BusAddress.of(addr).getListenerAddress(); diff --git a/dbus-java-transport-junixsocket/src/main/java/org/freedesktop/dbus/transport/junixsocket/JUnixSocketBusAddress.java b/dbus-java-transport-junixsocket/src/main/java/org/freedesktop/dbus/transport/junixsocket/JUnixSocketBusAddress.java index 8430588e5..21ccb31fd 100644 --- a/dbus-java-transport-junixsocket/src/main/java/org/freedesktop/dbus/transport/junixsocket/JUnixSocketBusAddress.java +++ b/dbus-java-transport-junixsocket/src/main/java/org/freedesktop/dbus/transport/junixsocket/JUnixSocketBusAddress.java @@ -5,7 +5,6 @@ import org.freedesktop.dbus.utils.Util; import java.nio.file.Path; -import java.nio.file.Paths; import java.nio.file.attribute.PosixFilePermission; import java.util.Set; @@ -28,7 +27,7 @@ public boolean isAbstract() { } public Path getPath() { - return Paths.get(getParameterValue("path")); + return Path.of(getParameterValue("path")); } @Override diff --git a/dbus-java-utils/src/main/java/org/freedesktop/dbus/utils/generator/ClassBuilderInfo.java b/dbus-java-utils/src/main/java/org/freedesktop/dbus/utils/generator/ClassBuilderInfo.java index dadc9b682..e0720fe70 100644 --- a/dbus-java-utils/src/main/java/org/freedesktop/dbus/utils/generator/ClassBuilderInfo.java +++ b/dbus-java-utils/src/main/java/org/freedesktop/dbus/utils/generator/ClassBuilderInfo.java @@ -279,7 +279,7 @@ private static void addEmptyLineIfNeeded(List _content) { return; } - String lastLine = _content.get(_content.size() - 1); + String lastLine = _content.getLast(); if (!Util.isBlank(lastLine)) { _content.add(""); } diff --git a/dbus-java-utils/src/main/java/org/freedesktop/dbus/utils/generator/InterfaceCodeGenerator.java b/dbus-java-utils/src/main/java/org/freedesktop/dbus/utils/generator/InterfaceCodeGenerator.java index 6d87ece5f..6b17d9fbf 100644 --- a/dbus-java-utils/src/main/java/org/freedesktop/dbus/utils/generator/InterfaceCodeGenerator.java +++ b/dbus-java-utils/src/main/java/org/freedesktop/dbus/utils/generator/InterfaceCodeGenerator.java @@ -356,7 +356,7 @@ private List extractMethods(Element _methodElement, ClassBuild resultType += joinedGenerics.isBlank() ? "" : "<" + joinedGenerics + ">"; } else { logger.debug("Found method with arguments: {}({})", methodElementName, inputArgs); - resultType = outputArgs.isEmpty() ? "void" : outputArgs.get(0).getFullType(new HashSet<>()); + resultType = outputArgs.isEmpty() ? "void" : outputArgs.getFirst().getFullType(new HashSet<>()); } if (resultType != null) { diff --git a/dbus-java-utils/src/main/java/org/freedesktop/dbus/utils/generator/StructTreeBuilder.java b/dbus-java-utils/src/main/java/org/freedesktop/dbus/utils/generator/StructTreeBuilder.java index c764f0417..e7927f776 100644 --- a/dbus-java-utils/src/main/java/org/freedesktop/dbus/utils/generator/StructTreeBuilder.java +++ b/dbus-java-utils/src/main/java/org/freedesktop/dbus/utils/generator/StructTreeBuilder.java @@ -64,9 +64,9 @@ public String buildStructClasses(String _dbusSig, String _structBaseFqcn, ClassB List structTree = buildTree(_dbusSig); String parentType = null; - if (!structTree.isEmpty() && Collection.class.isAssignableFrom(structTree.get(0).getDataType())) { - parentType = structTree.get(0).getDataType().getName(); - structTree = structTree.get(0).getSubType(); + if (!structTree.isEmpty() && Collection.class.isAssignableFrom(structTree.getFirst().getDataType())) { + parentType = structTree.getFirst().getDataType().getName(); + structTree = structTree.getFirst().getSubType(); } String rootStructName = findNextStructFqcn(_structBaseFqcn, generatedStructClassNames); diff --git a/dbus-java-utils/src/main/java/org/freedesktop/dbus/utils/generator/TypeConverter.java b/dbus-java-utils/src/main/java/org/freedesktop/dbus/utils/generator/TypeConverter.java index 24fa9d812..532d46d72 100644 --- a/dbus-java-utils/src/main/java/org/freedesktop/dbus/utils/generator/TypeConverter.java +++ b/dbus-java-utils/src/main/java/org/freedesktop/dbus/utils/generator/TypeConverter.java @@ -235,8 +235,8 @@ private static String getTypeAdv(String _dbusType, Set _javaIncludes) th List dataType = new ArrayList<>(); Marshalling.getJavaType(_dbusType, dataType, 1); - if (dataType.get(0) instanceof DBusListType || dataType.get(0) instanceof DBusMapType) { - ParameterizedType dBusListType = (ParameterizedType) dataType.get(0); + if (dataType.getFirst() instanceof DBusListType || dataType.getFirst() instanceof DBusMapType) { + ParameterizedType dBusListType = (ParameterizedType) dataType.getFirst(); Type[] actualTypeArguments = dBusListType.getActualTypeArguments(); String retVal = dBusListType.getRawType().getTypeName(); @@ -265,13 +265,13 @@ private static String getTypeAdv(String _dbusType, Set _javaIncludes) th } // if key and value of map is of same type: - if (dataType.get(0) instanceof DBusMapType && internalTypes.size() == 1) { - internalTypes.add(internalTypes.get(0)); + if (dataType.getFirst() instanceof DBusMapType && internalTypes.size() == 1) { + internalTypes.add(internalTypes.getFirst()); } return retVal + "<" + String.join(", ", internalTypes) + ">"; } - return dataType.get(0).getTypeName(); + return dataType.getFirst().getTypeName(); } } diff --git a/dbus-java-utils/src/main/java/org/freedesktop/dbus/viewer/TabbedSaveAction.java b/dbus-java-utils/src/main/java/org/freedesktop/dbus/viewer/TabbedSaveAction.java index ffb16209c..5152a7f9c 100644 --- a/dbus-java-utils/src/main/java/org/freedesktop/dbus/viewer/TabbedSaveAction.java +++ b/dbus-java-utils/src/main/java/org/freedesktop/dbus/viewer/TabbedSaveAction.java @@ -12,6 +12,7 @@ import java.awt.event.ActionEvent; import java.io.File; +import java.io.Serial; import javax.swing.AbstractAction; import javax.swing.JFileChooser; @@ -21,6 +22,7 @@ import javax.swing.text.JTextComponent; abstract class TabbedSaveAction extends AbstractAction implements Iterable { + @Serial private static final long serialVersionUID = -1L; /** File chooser component. * Make static so that previous save location is stored diff --git a/dbus-java-utils/src/test/java/org/freedesktop/dbus/utils/generator/StructTreeBuilderTest.java b/dbus-java-utils/src/test/java/org/freedesktop/dbus/utils/generator/StructTreeBuilderTest.java index 606fdf5b6..97c674f74 100644 --- a/dbus-java-utils/src/test/java/org/freedesktop/dbus/utils/generator/StructTreeBuilderTest.java +++ b/dbus-java-utils/src/test/java/org/freedesktop/dbus/utils/generator/StructTreeBuilderTest.java @@ -23,11 +23,11 @@ void testCreateStructContainingStruct() throws DBusException { .buildStructClasses(dbusTypeStr, "UnitTestStruct", classBuilderInfo, generated); assertEquals(2, generated.size()); - assertEquals("UnitTestStruct", generated.get(0).getClassName()); + assertEquals("UnitTestStruct", generated.getFirst().getClassName()); assertEquals("UnitTestStructStruct", generated.get(1).getClassName()); - assertTrue(generated.get(0).createClassFileContent().contains("private final String member0")); - assertTrue(generated.get(0).createClassFileContent().contains("private final List member1;")); + assertTrue(generated.getFirst().createClassFileContent().contains("private final String member0")); + assertTrue(generated.getFirst().createClassFileContent().contains("private final List member1;")); } }