Skip to content

Commit

Permalink
Minor formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
bmalinowsky committed Aug 4, 2024
1 parent 3f4baaa commit baccd2a
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
5 changes: 3 additions & 2 deletions src/io/calimero/server/Launcher.java
Original file line number Diff line number Diff line change
Expand Up @@ -748,7 +748,7 @@ private void setupContainers(final List<Container> containers) {
final var tunnelingUsers = container.tunnelingUsers();
if (!tunnelingUsers.isEmpty()) {
final var serverAddress = useServerAddress ? sc.getMediumSettings().getDeviceAddress() : null;
setTunnelingUsers(ios, objectInstance, tunnelingUsers, additionalAddresses, serverAddress);
setTunnelingUsers(objectInstance, tunnelingUsers, additionalAddresses, serverAddress);
}
else {
// list all additional addresses as tunneling addresses
Expand Down Expand Up @@ -953,14 +953,15 @@ private void setAdditionalIndividualAddresses(final InterfaceObjectServer ios, f
private static final int pidTunnelingAddresses = 79;
private static final int pidTunnelingUsers = 97;

private void setTunnelingUsers(final InterfaceObjectServer ios, final int objectInstance,
private void setTunnelingUsers(final int objectInstance,
final Map<Integer, List<IndividualAddress>> userToAddresses, final List<IndividualAddress> additionalAddresses,
final IndividualAddress ctrlEndpoint) {

// address indices are sorted in natural order
final var addrIndices = userToAddresses.values().stream().flatMap(List::stream)
.map(addr -> addressIndex(addr, additionalAddresses, ctrlEndpoint)).sorted().distinct()
.collect(ByteArrayOutputStream::new, ByteArrayOutputStream::write, (r1, r2) -> {}).toByteArray();
final var ios = server.getInterfaceObjectServer();
setTunnelingAddresses(ios, objectInstance, addrIndices);

// tunneling user entries are sorted first by user <, then by tunneling addr idx <
Expand Down
3 changes: 1 addition & 2 deletions src/io/calimero/server/knxnetip/DataEndpoint.java
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@
import io.calimero.KNXTimeoutException;
import io.calimero.KnxRuntimeException;
import io.calimero.ReturnCode;
import io.calimero.ServiceType;
import io.calimero.baos.BaosService;
import io.calimero.cemi.CEMI;
import io.calimero.cemi.CEMIBusMon;
Expand Down Expand Up @@ -499,7 +498,7 @@ private void respondToFeature(final EndpointAddress src, final KNXnetIPHeader h,
logger.log(DEBUG, "respond with {0}", res);

final var dst = etsDstHack(dataEndpt, src);
send(PacketHelper.toPacket(new ServiceRequest<ServiceType>(res.type(), channelId, getSeqSend(), res)), dst);
send(PacketHelper.toPacket(new ServiceRequest<>(res.type(), channelId, getSeqSend(), res)), dst);
}

private TunnelingFeature responseForFeature(final KNXnetIPHeader h, final ByteBuffer buffer) throws KNXFormatException {
Expand Down
1 change: 1 addition & 0 deletions src/io/calimero/server/knxnetip/DiscoveryService.java
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ final class DiscoveryService extends ServiceLooper
s = createSocket(joinOn);
}

@SuppressWarnings("resource")
private MulticastSocket createSocket(final NetworkInterface[] joinOn)
{
final String p = System.getProperties().getProperty("java.net.preferIPv4Stack");
Expand Down
2 changes: 1 addition & 1 deletion test/io/calimero/server/gateway/KnxServerGatewayTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ static class DummyLink implements KNXNetworkLink
private final EventListeners<NetworkLinkListener> listeners = new EventListeners<>();

// has to be public for creation by subnet connector
public DummyLink(final Object[] s) {}
public DummyLink(@SuppressWarnings("unused") final Object[] __) {}

@Override
public void addLinkListener(final NetworkLinkListener l)
Expand Down

0 comments on commit baccd2a

Please sign in to comment.