Code review changes

application/src/main/java/org/thingsboard/server/service/install/PsqlTsDatabaseUpgradeService.java

@@ -209,12 +209,6 @@ public class PsqlTsDatabaseUpgradeService extends AbstractSqlTsDatabaseUpgradeSe
                     executeQuery(conn, "DROP FUNCTION IF EXISTS delete_customer_records_from_ts_kv(character varying, character varying, bigint);");
                 }
                 break;
-            case "3.2.2":
-                try (Connection conn = DriverManager.getConnection(dbUrl, dbUserName, dbPassword)) {
-                    log.info("Load Edge TTL functions ...");
-                    loadSql(conn, LOAD_TTL_FUNCTIONS_SQL, "3.2.2");
-                }
-                break;
             default:
                 throw new RuntimeException("Unable to upgrade SQL database, unsupported fromVersion: " + fromVersion);
         }

application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java

@@ -471,6 +471,12 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
                         try {
                             conn.createStatement().execute("ALTER TABLE rule_chain ADD COLUMN type varchar(255) DEFAULT 'CORE'"); //NOSONAR, ignoring because method used to execute thingsboard database upgrade script
                         } catch (Exception ignored) {}
+
+                        log.info("Load Edge TTL functions ...");
+                        schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "3.2.2", "schema_update_ttl.sql");
+                        loadSql(schemaUpdateFile, conn);
+                        log.info("Edge TTL functions successfully loaded!");
+
                     } catch (Exception e) {
                         log.error("Failed updating schema!!!", e);
                     }

application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java

@@ -87,8 +87,8 @@ public class DefaultDataUpdateService implements DataUpdateService {
                 log.info("Updating data from version 3.1.1 to 3.2.0 ...");
                 tenantsRootRuleChainUpdater.updateEntities(null);
                 break;
-            case "3.2.1":
-                log.info("Updating data from version 3.2.1 to 3.3.0 ...");
+            case "3.2.2":
+                log.info("Updating data from version 3.2.2 to 3.3.0 ...");
                 tenantsDefaultEdgeRuleChainUpdater.updateEntities(null);
                 break;
             default:

application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java

@@ -334,7 +334,7 @@ public class DefaultTbClusterService implements TbClusterService {
                 || entityType.equals(EntityType.DEVICE_PROFILE)
                 || entityType.equals(EntityType.API_USAGE_STATE)
                 || (entityType.equals(EntityType.DEVICE) && msg.getEvent() == ComponentLifecycleEvent.UPDATED)
-                || msg.getEntityId().getEntityType().equals(EntityType.EDGE)) {
+                || entityType.equals(EntityType.EDGE)) {
             TbQueueProducer<TbProtoQueueMsg<ToCoreNotificationMsg>> toCoreNfProducer = producerProvider.getTbCoreNotificationsMsgProducer();
             Set<String> tbCoreServices = partitionService.getAllServiceIds(ServiceType.TB_CORE);
             for (String serviceId : tbCoreServices) {

application/src/main/resources/logback.xml

@@ -39,8 +39,6 @@
 
     <logger name="com.microsoft.azure.servicebus.primitives.CoreMessageReceiver" level="OFF" />
 
-    <logger name="org.thingsboard.server.service.edge" level="INFO" />
-
     <root level="INFO">
         <appender-ref ref="STDOUT"/>
     </root>

application/src/test/java/org/thingsboard/server/controller/sql/EdgeControllerSqlTest.java

@@ -20,4 +20,4 @@ import org.thingsboard.server.dao.service.DaoSqlTest;
 
 @DaoSqlTest
 public class EdgeControllerSqlTest extends BaseEdgeControllerTest {
-}
+}

common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/CoapTransportService.java

@@ -19,8 +19,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.eclipse.californium.core.CoapResource;
 import org.eclipse.californium.core.CoapServer;
 
-import org.eclipse.californium.core.network.CoapEndpoint;
-import org.eclipse.californium.core.server.resources.Resource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.stereotype.Service;
@@ -52,7 +50,6 @@ public class CoapTransportService {
     @PostConstruct
     public void init() throws UnknownHostException {
         log.info("Starting CoAP transport...");
-
         coapServer = coapServerService.getCoapServer();
         CoapResource api = new CoapResource(API);
         api.add(new CoapTransportResource(coapTransportContext, coapServerService, V1));

dao/src/main/java/org/thingsboard/server/dao/model/sql/EdgeEntity.java

@@ -45,4 +45,4 @@ public class EdgeEntity extends AbstractEdgeEntity<Edge> {
     public Edge toData() {
         return super.toEdge();
     }
-}
+}

dao/src/main/java/org/thingsboard/server/dao/sql/entityview/JpaEntityViewDao.java

@@ -31,7 +31,6 @@ import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.entityview.EntityViewDao;
 import org.thingsboard.server.dao.model.sql.EntityViewEntity;
 import org.thingsboard.server.dao.model.sql.EntityViewInfoEntity;
-import org.thingsboard.server.dao.relation.RelationDao;
 import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao;
 
 import java.util.ArrayList;
@@ -52,9 +51,6 @@ public class JpaEntityViewDao extends JpaAbstractSearchTextDao<EntityViewEntity,
     @Autowired
     private EntityViewRepository entityViewRepository;
 
-    @Autowired
-    private RelationDao relationDao;
-
     @Override
     protected Class<EntityViewEntity> getEntityClass() {
         return EntityViewEntity.class;

dao/src/test/resources/sql/psql/drop-all-tables.sql

@@ -31,4 +31,4 @@ DROP TABLE IF EXISTS oauth2_client_registration_template;
 DROP TABLE IF EXISTS api_usage_state;
 DROP TABLE IF EXISTS resource;
 DROP TABLE IF EXISTS edge;
-DROP TABLE IF EXISTS edge_event;
+DROP TABLE IF EXISTS edge_event;

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgAttributesNode.java

@@ -17,7 +17,7 @@ package org.thingsboard.rule.engine.telemetry;
 
 import com.google.gson.JsonParser;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.util.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.thingsboard.rule.engine.api.RuleNode;
 import org.thingsboard.rule.engine.api.TbContext;
 import org.thingsboard.rule.engine.api.TbNode;