Commit 22d8b4a413b702da456760d0423a11c2f8858148

Authored by Chris Eykamp
2 parents 651e0caf 6b7e7cd3

Merge branch 'is_public'

@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
15 */ 15 */
16 package org.thingsboard.server.common.data; 16 package org.thingsboard.server.common.data;
17 17
  18 +import com.fasterxml.jackson.annotation.JsonIgnore;
18 import com.fasterxml.jackson.annotation.JsonProperty; 19 import com.fasterxml.jackson.annotation.JsonProperty;
19 import com.fasterxml.jackson.annotation.JsonProperty.Access; 20 import com.fasterxml.jackson.annotation.JsonProperty.Access;
20 import org.thingsboard.server.common.data.id.CustomerId; 21 import org.thingsboard.server.common.data.id.CustomerId;
@@ -60,12 +61,13 @@ public class Customer extends ContactBased<CustomerId> implements HasName { @@ -60,12 +61,13 @@ public class Customer extends ContactBased<CustomerId> implements HasName {
60 public void setTitle(String title) { 61 public void setTitle(String title) {
61 this.title = title; 62 this.title = title;
62 } 63 }
63 - 64 +
  65 + @JsonIgnore
64 public boolean isPublic() { 66 public boolean isPublic() {
65 if (getAdditionalInfo() != null && getAdditionalInfo().has("isPublic")) { 67 if (getAdditionalInfo() != null && getAdditionalInfo().has("isPublic")) {
66 - return getAdditionalInfo().get("isPublic").asBoolean(); 68 + return additionalInfo.get("isPublic").asBoolean();
67 } 69 }
68 - 70 +
69 return false; 71 return false;
70 } 72 }
71 73