diff --git a/wizard-common/src/main/java/org/cobbzilla/wizard/model/NamedEntity.java b/wizard-common/src/main/java/org/cobbzilla/wizard/model/NamedEntity.java index ecb753a..6d22608 100644 --- a/wizard-common/src/main/java/org/cobbzilla/wizard/model/NamedEntity.java +++ b/wizard-common/src/main/java/org/cobbzilla/wizard/model/NamedEntity.java @@ -2,12 +2,15 @@ package org.cobbzilla.wizard.model; import java.util.Comparator; +import static org.cobbzilla.util.daemon.ZillaRuntime.empty; + public interface NamedEntity { int NAME_MAXLEN = 100; String[] NAME_FIELD_ARRAY = {"name"}; String getName (); + default boolean hasName () { return !empty(getName()); } Comparator NAME_COMPARATOR = (Comparator) (o1, o2) -> o1.getName().compareToIgnoreCase(o2.getName()); diff --git a/wizard-common/src/main/java/org/cobbzilla/wizard/model/UniquelyNamedEntity.java b/wizard-common/src/main/java/org/cobbzilla/wizard/model/UniquelyNamedEntity.java index 8f2f4ac..38f19c1 100644 --- a/wizard-common/src/main/java/org/cobbzilla/wizard/model/UniquelyNamedEntity.java +++ b/wizard-common/src/main/java/org/cobbzilla/wizard/model/UniquelyNamedEntity.java @@ -6,8 +6,6 @@ import javax.persistence.Column; import javax.persistence.MappedSuperclass; import javax.validation.constraints.Size; -import static org.cobbzilla.util.daemon.ZillaRuntime.empty; - @MappedSuperclass @NoArgsConstructor public abstract class UniquelyNamedEntity extends IdentifiableBase implements NamedEntity { @@ -20,8 +18,7 @@ public abstract class UniquelyNamedEntity extends IdentifiableBase implements Na @Column(length=NAME_MAXLEN, unique=true, nullable=false, updatable=false) @Size(min=2, max=NAME_MAXLEN, message="err.name.length") protected String name; - public boolean hasName () { return !empty(getName()); } - public String getName () { return !empty(name) ? (forceLowercase() ? name.toLowerCase() : name) : name; } + public String getName () { return hasName() ? (forceLowercase() ? name.toLowerCase() : name) : name; } public UniquelyNamedEntity setName (String name) { this.name = (name == null ? null : forceLowercase() ? name.toLowerCase() : name); return this; } public boolean isSameName(UniquelyNamedEntity other) { return getName().equals(other.getName()); }