moved name from Tenant and Customer to ContactBased (#1929)

@@ -19,7 +19,7 @@ import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.id.UUIDBased;
 import org.thingsboard.server.common.data.id.UUIDBased;
 
 
 @EqualsAndHashCode(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
-public abstract class ContactBased<I extends UUIDBased> extends SearchTextBasedWithAdditionalInfo<I> {
+public abstract class ContactBased<I extends UUIDBased> extends SearchTextBasedWithAdditionalInfo<I> implements HasName {
     
     
     private static final long serialVersionUID = 5047448057830660988L;
     private static final long serialVersionUID = 5047448057830660988L;
     
     

@@ -23,7 +23,7 @@ import org.thingsboard.server.common.data.id.TenantId;
 
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.JsonNode;
 
 
-public class Customer extends ContactBased<CustomerId> implements HasName, HasTenantId {
+public class Customer extends ContactBased<CustomerId> implements HasTenantId {
     
     
     private static final long serialVersionUID = -1599722990298929275L;
     private static final long serialVersionUID = -1599722990298929275L;
     
     

@@ -23,7 +23,7 @@ import org.thingsboard.server.common.data.id.TenantId;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.JsonNode;
 
 
 @EqualsAndHashCode(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
-public class Tenant extends ContactBased<TenantId> implements HasName, HasTenantId {
+public class Tenant extends ContactBased<TenantId> implements HasTenantId {
 
 
     private static final long serialVersionUID = 8057243243859922101L;
     private static final long serialVersionUID = 8057243243859922101L;
     
     

@@ -120,6 +120,9 @@ public abstract class TbAbstractGetEntityDetailsNode<C extends TbAbstractGetEnti
     private JsonElement setProperties(ContactBased entity, JsonElement data, EntityDetails entityDetails, String prefix) {
     private JsonElement setProperties(ContactBased entity, JsonElement data, EntityDetails entityDetails, String prefix) {
         JsonObject dataAsObject = data.getAsJsonObject();
         JsonObject dataAsObject = data.getAsJsonObject();
         switch (entityDetails) {
         switch (entityDetails) {
+            case TITLE:
+                dataAsObject.addProperty(prefix + "title", entity.getName());
+                break;
             case ADDRESS:
             case ADDRESS:
                 if (entity.getAddress() != null) {
                 if (entity.getAddress() != null) {
                     dataAsObject.addProperty(prefix + "address", entity.getAddress());
                     dataAsObject.addProperty(prefix + "address", entity.getAddress());

@@ -17,6 +17,6 @@ package org.thingsboard.rule.engine.util;
 
 
 public enum EntityDetails {
 public enum EntityDetails {
 
 
-    COUNTRY, CITY, STATE, ZIP, ADDRESS, ADDRESS2, PHONE, EMAIL, ADDITIONAL_INFO
+    TITLE, COUNTRY, CITY, STATE, ZIP, ADDRESS, ADDRESS2, PHONE, EMAIL, ADDITIONAL_INFO
 
 
 }
 }