From 853dfed14cb46e4b8d0b68f4475ccf2e9e985820 Mon Sep 17 00:00:00 2001 From: imbeacon Date: Fri, 18 Aug 2023 14:12:19 +0300 Subject: [PATCH] Removed unnecessary imports --- .../server/service/entitiy/alarm/DefaultTbAlarmService.java | 4 ---- .../housekeeper/InMemoryHouseKeeperServiceService.java | 2 -- 2 files changed, 6 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmService.java index 0e02d1ccd3..91223ef69d 100644 --- a/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmService.java +++ b/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmService.java @@ -40,7 +40,6 @@ import org.thingsboard.server.common.data.id.UserId; import org.thingsboard.server.common.data.page.PageData; import org.thingsboard.server.common.data.page.PageLink; import org.thingsboard.server.common.data.page.SortOrder; -import org.thingsboard.server.dao.housekeeper.HouseKeeperService; import org.thingsboard.server.service.entitiy.AbstractTbEntityService; import java.util.ArrayList; @@ -54,9 +53,6 @@ public class DefaultTbAlarmService extends AbstractTbEntityService implements Tb @Autowired protected TbAlarmCommentService alarmCommentService; - @Autowired - private HouseKeeperService housekeeper; - @Override public Alarm save(Alarm alarm, User user) throws ThingsboardException { ActionType actionType = alarm.getId() == null ? ActionType.ADDED : ActionType.UPDATED; diff --git a/application/src/main/java/org/thingsboard/server/service/housekeeper/InMemoryHouseKeeperServiceService.java b/application/src/main/java/org/thingsboard/server/service/housekeeper/InMemoryHouseKeeperServiceService.java index b281452995..4e83aa0060 100644 --- a/application/src/main/java/org/thingsboard/server/service/housekeeper/InMemoryHouseKeeperServiceService.java +++ b/application/src/main/java/org/thingsboard/server/service/housekeeper/InMemoryHouseKeeperServiceService.java @@ -23,7 +23,6 @@ import com.google.common.util.concurrent.MoreExecutors; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; import org.springframework.transaction.event.TransactionalEventListener; import org.thingsboard.common.util.ThingsBoardThreadFactory; @@ -47,7 +46,6 @@ import java.util.concurrent.atomic.AtomicInteger; @Slf4j public class InMemoryHouseKeeperServiceService implements HouseKeeperService { - @Lazy final TbAlarmService alarmService; ListeningExecutorService executor;