Project

General

Profile

Revision 39577f4d

ID39577f4d07e1797503320f5e38c39cb3ace32a6d
Parent 0fe80050
Child 5c0f124f

Added by Andreas Müller over 1 year ago

cleanup

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/PolytomousKey.java
89 89
    @ManyToMany(fetch = FetchType.LAZY)
90 90
    @NotNull
91 91
    @Cascade({CascadeType.SAVE_UPDATE, CascadeType.MERGE})
92
    private Set<Taxon> coveredTaxa = new HashSet<Taxon>();
92
    private Set<Taxon> coveredTaxa = new HashSet<>();
93 93

  
94 94
    @XmlElementWrapper(name = "TaxonomicScope")
95 95
    @XmlElement(name = "Taxon")
......
102 102
    )
103 103
    @NotNull
104 104
    @Cascade({CascadeType.SAVE_UPDATE, CascadeType.MERGE})
105
    private Set<Taxon> taxonomicScope = new HashSet<Taxon>();
105
    private Set<Taxon> taxonomicScope = new HashSet<>();
106 106

  
107 107
    @XmlElementWrapper(name = "GeographicalScope")
108 108
    @XmlElement(name = "Area")
......
112 112
    @JoinTable(name = "PolytomousKey_NamedArea")
113 113
    @NotNull
114 114
//    @Cascade({CascadeType.MERGE})   remove cascade #5755
115
    private Set<NamedArea> geographicalScope = new HashSet<NamedArea>();
115
    private Set<NamedArea> geographicalScope = new HashSet<>();
116 116

  
117 117
    @XmlElementWrapper(name = "ScopeRestrictions")
118 118
    @XmlElement(name = "Restriction")
......
122 122
    @JoinTable(name = "PolytomousKey_Scope")
123 123
    @NotNull
124 124
 //   @Cascade({CascadeType.MERGE}) remove cascade #5755
125
    private Set<DefinedTerm> scopeRestrictions = new HashSet<DefinedTerm>();
125
    private Set<DefinedTerm> scopeRestrictions = new HashSet<>();
126 126

  
127 127
    @XmlElement(name = "Root")
128 128
    @OneToOne(fetch = FetchType.LAZY)
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TaxonDescription.java
42 42
import eu.etaxonomy.cdm.model.taxon.Taxon;
43 43
import eu.etaxonomy.cdm.strategy.cache.common.IIdentifiableEntityCacheStrategy;
44 44
import eu.etaxonomy.cdm.strategy.cache.description.TaxonDescriptionDefaultCacheStrategy;
45
import javafx.stage.Stage;
45 46

  
46 47

  
47 48
/**
......
82 83
    @XmlSchemaType(name="IDREF")
83 84
    @ManyToMany(fetch = FetchType.LAZY)
84 85
    @JoinTable(name="DescriptionBase_Scope")
85
    private Set<DefinedTerm> scopes = new HashSet<DefinedTerm>();
86
    private Set<DefinedTerm> scopes = new HashSet<>();
86 87

  
87 88
    @XmlElementWrapper( name = "GeoScopes")
88 89
    @XmlElement( name = "GeoScope")
......
91 92
    @ManyToMany(fetch = FetchType.LAZY)
92 93
    @JoinTable(name="DescriptionBase_GeoScope")
93 94
//    @Cascade({CascadeType.SAVE_UPDATE,CascadeType.MERGE})  remove cascade #5755
94
    private Set<NamedArea> geoScopes = new HashSet<NamedArea>();
95
    private Set<NamedArea> geoScopes = new HashSet<>();
95 96

  
96 97
    @XmlElement( name = "Taxon")
97 98
    @ManyToOne(fetch = FetchType.LAZY)
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.java
132 132
    private NamedArea russia ;
133 133
    private NamedArea canada ;
134 134

  
135
    /**
136
     * @throws java.lang.Exception
137
     */
138 135
    @Before
139 136
    public void setUp() throws Exception {
140 137
        typesToIndex = new HashSet<Class<? extends CdmBase>>();
......
147 144
        russia = Country.RUSSIANFEDERATION();
148 145
        canada = Country.CANADA();
149 146

  
150

  
151 147
    }
152 148

  
153 149
    @Test

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)