ref #6072 test missing entity in webservice

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/FindByMarkerDTO.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/FindByMarkerDTO.java
index 500cfe413bbf1b99eac897cffbd6aca5b0955318..6b41842a476d3062df0fc03facbfe2bfaaaa83fd 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/FindByMarkerDTO.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/FindByMarkerDTO.java
@@ -13,6 +13,7 @@ import java.util.UUID;
 
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.MarkerType;
+import eu.etaxonomy.cdm.model.taxon.Taxon;
 
 /**
  * DTO for IdentifiableEntities matching a certain marker.
@@ -40,15 +41,16 @@ public class FindByMarkerDTO<T extends IdentifiableEntity> {
        public class CdmEntity{
                UUID cdmUuid;
                String titleCache;
-               T entitys;
+               T entity;
                public CdmEntity(UUID cdmUuid, String titleCache, T entity) {
                        this.cdmUuid = cdmUuid;
                        this.titleCache = titleCache;
-                       this.entitys = entity;
+                       this.entity = (T)new Taxon();
+
                }
                public UUID getCdmUuid() {return cdmUuid;}
                public String getTitleCache() {return titleCache;}
-               public T getEntityX() {return entitys;}
+               public T getEntity() {return entity;}
 
        }
 

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/IdentifiableServiceBaseTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/IdentifiableServiceBaseTest.java
index 609b3e18157e67843f0d053e74ed892d69bba933..fbd2c3715ec4ce09039dedafc7ed614ca1488d3d 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/IdentifiableServiceBaseTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/IdentifiableServiceBaseTest.java
@@ -220,8 +220,8 @@ public class IdentifiableServiceBaseTest extends CdmTransactionalIntegrationTest
         FindByMarkerDTO<Taxon>.Marker marker = dto.getMarker();
         Assert.assertTrue("Flag must be true", marker.getFlag());
         Assert.assertEquals("Flag must be true", uuidMarkerTypeCompleted, marker.getTypeUuid());
-        Assert.assertNotNull("the CDM entity in the dto must not be empty if includeEntity=true", dto.getCdmEntity().getEntityX());
-        Assert.assertEquals(5000, dto.getCdmEntity().getEntityX().getId());
+        Assert.assertNotNull("the CDM entity in the dto must not be empty if includeEntity=true", dto.getCdmEntity().getEntity());
+        Assert.assertEquals(5000, dto.getCdmEntity().getEntity().getId());
 
         markerValue = false;
         taxonPager = taxonService.findByMarker(Taxon.class, markerType, markerValue, rootNode, false, null, null, null);