Quellcode durchsuchen

make hasName a default method

tags/2.0.1
Jonathan Cobb vor 4 Jahren
Ursprung
Commit
b171791b38
2 geänderte Dateien mit 4 neuen und 4 gelöschten Zeilen
  1. +3
    -0
      wizard-common/src/main/java/org/cobbzilla/wizard/model/NamedEntity.java
  2. +1
    -4
      wizard-common/src/main/java/org/cobbzilla/wizard/model/UniquelyNamedEntity.java

+ 3
- 0
wizard-common/src/main/java/org/cobbzilla/wizard/model/NamedEntity.java Datei anzeigen

@@ -2,12 +2,15 @@ package org.cobbzilla.wizard.model;


import java.util.Comparator; import java.util.Comparator;


import static org.cobbzilla.util.daemon.ZillaRuntime.empty;

public interface NamedEntity { public interface NamedEntity {


int NAME_MAXLEN = 100; int NAME_MAXLEN = 100;
String[] NAME_FIELD_ARRAY = {"name"}; String[] NAME_FIELD_ARRAY = {"name"};


String getName (); String getName ();
default boolean hasName () { return !empty(getName()); }


Comparator<? extends NamedEntity> NAME_COMPARATOR Comparator<? extends NamedEntity> NAME_COMPARATOR
= (Comparator<NamedEntity>) (o1, o2) -> o1.getName().compareToIgnoreCase(o2.getName()); = (Comparator<NamedEntity>) (o1, o2) -> o1.getName().compareToIgnoreCase(o2.getName());


+ 1
- 4
wizard-common/src/main/java/org/cobbzilla/wizard/model/UniquelyNamedEntity.java Datei anzeigen

@@ -6,8 +6,6 @@ import javax.persistence.Column;
import javax.persistence.MappedSuperclass; import javax.persistence.MappedSuperclass;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;


import static org.cobbzilla.util.daemon.ZillaRuntime.empty;

@MappedSuperclass @NoArgsConstructor @MappedSuperclass @NoArgsConstructor
public abstract class UniquelyNamedEntity extends IdentifiableBase implements NamedEntity { 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) @Column(length=NAME_MAXLEN, unique=true, nullable=false, updatable=false)
@Size(min=2, max=NAME_MAXLEN, message="err.name.length") @Size(min=2, max=NAME_MAXLEN, message="err.name.length")
protected String name; 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 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()); } public boolean isSameName(UniquelyNamedEntity other) { return getName().equals(other.getName()); }


Laden…
Abbrechen
Speichern