Revision 9f53e2a3
Added by Andreas Müller over 7 years ago
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/FindByMarkerDTO.java | ||
---|---|---|
40 | 40 |
public class CdmEntity{ |
41 | 41 |
UUID cdmUuid; |
42 | 42 |
String titleCache; |
43 |
T entity; |
|
43 |
T entitys;
|
|
44 | 44 |
public CdmEntity(UUID cdmUuid, String titleCache, T entity) { |
45 | 45 |
this.cdmUuid = cdmUuid; |
46 | 46 |
this.titleCache = titleCache; |
47 |
this.entity = entity; |
|
47 |
this.entitys = entity;
|
|
48 | 48 |
} |
49 | 49 |
public UUID getCdmUuid() {return cdmUuid;} |
50 | 50 |
public String getTitleCache() {return titleCache;} |
51 |
public T getEntity() {return entity;}
|
|
51 |
public T getEntityX() {return entitys;}
|
|
52 | 52 |
|
53 | 53 |
} |
54 | 54 |
|
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/IdentifiableServiceBaseTest.java | ||
---|---|---|
220 | 220 |
FindByMarkerDTO<Taxon>.Marker marker = dto.getMarker(); |
221 | 221 |
Assert.assertTrue("Flag must be true", marker.getFlag()); |
222 | 222 |
Assert.assertEquals("Flag must be true", uuidMarkerTypeCompleted, marker.getTypeUuid()); |
223 |
Assert.assertNotNull("the CDM entity in the dto must not be empty if includeEntity=true", dto.getCdmEntity().getEntity()); |
|
224 |
Assert.assertEquals(5000, dto.getCdmEntity().getEntity().getId()); |
|
223 |
Assert.assertNotNull("the CDM entity in the dto must not be empty if includeEntity=true", dto.getCdmEntity().getEntityX());
|
|
224 |
Assert.assertEquals(5000, dto.getCdmEntity().getEntityX().getId());
|
|
225 | 225 |
|
226 | 226 |
markerValue = false; |
227 | 227 |
taxonPager = taxonService.findByMarker(Taxon.class, markerType, markerValue, rootNode, false, null, null, null); |
Also available in: Unified diff
ref #6072 test missing entity in webservice