From 728e55fc00a4b7b980d6e59f2ce8664859a5c848 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Tue, 26 Feb 2019 19:05:25 -0800
Subject: Refactor computed attributes

---
 src/org/traccar/BasePipelineFactory.java | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'src/org/traccar/BasePipelineFactory.java')

diff --git a/src/org/traccar/BasePipelineFactory.java b/src/org/traccar/BasePipelineFactory.java
index 088689fe7..85127fd7a 100644
--- a/src/org/traccar/BasePipelineFactory.java
+++ b/src/org/traccar/BasePipelineFactory.java
@@ -57,8 +57,6 @@ public abstract class BasePipelineFactory extends ChannelInitializer<Channel> {
     private final TrackerServer server;
     private int timeout;
 
-    private ComputedAttributesHandler computedAttributesHandler;
-
     private CommandResultEventHandler commandResultEventHandler;
     private OverspeedEventHandler overspeedEventHandler;
     private FuelDropEventHandler fuelDropEventHandler;
@@ -77,10 +75,6 @@ public abstract class BasePipelineFactory extends ChannelInitializer<Channel> {
             timeout = Context.getConfig().getInteger(Keys.SERVER_TIMEOUT);
         }
 
-        if (Context.getConfig().getBoolean("processing.computedAttributes.enable")) {
-            computedAttributesHandler = new ComputedAttributesHandler();
-        }
-
         if (Context.getConfig().getBoolean("event.enable")) {
             commandResultEventHandler = new CommandResultEventHandler();
             overspeedEventHandler = Context.getOverspeedEventHandler();
@@ -157,7 +151,7 @@ public abstract class BasePipelineFactory extends ChannelInitializer<Channel> {
                 Main.getInjector().getInstance(MotionHandler.class),
                 Main.getInjector().getInstance(EngineHoursHandler.class),
                 Main.getInjector().getInstance(CopyAttributesHandler.class),
-                computedAttributesHandler);
+                Main.getInjector().getInstance(ComputedAttributesHandler.class));
 
         if (Context.getDataManager() != null) {
             pipeline.addLast(new DefaultDataHandler());
-- 
cgit v1.2.3