Minor formatting

src/io/calimero/DeviceDescriptor.java

@@ -340,7 +340,7 @@ public DD2(final int appManufacturer, final int deviceType, final int version,
 			d[i++] = (byte) (channelInfo3 >> 8);
 			d[i++] = (byte) (channelInfo3);
 			d[i++] = (byte) (channelInfo4 >> 8);
-			d[i++] = (byte) (channelInfo4);
+			d[i] = (byte) (channelInfo4);
 		}
 
 		/**

src/io/calimero/buffer/StateFilter.java

@@ -176,7 +176,7 @@ public void accept(final CEMI frame, final Configuration c)
 		if (!(f.getDestination() instanceof final GroupAddress dst))
 			return;
 		final DatapointModel<?> m = c.getDatapointModel();
-		Datapoint dp = null;
+		Datapoint dp;
 		if (m != null && ((dp = m.get(dst)) == null || !dp.isStateBased()))
 			return;
 		final byte[] d = f.getPayload();

src/io/calimero/buffer/cache/ExpiringCache.java

@@ -1,6 +1,6 @@
 /*
     Calimero 2 - A library for KNX network access
-    Copyright (c) 2006, 2023 B. Malinowsky
+    Copyright (c) 2006, 2024 B. Malinowsky
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -120,7 +120,7 @@ public void removeExpired()
 			return;
 		final long now = System.currentTimeMillis();
 		final long duration = timeToExpire * 1000L;
-		CacheObject o = null;
+		CacheObject o;
 		synchronized (this) {
 			for (final Iterator<CacheObject> i = map.values().iterator(); i.hasNext();) {
 				o = i.next();

src/io/calimero/datapoint/Datapoint.java

@@ -123,7 +123,7 @@ public abstract class Datapoint
 			throw new KNXMLException("missing attribute " + ATTR_DPTID, r);
 		if (dptId.isEmpty())
 			dptId = null;
-		String a = null;
+		String a;
 		try {
 			a = r.getAttributeValue(null, ATTR_MAINNUMBER);
 			if (a != null)

src/io/calimero/dptxlator/DptXlator8BitSet.java

@@ -262,11 +262,7 @@ public final void setValue(final EnumSet<?> elements)
 	public final EnumSet<?> value() throws KNXFormatException {
 		final short v = fromDpt(0);
 		final EnumSet<?> set = EnumSet.allOf(((EnumDpt<?>) dpt).elements);
-		for (final var i = set.iterator(); i.hasNext();) {
-			final var e = i.next();
-			if ((v & (1 << e.ordinal())) == 0)
-				i.remove();
-		}
+		set.removeIf(e -> (v & (1 << e.ordinal())) == 0);
 		return set;
 	}
 

src/io/calimero/dptxlator/DptXlatorBrightnessClrTempControl.java

@@ -1,6 +1,6 @@
 /*
     Calimero 2 - A library for KNX network access
-    Copyright (c) 2018, 2022 B. Malinowsky
+    Copyright (c) 2018, 2024 B. Malinowsky
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -167,7 +167,7 @@ protected static Map<String, DPT> getSubTypesStatic() {
 
 	private String fromDpt(final int index) {
 		final int offset = index * 3;
-		String s = "";
+		String s;
 
 		t.setAppendUnit(appendUnit);
 		final int valid = data[offset + 2];

src/io/calimero/dptxlator/DptXlatorBrightnessClrTempTrans.java

@@ -1,6 +1,6 @@
 /*
     Calimero 2 - A library for KNX network access
-    Copyright (c) 2018, 2022 B. Malinowsky
+    Copyright (c) 2018, 2024 B. Malinowsky
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -125,7 +125,7 @@ public Optional<Integer> colorTemp() {
 		final int valid = data[5];
 		if ((valid & 2) == 2) {
 			int offset = 2;
-			final int temperature = (data[offset++] << 8) | data[offset++];
+			final int temperature = (data[offset++] << 8) | data[offset];
 			return Optional.of(temperature);
 		}
 		return Optional.empty();
@@ -135,7 +135,7 @@ public Optional<Duration> fadingTime() {
 		final int valid = data[5];
 		if ((valid & 4) == 4) {
 			int offset = 0;
-			final long time = ((data[offset++] << 8) | data[offset++]) * 100;
+			final long time = ((data[offset++] << 8) | data[offset]) * 100;
 			return Optional.of(Duration.ofMillis(time));
 		}
 		return Optional.empty();
@@ -209,7 +209,7 @@ private String fromDpt(final int index) {
 		final double time = ((data[offset++] << 8) | data[offset++]) / 10d;
 		final int temperature = (data[offset++] << 8) | data[offset++];
 		final double brightness = data[offset++] * 100d / 255;
-		final int valid = data[offset++];
+		final int valid = data[offset];
 
 		final StringBuilder sb = new StringBuilder();
 		sb.append((valid & 1) == 1 ? formatter.format(brightness) : "-").append(appendUnit ? " % " : " ");

src/io/calimero/dptxlator/DptXlatorXyY.java

@@ -1,6 +1,6 @@
 /*
     Calimero 2 - A library for KNX network access
-    Copyright (c) 2018, 2023 B. Malinowsky
+    Copyright (c) 2018, 2024 B. Malinowsky
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -185,7 +185,7 @@ private double[] fromDptDouble(final int index) {
 		final double y = ((data[offset++] << 8) | data[offset++]) / 65_535d;
 		final double brightness = data[offset++] * 100d / 255;
 
-		final int valid = data[offset++];
+		final int valid = data[offset];
 		final boolean clrValid = (valid & 2) == 2;
 		final boolean brightnessValid = (valid & 1) == 1;
 
@@ -242,7 +242,7 @@ protected void toDPT(final String value, final short[] dst, final int index) thr
 		dst[offset++] = (short) (yRaw >> 8);
 		dst[offset++] = ubyte(yRaw);
 		dst[offset++] = ubyte(brightnessRaw);
-		dst[offset++] = (short) valid;
+		dst[offset] = (short) valid;
 	}
 
 	private void toDpt(final double x, final double y, final double brightness) {

src/io/calimero/dptxlator/DptXlatorXyYTransition.java

@@ -205,7 +205,7 @@ private double[] fromDptDouble(final int index) {
 		final double x = ((data[offset++] << 8) | data[offset++]) / 65_535d;
 		final double brightness = data[offset++] * 100d / 255;
 
-		final int valid = data[offset++];
+		final int valid = data[offset];
 		final boolean clrValid = (valid & 2) == 2;
 		final boolean brightnessValid = (valid & 1) == 1;
 
@@ -273,7 +273,7 @@ protected void toDPT(final String value, final short[] dst, final int index) thr
 		dst[offset++] = (short) (xRaw >> 8);
 		dst[offset++] = (short) (xRaw & 0xff);
 		dst[offset++] = brightnessRaw;
-		dst[offset++] = (short) valid;
+		dst[offset] = (short) valid;
 	}
 
 	private void toDpt(final double x, final double y, final double brightness, final Duration fadingTime) {

src/io/calimero/knxnetip/ConnectionBase.java

@@ -574,7 +574,6 @@ final void stopReceiver()
 
 	boolean waitForStateChange(final int initialState, final int timeout) throws InterruptedException
 	{
-		boolean changed = false;
 		long remaining = timeout * 1000L;
 		final long end = System.currentTimeMillis() + remaining;
 		lock.lock();
@@ -587,8 +586,7 @@ boolean waitForStateChange(final int initialState, final int timeout) throws Int
 		finally {
 			lock.unlock();
 		}
-		changed = remaining > 0;
-		return changed;
+		return remaining > 0;
 	}
 
 	/**

src/io/calimero/knxnetip/servicetype/ConnectRequest.java

@@ -112,7 +112,7 @@ public ConnectRequest(final CRI requestInfo, final int localPort)
 	{
 		super(KNXnetIPHeader.CONNECT_REQ);
 		cri = requestInfo;
-		ctrlPt = new HPAI((InetAddress) null, localPort);
+		ctrlPt = new HPAI(null, localPort);
 		dataPt = ctrlPt;
 	}
 

src/io/calimero/knxnetip/servicetype/SearchRequest.java

@@ -164,7 +164,7 @@ public SearchRequest(final InetSocketAddress responseAddr, final Srp... searchPa
 	public SearchRequest(final int responsePort)
 	{
 		super(KNXnetIPHeader.SEARCH_REQ);
-		endpoint = new HPAI((InetAddress) null, responsePort);
+		endpoint = new HPAI(null, responsePort);
 	}
 
 	/**

src/io/calimero/knxnetip/servicetype/ServiceAck.java

@@ -1,6 +1,6 @@
 /*
     Calimero 2 - A library for KNX network access
-    Copyright (c) 2006, 2023 B. Malinowsky
+    Copyright (c) 2006, 2024 B. Malinowsky
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -79,7 +79,7 @@ public ServiceAck(final int serviceType, final byte[] data, final int offset)
 			throw new KNXFormatException("unsupported connection header");
 		channelid = data[i++] & 0xFF;
 		seq = data[i++] & 0xFF;
-		status = data[i++] & 0xFF;
+		status = data[i] & 0xFF;
 	}
 
 	/**

src/io/calimero/knxnetip/util/IPConfigDIB.java

@@ -1,6 +1,6 @@
 /*
     Calimero 2 - A library for KNX network access
-    Copyright (c) 2015, 2023 B. Malinowsky
+    Copyright (c) 2015, 2024 B. Malinowsky
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -192,7 +192,7 @@ public byte[] toByteArray()
 			buf[i++] = gw[k];
 
 		buf[i++] = (byte) caps;
-		buf[i++] = (byte) assignment;
+		buf[i] = (byte) assignment;
 		return buf;
 	}
 

src/io/calimero/knxnetip/util/IPCurrentConfigDIB.java

@@ -1,6 +1,6 @@
 /*
     Calimero 2 - A library for KNX network access
-    Copyright (c) 2015, 2023 B. Malinowsky
+    Copyright (c) 2015, 2024 B. Malinowsky
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -194,7 +194,7 @@ public byte[] toByteArray()
 			buf[i++] = dhcp[k];
 
 		buf[i++] = (byte) assignment;
-		buf[i++] = 0;
+		buf[i] = 0;
 		return buf;
 	}
 

src/io/calimero/knxnetip/util/TunnelingDib.java

@@ -1,6 +1,6 @@
 /*
     Calimero 2 - A library for KNX network access
-    Copyright (c) 2018, 2023 B. Malinowsky
+    Copyright (c) 2018, 2024 B. Malinowsky
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -98,7 +98,7 @@ public static SlotStatus of(final int value) {
 
 
 	public TunnelingDib(final Map<IndividualAddress, EnumSet<SlotStatus>> tunnelingSlots) {
-		this((short) 0xfe, tunnelingSlots);
+		this(0xfe, tunnelingSlots);
 	}
 
 	public TunnelingDib(final int maxApduLength, final Map<IndividualAddress, EnumSet<SlotStatus>> tunnelingSlots) {

src/io/calimero/mgmt/LocalDeviceManagement.java

@@ -1,6 +1,6 @@
 /*
     Calimero 2 - A library for KNX network access
-    Copyright (c) 2015, 2022 B. Malinowsky
+    Copyright (c) 2015, 2024 B. Malinowsky
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -315,7 +315,7 @@ protected void initInterfaceObjects() throws KNXException, InterruptedException
 		final CEMIDevMgmt req = new CEMIDevMgmt(CEMIDevMgmt.MC_PROPREAD_REQ, DEVICE_OBJECT, 1,
 				PropertyAccess.PID.IO_LIST, 0, 1);
 		send(req, BlockingMode.Confirmation);
-		int objects = 0;
+		int objects;
 		try {
 			final byte[] ret = findFrame(CEMIDevMgmt.MC_PROPREAD_CON, req);
 			objects = (ret[0] & 0xff) << 8 | (ret[1] & 0xff);

src/io/calimero/mgmt/ManagementProceduresImpl.java

@@ -740,7 +740,7 @@ public void assignDomainAndDeviceAddress(final byte[] domainAddress, final Indiv
 		while (Instant.now().isBefore(deadline) && list.isEmpty())
 			list = readSerialNumber();
 		if (list.size() != 1)
-			throw new KNXRemoteException("" + (list.isEmpty() ? "no" : list.size()) + " devices in programming mode");
+			throw new KNXRemoteException((list.isEmpty() ? "no" : list.size()) + " devices in programming mode");
 		final var sno = list.get(0);
 
 		final var link = ((TransportLayerImpl) tl).link();

src/io/calimero/secure/Keyring.java

@@ -1,6 +1,6 @@
 /*
     Calimero 2 - A library for KNX network access
-    Copyright (c) 2019, 2023 B. Malinowsky
+    Copyright (c) 2019, 2024 B. Malinowsky
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -97,12 +97,12 @@ public enum Type {
 
 			// parse value from xsd Type enumeration
 			static Type from(final String type) {
-				switch (type) {
-					case "Backbone": return Backbone;
-					case "Tunneling": return Tunneling;
-					case "USB": return Usb; // important: USB is specified upper-case
-				}
-				throw new KNXIllegalArgumentException("unknown interface type " + type);
+				return switch (type) {
+					case "Backbone" -> Backbone;
+					case "Tunneling" -> Tunneling;
+					case "USB" -> Usb; // important: USB is specified upper-case
+					default -> throw new KNXIllegalArgumentException("unknown interface type " + type);
+				};
 			}
 		}
 

src/io/calimero/serial/FT12Connection.java

@@ -1,6 +1,6 @@
 /*
     Calimero 2 - A library for KNX network access
-    Copyright (c) 2006, 2023 B. Malinowsky
+    Copyright (c) 2006, 2024 B. Malinowsky
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -506,7 +506,7 @@ private void sendData(final byte[] data) throws IOException, KNXPortClosedExcept
 		for (final byte b : data)
 			buf[i++] = b;
 		buf[i++] = checksum(buf, 4, data.length + 1);
-		buf[i++] = END;
+		buf[i] = END;
 
 		state = ACK_PENDING;
 		os.write(buf);

src/io/calimero/xml/XmlResolver.java

@@ -1,6 +1,6 @@
 /*
     Calimero 2 - A library for KNX network access
-    Copyright (c) 2006, 2022 B. Malinowsky
+    Copyright (c) 2006, 2024 B. Malinowsky
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -121,9 +121,8 @@ OutputStream resolveOutput(final String systemID)
 
 	Reader getInputReader(final InputStream is) throws KNXMLException
 	{
-		InputStream in = null;
 		try {
-			in = new BufferedInputStream(is);
+			InputStream in = new BufferedInputStream(is);
 			in.mark(9000);
 			// deduce encoding from first 4 bytes of stream
 			final byte[] start = new byte[4];
@@ -233,10 +232,9 @@ else if (state == 1 && s.startsWith("encoding")) {
 			}
 			else if (state == 1 || state == 2) {
 				if (s.startsWith("standalone")) {
-					standalone = getAttValue(s = s.substring(10));
+					standalone = getAttValue(s.substring(10));
 					if (!"yes".equals(standalone) && !"no".equals(standalone))
-						throw new KNXMLException("invalid standalone pseudo-attribute",
-							standalone, 0);
+						throw new KNXMLException("invalid standalone pseudo-attribute", standalone, 0);
 					break;
 				}
 			}