Project

General

Profile

« Previous | Next » 

Revision da0ac859

Added by Andreas Müller about 9 years ago

add Transient to getNullSafe methods and make MarkerType not null Level2 rule

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Marker.java
30 30
import org.hibernate.envers.Audited;
31 31
import org.hibernate.envers.NotAudited;
32 32

  
33
import eu.etaxonomy.cdm.validation.Level2;
34

  
33 35
/**
34 36
 * This class aims to make available some "flags" for identifiable entities in a
35 37
 * flexible way. Application developers (and even users) can define their own
......
55 57
    @XmlIDREF
56 58
    @XmlSchemaType(name = "IDREF")
57 59
    @ManyToOne(fetch = FetchType.LAZY)
58
    @NotNull
60
    @NotNull(groups=Level2.class)   //removed from Level1 for now, see #4588
59 61
	private MarkerType markerType;
60 62
    
61 63
    @XmlElement(name = "MarkedObject")
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonBase.java
351 351
    /**
352 352
     * @return
353 353
     */
354
    @Transient
354 355
    public Rank getNullSafeRank() {
355 356
        return name == null ? null : name.getRank();
356 357
    }
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNode.java
797 797
    /**
798 798
     * @return
799 799
     */
800
	@Transient
800 801
    public Rank getNullSafeRank() {
801 802
        return hasTaxon() ? getTaxon().getNullSafeRank() : null;
802 803
    }

Also available in: Unified diff