From ebb29ca2007088776857c17cadf98a116938513a Mon Sep 17 00:00:00 2001
From: Andrii Landiak <andriylandiak@gmail.com>
Date: Mon, 7 Nov 2022 18:17:12 +0200
Subject: [PATCH] Refactoring code and optimize import

---
 .../server/service/ttl/EdgeEventsCleanUpService.java  |  1 -
 .../src/test/resources/application-test.properties    |  2 +-
 .../server/dao/edge/BaseEdgeEventService.java         |  7 ++-----
 .../server/dao/sql/edge/JpaBaseEdgeEventDao.java      | 11 +++++------
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/ttl/EdgeEventsCleanUpService.java b/application/src/main/java/org/thingsboard/server/service/ttl/EdgeEventsCleanUpService.java
index 880d3eb125..375c9b3932 100644
--- a/application/src/main/java/org/thingsboard/server/service/ttl/EdgeEventsCleanUpService.java
+++ b/application/src/main/java/org/thingsboard/server/service/ttl/EdgeEventsCleanUpService.java
@@ -20,7 +20,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
-import org.thingsboard.server.dao.edge.EdgeEventDao;
 import org.thingsboard.server.dao.edge.EdgeEventService;
 import org.thingsboard.server.dao.sqlts.insert.sql.SqlPartitioningRepository;
 import org.thingsboard.server.queue.discovery.PartitionService;
diff --git a/application/src/test/resources/application-test.properties b/application/src/test/resources/application-test.properties
index fb2fdfe0a4..e4a36c151d 100644
--- a/application/src/test/resources/application-test.properties
+++ b/application/src/test/resources/application-test.properties
@@ -62,4 +62,4 @@ sql.audit_logs.partition_size=24
 sql.ttl.audit_logs.ttl=2592000
 
 sql.edge_events.partition_size=168
-sql.ttl.edge_events.edge_event_ttl=2592000
\ No newline at end of file
+sql.ttl.edge_events.edge_event_ttl=2592000
diff --git a/dao/src/main/java/org/thingsboard/server/dao/edge/BaseEdgeEventService.java b/dao/src/main/java/org/thingsboard/server/dao/edge/BaseEdgeEventService.java
index 09322aa555..be78866e7a 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/edge/BaseEdgeEventService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/edge/BaseEdgeEventService.java
@@ -16,6 +16,7 @@
 package org.thingsboard.server.dao.edge;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.edge.EdgeEvent;
@@ -27,17 +28,13 @@ import org.thingsboard.server.dao.service.DataValidator;
 
 @Service
 @Slf4j
+@AllArgsConstructor
 public class BaseEdgeEventService implements EdgeEventService {
 
     private final EdgeEventDao edgeEventDao;
 
     private final DataValidator<EdgeEvent> edgeEventValidator;
 
-    public BaseEdgeEventService(EdgeEventDao edgeEventDao, DataValidator<EdgeEvent> edgeEventValidator) {
-        this.edgeEventDao = edgeEventDao;
-        this.edgeEventValidator = edgeEventValidator;
-    }
-
     @Override
     public ListenableFuture<Void> saveAsync(EdgeEvent edgeEvent) {
         edgeEventValidator.validate(edgeEvent, EdgeEvent::getTenantId);
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/edge/JpaBaseEdgeEventDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/edge/JpaBaseEdgeEventDao.java
index a0efcde00e..6f194d03cb 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/edge/JpaBaseEdgeEventDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/edge/JpaBaseEdgeEventDao.java
@@ -1,12 +1,12 @@
 /**
  * Copyright © 2016-2022 The Thingsboard Authors
- *
+ * <p>
  * 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
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
  * 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.
@@ -50,6 +50,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 
 import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID;
+
 @Component
 @SqlDao
 @RequiredArgsConstructor
@@ -223,12 +224,10 @@ public class JpaBaseEdgeEventDao extends JpaAbstractSearchTextDao<EdgeEventEntit
             startTime = endTime;
         }
         log.info("Event edge migration finished");
-
         jdbcTemplate.execute("DROP TABLE IF EXISTS old_edge_event");
     }
 
     private void callMigrationFunction(long startTime, long endTime, long partitionSIzeInMs) {
         jdbcTemplate.update("CALL migrate_edge_event(?, ?, ?)", startTime, endTime, partitionSIzeInMs);
     }
-
 }