From a11592641c0db367230e451305171930175478dc Mon Sep 17 00:00:00 2001 From: viktorbasanets Date: Wed, 29 Aug 2018 15:38:02 +0300 Subject: [PATCH] Were replace constructor, gets & sets by annotations --- .../server/common/data/EntityView.java | 77 ++----------------- 1 file changed, 5 insertions(+), 72 deletions(-) diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/EntityView.java b/common/data/src/main/java/org/thingsboard/server/common/data/EntityView.java index 6b4dcd1a0c..b12e38e6b8 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/EntityView.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/EntityView.java @@ -15,17 +15,22 @@ */ package org.thingsboard.server.common.data; +import lombok.AllArgsConstructor; +import lombok.Data; import lombok.EqualsAndHashCode; import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.EntityViewId; import org.thingsboard.server.common.data.id.TenantId; +import java.beans.ConstructorProperties; import java.util.List; /** * Created by Victor Basanets on 8/27/2017. */ +@Data +@AllArgsConstructor @EqualsAndHashCode(callSuper = true) public class EntityView extends SearchTextBasedWithAdditionalInfo implements HasName, HasTenantId, HasCustomerId { @@ -48,71 +53,10 @@ public class EntityView extends SearchTextBasedWithAdditionalInfo super(id); } - public EntityView(EntityId entityId, - TenantId tenantId, - CustomerId customerId, - String name, - List keys, - Long tsStart, - Long tsEnd) { - - this.entityId = entityId; - this.tenantId = tenantId; - this.customerId = customerId; - this.name = name; - this.keys = keys; - this.tsStart = tsStart; - this.tsEnd = tsEnd; - } - public EntityView(EntityView entityView) { super(entityView); } - public EntityId getEntityId() { - return entityId; - } - - public void setEntityId(EntityId entityId) { - this.entityId = entityId; - } - - public void setTenantId(TenantId tenantId) { - this.tenantId = tenantId; - } - - public void setCustomerId(CustomerId customerId) { - this.customerId = customerId; - } - - public void setName(String name) { - this.name = name; - } - - public List getKeys() { - return keys; - } - - public void setKeys(List keys) { - this.keys = keys; - } - - public Long getTsStart() { - return tsStart; - } - - public void setTsStart(Long tsStart) { - this.tsStart = tsStart; - } - - public Long getTsEnd() { - return tsEnd; - } - - public void setTsEnd(Long tsEnd) { - this.tsEnd = tsEnd; - } - @Override public String getSearchText() { return getName() /*What the ...*/; @@ -132,15 +76,4 @@ public class EntityView extends SearchTextBasedWithAdditionalInfo public TenantId getTenantId() { return tenantId; } - - @Override - public String toString() { - return "EntityView{entityId=" + entityId.getId() + - ", tenantId=" + tenantId + - ", customerId=" + customerId + - ", name='" + name + "\'" + - ", keys=" + String.join(",", keys) + - ", tsStart=" + tsStart + - ", tsEnd=" + tsEnd + "}"; - } }