From 631348a60c07ab5dd025f61e485741dfa27207b3 Mon Sep 17 00:00:00 2001
From: desoliture <ikozka@thingsboard.io>
Date: Mon, 24 Jan 2022 13:41:07 +0200
Subject: [PATCH] refactor checkCanCreateRelation

---
 .../server/controller/EntityRelationController.java            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/src/main/java/org/thingsboard/server/controller/EntityRelationController.java b/application/src/main/java/org/thingsboard/server/controller/EntityRelationController.java
index a9ae6d7edf..d1278b271b 100644
--- a/application/src/main/java/org/thingsboard/server/controller/EntityRelationController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/EntityRelationController.java
@@ -382,7 +382,8 @@ public class EntityRelationController extends BaseController {
 
     private void checkCanCreateRelation(EntityId entityId) throws ThingsboardException {
         SecurityUser currentUser = getCurrentUser();
-        if (!(currentUser.isTenantAdmin() && currentUser.getTenantId().equals(entityId))) {
+        var isTenantAdminAndRelateToSelf = currentUser.isTenantAdmin() && currentUser.getTenantId().equals(entityId);
+        if (!isTenantAdminAndRelateToSelf) {
             checkEntityId(entityId, Operation.WRITE);
         }
     }