1 files changed, 12 insertions, 22 deletions
diff --git a/src/main/java/org/traccar/handler/CopyAttributesHandler.java b/src/main/java/org/traccar/handler/CopyAttributesHandler.java
index 42b438e41..c7452e58c 100644
--- a/src/main/java/org/traccar/handler/CopyAttributesHandler.java
+++ b/src/main/java/org/traccar/handler/CopyAttributesHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2022 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2024 Anton Tananaev (anton@traccar.org)
  * Copyright 2016 - 2017 Andrey Kunitsyn (andrey@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,45 +16,35 @@
  */
 package org.traccar.handler;
 
-import io.netty.channel.ChannelHandler;
-import org.traccar.BaseDataHandler;
+import jakarta.inject.Inject;
 import org.traccar.config.Config;
 import org.traccar.config.Keys;
 import org.traccar.helper.model.AttributeUtil;
 import org.traccar.model.Position;
 import org.traccar.session.cache.CacheManager;
 
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-
-@Singleton
-@ChannelHandler.Sharable
-public class CopyAttributesHandler extends BaseDataHandler {
+public class CopyAttributesHandler extends BasePositionHandler {
 
-    private final boolean enabled;
     private final CacheManager cacheManager;
 
     @Inject
     public CopyAttributesHandler(Config config, CacheManager cacheManager) {
-        enabled = config.getBoolean(Keys.PROCESSING_COPY_ATTRIBUTES_ENABLE);
         this.cacheManager = cacheManager;
     }
 
     @Override
-    protected Position handlePosition(Position position) {
-        if (enabled) {
-            String attributesString = AttributeUtil.lookup(
-                    cacheManager, Keys.PROCESSING_COPY_ATTRIBUTES, position.getDeviceId());
-            Position last = cacheManager.getPosition(position.getDeviceId());
-            if (last != null && attributesString != null) {
-                for (String attribute : attributesString.split("[ ,]")) {
-                    if (last.hasAttribute(attribute) && !position.hasAttribute(attribute)) {
-                        position.getAttributes().put(attribute, last.getAttributes().get(attribute));
-                    }
+    public void handlePosition(Position position, Callback callback) {
+        String attributesString = AttributeUtil.lookup(
+                cacheManager, Keys.PROCESSING_COPY_ATTRIBUTES, position.getDeviceId());
+        Position last = cacheManager.getPosition(position.getDeviceId());
+        if (last != null && attributesString != null) {
+            for (String attribute : attributesString.split("[ ,]")) {
+                if (last.hasAttribute(attribute) && !position.hasAttribute(attribute)) {
+                    position.getAttributes().put(attribute, last.getAttributes().get(attribute));
                 }
             }
         }
-        return position;
+        callback.processed(false);
     }
 
 }