TenantId static initializer replaced with a static variable order

4 years ago · 2e9d776845
1 changed files with 2 additions and 5 deletions
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/TenantId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/TenantId.java
@ -28,13 +28,10 @@ import java.util.UUID;
 public final class TenantId extends UUIDBased implements EntityId {

    @JsonIgnore
-    public static final TenantId SYS_TENANT_ID = new TenantId(EntityId.NULL_UUID);
-
    static final ConcurrentReferenceHashMap<UUID, TenantId> tenants = new ConcurrentReferenceHashMap<>(16, ReferenceType.SOFT);

-    static {
-        tenants.put(SYS_TENANT_ID.getId(), SYS_TENANT_ID);
-    }
+    @JsonIgnore
+    public static final TenantId SYS_TENANT_ID = TenantId.fromUUID(EntityId.NULL_UUID);

    private static final long serialVersionUID = 1L;