Revert commit for Device State: 494bb544

@@ -94,5 +94,3 @@ CREATE TABLE IF NOT EXISTS  thingsboard.rule_node (
     PRIMARY KEY (id)
     PRIMARY KEY (id)
 );
 );
 
 
-ALTER TABLE thingsboard.device ADD last_connect bigint;
-ALTER TABLE thingsboard.device ADD last_update bigint;

@@ -35,7 +35,4 @@ CREATE TABLE IF NOT EXISTS rule_node (
     name varchar(255),
     name varchar(255),
     debug_mode boolean,
     debug_mode boolean,
     search_text varchar(255)
     search_text varchar(255)
-);
-
-ALTER TABLE device ADD COLUMN IF NOT EXISTS last_connect BIGINT;
-ALTER TABLE device ADD COLUMN IF NOT EXISTS last_update BIGINT;
+);

@@ -45,7 +45,6 @@ import org.thingsboard.server.dao.audit.AuditLogService;
 import org.thingsboard.server.dao.customer.CustomerService;
 import org.thingsboard.server.dao.customer.CustomerService;
 import org.thingsboard.server.dao.dashboard.DashboardService;
 import org.thingsboard.server.dao.dashboard.DashboardService;
 import org.thingsboard.server.dao.device.DeviceCredentialsService;
 import org.thingsboard.server.dao.device.DeviceCredentialsService;
-import org.thingsboard.server.dao.device.DeviceOfflineService;
 import org.thingsboard.server.dao.device.DeviceService;
 import org.thingsboard.server.dao.device.DeviceService;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.exception.IncorrectParameterException;
 import org.thingsboard.server.dao.exception.IncorrectParameterException;
@@ -136,9 +135,6 @@ public abstract class BaseController {
     protected AuditLogService auditLogService;
     protected AuditLogService auditLogService;
 
 
     @Autowired
     @Autowired
-    protected DeviceOfflineService offlineService;
-
-    @Autowired
     protected DeviceStateService deviceStateService;
     protected DeviceStateService deviceStateService;
 
 
     @ExceptionHandler(ThingsboardException.class)
     @ExceptionHandler(ThingsboardException.class)

@@ -25,9 +25,6 @@ import org.thingsboard.server.common.data.EntitySubtype;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.device.DeviceSearchQuery;
 import org.thingsboard.server.common.data.device.DeviceSearchQuery;
-import org.thingsboard.server.common.data.device.DeviceStatusQuery;
-import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
-import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -37,6 +34,8 @@ import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.common.data.security.DeviceCredentials;
 import org.thingsboard.server.common.data.security.DeviceCredentials;
 import org.thingsboard.server.dao.exception.IncorrectParameterException;
 import org.thingsboard.server.dao.exception.IncorrectParameterException;
 import org.thingsboard.server.dao.model.ModelConstants;
 import org.thingsboard.server.dao.model.ModelConstants;
+import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.model.SecurityUser;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
@@ -70,7 +69,7 @@ public class DeviceController extends BaseController {
             device.setTenantId(getCurrentUser().getTenantId());
             device.setTenantId(getCurrentUser().getTenantId());
             if (getCurrentUser().getAuthority() == Authority.CUSTOMER_USER) {
             if (getCurrentUser().getAuthority() == Authority.CUSTOMER_USER) {
                 if (device.getId() == null || device.getId().isNullUid() ||
                 if (device.getId() == null || device.getId().isNullUid() ||
-                        device.getCustomerId() == null || device.getCustomerId().isNullUid()) {
+                    device.getCustomerId() == null || device.getCustomerId().isNullUid()) {
                     throw new ThingsboardException("You don't have permission to perform this operation!",
                     throw new ThingsboardException("You don't have permission to perform this operation!",
                             ThingsboardErrorCode.PERMISSION_DENIED);
                             ThingsboardErrorCode.PERMISSION_DENIED);
                 } else {
                 } else {
@@ -374,32 +373,4 @@ public class DeviceController extends BaseController {
             throw handleException(e);
             throw handleException(e);
         }
         }
     }
     }
-
-    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
-    @RequestMapping(value = "/device/offline", method = RequestMethod.GET)
-    @ResponseBody
-    public List<Device> getOfflineDevices(@RequestParam("contactType") DeviceStatusQuery.ContactType contactType,
-                                          @RequestParam("threshold") long threshold) throws ThingsboardException {
-        try {
-            TenantId tenantId = getCurrentUser().getTenantId();
-            ListenableFuture<List<Device>> offlineDevices = offlineService.findOfflineDevices(tenantId.getId(), contactType, threshold);
-            return checkNotNull(offlineDevices.get());
-        } catch (Exception e) {
-            throw handleException(e);
-        }
-    }
-
-    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
-    @RequestMapping(value = "/device/online", method = RequestMethod.GET)
-    @ResponseBody
-    public List<Device> getOnlineDevices(@RequestParam("contactType") DeviceStatusQuery.ContactType contactType,
-                                         @RequestParam("threshold") long threshold) throws ThingsboardException {
-        try {
-            TenantId tenantId = getCurrentUser().getTenantId();
-            ListenableFuture<List<Device>> offlineDevices = offlineService.findOnlineDevices(tenantId.getId(), contactType, threshold);
-            return checkNotNull(offlineDevices.get());
-        } catch (Exception e) {
-            throw handleException(e);
-        }
-    }
 }
 }

@@ -262,7 +262,7 @@ public class DefaultDeviceStateService implements DeviceStateService {
             state.setInactivityTimeout(inactivityTimeout);
             state.setInactivityTimeout(inactivityTimeout);
             boolean oldActive = state.isActive();
             boolean oldActive = state.isActive();
             state.setActive(ts < state.getLastActivityTime() + state.getInactivityTimeout());
             state.setActive(ts < state.getLastActivityTime() + state.getInactivityTimeout());
-            if (!oldActive && state.isActive()) {
+            if (!oldActive && state.isActive() || oldActive && !state.isActive()) {
                 saveAttribute(deviceId, ACTIVITY_STATE, state.isActive());
                 saveAttribute(deviceId, ACTIVITY_STATE, state.isActive());
             }
             }
         }
         }
@@ -333,10 +333,6 @@ public class DefaultDeviceStateService implements DeviceStateService {
         });
         });
     }
     }
 
 
