ref #9524 fix compile errors

diff --git a/cdmlib-api/src/main/java/eu/etaxonomy/cdm/api/dto/portal/SourceDto.java b/cdmlib-api/src/main/java/eu/etaxonomy/cdm/api/dto/portal/SourceDto.java
index fa7debde7990c7296b5c3b290ed8410d8d8abc8e..ab55c9f866a8422373042889bf48b0e2754dbc70 100644 (file)
--- a/cdmlib-api/src/main/java/eu/etaxonomy/cdm/api/dto/portal/SourceDto.java
+++ b/cdmlib-api/src/main/java/eu/etaxonomy/cdm/api/dto/portal/SourceDto.java
@@ -8,6 +8,7 @@
 */
 package eu.etaxonomy.cdm.api.dto.portal;
 
+import java.beans.Transient;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
@@ -38,6 +39,8 @@ public class SourceDto extends CdmBaseDto {  //but could be annotatable
 
     private List<URI> links;
 
+    private String citationDetail;
+
 // ******************** CONSTRUCTOR ****************/
 
     public SourceDto() {
@@ -139,4 +142,12 @@ public class SourceDto extends CdmBaseDto {  //but could be annotatable
     public void setAccessed(String accessed) {
         this.accessed = accessed;
     }
+
+    @Transient //TODO transient for now not needed as API, only for loading persistent data
+    public String getCitationDetail() {
+        return citationDetail;
+    }
+    public void setCitationDetail(String citationDetail) {
+        this.citationDetail = citationDetail;
+    }
 }
\ No newline at end of file

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/portal/LazyDtoLoader.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/portal/LazyDtoLoader.java
index 9a5fdf965cfce32d59b71ce4a325ffb855e6a7ba..939fcbcf6829b7671068a3fbd3b9595a414371d0 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/portal/LazyDtoLoader.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/portal/LazyDtoLoader.java
@@ -10,18 +10,19 @@ package eu.etaxonomy.cdm.api.service.portal;
 
 import java.util.EnumSet;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 
 import eu.etaxonomy.cdm.api.dto.portal.AnnotatableDto;
 import eu.etaxonomy.cdm.api.dto.portal.CdmBaseDto;
 import eu.etaxonomy.cdm.api.dto.portal.FactDto;
 import eu.etaxonomy.cdm.api.dto.portal.IdentifiableDto;
+import eu.etaxonomy.cdm.api.dto.portal.SourceDto;
 import eu.etaxonomy.cdm.api.dto.portal.SourcedDto;
-import eu.etaxonomy.cdm.api.service.dto.SourceDtoLoader;
 import eu.etaxonomy.cdm.common.SetMap;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
-import eu.etaxonomy.cdm.model.reference.OriginalSourceBase;
 import eu.etaxonomy.cdm.model.reference.OriginalSourceType;
 import eu.etaxonomy.cdm.persistence.dao.common.ICdmGenericDao;
 
@@ -43,7 +44,7 @@ public class LazyDtoLoader {
     //not necessarily a map
     private Map<Class<DescriptionElementBase>,? extends FactDto> factProxies = new HashMap<>();
 
-    private Map<Class<OriginalSourceBase>,? extends FactDto> sourceProxies = new HashMap<>();
+    private Set<SourceDto> sourceProxies = new HashSet<>();
 
 
 
@@ -68,10 +69,10 @@ public class LazyDtoLoader {
         }
 
         //TODO clazz distinction needed here
-        for (Class<? extends CdmBase> clazz : sourceProxies.keySet()) {
-            SourceDtoLoader .INSTANCE().loadAll(sourcedProxies.get(clazz),
-                    clazz, dao, sourceTypes, this);
-        }
+//        for (Class<? extends CdmBase> clazz : sourceProxies) {
+            SourceDtoLoader.INSTANCE().loadAll(sourceProxies,
+                    dao, sourceTypes, this);
+//        }
 
 
     }

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/portal/SourceDtoLoader.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/portal/SourceDtoLoader.java
index 9c7907611ab746a9de9789636b96372041858916..36a561aa4170832f95452af7aa79b9462ae3a64f 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/portal/SourceDtoLoader.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/portal/SourceDtoLoader.java
@@ -41,8 +41,8 @@ public class SourceDtoLoader {
     /**
      * DTOs must have id initialized
      */
-    public void loadAll(Set<SourceDto> dtos, Class baseClass, ICdmGenericDao commonDao,
-            EnumSet<OriginalSourceType> sourceTypes, LazyDtoLoader lazyLoader) {
+    public void loadAll(Set<SourceDto> dtos, ICdmGenericDao commonDao,
+            EnumSet<OriginalSourceType> sourceTypeFilter, LazyDtoLoader lazyLoader) {
 
         Set<Integer> baseIds = dtos.stream().map(d->d.getId()).collect(Collectors.toSet());