X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/f3ba008a16825a33ae07ac16a6bcaf02437bd411..96e3416d946aaf1d06e72ffbc83e2db8aa2e6045:/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IDescriptionService.java

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IDescriptionService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IDescriptionService.java
index e6611878fa..3dc5ac84dd 100644
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IDescriptionService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IDescriptionService.java
@@ -36,73 +36,6 @@ import eu.etaxonomy.cdm.persistence.dao.BeanInitializer;
 import eu.etaxonomy.cdm.persistence.query.OrderHint;
 
 public interface IDescriptionService extends IIdentifiableEntityService<DescriptionBase> {
-
-	/**
-	 * @return
-	 */
-	// FIXME candidate for harmonization? findByUuid
-	public DescriptionBase getDescriptionBaseByUuid(UUID uuid);
-
-	/**
-	 * Persists a <code>Description</code>
-	  * @param description
-	 * @return
-	 */
-	// FIXME candidate for harmonization? save
-	public UUID saveDescription(DescriptionBase description);
-
-	/**
-	 * Persists a <code>FeatureTree</code>
-	 * @param tree
-	 * @return
-	 */
-	public UUID saveFeatureTree(FeatureTree tree);
-	// FIXME could you handle the feature data elements using @Cascade?
-	public void saveFeatureDataAll(Collection<VersionableEntity> featureData);
-	public Map<UUID, FeatureTree> saveFeatureTreeAll(Collection<FeatureTree> trees);
-	public Map<UUID, FeatureNode> saveFeatureNodeAll(Collection<FeatureNode> nodes);
-	
-	/**
-	 * Gets a FeatureTree instance matching the supplied uuid
-	 * 
-	 * @param uuid the uuid of the FeatureTree of interest
-	 * @return a FeatureTree, or null if the FeatureTree does not exist
-	 */
-	public FeatureTree getFeatureTreeByUuid(UUID uuid);
-	
-	/**
-	 * Finds the feature tree specified by the <code>uuid</code> parameter and
-	 * recursively initializes all bean properties given in the
-	 * <code>propertyPaths</code> parameter.
-	 * <p>
-	 * For detailed description and examples <b>please refer to:</b> 
-	 * {@link BeanInitializer#initialize(Object, List)}
-	 * 
-	 * @param uuid
-	 * @param propertyPaths properties to initialize
-	 * @return
-	 */
-	public FeatureTree loadFeatureTree(UUID uuid, List<String> propertyPaths);
-	
-	/**
-	 * Finds the feature node specified by the <code>uuid</code> parameter and
-	 * recursively initializes all bean properties given in the
-	 * <code>propertyPaths</code> parameter.
-	 * <p>
-	 * For detailed description and examples <b>please refer to:</b> 
-	 * {@link BeanInitializer#initialize(Object, List)}
-	 * 
-	 * @param uuid
-	 * @param propertyPaths properties to initialize
-	 * @return
-	 */
-	public FeatureNode loadFeatureNode(UUID uuid, List<String> propertyPaths);
-	public List<FeatureNode> getFeatureNodesAll();
-	public List<Feature> getFeaturesAll();
-	
-	public List<FeatureTree> getFeatureTreesAll(List<String> propertyPaths);
-	public List<FeatureNode> getFeatureNodesAll(List<String> propertyPaths);
-	public List<Feature> getFeaturesAll(List<String> propertyPaths);
 	
 	/**
 	 * 
@@ -110,7 +43,7 @@ public interface IDescriptionService extends IIdentifiableEntityService<Descript
 	 * @deprecated use TermService#getVocabulary(VocabularyType) instead
 	 */
 	public TermVocabulary<Feature> getDefaultFeatureVocabulary();
-	//public TermVocabulary<Feature> getFeatureVocabulary();
+
 	/**
 	 * @deprecated use TermService#getVocabulary(VocabularyType) instead
 	 */
@@ -153,7 +86,7 @@ public interface IDescriptionService extends IIdentifiableEntityService<Descript
 	public UUID deleteDescriptionElement(DescriptionElementBase descriptionElement);
 	
 	/**
-	 * List the descriptions of type <TYPE>, filtered using the following parameters
+	 * List the descriptions of type <T>, filtered using the following parameters
 	 *  
 	 * @param type The type of description returned (Taxon, TaxonName, or Specimen)
 	 * @param hasMedia Restrict the description to those that do (true) or don't (false) contain <i>elements</i> that have one or more media (can be null)
@@ -165,7 +98,7 @@ public interface IDescriptionService extends IIdentifiableEntityService<Descript
 	 * @param propertyPaths properties to initialize - see {@link BeanInitializer#initialize(Object, List)}
 	 * @return a Pager containing DescriptionBase instances
 	 */
-	public <TYPE extends DescriptionBase> Pager<TYPE> listDescriptions(Class<TYPE> type, Boolean hasMedia, Boolean hasText, Set<Feature> feature, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths);
+	public Pager<DescriptionBase> page(Class<? extends DescriptionBase> type, Boolean hasMedia, Boolean hasText, Set<Feature> feature, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths);
 	
 	/**
 	 * Count the descriptions of type <TYPE>, filtered using the following parameters
@@ -176,7 +109,7 @@ public interface IDescriptionService extends IIdentifiableEntityService<Descript
 	 * @param feature Restrict the description to those <i>elements</i> which are scoped by one of the Features passed (can be null or empty)
 	 * @return a count of DescriptionBase instances
 	 */
-	public <TYPE extends DescriptionBase> int countDescriptions(Class<TYPE> type, Boolean hasImages, Boolean hasText, Set<Feature> feature);
+	public int count(Class<? extends DescriptionBase> type, Boolean hasImages, Boolean hasText, Set<Feature> feature);
 	
 	/**
 	 * Returns description elements of type <TYPE>, belonging to a given description, optionally filtered by one or more features
@@ -184,12 +117,13 @@ public interface IDescriptionService extends IIdentifiableEntityService<Descript
 	 * @param description The description which these description elements belong to (can be null to count all description elements)
 	 * @param features Restrict the results to those description elements which are scoped by one of the Features passed (can be null or empty)
 	 * @param type The type of description
+	 * @param class 
 	 * @param pageSize The maximum number of description elements returned (can be null for all description elements)
 	 * @param pageNumber The offset (in pageSize chunks) from the start of the result set (0 - based)
 	 * @param propertyPaths Properties to initialize in the returned entities, following the syntax described in {@link BeanInitializer#initialize(Object, List)}
 	 * @return a Pager containing DescriptionElementBase instances
 	 */
-	public <TYPE extends DescriptionElementBase> Pager<TYPE> getDescriptionElements(DescriptionBase description,Set<Feature> features, Class<TYPE> type, Integer pageSize, Integer pageNumber, List<String> propertyPaths);
+	public Pager<DescriptionElementBase> getDescriptionElements(DescriptionBase description,Set<Feature> features, Class<? extends DescriptionElementBase> type, Integer pageSize, Integer pageNumber, List<String> propertyPaths);
 	
 	/**
 	 * Returns a List of TaxonDescription instances, optionally filtered by parameters passed to this method
@@ -244,7 +178,7 @@ public interface IDescriptionService extends IIdentifiableEntityService<Descript
 	 * @return a Pager DescriptionElementBase instances
 	 * @see <a href="http://lucene.apache.org/java/2_4_0/queryparsersyntax.html">Apache Lucene - Query Parser Syntax</a>
 	 */
-	public Pager<DescriptionElementBase> search(Class<? extends DescriptionElementBase> clazz, String queryString, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths);
+	public Pager<DescriptionElementBase> searchElements(Class<? extends DescriptionElementBase> clazz, String queryString, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths);
 	
 	/**
      * Returns a List of Media that are associated with a given description element