-    private long getLastPersistTime(List<AttributeKvEntry> attributes) {
-        return attributes.stream().map(AttributeKvEntry::getLastUpdateTs).max(Long::compare).orElse(0L);
-    }
-
     private long getAttributeValue(List<AttributeKvEntry> attributes, String attributeName, long defaultValue) {
     private long getAttributeValue(List<AttributeKvEntry> attributes, String attributeName, long defaultValue) {
         for (AttributeKvEntry attribute : attributes) {
         for (AttributeKvEntry attribute : attributes) {
             if (attribute.getKey().equals(attributeName)) {
             if (attribute.getKey().equals(attributeName)) {

-/**
- * Copyright © 2016-2018 The Thingsboard Authors
- *
- * 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.thingsboard.server.system;
-
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.google.common.collect.ImmutableMap;
-import org.junit.Before;
-import org.junit.Test;
-import org.thingsboard.server.common.data.Device;
-import org.thingsboard.server.common.data.security.DeviceCredentials;
-import org.thingsboard.server.controller.AbstractControllerTest;
-
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-
-import static org.junit.Assert.assertEquals;
-
-public class BaseDeviceOfflineTest  extends AbstractControllerTest {
-
-    private Device deviceA;
-    private Device deviceB;
-    private DeviceCredentials credA;
-    private DeviceCredentials credB;
-
-    @Before
-    public void before() throws Exception {
-        loginTenantAdmin();
-        deviceA = createDevice("DevA", "VMS");
-        credA = getCredentials(deviceA.getUuidId());
-        deviceB = createDevice("DevB", "SOLAR");
-        credB = getCredentials(deviceB.getUuidId());
-    }
-
-    @Test
-    public void offlineDevicesCanBeFoundByLastConnectField() throws Exception {
-        makeDeviceContact(credA);
-        Thread.sleep(1000);
-        makeDeviceContact(credB);
-        Thread.sleep(100);
-        List<Device> devices = doGetTyped("/api/device/offline?contactType=CONNECT&threshold=700", new TypeReference<List<Device>>() {
-        });
-
-        assertEquals(devices.toString(),1, devices.size());
-        assertEquals("DevA", devices.get(0).getName());
-    }
-
-    @Test
-    public void offlineDevicesCanBeFoundByLastUpdateField() throws Exception {
-        makeDeviceUpdate(credA);
-        Thread.sleep(1000);
-        makeDeviceUpdate(credB);
-        makeDeviceContact(credA);
-        Thread.sleep(100);
-        List<Device> devices = doGetTyped("/api/device/offline?contactType=UPLOAD&threshold=700", new TypeReference<List<Device>>() {
-        });
-
-        assertEquals(devices.toString(),1, devices.size());
-        assertEquals("DevA", devices.get(0).getName());
-    }
-
-    @Test
-    public void onlineDevicesCanBeFoundByLastConnectField() throws Exception {
-        makeDeviceContact(credB);
-        Thread.sleep(1000);
-        makeDeviceContact(credA);
-        Thread.sleep(100);
-        List<Device> devices = doGetTyped("/api/device/online?contactType=CONNECT&threshold=700", new TypeReference<List<Device>>() {
-        });
-
-        assertEquals(devices.toString(),1, devices.size());
-        assertEquals("DevA", devices.get(0).getName());
-    }
-
-    @Test
-    public void onlineDevicesCanBeFoundByLastUpdateField() throws Exception {
-        makeDeviceUpdate(credB);
-        Thread.sleep(1000);
-        makeDeviceUpdate(credA);
-        makeDeviceContact(credB);
-        Thread.sleep(100);
-        List<Device> devices = doGetTyped("/api/device/online?contactType=UPLOAD&threshold=700", new TypeReference<List<Device>>() {
-        });
-
-        assertEquals(devices.toString(),1, devices.size());
-        assertEquals("DevA", devices.get(0).getName());
-    }
-
-    private Device createDevice(String name, String type) throws Exception {
-        Device device = new Device();
-        device.setName(name);
-        device.setType(type);
-        long currentTime = System.currentTimeMillis() - TimeUnit.SECONDS.toMillis(10);
-        device.setLastConnectTs(currentTime);
-        device.setLastUpdateTs(currentTime);
-        return doPost("/api/device", device, Device.class);
-    }
-
-    private DeviceCredentials getCredentials(UUID deviceId) throws Exception {
-        return doGet("/api/device/" + deviceId.toString() + "/credentials", DeviceCredentials.class);
-    }
-
-    private void makeDeviceUpdate(DeviceCredentials credentials) throws Exception {
-        doPost("/api/v1/" + credentials.getCredentialsId() + "/attributes", ImmutableMap.of("keyA", "valueA"), new String[]{});
-    }
-
-    private void makeDeviceContact(DeviceCredentials credentials) throws Exception {
-        doGet("/api/v1/" + credentials.getCredentialsId() + "/attributes?clientKeys=keyA,keyB,keyC");
-    }
-}

@@ -15,7 +15,6 @@
  */
  */
 package org.thingsboard.server.system;
 package org.thingsboard.server.system;
 
 
-import com.google.common.collect.ImmutableMap;
 import org.junit.Before;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.Test;
 import org.springframework.test.web.servlet.ResultActions;
 import org.springframework.test.web.servlet.ResultActions;
@@ -29,9 +28,6 @@ import java.util.Map;
 import java.util.Random;
 import java.util.Random;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicInteger;
 
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.request;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.request;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@@ -52,9 +48,6 @@ public abstract class BaseHttpDeviceApiTest extends AbstractControllerTest {
         device = new Device();
         device = new Device();
         device.setName("My device");
         device.setName("My device");
         device.setType("default");
         device.setType("default");
-        long currentTime = System.currentTimeMillis();
-        device.setLastConnectTs(currentTime);
-        device.setLastUpdateTs(currentTime);
         device = doPost("/api/device", device, Device.class);
         device = doPost("/api/device", device, Device.class);
 
 
         deviceCredentials =
         deviceCredentials =
@@ -74,34 +67,6 @@ public abstract class BaseHttpDeviceApiTest extends AbstractControllerTest {
         doGetAsync("/api/v1/" + deviceCredentials.getCredentialsId() + "/attributes?clientKeys=keyA,keyB,keyC").andExpect(status().isOk());
         doGetAsync("/api/v1/" + deviceCredentials.getCredentialsId() + "/attributes?clientKeys=keyA,keyB,keyC").andExpect(status().isOk());
     }
     }
 
 
-    @Test
-    public void deviceLastContactAndUpdateFieldsAreUpdated() throws Exception {
-        Device actualDevice = doGet("/api/device/" + this.device.getId(), Device.class);
-        Long initConnectTs = actualDevice.getLastConnectTs();
-        Long initUpdateTs = actualDevice.getLastUpdateTs();
-        assertNotNull(initConnectTs);
-        assertNotNull(initUpdateTs);
-        Thread.sleep(50);
-
-        doPost("/api/v1/" + deviceCredentials.getCredentialsId() + "/attributes", ImmutableMap.of("keyA", "valueA"), new String[]{});
-        actualDevice = doGet("/api/device/" + this.device.getId(), Device.class);
-        Long postConnectTs = actualDevice.getLastConnectTs();
-        Long postUpdateTs = actualDevice.getLastUpdateTs();
-        System.out.println(postConnectTs + "  -   " + postUpdateTs + " -> " + (postConnectTs - initConnectTs) + " : " + (postUpdateTs - initUpdateTs));
-        assertTrue(postConnectTs > initConnectTs);
-        assertEquals(postConnectTs, postUpdateTs);
-        Thread.sleep(50);
-
-        doGet("/api/v1/" + deviceCredentials.getCredentialsId() + "/attributes?clientKeys=keyA,keyB,keyC");
-        Thread.sleep(50);
-        actualDevice = doGet("/api/device/" + this.device.getId(), Device.class);
-        Long getConnectTs = actualDevice.getLastConnectTs();
-        Long getUpdateTs = actualDevice.getLastUpdateTs();
-        assertTrue(getConnectTs > postConnectTs);
-        assertEquals(getUpdateTs, postUpdateTs);
-
-    }
-
     protected ResultActions doGetAsync(String urlTemplate, Object... urlVariables) throws Exception {
     protected ResultActions doGetAsync(String urlTemplate, Object... urlVariables) throws Exception {
         MockHttpServletRequestBuilder getRequest;
         MockHttpServletRequestBuilder getRequest;
         getRequest = get(urlTemplate, urlVariables);
         getRequest = get(urlTemplate, urlVariables);

-/**
- * Copyright © 2016-2018 The Thingsboard Authors
- *
- * 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.thingsboard.server.system.nosql;
-
-import org.thingsboard.server.dao.service.DaoNoSqlTest;
-import org.thingsboard.server.system.BaseDeviceOfflineTest;
-
-@DaoNoSqlTest
-public class DeviceOfflineNoSqlTest extends BaseDeviceOfflineTest {
-}

-/**
- * Copyright © 2016-2018 The Thingsboard Authors
- *
- * 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.thingsboard.server.system.sql;
-
-import org.thingsboard.server.dao.service.DaoSqlTest;
-import org.thingsboard.server.system.BaseDeviceOfflineTest;
-
-@DaoSqlTest
-public class DeviceOfflineSqlTest extends BaseDeviceOfflineTest {
-}

@@ -31,8 +31,6 @@ public class Device extends SearchTextBasedWithAdditionalInfo<DeviceId> implemen
     private CustomerId customerId;
     private CustomerId customerId;
     private String name;
     private String name;
     private String type;
     private String type;
-    private Long lastConnectTs;
-    private Long lastUpdateTs;
 
 
     public Device() {
     public Device() {
         super();
         super();
@@ -83,22 +81,6 @@ public class Device extends SearchTextBasedWithAdditionalInfo<DeviceId> implemen
         this.type = type;
         this.type = type;
     }
     }
 
 
-    public Long getLastConnectTs() {
-        return lastConnectTs;
-    }
-
-    public void setLastConnectTs(Long lastConnectTs) {
-        this.lastConnectTs = lastConnectTs;
-    }
-
-    public Long getLastUpdateTs() {
-        return lastUpdateTs;
-    }
-
-    public void setLastUpdateTs(Long lastUpdateTs) {
-        this.lastUpdateTs = lastUpdateTs;
-    }
-
     @Override
     @Override
     public String getSearchText() {
     public String getSearchText() {
         return getName();
         return getName();
@@ -119,10 +101,6 @@ public class Device extends SearchTextBasedWithAdditionalInfo<DeviceId> implemen
         builder.append(getAdditionalInfo());
         builder.append(getAdditionalInfo());
         builder.append(", createdTime=");
         builder.append(", createdTime=");
         builder.append(createdTime);
         builder.append(createdTime);
-        builder.append(", lastUpdateTs=");
-        builder.append(lastUpdateTs);
-        builder.append(", lastConnectTs=");
-        builder.append(lastConnectTs);
         builder.append(", id=");
         builder.append(", id=");
         builder.append(id);
         builder.append(id);
         builder.append("]");
         builder.append("]");

-/**
- * Copyright © 2016-2018 The Thingsboard Authors
- *
- * 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.thingsboard.server.common.data.device;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.ToString;
-
-@Data
-@AllArgsConstructor
-@ToString
-public class DeviceStatusQuery {
-
-    private Status status;
-    private ContactType contactType;
-    private long threshold;
-
-
-    public enum Status {
-        ONLINE, OFFLINE
-    }
-
-    public enum ContactType {
-        CONNECT, UPLOAD
-    }
-
-}

@@ -15,9 +15,9 @@
  */
  */
 package org.thingsboard.server.dao.device;
 package org.thingsboard.server.dao.device;
 
 
-import com.datastax.driver.core.*;
-import com.datastax.driver.core.querybuilder.Clause;
-import com.datastax.driver.core.querybuilder.QueryBuilder;
+import com.datastax.driver.core.ResultSet;
+import com.datastax.driver.core.ResultSetFuture;
+import com.datastax.driver.core.Statement;
 import com.datastax.driver.core.querybuilder.Select;
 import com.datastax.driver.core.querybuilder.Select;
 import com.datastax.driver.mapping.Result;
 import com.datastax.driver.mapping.Result;
 import com.google.common.base.Function;
 import com.google.common.base.Function;
@@ -28,11 +28,9 @@ import org.springframework.stereotype.Component;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.EntitySubtype;
 import org.thingsboard.server.common.data.EntitySubtype;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.EntityType;
-import org.thingsboard.server.common.data.device.DeviceStatusQuery;
 import org.thingsboard.server.common.data.page.TextPageLink;
 import org.thingsboard.server.common.data.page.TextPageLink;
 import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.model.EntitySubtypeEntity;
 import org.thingsboard.server.dao.model.EntitySubtypeEntity;
-import org.thingsboard.server.dao.model.ModelConstants;
 import org.thingsboard.server.dao.model.nosql.DeviceEntity;
 import org.thingsboard.server.dao.model.nosql.DeviceEntity;
 import org.thingsboard.server.dao.nosql.CassandraAbstractSearchTextDao;
 import org.thingsboard.server.dao.nosql.CassandraAbstractSearchTextDao;
 import org.thingsboard.server.dao.util.NoSqlDao;
 import org.thingsboard.server.dao.util.NoSqlDao;
@@ -159,7 +157,7 @@ public class CassandraDeviceDao extends CassandraAbstractSearchTextDao<DeviceEnt
                 if (result != null) {
                 if (result != null) {
                     List<EntitySubtype> entitySubtypes = new ArrayList<>();
                     List<EntitySubtype> entitySubtypes = new ArrayList<>();
                     result.all().forEach((entitySubtypeEntity) ->
                     result.all().forEach((entitySubtypeEntity) ->
-                            entitySubtypes.add(entitySubtypeEntity.toEntitySubtype())
+                        entitySubtypes.add(entitySubtypeEntity.toEntitySubtype())
                     );
                     );
                     return entitySubtypes;
                     return entitySubtypes;
                 } else {
                 } else {
@@ -169,68 +167,4 @@ public class CassandraDeviceDao extends CassandraAbstractSearchTextDao<DeviceEnt
         });
         });
     }
     }
 
 
-    @Override
-    public ListenableFuture<List<Device>> findDevicesByTenantIdAndStatus(UUID tenantId, DeviceStatusQuery statusQuery) {
-        log.debug("Try to find [{}] devices by tenantId [{}]", statusQuery.getStatus(), tenantId);
-
-        Select select = select().from(DEVICE_BY_TENANT_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME).allowFiltering();
-        Select.Where query = select.where();
-        query.and(eq(DEVICE_TENANT_ID_PROPERTY, tenantId));
-        Clause clause = statusClause(statusQuery);
-        query.and(clause);
-        return findListByStatementAsync(query);
-    }
-
-    @Override
-    public ListenableFuture<List<Device>> findDevicesByTenantIdTypeAndStatus(UUID tenantId, String type, DeviceStatusQuery statusQuery) {
-        log.debug("Try to find [{}] devices by tenantId [{}] and type [{}]", statusQuery.getStatus(), tenantId, type);
-
-        Select select = select().from(DEVICE_BY_TENANT_BY_TYPE_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME).allowFiltering();
-        Select.Where query = select.where()
-                .and(eq(DEVICE_TENANT_ID_PROPERTY, tenantId))
-                .and(eq(DEVICE_TYPE_PROPERTY, type));
-
-        query.and(statusClause(statusQuery));
-        return findListByStatementAsync(query);
-    }
-
-
-    @Override
-    public void saveDeviceStatus(Device device) {
-        PreparedStatement statement = prepare("insert into " +
-                "device (id, tenant_id, customer_id, type, last_connect, last_update) values (?, ?, ?, ?, ?, ?)");
-        BoundStatement boundStatement = statement.bind(device.getUuidId(), device.getTenantId().getId(), device.getCustomerId().getId(),
-                device.getType(), device.getLastConnectTs(), device.getLastUpdateTs());
-        ResultSetFuture resultSetFuture = executeAsyncWrite(boundStatement);
-        Futures.withFallback(resultSetFuture, t -> {
-            log.error("Can't update device status for [{}]", device, t);
-            throw new IllegalArgumentException("Can't update device status for {" + device + "}", t);
-        });
-    }
-
-    private String getStatusProperty(DeviceStatusQuery statusQuery) {
-        switch (statusQuery.getContactType()) {
-            case UPLOAD:
-                return DEVICE_LAST_UPDATE_PROPERTY;
-            case CONNECT:
-                return DEVICE_LAST_CONNECT_PROPERTY;
-        }
-        return null;
-    }
-
-    private Clause statusClause(DeviceStatusQuery statusQuery) {
-        long minTime = System.currentTimeMillis() - statusQuery.getThreshold();
-        String statusProperty = getStatusProperty(statusQuery);
-        if (statusProperty != null) {
-            switch (statusQuery.getStatus()) {
-                case ONLINE:
-                    return gt(statusProperty, minTime);
-                case OFFLINE:
-                    return lt(statusProperty, minTime);
-            }
-        }
-        log.error("Could not build status query from [{}]", statusQuery);
-        throw new IllegalStateException("Could not build status query for device []");
-    }
-
 }
 }

@@ -18,7 +18,6 @@ package org.thingsboard.server.dao.device;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListenableFuture;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.EntitySubtype;
 import org.thingsboard.server.common.data.EntitySubtype;
-import org.thingsboard.server.common.data.device.DeviceStatusQuery;
 import org.thingsboard.server.common.data.page.TextPageLink;
 import org.thingsboard.server.common.data.page.TextPageLink;
 import org.thingsboard.server.dao.Dao;
 import org.thingsboard.server.dao.Dao;
 
 
@@ -28,6 +27,7 @@ import java.util.UUID;
 
 
 /**
 /**
  * The Interface DeviceDao.
  * The Interface DeviceDao.
+ *
  */
  */
 public interface DeviceDao extends Dao<Device> {
 public interface DeviceDao extends Dao<Device> {
 
 
@@ -52,7 +52,7 @@ public interface DeviceDao extends Dao<Device> {
      * Find devices by tenantId, type and page link.
      * Find devices by tenantId, type and page link.
      *
      *
      * @param tenantId the tenantId
      * @param tenantId the tenantId
-     * @param type     the type
+     * @param type the type
      * @param pageLink the page link
      * @param pageLink the page link
      * @return the list of device objects
      * @return the list of device objects
      */
      */
@@ -61,7 +61,7 @@ public interface DeviceDao extends Dao<Device> {
     /**
     /**
      * Find devices by tenantId and devices Ids.
      * Find devices by tenantId and devices Ids.
      *
      *
-     * @param tenantId  the tenantId
+     * @param tenantId the tenantId
      * @param deviceIds the device Ids
      * @param deviceIds the device Ids
      * @return the list of device objects
      * @return the list of device objects
      */
      */
@@ -70,9 +70,9 @@ public interface DeviceDao extends Dao<Device> {
     /**
     /**
      * Find devices by tenantId, customerId and page link.
      * Find devices by tenantId, customerId and page link.
      *
      *
-     * @param tenantId   the tenantId
+     * @param tenantId the tenantId
      * @param customerId the customerId
      * @param customerId the customerId
-     * @param pageLink   the page link
+     * @param pageLink the page link
      * @return the list of device objects
      * @return the list of device objects
      */
      */
     List<Device> findDevicesByTenantIdAndCustomerId(UUID tenantId, UUID customerId, TextPageLink pageLink);
     List<Device> findDevicesByTenantIdAndCustomerId(UUID tenantId, UUID customerId, TextPageLink pageLink);
@@ -80,10 +80,10 @@ public interface DeviceDao extends Dao<Device> {
     /**
     /**
      * Find devices by tenantId, customerId, type and page link.
      * Find devices by tenantId, customerId, type and page link.
      *
      *
-     * @param tenantId   the tenantId
+     * @param tenantId the tenantId
      * @param customerId the customerId
      * @param customerId the customerId
-     * @param type       the type
-     * @param pageLink   the page link
+     * @param type the type
+     * @param pageLink the page link
      * @return the list of device objects
      * @return the list of device objects
      */
      */
     List<Device> findDevicesByTenantIdAndCustomerIdAndType(UUID tenantId, UUID customerId, String type, TextPageLink pageLink);
     List<Device> findDevicesByTenantIdAndCustomerIdAndType(UUID tenantId, UUID customerId, String type, TextPageLink pageLink);
@@ -92,9 +92,9 @@ public interface DeviceDao extends Dao<Device> {
     /**
     /**
      * Find devices by tenantId, customerId and devices Ids.
      * Find devices by tenantId, customerId and devices Ids.
      *
      *
-     * @param tenantId   the tenantId
+     * @param tenantId the tenantId
      * @param customerId the customerId
      * @param customerId the customerId
-     * @param deviceIds  the device Ids
+     * @param deviceIds the device Ids
      * @return the list of device objects
      * @return the list of device objects
      */
      */
     ListenableFuture<List<Device>> findDevicesByTenantIdCustomerIdAndIdsAsync(UUID tenantId, UUID customerId, List<UUID> deviceIds);
     ListenableFuture<List<Device>> findDevicesByTenantIdCustomerIdAndIdsAsync(UUID tenantId, UUID customerId, List<UUID> deviceIds);
@@ -103,7 +103,7 @@ public interface DeviceDao extends Dao<Device> {
      * Find devices by tenantId and device name.
      * Find devices by tenantId and device name.
      *
      *
      * @param tenantId the tenantId
      * @param tenantId the tenantId
-     * @param name     the device name
+     * @param name the device name
      * @return the optional device object
      * @return the optional device object
      */
      */
     Optional<Device> findDeviceByTenantIdAndName(UUID tenantId, String name);
     Optional<Device> findDeviceByTenantIdAndName(UUID tenantId, String name);
@@ -114,31 +114,4 @@ public interface DeviceDao extends Dao<Device> {
      * @return the list of tenant device type objects
      * @return the list of tenant device type objects
      */
      */
     ListenableFuture<List<EntitySubtype>> findTenantDeviceTypesAsync(UUID tenantId);
     ListenableFuture<List<EntitySubtype>> findTenantDeviceTypesAsync(UUID tenantId);
-
-    /**
-     * Find devices by tenantId, statusQuery and page link.
-     *
-     * @param tenantId    the tenantId
-     * @param statusQuery the page link
-     * @return the list of device objects
-     */
-    ListenableFuture<List<Device>> findDevicesByTenantIdAndStatus(UUID tenantId, DeviceStatusQuery statusQuery);
-
-    /**
-     * Find devices by tenantId, type, statusQuery and page link.
-     *
-     * @param tenantId    the tenantId
-     * @param type        the type
-     * @param statusQuery the page link
-     * @return the list of device objects
-     */
-    ListenableFuture<List<Device>> findDevicesByTenantIdTypeAndStatus(UUID tenantId, String type, DeviceStatusQuery statusQuery);
-
-
-    /**
-     * Update device last contact and update timestamp async
-     *
-     * @param device the device object
-     */
-    void saveDeviceStatus(Device device);
 }
 }

-/**
- * Copyright © 2016-2018 The Thingsboard Authors
- *
- * 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.thingsboard.server.dao.device;
-
-import com.google.common.util.concurrent.ListenableFuture;
-import org.thingsboard.server.common.data.Device;
-import org.thingsboard.server.common.data.device.DeviceStatusQuery;
-
-import java.util.List;
-import java.util.UUID;
-
-public interface DeviceOfflineService {
-
-    void online(Device device, boolean isUpdate);
-
-    void offline(Device device);
-
-    ListenableFuture<List<Device>> findOfflineDevices(UUID tenantId, DeviceStatusQuery.ContactType contactType, long offlineThreshold);
-
-    ListenableFuture<List<Device>> findOnlineDevices(UUID tenantId, DeviceStatusQuery.ContactType contactType, long offlineThreshold);
-}

-/**
- * Copyright © 2016-2018 The Thingsboard Authors
- *
- * 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.thingsboard.server.dao.device;
-
-import com.google.common.util.concurrent.ListenableFuture;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.thingsboard.server.common.data.Device;
-import org.thingsboard.server.common.data.device.DeviceStatusQuery;
-
-import java.util.List;
-import java.util.UUID;
-
-import static org.thingsboard.server.common.data.device.DeviceStatusQuery.Status.OFFLINE;
-import static org.thingsboard.server.common.data.device.DeviceStatusQuery.Status.ONLINE;
-
-@Service
-public class DeviceOfflineServiceImpl implements DeviceOfflineService {
-
-    @Autowired
-    private DeviceDao deviceDao;
-
-    @Override
-    public void online(Device device, boolean isUpdate) {
-        long current = System.currentTimeMillis();
-        device.setLastConnectTs(current);
-        if(isUpdate) {
-            device.setLastUpdateTs(current);
-        }
-        deviceDao.saveDeviceStatus(device);
-    }
-
-    @Override
-    public void offline(Device device) {
-        online(device, false);
-    }
-
-    @Override
-    public ListenableFuture<List<Device>> findOfflineDevices(UUID tenantId, DeviceStatusQuery.ContactType contactType, long offlineThreshold) {
-        DeviceStatusQuery statusQuery = new DeviceStatusQuery(OFFLINE, contactType, offlineThreshold);
-        return deviceDao.findDevicesByTenantIdAndStatus(tenantId, statusQuery);
-    }
-
-    @Override
-    public ListenableFuture<List<Device>> findOnlineDevices(UUID tenantId, DeviceStatusQuery.ContactType contactType, long offlineThreshold) {
-        DeviceStatusQuery statusQuery = new DeviceStatusQuery(ONLINE, contactType, offlineThreshold);
-        return deviceDao.findDevicesByTenantIdAndStatus(tenantId, statusQuery);
-    }
-}

@@ -133,8 +133,6 @@ public class ModelConstants {
     public static final String DEVICE_NAME_PROPERTY = "name";
     public static final String DEVICE_NAME_PROPERTY = "name";
     public static final String DEVICE_TYPE_PROPERTY = "type";
     public static final String DEVICE_TYPE_PROPERTY = "type";
     public static final String DEVICE_ADDITIONAL_INFO_PROPERTY = ADDITIONAL_INFO_PROPERTY;
     public static final String DEVICE_ADDITIONAL_INFO_PROPERTY = ADDITIONAL_INFO_PROPERTY;
-    public static final String DEVICE_LAST_CONNECT_PROPERTY = "last_connect";
-    public static final String DEVICE_LAST_UPDATE_PROPERTY = "last_update";
 
 
     public static final String DEVICE_BY_TENANT_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME = "device_by_tenant_and_search_text";
     public static final String DEVICE_BY_TENANT_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME = "device_by_tenant_and_search_text";
     public static final String DEVICE_BY_TENANT_BY_TYPE_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME = "device_by_tenant_by_type_and_search_text";
     public static final String DEVICE_BY_TENANT_BY_TYPE_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME = "device_by_tenant_by_type_and_search_text";

@@ -63,12 +63,6 @@ public final class DeviceEntity implements SearchTextEntity<Device> {
     @Column(name = DEVICE_ADDITIONAL_INFO_PROPERTY, codec = JsonCodec.class)
     @Column(name = DEVICE_ADDITIONAL_INFO_PROPERTY, codec = JsonCodec.class)
     private JsonNode additionalInfo;
     private JsonNode additionalInfo;
 
 
-    @Column(name = DEVICE_LAST_CONNECT_PROPERTY)
-    private Long lastConnectTs;
-
-    @Column(name = DEVICE_LAST_UPDATE_PROPERTY)
-    private Long lastUpdateTs;
-
     public DeviceEntity() {
     public DeviceEntity() {
         super();
         super();
     }
     }
@@ -86,8 +80,6 @@ public final class DeviceEntity implements SearchTextEntity<Device> {
         this.name = device.getName();
         this.name = device.getName();
         this.type = device.getType();
         this.type = device.getType();
         this.additionalInfo = device.getAdditionalInfo();
         this.additionalInfo = device.getAdditionalInfo();
-        this.lastConnectTs = device.getLastConnectTs();
-        this.lastUpdateTs = device.getLastUpdateTs();
     }
     }
     
     
     public UUID getId() {
     public UUID getId() {
@@ -137,23 +129,7 @@ public final class DeviceEntity implements SearchTextEntity<Device> {
     public void setAdditionalInfo(JsonNode additionalInfo) {
     public void setAdditionalInfo(JsonNode additionalInfo) {
         this.additionalInfo = additionalInfo;
         this.additionalInfo = additionalInfo;
     }
     }
-
-    public Long getLastConnectTs() {
-        return lastConnectTs;
-    }
-
-    public void setLastConnectTs(Long lastConnectTs) {
-        this.lastConnectTs = lastConnectTs;
-    }
-
-    public Long getLastUpdateTs() {
-        return lastUpdateTs;
-    }
-
-    public void setLastUpdateTs(Long lastUpdateTs) {
-        this.lastUpdateTs = lastUpdateTs;
-    }
-
+    
     @Override
     @Override
     public String getSearchTextSource() {
     public String getSearchTextSource() {
         return getName();
         return getName();
@@ -181,8 +157,6 @@ public final class DeviceEntity implements SearchTextEntity<Device> {
         device.setName(name);
         device.setName(name);
         device.setType(type);
         device.setType(type);
         device.setAdditionalInfo(additionalInfo);
         device.setAdditionalInfo(additionalInfo);
-        device.setLastConnectTs(lastConnectTs);
-        device.setLastUpdateTs(lastUpdateTs);
         return device;
         return device;
     }
     }
 
 

@@ -34,9 +34,6 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Table;
 
 
-import static org.thingsboard.server.dao.model.ModelConstants.DEVICE_LAST_CONNECT_PROPERTY;
-import static org.thingsboard.server.dao.model.ModelConstants.DEVICE_LAST_UPDATE_PROPERTY;
-
 @Data
 @Data
 @EqualsAndHashCode(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 @Entity
 @Entity
@@ -63,12 +60,6 @@ public final class DeviceEntity extends BaseSqlEntity<Device> implements SearchT
     @Column(name = ModelConstants.DEVICE_ADDITIONAL_INFO_PROPERTY)
     @Column(name = ModelConstants.DEVICE_ADDITIONAL_INFO_PROPERTY)
     private JsonNode additionalInfo;
     private JsonNode additionalInfo;
 
 
-    @Column(name = DEVICE_LAST_CONNECT_PROPERTY)
-    private Long lastConnectTs;
-
-    @Column(name = DEVICE_LAST_UPDATE_PROPERTY)
-    private Long lastUpdateTs;
-
     public DeviceEntity() {
     public DeviceEntity() {
         super();
         super();
     }
     }
@@ -86,8 +77,6 @@ public final class DeviceEntity extends BaseSqlEntity<Device> implements SearchT
         this.name = device.getName();
         this.name = device.getName();
         this.type = device.getType();
         this.type = device.getType();
         this.additionalInfo = device.getAdditionalInfo();
         this.additionalInfo = device.getAdditionalInfo();
-        this.lastConnectTs = device.getLastConnectTs();
-        this.lastUpdateTs = device.getLastUpdateTs();
     }
     }
 
 
     @Override
     @Override
@@ -113,8 +102,6 @@ public final class DeviceEntity extends BaseSqlEntity<Device> implements SearchT
         device.setName(name);
         device.setName(name);
         device.setType(type);
         device.setType(type);
         device.setAdditionalInfo(additionalInfo);
         device.setAdditionalInfo(additionalInfo);
-        device.setLastConnectTs(lastConnectTs);
-        device.setLastUpdateTs(lastUpdateTs);
         return device;
         return device;
     }
     }
 }
 }

@@ -79,28 +79,4 @@ public interface DeviceRepository extends CrudRepository<DeviceEntity, String> {
     List<DeviceEntity> findDevicesByTenantIdAndCustomerIdAndIdIn(String tenantId, String customerId, List<String> deviceIds);
     List<DeviceEntity> findDevicesByTenantIdAndCustomerIdAndIdIn(String tenantId, String customerId, List<String> deviceIds);
 
 
     List<DeviceEntity> findDevicesByTenantIdAndIdIn(String tenantId, List<String> deviceIds);
     List<DeviceEntity> findDevicesByTenantIdAndIdIn(String tenantId, List<String> deviceIds);
-
-    @Query("SELECT d FROM DeviceEntity d WHERE d.tenantId = :tenantId AND d.lastConnectTs > :time")
-    List<DeviceEntity> findConnectOnlineByTenantId(@Param("tenantId") String tenantId, @Param("time") long time);
-
-    @Query("SELECT d FROM DeviceEntity d WHERE d.tenantId = :tenantId AND d.lastConnectTs < :time")
-    List<DeviceEntity> findConnectOfflineByTenantId(@Param("tenantId") String tenantId, @Param("time") long time);
-
-    @Query("SELECT d FROM DeviceEntity d WHERE d.tenantId = :tenantId AND d.lastUpdateTs > :time")
-    List<DeviceEntity> findUpdateOnlineByTenantId(@Param("tenantId") String tenantId, @Param("time") long time);
-
-    @Query("SELECT d FROM DeviceEntity d WHERE d.tenantId = :tenantId AND d.lastUpdateTs < :time")
-    List<DeviceEntity> findUpdateOfflineByTenantId(@Param("tenantId") String tenantId, @Param("time") long time);
-
-    @Query("SELECT d FROM DeviceEntity d WHERE d.tenantId = :tenantId AND d.lastConnectTs > :time AND d.type = :type")
-    List<DeviceEntity> findConnectOnlineByTenantIdAndType(@Param("tenantId") String tenantId, @Param("time") long time, @Param("type") String type);
-
-    @Query("SELECT d FROM DeviceEntity d WHERE d.tenantId = :tenantId AND d.lastConnectTs < :time AND d.type = :type")
-    List<DeviceEntity> findConnectOfflineByTenantIdAndType(@Param("tenantId") String tenantId, @Param("time") long time, @Param("type") String type);
-
-    @Query("SELECT d FROM DeviceEntity d WHERE d.tenantId = :tenantId AND d.lastUpdateTs > :time AND d.type = :type")
-    List<DeviceEntity> findUpdateOnlineByTenantIdAndType(@Param("tenantId") String tenantId, @Param("time") long time, @Param("type") String type);
-
-    @Query("SELECT d FROM DeviceEntity d WHERE d.tenantId = :tenantId AND d.lastUpdateTs < :time AND d.type = :type")
-    List<DeviceEntity> findUpdateOfflineByTenantIdAndType(@Param("tenantId") String tenantId, @Param("time") long time, @Param("type") String type);
 }
 }

@@ -15,9 +15,7 @@
  */
  */
 package org.thingsboard.server.dao.sql.device;
 package org.thingsboard.server.dao.sql.device;
 
 
-import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListenableFuture;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.CrudRepository;
@@ -26,7 +24,6 @@ import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.EntitySubtype;
 import org.thingsboard.server.common.data.EntitySubtype;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.UUIDConverter;
 import org.thingsboard.server.common.data.UUIDConverter;
-import org.thingsboard.server.common.data.device.DeviceStatusQuery;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.TextPageLink;
 import org.thingsboard.server.common.data.page.TextPageLink;
 import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.DaoUtil;
@@ -46,7 +43,6 @@ import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID_STR;
  */
  */
 @Component
 @Component
 @SqlDao
 @SqlDao
-@Slf4j
 public class JpaDeviceDao extends JpaAbstractSearchTextDao<DeviceEntity, Device> implements DeviceDao {
 public class JpaDeviceDao extends JpaAbstractSearchTextDao<DeviceEntity, Device> implements DeviceDao {
 
 
     @Autowired
     @Autowired
@@ -128,73 +124,6 @@ public class JpaDeviceDao extends JpaAbstractSearchTextDao<DeviceEntity, Device>
         return service.submit(() -> convertTenantDeviceTypesToDto(tenantId, deviceRepository.findTenantDeviceTypes(fromTimeUUID(tenantId))));
         return service.submit(() -> convertTenantDeviceTypesToDto(tenantId, deviceRepository.findTenantDeviceTypes(fromTimeUUID(tenantId))));
     }
     }
 
 
-    @Override
-    public ListenableFuture<List<Device>> findDevicesByTenantIdAndStatus(UUID tenantId, DeviceStatusQuery statusQuery) {
-        String strTenantId = fromTimeUUID(tenantId);
-        long minTime = System.currentTimeMillis() - statusQuery.getThreshold();
-        switch (statusQuery.getStatus()) {
-            case OFFLINE: {
-                switch (statusQuery.getContactType()) {
-                    case UPLOAD:
-                        return service.submit(() -> DaoUtil.convertDataList(deviceRepository.findUpdateOfflineByTenantId(strTenantId, minTime)));
-                    case CONNECT:
-                        return service.submit(() -> DaoUtil.convertDataList(deviceRepository.findConnectOfflineByTenantId(strTenantId, minTime)));
-                }
-                break;
-            }
-            case ONLINE: {
-                switch (statusQuery.getContactType()) {
-                    case UPLOAD:
-                        return service.submit(() -> DaoUtil.convertDataList(deviceRepository.findUpdateOnlineByTenantId(strTenantId, minTime)));
-                    case CONNECT:
-                        return service.submit(() -> DaoUtil.convertDataList(deviceRepository.findConnectOnlineByTenantId(strTenantId, minTime)));
-                }
-                break;
-            }
-        }
-
-        log.error("Could not build status query from [{}]", statusQuery);
-        throw new IllegalStateException("Could not build status query for device []");
-    }
-
-    @Override
-    public ListenableFuture<List<Device>> findDevicesByTenantIdTypeAndStatus(UUID tenantId, String type, DeviceStatusQuery statusQuery) {
-        String strTenantId = fromTimeUUID(tenantId);
-        long minTime = System.currentTimeMillis() - statusQuery.getThreshold();
-        switch (statusQuery.getStatus()) {
-            case OFFLINE: {
-                switch (statusQuery.getContactType()) {
-                    case UPLOAD:
-                        return service.submit(() -> DaoUtil.convertDataList(deviceRepository.findUpdateOfflineByTenantIdAndType(strTenantId, minTime, type)));
-                    case CONNECT:
-                        return service.submit(() -> DaoUtil.convertDataList(deviceRepository.findConnectOfflineByTenantIdAndType(strTenantId, minTime, type)));
-                }
-                break;
-            }
-            case ONLINE: {
-                switch (statusQuery.getContactType()) {
-                    case UPLOAD:
-                        return service.submit(() -> DaoUtil.convertDataList(deviceRepository.findUpdateOnlineByTenantIdAndType(strTenantId, minTime, type)));
-                    case CONNECT:
-                        return service.submit(() -> DaoUtil.convertDataList(deviceRepository.findConnectOnlineByTenantIdAndType(strTenantId, minTime, type)));
-                }
-                break;
-            }
-        }
-
-        log.error("Could not build status query from [{}]", statusQuery);
-        throw new IllegalStateException("Could not build status query for device []");
-    }
-
-    @Override
-    public void saveDeviceStatus(Device device) {
-        ListenableFuture<Device> future = service.submit(() -> save(device));
-        Futures.withFallback(future, t -> {
-            log.error("Can't update device status for [{}]", device, t);
-            throw new IllegalArgumentException("Can't update device status for {" + device + "}", t);
-        });
-    }
-
     private List<EntitySubtype> convertTenantDeviceTypesToDto(UUID tenantId, List<String> types) {
     private List<EntitySubtype> convertTenantDeviceTypesToDto(UUID tenantId, List<String> types) {
         List<EntitySubtype> list = Collections.emptyList();
         List<EntitySubtype> list = Collections.emptyList();
         if (types != null && !types.isEmpty()) {
         if (types != null && !types.isEmpty()) {

@@ -159,8 +159,6 @@ CREATE TABLE IF NOT EXISTS thingsboard.device (
     type text,
     type text,
     search_text text,
     search_text text,
     additional_info text,
     additional_info text,
-    last_connect bigint,
-    last_update bigint,
     PRIMARY KEY (id, tenant_id, customer_id, type)
     PRIMARY KEY (id, tenant_id, customer_id, type)
 );
 );
 
 

@@ -118,9 +118,7 @@ CREATE TABLE IF NOT EXISTS device (
     type varchar(255),
     type varchar(255),
     name varchar(255),
     name varchar(255),
     search_text varchar(255),
     search_text varchar(255),
-    tenant_id varchar(31),
-    last_connect bigint,
-    last_update bigint
+    tenant_id varchar(31)
 );
 );
 
 
 CREATE TABLE IF NOT EXISTS device_credentials (
 CREATE TABLE IF NOT EXISTS device_credentials (

@@ -59,6 +59,9 @@ public class TbMsgToEmailNodeTest {
         initWithScript();
         initWithScript();
         metaData.putValue("username", "oreo");
         metaData.putValue("username", "oreo");
         metaData.putValue("userEmail", "user@email.io");
         metaData.putValue("userEmail", "user@email.io");
+        metaData.putValue("name", "temp");
+        metaData.putValue("passed", "5");
+        metaData.putValue("count", "100");
         TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", originator, metaData, rawJson, ruleChainId, ruleNodeId, 0L);
         TbMsg msg = new TbMsg(UUIDs.timeBased(), "USER", originator, metaData, rawJson, ruleChainId, ruleNodeId, 0L);
 
 
         emailNode.onMsg(ctx, msg);
         emailNode.onMsg(ctx, msg);
@@ -91,9 +94,9 @@ public class TbMsgToEmailNodeTest {
         try {
         try {
             TbMsgToEmailNodeConfiguration config = new TbMsgToEmailNodeConfiguration();
             TbMsgToEmailNodeConfiguration config = new TbMsgToEmailNodeConfiguration();
             config.setFromTemplate("test@mail.org");
             config.setFromTemplate("test@mail.org");
-            config.setToTemplate("$metadata.userEmail");
-            config.setSubjectTemplate("Hi $metadata.username there");
-            config.setBodyTemplate("$msg.name is to high. Current $msg.passed and $msg.complex.count");
+            config.setToTemplate("${userEmail}");
+            config.setSubjectTemplate("Hi ${username} there");
+            config.setBodyTemplate("${name} is to high. Current ${passed} and ${count}");
             ObjectMapper mapper = new ObjectMapper();
             ObjectMapper mapper = new ObjectMapper();
             TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(mapper.valueToTree(config));
             TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(mapper.valueToTree(config));
 
 

@@ -35,7 +35,6 @@ import org.thingsboard.server.common.transport.SessionMsgProcessor;
 import org.thingsboard.server.common.transport.adaptor.AdaptorException;
 import org.thingsboard.server.common.transport.adaptor.AdaptorException;
 import org.thingsboard.server.common.transport.auth.DeviceAuthService;
 import org.thingsboard.server.common.transport.auth.DeviceAuthService;
 import org.thingsboard.server.common.transport.quota.QuotaService;
 import org.thingsboard.server.common.transport.quota.QuotaService;
-import org.thingsboard.server.dao.device.DeviceOfflineService;
 import org.thingsboard.server.transport.coap.adaptors.CoapTransportAdaptor;
 import org.thingsboard.server.transport.coap.adaptors.CoapTransportAdaptor;
 import org.thingsboard.server.transport.coap.session.CoapExchangeObserverProxy;
 import org.thingsboard.server.transport.coap.session.CoapExchangeObserverProxy;
 import org.thingsboard.server.transport.coap.session.CoapSessionCtx;
 import org.thingsboard.server.transport.coap.session.CoapSessionCtx;
@@ -54,17 +53,15 @@ public class CoapTransportResource extends CoapResource {
     private final SessionMsgProcessor processor;
     private final SessionMsgProcessor processor;
     private final DeviceAuthService authService;
     private final DeviceAuthService authService;
     private final QuotaService quotaService;
     private final QuotaService quotaService;
-    private final DeviceOfflineService offlineService;
     private final Field observerField;
     private final Field observerField;
     private final long timeout;
     private final long timeout;
 
 
     public CoapTransportResource(SessionMsgProcessor processor, DeviceAuthService authService, CoapTransportAdaptor adaptor, String name,
     public CoapTransportResource(SessionMsgProcessor processor, DeviceAuthService authService, CoapTransportAdaptor adaptor, String name,
-                                 long timeout, QuotaService quotaService, DeviceOfflineService offlineService) {
+                                 long timeout, QuotaService quotaService) {
         super(name);
         super(name);
         this.processor = processor;
         this.processor = processor;
         this.authService = authService;
         this.authService = authService;
         this.quotaService = quotaService;
         this.quotaService = quotaService;
-        this.offlineService = offlineService;
         this.adaptor = adaptor;
         this.adaptor = adaptor;
         this.timeout = timeout;
         this.timeout = timeout;
         // This is important to turn off existing observable logic in
         // This is important to turn off existing observable logic in
@@ -171,7 +168,6 @@ public class CoapTransportResource extends CoapResource {
                 case TO_SERVER_RPC_REQUEST:
                 case TO_SERVER_RPC_REQUEST:
                     ctx.setSessionType(SessionType.SYNC);
                     ctx.setSessionType(SessionType.SYNC);
                     msg = adaptor.convertToActorMsg(ctx, type, request);
                     msg = adaptor.convertToActorMsg(ctx, type, request);
-                    offlineService.online(ctx.getDevice(), true);
                     break;
                     break;
                 case SUBSCRIBE_ATTRIBUTES_REQUEST:
                 case SUBSCRIBE_ATTRIBUTES_REQUEST:
                 case SUBSCRIBE_RPC_COMMANDS_REQUEST:
                 case SUBSCRIBE_RPC_COMMANDS_REQUEST:
@@ -179,13 +175,11 @@ public class CoapTransportResource extends CoapResource {
                     advanced.setObserver(new CoapExchangeObserverProxy(systemObserver, ctx));
                     advanced.setObserver(new CoapExchangeObserverProxy(systemObserver, ctx));
                     ctx.setSessionType(SessionType.ASYNC);
                     ctx.setSessionType(SessionType.ASYNC);
                     msg = adaptor.convertToActorMsg(ctx, type, request);
                     msg = adaptor.convertToActorMsg(ctx, type, request);
-                    offlineService.online(ctx.getDevice(), false);
                     break;
                     break;
                 case UNSUBSCRIBE_ATTRIBUTES_REQUEST:
                 case UNSUBSCRIBE_ATTRIBUTES_REQUEST:
                 case UNSUBSCRIBE_RPC_COMMANDS_REQUEST:
                 case UNSUBSCRIBE_RPC_COMMANDS_REQUEST:
                     ctx.setSessionType(SessionType.ASYNC);
                     ctx.setSessionType(SessionType.ASYNC);
                     msg = adaptor.convertToActorMsg(ctx, type, request);
                     msg = adaptor.convertToActorMsg(ctx, type, request);
-                    offlineService.online(ctx.getDevice(), false);
                     break;
                     break;
                 default:
                 default:
                     log.trace("[{}] Unsupported msg type: {}", ctx.getSessionId(), type);
                     log.trace("[{}] Unsupported msg type: {}", ctx.getSessionId(), type);

@@ -27,7 +27,6 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.transport.SessionMsgProcessor;
 import org.thingsboard.server.common.transport.SessionMsgProcessor;
 import org.thingsboard.server.common.transport.auth.DeviceAuthService;
 import org.thingsboard.server.common.transport.auth.DeviceAuthService;
 import org.thingsboard.server.common.transport.quota.QuotaService;
 import org.thingsboard.server.common.transport.quota.QuotaService;
-import org.thingsboard.server.dao.device.DeviceOfflineService;
 import org.thingsboard.server.transport.coap.adaptors.CoapTransportAdaptor;
 import org.thingsboard.server.transport.coap.adaptors.CoapTransportAdaptor;
 
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PostConstruct;
@@ -58,9 +57,6 @@ public class CoapTransportService {
     @Autowired(required = false)
     @Autowired(required = false)
     private QuotaService quotaService;
     private QuotaService quotaService;
 
 
-    @Autowired(required = false)
-    private DeviceOfflineService offlineService;
-
 
 
     @Value("${coap.bind_address}")
     @Value("${coap.bind_address}")
     private String host;
     private String host;
@@ -90,7 +86,7 @@ public class CoapTransportService {
 
 
     private void createResources() {
     private void createResources() {
         CoapResource api = new CoapResource(API);
         CoapResource api = new CoapResource(API);
-        api.add(new CoapTransportResource(processor, authService, adaptor, V1, timeout, quotaService, offlineService));
+        api.add(new CoapTransportResource(processor, authService, adaptor, V1, timeout, quotaService));
         server.add(api);
         server.add(api);
     }
     }
 
 

@@ -15,7 +15,6 @@
  */
  */
 package org.thingsboard.server.transport.coap;
 package org.thingsboard.server.transport.coap;
 
 
-import com.google.common.util.concurrent.ListenableFuture;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.californium.core.CoapClient;
 import org.eclipse.californium.core.CoapClient;
 import org.eclipse.californium.core.CoapResponse;
 import org.eclipse.californium.core.CoapResponse;
@@ -32,7 +31,6 @@ import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.annotation.DirtiesContext.ClassMode;
 import org.springframework.test.annotation.DirtiesContext.ClassMode;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.Device;
-import org.thingsboard.server.common.data.device.DeviceStatusQuery;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -53,7 +51,6 @@ import org.thingsboard.server.common.transport.SessionMsgProcessor;
 import org.thingsboard.server.common.transport.auth.DeviceAuthResult;
 import org.thingsboard.server.common.transport.auth.DeviceAuthResult;
 import org.thingsboard.server.common.transport.auth.DeviceAuthService;
 import org.thingsboard.server.common.transport.auth.DeviceAuthService;
 import org.thingsboard.server.common.transport.quota.QuotaService;
 import org.thingsboard.server.common.transport.quota.QuotaService;
-import org.thingsboard.server.dao.device.DeviceOfflineService;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
@@ -140,31 +137,6 @@ public class CoapServerTest {
         public static QuotaService quotaService() {
         public static QuotaService quotaService() {
             return key -> false;
             return key -> false;
         }
         }
-
-        @Bean
-        public static DeviceOfflineService offlineService() {
-            return new DeviceOfflineService() {
-                @Override
-                public void online(Device device, boolean isUpdate) {
-
-                }
-
-                @Override
-                public void offline(Device device) {
-
-                }
-
-                @Override
-                public ListenableFuture<List<Device>> findOfflineDevices(UUID tenantId, DeviceStatusQuery.ContactType contactType, long offlineThreshold) {
-                    return null;
-                }
-
-                @Override
-                public ListenableFuture<List<Device>> findOnlineDevices(UUID tenantId, DeviceStatusQuery.ContactType contactType, long offlineThreshold) {
-                    return null;
-                }
-            };
-        }
     }
     }
 
 
     @Autowired
     @Autowired

@@ -26,7 +26,6 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.util.StringUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.context.request.async.DeferredResult;
 import org.springframework.web.context.request.async.DeferredResult;
-import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.security.DeviceTokenCredentials;
 import org.thingsboard.server.common.data.security.DeviceTokenCredentials;
 import org.thingsboard.server.common.msg.core.*;
 import org.thingsboard.server.common.msg.core.*;
 import org.thingsboard.server.common.msg.session.AdaptorToSessionActorMsg;
 import org.thingsboard.server.common.msg.session.AdaptorToSessionActorMsg;
@@ -37,7 +36,6 @@ import org.thingsboard.server.common.transport.SessionMsgProcessor;
 import org.thingsboard.server.common.transport.adaptor.JsonConverter;
 import org.thingsboard.server.common.transport.adaptor.JsonConverter;
 import org.thingsboard.server.common.transport.auth.DeviceAuthService;
 import org.thingsboard.server.common.transport.auth.DeviceAuthService;
 import org.thingsboard.server.common.transport.quota.QuotaService;
 import org.thingsboard.server.common.transport.quota.QuotaService;
-import org.thingsboard.server.dao.device.DeviceOfflineService;
 import org.thingsboard.server.transport.http.session.HttpSessionCtx;
 import org.thingsboard.server.transport.http.session.HttpSessionCtx;
 
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
@@ -65,9 +63,6 @@ public class DeviceApiController {
     @Autowired(required = false)
     @Autowired(required = false)
     private QuotaService quotaService;
     private QuotaService quotaService;
 
 
-    @Autowired(required = false)
-    private DeviceOfflineService offlineService;
-
     @RequestMapping(value = "/{deviceToken}/attributes", method = RequestMethod.GET, produces = "application/json")
     @RequestMapping(value = "/{deviceToken}/attributes", method = RequestMethod.GET, produces = "application/json")
     public DeferredResult<ResponseEntity> getDeviceAttributes(@PathVariable("deviceToken") String deviceToken,
     public DeferredResult<ResponseEntity> getDeviceAttributes(@PathVariable("deviceToken") String deviceToken,
                                                               @RequestParam(value = "clientKeys", required = false, defaultValue = "") String clientKeys,
                                                               @RequestParam(value = "clientKeys", required = false, defaultValue = "") String clientKeys,
@@ -87,7 +82,7 @@ public class DeviceApiController {
                 Set<String> sharedKeySet = !StringUtils.isEmpty(sharedKeys) ? new HashSet<>(Arrays.asList(sharedKeys.split(","))) : null;
                 Set<String> sharedKeySet = !StringUtils.isEmpty(sharedKeys) ? new HashSet<>(Arrays.asList(sharedKeys.split(","))) : null;
                 request = new BasicGetAttributesRequest(0, clientKeySet, sharedKeySet);
                 request = new BasicGetAttributesRequest(0, clientKeySet, sharedKeySet);
             }
             }
-            process(ctx, request, false);
+            process(ctx, request);
         } else {
         } else {
             responseWriter.setResult(new ResponseEntity<>(HttpStatus.UNAUTHORIZED));
             responseWriter.setResult(new ResponseEntity<>(HttpStatus.UNAUTHORIZED));
         }
         }
@@ -105,7 +100,7 @@ public class DeviceApiController {
         HttpSessionCtx ctx = getHttpSessionCtx(responseWriter);
         HttpSessionCtx ctx = getHttpSessionCtx(responseWriter);
         if (ctx.login(new DeviceTokenCredentials(deviceToken))) {
         if (ctx.login(new DeviceTokenCredentials(deviceToken))) {
             try {
             try {
-                process(ctx, JsonConverter.convertToAttributes(new JsonParser().parse(json)), true);
+                process(ctx, JsonConverter.convertToAttributes(new JsonParser().parse(json)));
             } catch (IllegalStateException | JsonSyntaxException ex) {
             } catch (IllegalStateException | JsonSyntaxException ex) {
                 responseWriter.setResult(new ResponseEntity<>(HttpStatus.BAD_REQUEST));
                 responseWriter.setResult(new ResponseEntity<>(HttpStatus.BAD_REQUEST));
             }
             }
@@ -125,7 +120,7 @@ public class DeviceApiController {
         HttpSessionCtx ctx = getHttpSessionCtx(responseWriter);
         HttpSessionCtx ctx = getHttpSessionCtx(responseWriter);
         if (ctx.login(new DeviceTokenCredentials(deviceToken))) {
         if (ctx.login(new DeviceTokenCredentials(deviceToken))) {
             try {
             try {
-                process(ctx, JsonConverter.convertToTelemetry(new JsonParser().parse(json)), true);
+                process(ctx, JsonConverter.convertToTelemetry(new JsonParser().parse(json)));
             } catch (IllegalStateException | JsonSyntaxException ex) {
             } catch (IllegalStateException | JsonSyntaxException ex) {
                 responseWriter.setResult(new ResponseEntity<>(HttpStatus.BAD_REQUEST));
                 responseWriter.setResult(new ResponseEntity<>(HttpStatus.BAD_REQUEST));
             }
             }
@@ -155,7 +150,7 @@ public class DeviceApiController {
         if (ctx.login(new DeviceTokenCredentials(deviceToken))) {
         if (ctx.login(new DeviceTokenCredentials(deviceToken))) {
             try {
             try {
                 JsonObject response = new JsonParser().parse(json).getAsJsonObject();
                 JsonObject response = new JsonParser().parse(json).getAsJsonObject();
-                process(ctx, new ToDeviceRpcResponseMsg(requestId, response.toString()), true);
+                process(ctx, new ToDeviceRpcResponseMsg(requestId, response.toString()));
             } catch (IllegalStateException | JsonSyntaxException ex) {
             } catch (IllegalStateException | JsonSyntaxException ex) {
                 responseWriter.setResult(new ResponseEntity<>(HttpStatus.BAD_REQUEST));
                 responseWriter.setResult(new ResponseEntity<>(HttpStatus.BAD_REQUEST));
             }
             }
@@ -178,7 +173,7 @@ public class DeviceApiController {
                 JsonObject request = new JsonParser().parse(json).getAsJsonObject();
                 JsonObject request = new JsonParser().parse(json).getAsJsonObject();
                 process(ctx, new ToServerRpcRequestMsg(0,
                 process(ctx, new ToServerRpcRequestMsg(0,
                         request.get("method").getAsString(),
                         request.get("method").getAsString(),
-                        request.get("params").toString()), true);
+                        request.get("params").toString()));
             } catch (IllegalStateException | JsonSyntaxException ex) {
             } catch (IllegalStateException | JsonSyntaxException ex) {
                 responseWriter.setResult(new ResponseEntity<>(HttpStatus.BAD_REQUEST));
                 responseWriter.setResult(new ResponseEntity<>(HttpStatus.BAD_REQUEST));
             }
             }
@@ -204,7 +199,7 @@ public class DeviceApiController {
         HttpSessionCtx ctx = getHttpSessionCtx(responseWriter, timeout);
         HttpSessionCtx ctx = getHttpSessionCtx(responseWriter, timeout);
         if (ctx.login(new DeviceTokenCredentials(deviceToken))) {
         if (ctx.login(new DeviceTokenCredentials(deviceToken))) {
             try {
             try {
-                process(ctx, msg, false);
+                process(ctx, msg);
             } catch (IllegalStateException | JsonSyntaxException ex) {
             } catch (IllegalStateException | JsonSyntaxException ex) {
                 responseWriter.setResult(new ResponseEntity<>(HttpStatus.BAD_REQUEST));
                 responseWriter.setResult(new ResponseEntity<>(HttpStatus.BAD_REQUEST));
             }
             }
@@ -222,10 +217,9 @@ public class DeviceApiController {
         return new HttpSessionCtx(processor, authService, responseWriter, timeout != 0 ? timeout : defaultTimeout);
         return new HttpSessionCtx(processor, authService, responseWriter, timeout != 0 ? timeout : defaultTimeout);
     }
     }
 
 
-    private void process(HttpSessionCtx ctx, FromDeviceMsg request, boolean isUpdate) {
+    private void process(HttpSessionCtx ctx, FromDeviceMsg request) {
         AdaptorToSessionActorMsg msg = new BasicAdaptorToSessionActorMsg(ctx, request);
         AdaptorToSessionActorMsg msg = new BasicAdaptorToSessionActorMsg(ctx, request);
         processor.process(new BasicToDeviceActorSessionMsg(ctx.getDevice(), msg));
         processor.process(new BasicToDeviceActorSessionMsg(ctx.getDevice(), msg));
-        offlineService.online(ctx.getDevice(), isUpdate);
     }
     }
 
 
     private boolean quotaExceeded(HttpServletRequest request, DeferredResult<ResponseEntity> responseWriter) {
     private boolean quotaExceeded(HttpServletRequest request, DeferredResult<ResponseEntity> responseWriter) {

@@ -37,7 +37,6 @@ import org.thingsboard.server.common.transport.adaptor.AdaptorException;
 import org.thingsboard.server.common.transport.auth.DeviceAuthService;
 import org.thingsboard.server.common.transport.auth.DeviceAuthService;
 import org.thingsboard.server.common.transport.quota.QuotaService;
 import org.thingsboard.server.common.transport.quota.QuotaService;
 import org.thingsboard.server.dao.EncryptionUtil;
 import org.thingsboard.server.dao.EncryptionUtil;
-import org.thingsboard.server.dao.device.DeviceOfflineService;
 import org.thingsboard.server.dao.device.DeviceService;
 import org.thingsboard.server.dao.device.DeviceService;
 import org.thingsboard.server.dao.relation.RelationService;
 import org.thingsboard.server.dao.relation.RelationService;
 import org.thingsboard.server.transport.mqtt.adaptors.MqttTransportAdaptor;
 import org.thingsboard.server.transport.mqtt.adaptors.MqttTransportAdaptor;
@@ -73,14 +72,13 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
     private final DeviceAuthService authService;
     private final DeviceAuthService authService;
     private final RelationService relationService;
     private final RelationService relationService;
     private final QuotaService quotaService;
     private final QuotaService quotaService;
-    private final DeviceOfflineService offlineService;
     private final SslHandler sslHandler;
     private final SslHandler sslHandler;
     private volatile boolean connected;
     private volatile boolean connected;
     private volatile InetSocketAddress address;
     private volatile InetSocketAddress address;
     private volatile GatewaySessionCtx gatewaySessionCtx;
     private volatile GatewaySessionCtx gatewaySessionCtx;
 
 
     public MqttTransportHandler(SessionMsgProcessor processor, DeviceService deviceService, DeviceAuthService authService, RelationService relationService,
     public MqttTransportHandler(SessionMsgProcessor processor, DeviceService deviceService, DeviceAuthService authService, RelationService relationService,
-                                MqttTransportAdaptor adaptor, SslHandler sslHandler, QuotaService quotaService, DeviceOfflineService offlineService) {
+                                MqttTransportAdaptor adaptor, SslHandler sslHandler, QuotaService quotaService) {
         this.processor = processor;
         this.processor = processor;
         this.deviceService = deviceService;
         this.deviceService = deviceService;
         this.relationService = relationService;
         this.relationService = relationService;
@@ -90,7 +88,6 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
         this.sessionId = deviceSessionCtx.getSessionId().toUidStr();
         this.sessionId = deviceSessionCtx.getSessionId().toUidStr();
         this.sslHandler = sslHandler;
         this.sslHandler = sslHandler;
         this.quotaService = quotaService;
         this.quotaService = quotaService;
-        this.offlineService = offlineService;
     }
     }
 
 
     @Override
     @Override
@@ -132,13 +129,11 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
             case PINGREQ:
             case PINGREQ:
                 if (checkConnected(ctx)) {
                 if (checkConnected(ctx)) {
                     ctx.writeAndFlush(new MqttMessage(new MqttFixedHeader(PINGRESP, false, AT_MOST_ONCE, false, 0)));
                     ctx.writeAndFlush(new MqttMessage(new MqttFixedHeader(PINGRESP, false, AT_MOST_ONCE, false, 0)));
-                    offlineService.online(deviceSessionCtx.getDevice(), false);
                 }
                 }
                 break;
                 break;
             case DISCONNECT:
             case DISCONNECT:
                 if (checkConnected(ctx)) {
                 if (checkConnected(ctx)) {
                     processDisconnect(ctx);
                     processDisconnect(ctx);
-                    offlineService.offline(deviceSessionCtx.getDevice());
                 }
                 }
                 break;
                 break;
             default:
             default:
@@ -190,28 +185,23 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
         try {
         try {
             if (topicName.equals(DEVICE_TELEMETRY_TOPIC)) {
             if (topicName.equals(DEVICE_TELEMETRY_TOPIC)) {
                 msg = adaptor.convertToActorMsg(deviceSessionCtx, POST_TELEMETRY_REQUEST, mqttMsg);
                 msg = adaptor.convertToActorMsg(deviceSessionCtx, POST_TELEMETRY_REQUEST, mqttMsg);
-                offlineService.online(deviceSessionCtx.getDevice(), true);
             } else if (topicName.equals(DEVICE_ATTRIBUTES_TOPIC)) {
             } else if (topicName.equals(DEVICE_ATTRIBUTES_TOPIC)) {
                 msg = adaptor.convertToActorMsg(deviceSessionCtx, POST_ATTRIBUTES_REQUEST, mqttMsg);
                 msg = adaptor.convertToActorMsg(deviceSessionCtx, POST_ATTRIBUTES_REQUEST, mqttMsg);
-                offlineService.online(deviceSessionCtx.getDevice(), true);
             } else if (topicName.startsWith(DEVICE_ATTRIBUTES_REQUEST_TOPIC_PREFIX)) {
             } else if (topicName.startsWith(DEVICE_ATTRIBUTES_REQUEST_TOPIC_PREFIX)) {
                 msg = adaptor.convertToActorMsg(deviceSessionCtx, GET_ATTRIBUTES_REQUEST, mqttMsg);
                 msg = adaptor.convertToActorMsg(deviceSessionCtx, GET_ATTRIBUTES_REQUEST, mqttMsg);
                 if (msgId >= 0) {
                 if (msgId >= 0) {
                     ctx.writeAndFlush(createMqttPubAckMsg(msgId));
                     ctx.writeAndFlush(createMqttPubAckMsg(msgId));
                 }
                 }
-                offlineService.online(deviceSessionCtx.getDevice(), false);
             } else if (topicName.startsWith(DEVICE_RPC_RESPONSE_TOPIC)) {
             } else if (topicName.startsWith(DEVICE_RPC_RESPONSE_TOPIC)) {
                 msg = adaptor.convertToActorMsg(deviceSessionCtx, TO_DEVICE_RPC_RESPONSE, mqttMsg);
                 msg = adaptor.convertToActorMsg(deviceSessionCtx, TO_DEVICE_RPC_RESPONSE, mqttMsg);
                 if (msgId >= 0) {
                 if (msgId >= 0) {
                     ctx.writeAndFlush(createMqttPubAckMsg(msgId));
                     ctx.writeAndFlush(createMqttPubAckMsg(msgId));
                 }
                 }
-                offlineService.online(deviceSessionCtx.getDevice(), true);
             } else if (topicName.startsWith(DEVICE_RPC_REQUESTS_TOPIC)) {
             } else if (topicName.startsWith(DEVICE_RPC_REQUESTS_TOPIC)) {
                 msg = adaptor.convertToActorMsg(deviceSessionCtx, TO_SERVER_RPC_REQUEST, mqttMsg);
                 msg = adaptor.convertToActorMsg(deviceSessionCtx, TO_SERVER_RPC_REQUEST, mqttMsg);
                 if (msgId >= 0) {
                 if (msgId >= 0) {
                     ctx.writeAndFlush(createMqttPubAckMsg(msgId));
                     ctx.writeAndFlush(createMqttPubAckMsg(msgId));
                 }
                 }
-                offlineService.online(deviceSessionCtx.getDevice(), true);
             }
             }
         } catch (AdaptorException e) {
         } catch (AdaptorException e) {
             log.warn("[{}] Failed to process publish msg [{}][{}]", sessionId, topicName, msgId, e);
             log.warn("[{}] Failed to process publish msg [{}][{}]", sessionId, topicName, msgId, e);
@@ -260,7 +250,6 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
             }
             }
         }
         }
         ctx.writeAndFlush(createSubAckMessage(mqttMsg.variableHeader().messageId(), grantedQoSList));
         ctx.writeAndFlush(createSubAckMessage(mqttMsg.variableHeader().messageId(), grantedQoSList));
-        offlineService.online(deviceSessionCtx.getDevice(), false);
     }
     }
 
 
     private void processUnsubscribe(ChannelHandlerContext ctx, MqttUnsubscribeMessage mqttMsg) {
     private void processUnsubscribe(ChannelHandlerContext ctx, MqttUnsubscribeMessage mqttMsg) {
@@ -284,7 +273,6 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
             }
             }
         }
         }
         ctx.writeAndFlush(createUnSubAckMessage(mqttMsg.variableHeader().messageId()));
         ctx.writeAndFlush(createUnSubAckMessage(mqttMsg.variableHeader().messageId()));
-        offlineService.online(deviceSessionCtx.getDevice(), false);
     }
     }
 
 
     private MqttMessage createUnSubAckMessage(int msgId) {
     private MqttMessage createUnSubAckMessage(int msgId) {
@@ -316,7 +304,6 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
             ctx.writeAndFlush(createMqttConnAckMsg(CONNECTION_ACCEPTED));
             ctx.writeAndFlush(createMqttConnAckMsg(CONNECTION_ACCEPTED));
             connected = true;
             connected = true;
             checkGatewaySession();
             checkGatewaySession();
-            offlineService.online(deviceSessionCtx.getDevice(), false);
         }
         }
     }
     }
 
 
@@ -328,7 +315,6 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
                 ctx.writeAndFlush(createMqttConnAckMsg(CONNECTION_ACCEPTED));
                 ctx.writeAndFlush(createMqttConnAckMsg(CONNECTION_ACCEPTED));
                 connected = true;
                 connected = true;
                 checkGatewaySession();
                 checkGatewaySession();
-                offlineService.online(deviceSessionCtx.getDevice(), false);
             } else {
             } else {
                 ctx.writeAndFlush(createMqttConnAckMsg(CONNECTION_REFUSED_NOT_AUTHORIZED));
                 ctx.writeAndFlush(createMqttConnAckMsg(CONNECTION_REFUSED_NOT_AUTHORIZED));
                 ctx.close();
                 ctx.close();
@@ -379,9 +365,6 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
     public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
     public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
         log.error("[{}] Unexpected Exception", sessionId, cause);
         log.error("[{}] Unexpected Exception", sessionId, cause);
         ctx.close();
         ctx.close();
-        if(deviceSessionCtx.getDevice() != null) {
-            offlineService.offline(deviceSessionCtx.getDevice());
-        }
     }
     }
 
 
     private static MqttSubAckMessage createSubAckMessage(Integer msgId, List<Integer> grantedQoSList) {
     private static MqttSubAckMessage createSubAckMessage(Integer msgId, List<Integer> grantedQoSList) {
@@ -420,8 +403,7 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
         if (infoNode != null) {
         if (infoNode != null) {
             JsonNode gatewayNode = infoNode.get("gateway");
             JsonNode gatewayNode = infoNode.get("gateway");
             if (gatewayNode != null && gatewayNode.asBoolean()) {
             if (gatewayNode != null && gatewayNode.asBoolean()) {
-                gatewaySessionCtx = new GatewaySessionCtx(processor, deviceService, authService,
-                        relationService, deviceSessionCtx, offlineService);
+                gatewaySessionCtx = new GatewaySessionCtx(processor, deviceService, authService, relationService, deviceSessionCtx);
             }
             }
         }
         }
     }
     }
@@ -429,8 +411,5 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
     @Override
     @Override
     public void operationComplete(Future<? super Void> future) throws Exception {
     public void operationComplete(Future<? super Void> future) throws Exception {
         processor.process(SessionCloseMsg.onError(deviceSessionCtx.getSessionId()));
         processor.process(SessionCloseMsg.onError(deviceSessionCtx.getSessionId()));
-        if(deviceSessionCtx.getDevice() != null) {
-            offlineService.offline(deviceSessionCtx.getDevice());
-        }
     }
     }
 }
 }

@@ -24,7 +24,6 @@ import io.netty.handler.ssl.SslHandler;
 import org.thingsboard.server.common.transport.SessionMsgProcessor;
 import org.thingsboard.server.common.transport.SessionMsgProcessor;
 import org.thingsboard.server.common.transport.auth.DeviceAuthService;
 import org.thingsboard.server.common.transport.auth.DeviceAuthService;
 import org.thingsboard.server.common.transport.quota.QuotaService;
 import org.thingsboard.server.common.transport.quota.QuotaService;
-import org.thingsboard.server.dao.device.DeviceOfflineService;
 import org.thingsboard.server.dao.device.DeviceService;
 import org.thingsboard.server.dao.device.DeviceService;
 import org.thingsboard.server.dao.relation.RelationService;
 import org.thingsboard.server.dao.relation.RelationService;
 import org.thingsboard.server.transport.mqtt.adaptors.MqttTransportAdaptor;
 import org.thingsboard.server.transport.mqtt.adaptors.MqttTransportAdaptor;
@@ -43,11 +42,10 @@ public class MqttTransportServerInitializer extends ChannelInitializer<SocketCha
     private final MqttTransportAdaptor adaptor;
     private final MqttTransportAdaptor adaptor;
     private final MqttSslHandlerProvider sslHandlerProvider;
     private final MqttSslHandlerProvider sslHandlerProvider;
     private final QuotaService quotaService;
     private final QuotaService quotaService;
-    private final DeviceOfflineService offlineService;
 
 
     public MqttTransportServerInitializer(SessionMsgProcessor processor, DeviceService deviceService, DeviceAuthService authService, RelationService relationService,
     public MqttTransportServerInitializer(SessionMsgProcessor processor, DeviceService deviceService, DeviceAuthService authService, RelationService relationService,
                                           MqttTransportAdaptor adaptor, MqttSslHandlerProvider sslHandlerProvider,
                                           MqttTransportAdaptor adaptor, MqttSslHandlerProvider sslHandlerProvider,
-                                          QuotaService quotaService, DeviceOfflineService offlineService) {
+                                          QuotaService quotaService) {
         this.processor = processor;
         this.processor = processor;
         this.deviceService = deviceService;
         this.deviceService = deviceService;
         this.authService = authService;
         this.authService = authService;
@@ -55,7 +53,6 @@ public class MqttTransportServerInitializer extends ChannelInitializer<SocketCha
         this.adaptor = adaptor;
         this.adaptor = adaptor;
         this.sslHandlerProvider = sslHandlerProvider;
         this.sslHandlerProvider = sslHandlerProvider;
         this.quotaService = quotaService;
         this.quotaService = quotaService;
-        this.offlineService = offlineService;
     }
     }
 
 
     @Override
     @Override
@@ -70,7 +67,7 @@ public class MqttTransportServerInitializer extends ChannelInitializer<SocketCha
         pipeline.addLast("encoder", MqttEncoder.INSTANCE);
         pipeline.addLast("encoder", MqttEncoder.INSTANCE);
 
 
         MqttTransportHandler handler = new MqttTransportHandler(processor, deviceService, authService, relationService,
         MqttTransportHandler handler = new MqttTransportHandler(processor, deviceService, authService, relationService,
-                adaptor, sslHandler, quotaService, offlineService);
+                adaptor, sslHandler, quotaService);
 
 
         pipeline.addLast(handler);
         pipeline.addLast(handler);
         ch.closeFuture().addListener(handler);
         ch.closeFuture().addListener(handler);

@@ -30,7 +30,6 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.transport.SessionMsgProcessor;
 import org.thingsboard.server.common.transport.SessionMsgProcessor;
 import org.thingsboard.server.common.transport.auth.DeviceAuthService;
 import org.thingsboard.server.common.transport.auth.DeviceAuthService;
 import org.thingsboard.server.common.transport.quota.QuotaService;
 import org.thingsboard.server.common.transport.quota.QuotaService;
-import org.thingsboard.server.dao.device.DeviceOfflineService;
 import org.thingsboard.server.dao.device.DeviceService;
 import org.thingsboard.server.dao.device.DeviceService;
 import org.thingsboard.server.dao.relation.RelationService;
 import org.thingsboard.server.dao.relation.RelationService;
 import org.thingsboard.server.transport.mqtt.adaptors.MqttTransportAdaptor;
 import org.thingsboard.server.transport.mqtt.adaptors.MqttTransportAdaptor;
@@ -70,9 +69,6 @@ public class MqttTransportService {
     @Autowired(required = false)
     @Autowired(required = false)
     private QuotaService quotaService;
     private QuotaService quotaService;
 
 
-    @Autowired(required = false)
-    private DeviceOfflineService offlineService;
-
     @Value("${mqtt.bind_address}")
     @Value("${mqtt.bind_address}")
     private String host;
     private String host;
     @Value("${mqtt.bind_port}")
     @Value("${mqtt.bind_port}")
@@ -110,7 +106,7 @@ public class MqttTransportService {
         b.group(bossGroup, workerGroup)
         b.group(bossGroup, workerGroup)
                 .channel(NioServerSocketChannel.class)
                 .channel(NioServerSocketChannel.class)
                 .childHandler(new MqttTransportServerInitializer(processor, deviceService, authService, relationService,
                 .childHandler(new MqttTransportServerInitializer(processor, deviceService, authService, relationService,
-                        adaptor, sslHandlerProvider, quotaService, offlineService));
+                        adaptor, sslHandlerProvider, quotaService));
 
 
         serverChannel = b.bind(host, port).sync().channel();
         serverChannel = b.bind(host, port).sync().channel();
         log.info("Mqtt transport started!");
         log.info("Mqtt transport started!");

@@ -36,7 +36,6 @@ import org.thingsboard.server.common.transport.SessionMsgProcessor;
 import org.thingsboard.server.common.transport.adaptor.AdaptorException;
 import org.thingsboard.server.common.transport.adaptor.AdaptorException;
 import org.thingsboard.server.common.transport.adaptor.JsonConverter;
 import org.thingsboard.server.common.transport.adaptor.JsonConverter;
 import org.thingsboard.server.common.transport.auth.DeviceAuthService;
 import org.thingsboard.server.common.transport.auth.DeviceAuthService;
-import org.thingsboard.server.dao.device.DeviceOfflineService;
 import org.thingsboard.server.dao.device.DeviceService;
 import org.thingsboard.server.dao.device.DeviceService;
 import org.thingsboard.server.dao.relation.RelationService;
 import org.thingsboard.server.dao.relation.RelationService;
 import org.thingsboard.server.transport.mqtt.MqttTransportHandler;
 import org.thingsboard.server.transport.mqtt.MqttTransportHandler;
@@ -62,17 +61,14 @@ public class GatewaySessionCtx {
     private final DeviceService deviceService;
     private final DeviceService deviceService;
     private final DeviceAuthService authService;
     private final DeviceAuthService authService;
     private final RelationService relationService;
     private final RelationService relationService;
-    private final DeviceOfflineService offlineService;
     private final Map<String, GatewayDeviceSessionCtx> devices;
     private final Map<String, GatewayDeviceSessionCtx> devices;
     private ChannelHandlerContext channel;
     private ChannelHandlerContext channel;
 
 
-    public GatewaySessionCtx(SessionMsgProcessor processor, DeviceService deviceService, DeviceAuthService authService,
-                             RelationService relationService, DeviceSessionCtx gatewaySessionCtx, DeviceOfflineService offlineService) {
+    public GatewaySessionCtx(SessionMsgProcessor processor, DeviceService deviceService, DeviceAuthService authService, RelationService relationService, DeviceSessionCtx gatewaySessionCtx) {
         this.processor = processor;
         this.processor = processor;
         this.deviceService = deviceService;
         this.deviceService = deviceService;
         this.authService = authService;
         this.authService = authService;
         this.relationService = relationService;
         this.relationService = relationService;
-        this.offlineService = offlineService;
         this.gateway = gatewaySessionCtx.getDevice();
         this.gateway = gatewaySessionCtx.getDevice();
         this.gatewaySessionId = gatewaySessionCtx.getSessionId();
         this.gatewaySessionId = gatewaySessionCtx.getSessionId();
         this.devices = new HashMap<>();
         this.devices = new HashMap<>();
@@ -102,7 +98,6 @@ public class GatewaySessionCtx {
             log.debug("[{}] Added device [{}] to the gateway session", gatewaySessionId, deviceName);
             log.debug("[{}] Added device [{}] to the gateway session", gatewaySessionId, deviceName);
             processor.process(new BasicToDeviceActorSessionMsg(device, new BasicAdaptorToSessionActorMsg(ctx, new AttributesSubscribeMsg())));
             processor.process(new BasicToDeviceActorSessionMsg(device, new BasicAdaptorToSessionActorMsg(ctx, new AttributesSubscribeMsg())));
             processor.process(new BasicToDeviceActorSessionMsg(device, new BasicAdaptorToSessionActorMsg(ctx, new RpcSubscribeMsg())));
             processor.process(new BasicToDeviceActorSessionMsg(device, new BasicAdaptorToSessionActorMsg(ctx, new RpcSubscribeMsg())));
-            offlineService.online(device, false);
         }
         }
     }
     }
 
 
@@ -112,7 +107,6 @@ public class GatewaySessionCtx {
         if (deviceSessionCtx != null) {
         if (deviceSessionCtx != null) {
             processor.process(SessionCloseMsg.onDisconnect(deviceSessionCtx.getSessionId()));
             processor.process(SessionCloseMsg.onDisconnect(deviceSessionCtx.getSessionId()));
             deviceSessionCtx.setClosed(true);
             deviceSessionCtx.setClosed(true);
-            offlineService.offline(deviceSessionCtx.getDevice());
             log.debug("[{}] Removed device [{}] from the gateway session", gatewaySessionId, deviceName);
             log.debug("[{}] Removed device [{}] from the gateway session", gatewaySessionId, deviceName);
         } else {
         } else {
             log.debug("[{}] Device [{}] was already removed from the gateway session", gatewaySessionId, deviceName);
             log.debug("[{}] Device [{}] was already removed from the gateway session", gatewaySessionId, deviceName);
@@ -123,7 +117,6 @@ public class GatewaySessionCtx {
     public void onGatewayDisconnect() {
     public void onGatewayDisconnect() {
         devices.forEach((k, v) -> {
         devices.forEach((k, v) -> {
             processor.process(SessionCloseMsg.onDisconnect(v.getSessionId()));
             processor.process(SessionCloseMsg.onDisconnect(v.getSessionId()));
-            offlineService.offline(v.getDevice());
         });
         });
     }
     }
 
 
@@ -145,7 +138,6 @@ public class GatewaySessionCtx {
                 GatewayDeviceSessionCtx deviceSessionCtx = devices.get(deviceName);
                 GatewayDeviceSessionCtx deviceSessionCtx = devices.get(deviceName);
                 processor.process(new BasicToDeviceActorSessionMsg(deviceSessionCtx.getDevice(),
                 processor.process(new BasicToDeviceActorSessionMsg(deviceSessionCtx.getDevice(),
                         new BasicAdaptorToSessionActorMsg(deviceSessionCtx, request)));
                         new BasicAdaptorToSessionActorMsg(deviceSessionCtx, request)));
-                offlineService.online(deviceSessionCtx.getDevice(), true);
             }
             }
         } else {
         } else {
             throw new JsonSyntaxException(CAN_T_PARSE_VALUE + json);
             throw new JsonSyntaxException(CAN_T_PARSE_VALUE + json);
@@ -162,7 +154,6 @@ public class GatewaySessionCtx {
             GatewayDeviceSessionCtx deviceSessionCtx = devices.get(deviceName);
             GatewayDeviceSessionCtx deviceSessionCtx = devices.get(deviceName);
             processor.process(new BasicToDeviceActorSessionMsg(deviceSessionCtx.getDevice(),
             processor.process(new BasicToDeviceActorSessionMsg(deviceSessionCtx.getDevice(),
                     new BasicAdaptorToSessionActorMsg(deviceSessionCtx, new ToDeviceRpcResponseMsg(requestId, data))));
                     new BasicAdaptorToSessionActorMsg(deviceSessionCtx, new ToDeviceRpcResponseMsg(requestId, data))));
-            offlineService.online(deviceSessionCtx.getDevice(), true);
         } else {
         } else {
             throw new JsonSyntaxException(CAN_T_PARSE_VALUE + json);
             throw new JsonSyntaxException(CAN_T_PARSE_VALUE + json);
         }
         }
@@ -185,7 +176,6 @@ public class GatewaySessionCtx {
                 GatewayDeviceSessionCtx deviceSessionCtx = devices.get(deviceName);
                 GatewayDeviceSessionCtx deviceSessionCtx = devices.get(deviceName);
                 processor.process(new BasicToDeviceActorSessionMsg(deviceSessionCtx.getDevice(),
                 processor.process(new BasicToDeviceActorSessionMsg(deviceSessionCtx.getDevice(),
                         new BasicAdaptorToSessionActorMsg(deviceSessionCtx, request)));
                         new BasicAdaptorToSessionActorMsg(deviceSessionCtx, request)));
-                offlineService.online(deviceSessionCtx.getDevice(), true);
             }
             }
         } else {
         } else {
             throw new JsonSyntaxException(CAN_T_PARSE_VALUE + json);
             throw new JsonSyntaxException(CAN_T_PARSE_VALUE + json);
@@ -220,7 +210,6 @@ public class GatewaySessionCtx {
             processor.process(new BasicToDeviceActorSessionMsg(deviceSessionCtx.getDevice(),
             processor.process(new BasicToDeviceActorSessionMsg(deviceSessionCtx.getDevice(),
                     new BasicAdaptorToSessionActorMsg(deviceSessionCtx, request)));
                     new BasicAdaptorToSessionActorMsg(deviceSessionCtx, request)));
             ack(msg);
             ack(msg);
-            offlineService.online(deviceSessionCtx.getDevice(), false);
         } else {
         } else {
             throw new JsonSyntaxException(CAN_T_PARSE_VALUE + json);
             throw new JsonSyntaxException(CAN_T_PARSE_VALUE + json);
         }
         }