fixing MediaAutoInitializer & fixing bug in AbstractBeanInitializer

[cdmlib.git] / cdmlib-services / src / main / java / eu / etaxonomy / cdm / api / service / IMediaService.java

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IMediaService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IMediaService.java
index 9b44878e36a390daba1f339c1c7ce60f4a4470fc..8ab58e5bf326e681aea5588576ca51eebee8f8dc 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IMediaService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IMediaService.java
@@ -10,35 +10,20 @@
 \r
 package eu.etaxonomy.cdm.api.service;\r
 \r
-import java.util.Collection;\r
 import java.util.List;\r
-import java.util.Map;\r
 import java.util.Set;\r
-import java.util.UUID;\r
 \r
 import eu.etaxonomy.cdm.api.service.pager.Pager;\r
 import eu.etaxonomy.cdm.model.description.MediaKey;\r
 import eu.etaxonomy.cdm.model.location.NamedArea;\r
 import eu.etaxonomy.cdm.model.media.Media;\r
-import eu.etaxonomy.cdm.model.media.MediaRepresentation;\r
-import eu.etaxonomy.cdm.model.media.MediaRepresentationPart;\r
 import eu.etaxonomy.cdm.model.media.Rights;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.cdm.persistence.dao.BeanInitializer;\r
+import eu.etaxonomy.cdm.persistence.dao.IBeanInitializer;\r
 import eu.etaxonomy.cdm.persistence.query.OrderHint;\r
 \r
-public interface IMediaService extends IAnnotatableService<Media> {\r
+public interface IMediaService extends IIdentifiableEntityService<Media> {\r
 \r
-       // FIXME candidate for harmonization?\r
-       public abstract Map<UUID, Media> saveMediaAll(Collection<Media> mediaCollection);\r
-       \r
-       // FIXME candidate for harmonization?\r
-       public abstract List<Media> getAllMedia(int limit, int start);\r
-\r
-       public abstract List<MediaRepresentation> getAllMediaRepresentations(int limit, int start);\r
-\r
-       public abstract List<MediaRepresentationPart> getAllMediaRepresentationParts(int limit, int start);\r
-       \r
        /**\r
         * Return a List of MediaKeys, optionally filtered by the parameters passed.\r
         * \r
@@ -46,7 +31,7 @@ public interface IMediaService extends IAnnotatableService<Media> {
         * @param geoScopes a Set of NamedArea instances that define the geospatial scope of the key (can be null)\r
         * @param pageSize The maximum number of keys returned (can be null for all keys)\r
         * @param pageNumber The offset (in pageSize chunks) from the start of the result set (0 - based)\r
-        * @param propertyPaths Properties to initialize in the returned entities, following the syntax described in {@link BeanInitializer#initialize(Object, List)}\r
+        * @param propertyPaths Properties to initialize in the returned entities, following the syntax described in {@link IBeanInitializer#initialize(Object, List)}\r
         * @return a Pager containing MediaKey instances\r
         */\r
        public Pager<MediaKey> getMediaKeys(Set<Taxon> taxonomicScope, Set<NamedArea> geoScopes, Integer pageSize, Integer pageNumber, List<String> propertyPaths);\r
@@ -57,7 +42,7 @@ public interface IMediaService extends IAnnotatableService<Media> {
         * @param t The media object\r
         * @param pageSize The maximum number of rights returned (can be null for all rights)\r
         * @param pageNumber The offset (in pageSize chunks) from the start of the result set (0 - based)\r
-        * @param propertyPaths properties to initialize - see {@link BeanInitializer#initialize(Object, List)}\r
+        * @param propertyPaths properties to initialize - see {@link IBeanInitializer#initialize(Object, List)}\r
         * @return a Pager of Rights entities\r
         */\r
     public Pager<Rights> getRights(Media t, Integer pageSize, Integer pageNumber, List<String> propertyPaths);\r