Project

General

Profile

« Previous | Next » 

Revision 08183f99

Added by Andreas Müller about 5 years ago

cleanup

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Person.java
203 203
	 */
204 204
	public Set<InstitutionalMembership> getInstitutionalMemberships(){
205 205
		if(institutionalMemberships == null) {
206
			this.institutionalMemberships = new HashSet<InstitutionalMembership>();
206
			this.institutionalMemberships = new HashSet<>();
207 207
		}
208 208
		return this.institutionalMemberships;
209 209
	}
......
214 214
			logger.warn("Institutional membership's person has to be changed for adding it to person: " + this);
215 215
			ims.getPerson().removeInstitutionalMembership(ims);
216 216
			ims.setPerson(this);
217

  
218 217
		}
219 218
	}
220 219

  
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Team.java
340 340
		this.hasMoreMembers = hasMoreMembers;
341 341
	}
342 342

  
343

  
343 344
    @Override
344 345
    public boolean hasUnprotectedCache(){
345 346
        return super.hasUnprotectedCache()
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Group.java
90 90
    @XmlSchemaType(name = "IDREF")
91 91
    @ManyToMany(fetch = FetchType.LAZY, mappedBy = "groups")
92 92
    @Cascade({CascadeType.REFRESH, CascadeType.MERGE}) // see #2414 (Group updating doesn't work)
93
    protected Set<User> members = new HashSet<User>();
93
    protected Set<User> members = new HashSet<>();
94 94

  
95 95
    @XmlElementWrapper(name = "GrantedAuthorities")
96 96
    @XmlElement(name = "GrantedAuthority", type = GrantedAuthorityImpl.class)
......
161 161
        Group result;
162 162
        try{
163 163
            result = (Group)super.clone();
164
            result.grantedAuthorities = new HashSet<GrantedAuthority>();
164
            result.grantedAuthorities = new HashSet<>();
165 165
            for (GrantedAuthority grantedauthority: this.grantedAuthorities){
166 166
                result.addGrantedAuthority(grantedauthority);
167 167
            }
168 168

  
169
            result.members = new HashSet<User>();
169
            result.members = new HashSet<>();
170 170
            for (User member: this.members){
171 171
                result.addMember(member);
172 172
            }
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IdentifiableEntity.java
288 288
    @Override
289 289
    public Set<Rights> getRights() {
290 290
        if(rights == null) {
291
            this.rights = new HashSet<Rights>();
291
            this.rights = new HashSet<>();
292 292
        }
293 293
        return this.rights;
294 294
    }
......
306 306
    @Override
307 307
    public List<Credit> getCredits() {
308 308
        if(credits == null) {
309
            this.credits = new ArrayList<Credit>();
309
            this.credits = new ArrayList<>();
310 310
        }
311 311
        return this.credits;
312 312
    }
......
346 346
    @Override
347 347
    public List<Identifier> getIdentifiers(){
348 348
        if(this.identifiers == null) {
349
            this.identifiers = new ArrayList<Identifier>();
349
            this.identifiers = new ArrayList<>();
350 350
        }
351 351
        return this.identifiers;
352 352
    }
......
362 362
     * @return a set of identifier value strings
363 363
     */
364 364
    public Set<String> getIdentifiers(UUID identifierTypeUuid){
365
        Set<String> result = new HashSet<String>();
365
        Set<String> result = new HashSet<>();
366 366
        for (Identifier<?> identifier : getIdentifiers()){
367 367
            if (identifier.getType().getUuid().equals(identifierTypeUuid)){
368 368
                result.add(identifier.getIdentifier());
......
423 423
    @Override
424 424
    public Set<Extension> getExtensions(){
425 425
        if(extensions == null) {
426
            this.extensions = new HashSet<Extension>();
426
            this.extensions = new HashSet<>();
427 427
        }
428 428
        return this.extensions;
429 429
    }
......
506 506
    @Override
507 507
    public Set<IdentifiableSource> getSources() {
508 508
        if(sources == null) {
509
            this.sources = new HashSet<IdentifiableSource>();
509
            this.sources = new HashSet<>();
510 510
        }
511 511
        return this.sources;
512 512
    }
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonName.java
1587 1587
    }
1588 1588

  
1589 1589
    /**
1590
     * Generates and returns a concatenated and formated authorteams string
1591
     * including basionym and combination authors of <i>this</i> non viral taxon name
1590
     * Generates and returns a concatenated and formated author team string
1591
     * including basionym and combination authors of <i>this</i> taxon name
1592 1592
     * according to the strategy defined in
1593 1593
     * {@link eu.etaxonomy.cdm.strategy.cache.name.INonViralNameCacheStrategy#getAuthorshipCache(TaxonName) INonViralNameCacheStrategy}.
1594 1594
     *
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IdentifiableServiceBase.java
268 268
		updateTitleCache(null, null, null, null);
269 269
	}
270 270

  
271
	@Transactional(readOnly = false)  //TODO check transactional behaviour, e.g. what happens with the session if count is very large
271
	@Transactional(readOnly = false)  //TODO check transactional behavior, e.g. what happens with the session if count is very large
272 272
	protected <S extends T > void updateTitleCacheImpl(Class<S> clazz, Integer stepSize, IIdentifiableEntityCacheStrategy<T> cacheStrategy, IProgressMonitor monitor) {
273 273
		if (stepSize == null){
274 274
			stepSize = UPDATE_TITLE_CACHE_DEFAULT_STEP_SIZE;
......
278 278
		}
279 279

  
280 280
		long count = dao.count(clazz);
281
		monitor.beginTask("update titles", Long.valueOf(count).intValue());
281
		long countUpdated = 0;
282
		monitor.beginTask("update titles for " + clazz.getSimpleName(), Long.valueOf(count).intValue());
282 283
		int worked = 0;
283 284
		for(int i = 0 ; i < count ; i = i + stepSize){
284 285
			// not sure if such strict ordering is necessary here, but for safety reasons I do it
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ReferenceServiceImpl.java
70 70

  
71 71
    @Override
72 72
    public List<UuidAndTitleCache<Reference>> getUuidAndTitle() {
73

  
74 73
        return dao.getUuidAndTitle();
75 74
    }
76 75

  
......
81 80

  
82 81
    @Override
83 82
    public List<Reference> getAllNomenclaturalReferences() {
84

  
85 83
        return dao.getAllNomenclaturalReferences();
86 84
    }
87 85

  
88 86
    @Override
89 87
    public List<TaxonBase> listCoveredTaxa(Reference reference, boolean includeSubordinateReferences, List<String> propertyPaths) {
90

  
91 88
        List<TaxonBase> taxonList = dao.listCoveredTaxa(reference, includeSubordinateReferences, null, propertyPaths);
92

  
93 89
        return taxonList;
94 90
    }
95 91

  
......
166 162

  
167 163
        long numberOfResults = dao.countByIdentifier(Reference.class, identifier, identifierType, matchmode);
168 164
        long numberOfResultsTitle = dao.countByTitle(identifier);
169
        List<Object[]> daoResults = new ArrayList<Object[]>();
165
        List<Object[]> daoResults = new ArrayList<>();
170 166
        List<UuidAndTitleCache<Reference>> daoResultsTitle = new ArrayList();
171 167
        if(numberOfResults > 0) { // no point checking again
172 168
            daoResults = dao.findByIdentifierAbbrev( identifier, identifierType,
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TermServiceImpl.java
396 396
	@Override
397 397
	@Transactional(readOnly = false)
398 398
    public void updateTitleCache(Class<? extends DefinedTermBase> clazz, Integer stepSize, IIdentifiableEntityCacheStrategy<DefinedTermBase> cacheStrategy, IProgressMonitor monitor) {
399
		//TODO shouldnt this be TermBase instead of DefinedTermBase
399
		//TODO shouldn't this be TermBase instead of DefinedTermBase
400 400
		if (clazz == null){
401 401
			clazz = DefinedTermBase.class;
402 402
		}
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/AgentServiceImplTest.java
45 45
 */
46 46
public class AgentServiceImplTest extends CdmTransactionalIntegrationTest{
47 47

  
48
    /**
49
     *
50
     */
51
    private static final UUID UUID_EHRENBERG = UUID.fromString("6363ae88-ec57-4b23-8235-6c86fbe59446");
52

  
48 53
    @SuppressWarnings("unused")
49 54
	private static final Logger logger = Logger.getLogger(AgentServiceImplTest.class);
50 55

  
......
195 200
        Person turland = (Person) service.load(UUID.fromString("a598ab3f-b33b-4b4b-b237-d616fcb6b5b1"));
196 201
        Person monro = (Person) service.load(UUID.fromString("e7206bc5-61ab-468e-a9f5-dec118b46b7f"));
197 202
        // TODO Add Assertion Person "Ehrenberg" must not be member of a team.
198
        Person ehrenberg = (Person) service.load(UUID.fromString("6363ae88-ec57-4b23-8235-6c86fbe59446"));
203
        Person ehrenberg = (Person) service.load(UUID_EHRENBERG);
199 204

  
200 205

  
201 206
        Team turland_monro_protected = (Team) service.load(UUID.fromString("5bff55de-f7cc-44d9-baac-908f52ad0cb8"));
......
220 225

  
221 226
        turland_monro_protected = (Team) service.load(UUID.fromString("5bff55de-f7cc-44d9-baac-908f52ad0cb8"));
222 227
        turland_monro = (Team) service.load(UUID.fromString("30ca93d6-b543-4bb9-b6ff-e9ededa65af7"));
228
        ehrenberg = (Person)service.load(UUID_EHRENBERG);
223 229

  
224 230
        assertEquals("Expecting nomenclaturalTitle to be set since it was NULL", "Turland, N.J.", nomenclaturalTitleField.get(turland));
225 231
        assertEquals("Expecting nomenclaturalTitle to be set since it was NULL", "Ehrenberg, C.G.", nomenclaturalTitleField.get(ehrenberg));
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/NameServiceImplTest.java
1062 1062
        return (Rank)termService.find(Rank.uuidGenus);
1063 1063
    }
1064 1064

  
1065
    /* (non-Javadoc)
1066
     * @see eu.etaxonomy.cdm.test.integration.CdmIntegrationTest#createTestData()
1067
     */
1068 1065
    @Override
1069 1066
    public void createTestDataSet() throws FileNotFoundException {}
1070 1067

  
cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/AgentServiceImplTest.testUpdateTitleCache.xml
1 1
<?xml version='1.0' encoding='UTF-8'?>
2 2
<dataset>
3
  <AGENTBASE DTYPE="Person" ID="1" CREATED="2009-03-12 11:24:58.0" UUID="a598ab3f-b33b-4b4b-b237-d616fcb6b5b1" TITLECACHE="Turland, N.J." PROTECTEDTITLECACHE="true"                                      FAMILYNAME="Turland" INITIALS="N.J." LIFESPAN_END="00000000" PROTECTEDCOLLECTORTITLECACHE="FALSE" LIFESPAN_START="00000000"/>
4
  <AGENTBASE DTYPE="Person" ID="2" CREATED="2009-03-12 11:24:58.0" UUID="e7206bc5-61ab-468e-a9f5-dec118b46b7f" TITLECACHE="Monro, A.M."   PROTECTEDTITLECACHE="true" NOMENCLATURALTITLE="A.M. Monro" FAMILYNAME="Monro"   INITIALS="A.M." LIFESPAN_END="00000000" PROTECTEDCOLLECTORTITLECACHE="FALSE" LIFESPAN_START="00000000"/>
5
  <AGENTBASE DTYPE="Team" ID="3" CREATED="2009-03-12 11:24:58.0" UUID="5bff55de-f7cc-44d9-baac-908f52ad0cb8" TITLECACHE="Turland, N.J., A.M. Monro"  PROTECTEDTITLECACHE="true" NOMENCLATURALTITLE="Turland, Monro" PROTECTEDNOMENCLATURALTITLECACHE="true" LIFESPAN_END="00000000" LIFESPAN_START="00000000" PROTECTEDCOLLECTORTITLECACHE="FALSE" HASMOREMEMBERS="FALSE"/>
6
  <AGENTBASE DTYPE="Team" ID="4" CREATED="2009-03-12 11:24:58.0" UUID="30ca93d6-b543-4bb9-b6ff-e9ededa65af7" TITLECACHE="Turland, N.J., Monro, A.M." PROTECTEDTITLECACHE="true" NOMENCLATURALTITLE="--to be updated--"         PROTECTEDNOMENCLATURALTITLECACHE="false" LIFESPAN_END="00000000" LIFESPAN_START="00000000" PROTECTEDCOLLECTORTITLECACHE="FALSE" HASMOREMEMBERS="FALSE"/>
7
  <AGENTBASE DTYPE="Team" ID="5" CREATED="2009-03-12 11:24:58.0" UUID="a4ca0d37-d78b-4bcc-875e-d4ea5a031089" TITLECACHE="Turland, N.J., Monro, A.M." PROTECTEDTITLECACHE="true"                                                PROTECTEDNOMENCLATURALTITLECACHE="false" LIFESPAN_END="00000000" LIFESPAN_START="00000000" PROTECTEDCOLLECTORTITLECACHE="FALSE" HASMOREMEMBERS="FALSE"/>
8
  <AGENTBASE DTYPE="Person" ID="6" CREATED="2009-03-12 11:24:58.0" UUID="6363ae88-ec57-4b23-8235-6c86fbe59446" TITLECACHE="Ehrenb." PROTECTEDTITLECACHE="true"                               FAMILYNAME="Ehrenberg" INITIALS="C.G." LIFESPAN_END="00000000" PROTECTEDCOLLECTORTITLECACHE="FALSE" LIFESPAN_START="00000000"/>
3
  <AGENTBASE DTYPE="Person" ID="1" CREATED="2009-03-12 11:24:58.0" UUID="a598ab3f-b33b-4b4b-b237-d616fcb6b5b1" TITLECACHE="Turland, N.J." PROTECTEDTITLECACHE="true"                                 FAMILYNAME="Turland"   INITIALS="N.J." PROTECTEDCOLLECTORTITLECACHE="FALSE" />
4
  <AGENTBASE DTYPE="Person" ID="2" CREATED="2009-03-12 11:24:58.0" UUID="e7206bc5-61ab-468e-a9f5-dec118b46b7f" TITLECACHE="Monro, A.M."   PROTECTEDTITLECACHE="true" NOMENCLATURALTITLE="A.M. Monro" FAMILYNAME="Monro"     INITIALS="A.M." PROTECTEDCOLLECTORTITLECACHE="FALSE" />
5
  <AGENTBASE DTYPE="Person" ID="6" CREATED="2009-03-12 11:24:58.0" UUID="6363ae88-ec57-4b23-8235-6c86fbe59446" TITLECACHE="Ehrenb."       PROTECTEDTITLECACHE="true"                                 FAMILYNAME="Ehrenberg" INITIALS="C.G." PROTECTEDCOLLECTORTITLECACHE="FALSE" LIFESPAN_END="00000000" LIFESPAN_START="00000000"/>
6
  <AGENTBASE DTYPE="Team" ID="3"   CREATED="2009-03-12 11:24:58.0" UUID="5bff55de-f7cc-44d9-baac-908f52ad0cb8" TITLECACHE="Turland, N.J., A.M. Monro"  PROTECTEDTITLECACHE="true" NOMENCLATURALTITLE="Turland, Monro"     PROTECTEDNOMENCLATURALTITLECACHE="true"  PROTECTEDCOLLECTORTITLECACHE="FALSE" HASMOREMEMBERS="FALSE"/>
7
  <AGENTBASE DTYPE="Team" ID="4"   CREATED="2009-03-12 11:24:58.0" UUID="30ca93d6-b543-4bb9-b6ff-e9ededa65af7" TITLECACHE="Turland, N.J., Monro, A.M." PROTECTEDTITLECACHE="true" NOMENCLATURALTITLE="--to be updated--"  PROTECTEDNOMENCLATURALTITLECACHE="false" PROTECTEDCOLLECTORTITLECACHE="FALSE" HASMOREMEMBERS="FALSE"/>
8
  <AGENTBASE DTYPE="Team" ID="5"   CREATED="2009-03-12 11:24:58.0" UUID="a4ca0d37-d78b-4bcc-875e-d4ea5a031089" TITLECACHE="Turland, N.J., Monro, A.M." PROTECTEDTITLECACHE="true"                                         PROTECTEDNOMENCLATURALTITLECACHE="false" PROTECTEDCOLLECTORTITLECACHE="FALSE" HASMOREMEMBERS="FALSE"/>
9 9
  <AGENTBASE_AGENTBASE TEAM_ID="3" TEAMMEMBERS_ID="1" SORTINDEX="0"/>
10 10
  <AGENTBASE_AGENTBASE TEAM_ID="3" TEAMMEMBERS_ID="2" SORTINDEX="1"/>
11 11
  <AGENTBASE_AGENTBASE TEAM_ID="4" TEAMMEMBERS_ID="1" SORTINDEX="0"/>

Also available in: Unified diff