Merge branch 'master' of github.com:thingsboard/thingsboard

@@ -21,6 +21,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.dao.relation.RelationService;
 import org.thingsboard.server.dao.relation.RelationService;
 
 
+import java.util.concurrent.ExecutionException;
+
 @Slf4j
 @Slf4j
 public abstract class AbstractEntityService {
 public abstract class AbstractEntityService {
 
 
@@ -29,7 +31,11 @@ public abstract class AbstractEntityService {
 
 
     protected void deleteEntityRelations(EntityId entityId) {
     protected void deleteEntityRelations(EntityId entityId) {
         log.trace("Executing deleteEntityRelations [{}]", entityId);
         log.trace("Executing deleteEntityRelations [{}]", entityId);
-        relationService.deleteEntityRelations(entityId);
+        try {
+            relationService.deleteEntityRelations(entityId).get();
+        } catch (InterruptedException | ExecutionException e) {
+            throw new RuntimeException(e);
+        }
     }
     }
 
 
 
 

@@ -18,8 +18,14 @@ package org.thingsboard.server.dao.sql;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.MoreExecutors;
 
 
+import javax.annotation.PreDestroy;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Executors;
 
 
 public abstract class JpaAbstractDaoListeningExecutorService {
 public abstract class JpaAbstractDaoListeningExecutorService {
     protected ListeningExecutorService service = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(10));
     protected ListeningExecutorService service = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(10));
+
+    @PreDestroy
+    void onDestroy() {
+        service.shutdown();
+    }
 }
 }

@@ -50,5 +50,11 @@ public interface RelationRepository
                                                     String fromType);
                                                     String fromType);
 
 
     @Transactional
     @Transactional
+    RelationEntity save(RelationEntity entity);
+
+    @Transactional
+    void delete(RelationCompositeKey id);
+
+    @Transactional
     void deleteByFromIdAndFromType(String fromId, String fromType);
     void deleteByFromIdAndFromType(String fromId, String fromType);
 }
 }