aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton@traccar.org>2022-06-30 07:52:02 -0700
committerAnton Tananaev <anton@traccar.org>2022-06-30 07:52:02 -0700
commit8ea427480417580aab51ed8f291f53a4051c79ee (patch)
treee244fe49050945f306dd8c41e520bd8ccd20f6a4
parent418e7ce116dd6c19b594f14ba220d3bdb905241c (diff)
downloadtrackermap-server-8ea427480417580aab51ed8f291f53a4051c79ee.tar.gz
trackermap-server-8ea427480417580aab51ed8f291f53a4051c79ee.tar.bz2
trackermap-server-8ea427480417580aab51ed8f291f53a4051c79ee.zip
Extract device lookup
-rw-r--r--src/main/java/org/traccar/database/DeviceLookupService.java57
-rw-r--r--src/main/java/org/traccar/session/ConnectionManager.java19
2 files changed, 63 insertions, 13 deletions
diff --git a/src/main/java/org/traccar/database/DeviceLookupService.java b/src/main/java/org/traccar/database/DeviceLookupService.java
new file mode 100644
index 000000000..f0a4e7bf0
--- /dev/null
+++ b/src/main/java/org/traccar/database/DeviceLookupService.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2022 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.database;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.traccar.model.Device;
+import org.traccar.storage.Storage;
+import org.traccar.storage.query.Columns;
+import org.traccar.storage.query.Condition;
+import org.traccar.storage.query.Request;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+@Singleton
+public class DeviceLookupService {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(DeviceLookupService.class);
+
+ private final Storage storage;
+
+ @Inject
+ public DeviceLookupService(Storage storage) {
+ this.storage = storage;
+ }
+
+ public Device lookup(String[] uniqueIds) {
+ Device device = null;
+ try {
+ for (String uniqueId : uniqueIds) {
+ device = storage.getObject(Device.class, new Request(
+ new Columns.All(), new Condition.Equals("uniqueId", "uniqueId", uniqueId)));
+ if (device != null) {
+ break;
+ }
+ }
+ } catch (Exception e) {
+ LOGGER.warn("Find device error", e);
+ }
+ return device;
+ }
+
+}
diff --git a/src/main/java/org/traccar/session/ConnectionManager.java b/src/main/java/org/traccar/session/ConnectionManager.java
index 27d6184c2..abc13988d 100644
--- a/src/main/java/org/traccar/session/ConnectionManager.java
+++ b/src/main/java/org/traccar/session/ConnectionManager.java
@@ -26,6 +26,7 @@ import org.traccar.broadcast.BroadcastInterface;
import org.traccar.broadcast.BroadcastService;
import org.traccar.config.Config;
import org.traccar.config.Keys;
+import org.traccar.database.DeviceLookupService;
import org.traccar.database.NotificationManager;
import org.traccar.handler.events.MotionEventHandler;
import org.traccar.handler.events.OverspeedEventHandler;
@@ -76,6 +77,7 @@ public class ConnectionManager implements BroadcastInterface {
private final NotificationManager notificationManager;
private final Timer timer;
private final BroadcastService broadcastService;
+ private final DeviceLookupService deviceLookupService;
private final Map<Long, Set<UpdateListener>> listeners = new HashMap<>();
private final Map<Long, Set<Long>> userDevices = new HashMap<>();
@@ -86,7 +88,8 @@ public class ConnectionManager implements BroadcastInterface {
@Inject
public ConnectionManager(
Injector injector, Config config, CacheManager cacheManager, Storage storage,
- NotificationManager notificationManager, Timer timer, BroadcastService broadcastService) {
+ NotificationManager notificationManager, Timer timer, BroadcastService broadcastService,
+ DeviceLookupService deviceLookupService) {
this.injector = injector;
this.config = config;
this.cacheManager = cacheManager;
@@ -94,6 +97,7 @@ public class ConnectionManager implements BroadcastInterface {
this.notificationManager = notificationManager;
this.timer = timer;
this.broadcastService = broadcastService;
+ this.deviceLookupService = deviceLookupService;
deviceTimeout = config.getLong(Keys.STATUS_TIMEOUT) * 1000;
updateDeviceState = config.getBoolean(Keys.STATUS_UPDATE_DEVICE_STATE);
broadcastService.registerListener(this);
@@ -121,18 +125,7 @@ public class ConnectionManager implements BroadcastInterface {
return endpointSessions.values().stream().findAny().orElse(null);
}
- Device device = null;
- try {
- for (String uniqueId : uniqueIds) {
- device = storage.getObject(Device.class, new Request(
- new Columns.All(), new Condition.Equals("uniqueId", "uniqueId", uniqueId)));
- if (device != null) {
- break;
- }
- }
- } catch (Exception e) {
- LOGGER.warn("Find device error", e);
- }
+ Device device = deviceLookupService.lookup(uniqueIds);
if (device == null && config.getBoolean(Keys.DATABASE_REGISTER_UNKNOWN)) {
device = addUnknownDevice(uniqueIds[0]);