Merge tag 'tags/v6.3'

5 files changed, 14 insertions, 85 deletions

diff --git a/src/main/java/org/traccar/session/ConnectionKey.java b/src/main/java/org/traccar/session/ConnectionKey.java
index 3b7e2ebf8..807e68776 100644
--- a/src/main/java/org/traccar/session/ConnectionKey.java
+++ b/src/main/java/org/traccar/session/ConnectionKey.java
@@ -18,37 +18,9 @@ package org.traccar.session;
 import io.netty.channel.Channel;
 
 import java.net.SocketAddress;
-import java.util.Objects;
-
-public class ConnectionKey {
-
-    private final SocketAddress localAddress;
-    private final SocketAddress remoteAddress;
 
+public record ConnectionKey(SocketAddress localAddress, SocketAddress remoteAddress) {
     public ConnectionKey(Channel channel, SocketAddress remoteAddress) {
         this(channel.localAddress(), remoteAddress);
     }
-
-    public ConnectionKey(SocketAddress localAddress, SocketAddress remoteAddress) {
-        this.localAddress = localAddress;
-        this.remoteAddress = remoteAddress;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        ConnectionKey that = (ConnectionKey) o;
-        return Objects.equals(localAddress, that.localAddress) && Objects.equals(remoteAddress, that.remoteAddress);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(localAddress, remoteAddress);
-    }
-
 }
diff --git a/src/main/java/org/traccar/session/ConnectionManager.java b/src/main/java/org/traccar/session/ConnectionManager.java
index 8431a0327..a80c6aad1 100644
--- a/src/main/java/org/traccar/session/ConnectionManager.java
+++ b/src/main/java/org/traccar/session/ConnectionManager.java
@@ -241,17 +241,11 @@ public class ConnectionManager implements BroadcastInterface {
         if (!status.equals(oldStatus)) {
             String eventType;
             Map<Event, Position> events = new HashMap<>();
-            switch (status) {
-                case Device.STATUS_ONLINE:
-                    eventType = Event.TYPE_DEVICE_ONLINE;
-                    break;
-                case Device.STATUS_UNKNOWN:
-                    eventType = Event.TYPE_DEVICE_UNKNOWN;
-                    break;
-                default:
-                    eventType = Event.TYPE_DEVICE_OFFLINE;
-                    break;
-            }
+            eventType = switch (status) {
+                case Device.STATUS_ONLINE -> Event.TYPE_DEVICE_ONLINE;
+                case Device.STATUS_UNKNOWN -> Event.TYPE_DEVICE_UNKNOWN;
+                default -> Event.TYPE_DEVICE_OFFLINE;
+            };
             events.put(new Event(eventType, deviceId), null);
             notificationManager.updateEvents(events);
         }
diff --git a/src/main/java/org/traccar/session/cache/CacheGraph.java b/src/main/java/org/traccar/session/cache/CacheGraph.java
index c99997288..a4c2ce61b 100644
--- a/src/main/java/org/traccar/session/cache/CacheGraph.java
+++ b/src/main/java/org/traccar/session/cache/CacheGraph.java
@@ -38,7 +38,7 @@ public class CacheGraph {
         CacheKey key = new CacheKey(clazz, id);
         CacheNode node = nodes.remove(key);
         if (node != null) {
-            node.getAllLinks(false).forEach(child -> child.getLinks(key.getClazz(), true).remove(node));
+            node.getAllLinks(false).forEach(child -> child.getLinks(key.clazz(), true).remove(node));
         }
         roots.remove(key);
     }
diff --git a/src/main/java/org/traccar/session/cache/CacheKey.java b/src/main/java/org/traccar/session/cache/CacheKey.java
index f27d5fbf5..001058e4c 100644
--- a/src/main/java/org/traccar/session/cache/CacheKey.java
+++ b/src/main/java/org/traccar/session/cache/CacheKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Anton Tananaev (anton@traccar.org)
+ * Copyright 2022 - 2024 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,45 +17,8 @@ package org.traccar.session.cache;
 
 import org.traccar.model.BaseModel;
 
-import java.util.Objects;
-
-class CacheKey {
-
-    private final Class<? extends BaseModel> clazz;
-    private final long id;
-
+record CacheKey(Class<? extends BaseModel> clazz, long id) {
     CacheKey(BaseModel object) {
         this(object.getClass(), object.getId());
     }
-
-    CacheKey(Class<? extends BaseModel> clazz, long id) {
-        this.clazz = clazz;
-        this.id = id;
-    }
-
-    public Class<? extends BaseModel> getClazz() {
-        return clazz;
-    }
-
-    public boolean classIs(Class<? extends BaseModel> clazz) {
-        return clazz.equals(this.clazz);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        CacheKey cacheKey = (CacheKey) o;
-        return id == cacheKey.id && Objects.equals(clazz, cacheKey.clazz);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(clazz, id);
-    }
-
 }
diff --git a/src/main/java/org/traccar/session/cache/CacheManager.java b/src/main/java/org/traccar/session/cache/CacheManager.java
index 064e5672f..39546a5a7 100644
--- a/src/main/java/org/traccar/session/cache/CacheManager.java
+++ b/src/main/java/org/traccar/session/cache/CacheManager.java
@@ -170,7 +170,7 @@ public class CacheManager implements BroadcastInterface {
     public void removeDevice(long deviceId) {
         try {
             lock.writeLock().lock();
-            if (deviceReferences.computeIfAbsent(deviceId, k -> new AtomicInteger()).incrementAndGet() <= 0) {
+            if (deviceReferences.computeIfAbsent(deviceId, k -> new AtomicInteger()).decrementAndGet() <= 0) {
                 graph.removeObject(Device.class, deviceId);
                 devicePositions.remove(deviceId);
                 deviceReferences.remove(deviceId);
@@ -296,8 +296,8 @@ public class CacheManager implements BroadcastInterface {
                 }
             }
         } else {
-            if (object instanceof GroupedModel) {
-                long groupId = ((GroupedModel) object).getGroupId();
+            if (object instanceof GroupedModel groupedModel) {
+                long groupId = groupedModel.getGroupId();
                 if (groupId > 0) {
                     invalidatePermission(object.getClass(), object.getId(), Group.class, groupId, true);
                 }
@@ -319,8 +319,8 @@ public class CacheManager implements BroadcastInterface {
                 }
             }
 
-            if (object instanceof Schedulable) {
-                long calendarId = ((Schedulable) object).getCalendarId();
+            if (object instanceof Schedulable schedulable) {
+                long calendarId = schedulable.getCalendarId();
                 if (calendarId > 0) {
                     invalidatePermission(object.getClass(), object.getId(), Calendar.class, calendarId, true);
                 }