From 7ef0d9d6033e16d309034f129afa24ad53134351 Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Fri, 15 May 2020 19:30:35 +0300 Subject: [PATCH] Use equals instead of == --- .../org/thingsboard/server/controller/UserController.java | 2 +- .../thingsboard/server/controller/WidgetTypeController.java | 2 +- .../server/controller/WidgetsBundleController.java | 6 +++--- .../security/permission/CustomerUserPermissions.java | 2 +- .../service/security/permission/SysAdminPermissions.java | 2 +- .../service/security/permission/TenantAdminPermissions.java | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/controller/UserController.java b/application/src/main/java/org/thingsboard/server/controller/UserController.java index 459fdd9b66..38860ff5d0 100644 --- a/application/src/main/java/org/thingsboard/server/controller/UserController.java +++ b/application/src/main/java/org/thingsboard/server/controller/UserController.java @@ -135,7 +135,7 @@ public class UserController extends BaseController { HttpServletRequest request) throws ThingsboardException { try { - if (getCurrentUser().getAuthority() == Authority.TENANT_ADMIN) { + if (Authority.TENANT_ADMIN.equals(getCurrentUser().getAuthority())) { user.setTenantId(getCurrentUser().getTenantId()); } diff --git a/application/src/main/java/org/thingsboard/server/controller/WidgetTypeController.java b/application/src/main/java/org/thingsboard/server/controller/WidgetTypeController.java index debe49b018..bf9d5809ed 100644 --- a/application/src/main/java/org/thingsboard/server/controller/WidgetTypeController.java +++ b/application/src/main/java/org/thingsboard/server/controller/WidgetTypeController.java @@ -60,7 +60,7 @@ public class WidgetTypeController extends BaseController { @ResponseBody public WidgetType saveWidgetType(@RequestBody WidgetType widgetType) throws ThingsboardException { try { - if (getCurrentUser().getAuthority() == Authority.SYS_ADMIN) { + if (Authority.SYS_ADMIN.equals(getCurrentUser().getAuthority())) { widgetType.setTenantId(TenantId.SYS_TENANT_ID); } else { widgetType.setTenantId(getCurrentUser().getTenantId()); diff --git a/application/src/main/java/org/thingsboard/server/controller/WidgetsBundleController.java b/application/src/main/java/org/thingsboard/server/controller/WidgetsBundleController.java index c0cf672c6f..d82040c492 100644 --- a/application/src/main/java/org/thingsboard/server/controller/WidgetsBundleController.java +++ b/application/src/main/java/org/thingsboard/server/controller/WidgetsBundleController.java @@ -61,7 +61,7 @@ public class WidgetsBundleController extends BaseController { @ResponseBody public WidgetsBundle saveWidgetsBundle(@RequestBody WidgetsBundle widgetsBundle) throws ThingsboardException { try { - if (getCurrentUser().getAuthority() == Authority.SYS_ADMIN) { + if (Authority.SYS_ADMIN.equals(getCurrentUser().getAuthority())) { widgetsBundle.setTenantId(TenantId.SYS_TENANT_ID); } else { widgetsBundle.setTenantId(getCurrentUser().getTenantId()); @@ -103,7 +103,7 @@ public class WidgetsBundleController extends BaseController { @RequestParam(required = false) String sortOrder) throws ThingsboardException { try { PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder); - if (getCurrentUser().getAuthority() == Authority.SYS_ADMIN) { + if (Authority.SYS_ADMIN.equals(getCurrentUser().getAuthority())) { return checkNotNull(widgetsBundleService.findSystemWidgetsBundlesByPageLink(getTenantId(), pageLink)); } else { TenantId tenantId = getCurrentUser().getTenantId(); @@ -119,7 +119,7 @@ public class WidgetsBundleController extends BaseController { @ResponseBody public List getWidgetsBundles() throws ThingsboardException { try { - if (getCurrentUser().getAuthority() == Authority.SYS_ADMIN) { + if (Authority.SYS_ADMIN.equals(getCurrentUser().getAuthority())) { return checkNotNull(widgetsBundleService.findSystemWidgetsBundles(getTenantId())); } else { TenantId tenantId = getCurrentUser().getTenantId(); diff --git a/application/src/main/java/org/thingsboard/server/service/security/permission/CustomerUserPermissions.java b/application/src/main/java/org/thingsboard/server/service/security/permission/CustomerUserPermissions.java index c9aed5bd7a..377929cf7d 100644 --- a/application/src/main/java/org/thingsboard/server/service/security/permission/CustomerUserPermissions.java +++ b/application/src/main/java/org/thingsboard/server/service/security/permission/CustomerUserPermissions.java @@ -105,7 +105,7 @@ public class CustomerUserPermissions extends AbstractPermissions { @Override public boolean hasPermission(SecurityUser user, Operation operation, UserId userId, User userEntity) { - if (userEntity.getAuthority() != Authority.CUSTOMER_USER) { + if (!Authority.CUSTOMER_USER.equals(userEntity.getAuthority())) { return false; } if (!user.getId().equals(userId)) { diff --git a/application/src/main/java/org/thingsboard/server/service/security/permission/SysAdminPermissions.java b/application/src/main/java/org/thingsboard/server/service/security/permission/SysAdminPermissions.java index d7b90f9311..cd79a29f0b 100644 --- a/application/src/main/java/org/thingsboard/server/service/security/permission/SysAdminPermissions.java +++ b/application/src/main/java/org/thingsboard/server/service/security/permission/SysAdminPermissions.java @@ -57,7 +57,7 @@ public class SysAdminPermissions extends AbstractPermissions { @Override public boolean hasPermission(SecurityUser user, Operation operation, UserId userId, User userEntity) { - if (userEntity.getAuthority() == Authority.CUSTOMER_USER) { + if (Authority.CUSTOMER_USER.equals(userEntity.getAuthority())) { return false; } return true; diff --git a/application/src/main/java/org/thingsboard/server/service/security/permission/TenantAdminPermissions.java b/application/src/main/java/org/thingsboard/server/service/security/permission/TenantAdminPermissions.java index 705c955ea1..794fb72398 100644 --- a/application/src/main/java/org/thingsboard/server/service/security/permission/TenantAdminPermissions.java +++ b/application/src/main/java/org/thingsboard/server/service/security/permission/TenantAdminPermissions.java @@ -76,7 +76,7 @@ public class TenantAdminPermissions extends AbstractPermissions { @Override public boolean hasPermission(SecurityUser user, Operation operation, UserId userId, User userEntity) { - if (userEntity.getAuthority() == Authority.SYS_ADMIN) { + if (Authority.SYS_ADMIN.equals(userEntity.getAuthority())) { return false; } if (!user.getTenantId().equals(userEntity.getTenantId())) {