Merge pull request #10385 from YevhenBondarenko/fix/entity-service-registry

fixed NPE related to the entity service registry initialization

dao/src/main/java/org/thingsboard/server/dao/entity/BaseEntityService.java

@@ -17,6 +17,7 @@ package org.thingsboard.server.dao.entity;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.thingsboard.server.common.data.HasCustomerId;
@@ -60,6 +61,7 @@ public class BaseEntityService extends AbstractEntityService implements EntitySe
     private EntityQueryDao entityQueryDao;
 
     @Autowired
+    @Lazy
     EntityServiceRegistry entityServiceRegistry;
 
     @Override

dao/src/main/java/org/thingsboard/server/dao/entity/DefaultEntityServiceRegistry.java

@@ -17,15 +17,12 @@ package org.thingsboard.server.dao.entity;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.event.ContextRefreshedEvent;
-import org.springframework.context.event.EventListener;
-import org.springframework.core.Ordered;
-import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.EntityType;
 
+import javax.annotation.PostConstruct;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Service
@@ -33,14 +30,13 @@ import java.util.Map;
 @Slf4j
 public class DefaultEntityServiceRegistry implements EntityServiceRegistry {
 
-    private final ApplicationContext applicationContext;
+    private final List<EntityDaoService> entityDaoServices;
     private final Map<EntityType, EntityDaoService> entityDaoServicesMap = new HashMap<>();
 
-    @EventListener(ContextRefreshedEvent.class)
+    @PostConstruct
-    @Order(Ordered.HIGHEST_PRECEDENCE)
     public void init() {
         log.debug("Initializing EntityServiceRegistry on ContextRefreshedEvent");
-        applicationContext.getBeansOfType(EntityDaoService.class).values().forEach(entityDaoService -> {
+        entityDaoServices.forEach(entityDaoService -> {
             EntityType entityType = entityDaoService.getEntityType();
             entityDaoServicesMap.put(entityType, entityDaoService);
             if (EntityType.RULE_CHAIN.equals(entityType)) {