update Transient services

[taxeditor.git] / eu.etaxonomy.taxeditor.editor / src / main / java / eu / etaxonomy / taxeditor / editor / view / dataimport / transientServices / TransientTermService.java

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java
index f2b6c5627ca5326679aa8d7236751ff081d73588..73f46968fd6400b104f17abf62f7720f7fbcbbe5 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java
@@ -18,19 +18,20 @@ import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 
-import org.hibernate.LockMode;
+import org.hibernate.LockOptions;
 import org.hibernate.Session;
 import org.hibernate.criterion.Criterion;
 import org.hibernate.envers.query.criteria.AuditCriterion;
 
 import eu.etaxonomy.cdm.api.service.DeleteResult;
 import eu.etaxonomy.cdm.api.service.ITermService;
+import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase;
 import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator;
 import eu.etaxonomy.cdm.api.service.config.TermDeletionConfigurator;
-import eu.etaxonomy.cdm.api.service.exception.ReferencedObjectUndeletableException;
 import eu.etaxonomy.cdm.api.service.pager.Pager;
 import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
 import eu.etaxonomy.cdm.model.common.Annotation;
+import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.ISourceable;
 import eu.etaxonomy.cdm.model.common.IdentifiableSource;
@@ -41,6 +42,7 @@ import eu.etaxonomy.cdm.model.common.LanguageStringBase;
 import eu.etaxonomy.cdm.model.common.Marker;
 import eu.etaxonomy.cdm.model.common.MarkerType;
 import eu.etaxonomy.cdm.model.common.Representation;
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.common.UuidAndTitleCache;
 import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.location.NamedAreaLevel;
@@ -64,13 +66,13 @@ import eu.etaxonomy.cdm.strategy.merge.IMergeStrategy;
  */
 public class TransientTermService implements ITermService {
 
-    private final ITermService defaultTermService;
+    private final ITermService defaultService;
 
     /**
      * @param defaultTermService
      */
     public TransientTermService(ITermService defaultTermService) {
-        this.defaultTermService = defaultTermService;
+        this.defaultService = defaultTermService;
     }
 
     /**
@@ -84,7 +86,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public Pager<AuditEventRecord<DefinedTermBase>> pageAuditEvents(DefinedTermBase t, Integer pageSize, Integer pageNumber, AuditEventSort sort, List<String> propertyPaths) {
-        return defaultTermService.pageAuditEvents(t, pageSize, pageNumber, sort, propertyPaths);
+        return defaultService.pageAuditEvents(t, pageSize, pageNumber, sort, propertyPaths);
     }
 
     /**
@@ -99,7 +101,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public Pager<Annotation> getAnnotations(DefinedTermBase annotatedObj, MarkerType status, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultTermService.getAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.getAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths);
     }
 
     /**
@@ -108,7 +110,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public void clear() {
-        defaultTermService.clear();
+        defaultService.clear();
     }
 
     /**
@@ -117,8 +119,8 @@ public class TransientTermService implements ITermService {
      * @see eu.etaxonomy.cdm.api.service.IService#lock(eu.etaxonomy.cdm.model.common.ICdmBase, org.hibernate.LockMode)
      */
     @Override
-    public void lock(DefinedTermBase t, LockMode lockMode) {
-        defaultTermService.lock(t, lockMode);
+    public void lock(DefinedTermBase t, LockOptions lockOptions) {
+        defaultService.lock(t, lockOptions);
     }
 
     /**
@@ -128,7 +130,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public DefinedTermBase getByUri(URI uri) {
-        return defaultTermService.getByUri(uri);
+        return defaultService.getByUri(uri);
     }
 
     /**
@@ -138,8 +140,8 @@ public class TransientTermService implements ITermService {
      * @see eu.etaxonomy.cdm.api.service.IService#refresh(eu.etaxonomy.cdm.model.common.ICdmBase, org.hibernate.LockMode, java.util.List)
      */
     @Override
-    public void refresh(DefinedTermBase t, LockMode lockMode, List<String> propertyPaths) {
-        defaultTermService.refresh(t, lockMode, propertyPaths);
+    public void refresh(DefinedTermBase t, LockOptions lockOptions, List<String> propertyPaths) {
+        defaultService.refresh(t, lockOptions, propertyPaths);
     }
 
     /**
@@ -160,7 +162,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public List<LanguageString> getAllLanguageStrings(int limit, int start) {
-        return defaultTermService.getAllLanguageStrings(limit, start);
+        return defaultService.getAllLanguageStrings(limit, start);
     }
 
     /**
@@ -171,7 +173,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public List<Representation> getAllRepresentations(int limit, int start) {
-        return defaultTermService.getAllRepresentations(limit, start);
+        return defaultService.getAllRepresentations(limit, start);
     }
 
     /**
@@ -180,7 +182,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public void updateTitleCache() {
-        defaultTermService.updateTitleCache();
+        defaultService.updateTitleCache();
     }
 
     /**
@@ -190,7 +192,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public AuditEventRecord<DefinedTermBase> getNextAuditEvent(DefinedTermBase t) {
-        return defaultTermService.getNextAuditEvent(t);
+        return defaultService.getNextAuditEvent(t);
     }
 
     /**
@@ -200,7 +202,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public Language getLanguageByIso(String iso639) {
-        return defaultTermService.getLanguageByIso(iso639);
+        return defaultService.getLanguageByIso(iso639);
     }
 
     /**
@@ -210,7 +212,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public List<Language> getLanguagesByLocale(Enumeration<Locale> locales) {
-        return defaultTermService.getLanguagesByLocale(locales);
+        return defaultService.getLanguagesByLocale(locales);
     }
 
     /**
@@ -220,7 +222,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public NamedArea getAreaByTdwgAbbreviation(String tdwgAbbreviation) {
-        return defaultTermService.getAreaByTdwgAbbreviation(tdwgAbbreviation);
+        return defaultService.getAreaByTdwgAbbreviation(tdwgAbbreviation);
     }
 
     /**
@@ -235,7 +237,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public Pager<Marker> getMarkers(DefinedTermBase annotatableEntity, Boolean technical, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultTermService.getMarkers(annotatableEntity, technical, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.getMarkers(annotatableEntity, technical, pageSize, pageNumber, orderHints, propertyPaths);
     }
 
     /**
@@ -247,7 +249,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public Pager<Media> getMedia(DefinedTermBase definedTerm, Integer pageSize, Integer pageNumber) {
-        return defaultTermService.getMedia(definedTerm, pageSize, pageNumber);
+        return defaultService.getMedia(definedTerm, pageSize, pageNumber);
     }
 
     /**
@@ -259,7 +261,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public void updateTitleCache(Class<? extends DefinedTermBase> clazz, Integer stepSize, IIdentifiableEntityCacheStrategy<DefinedTermBase> cacheStrategy, IProgressMonitor monitor) {
-        defaultTermService.updateTitleCache(clazz, stepSize, cacheStrategy, monitor);
+        defaultService.updateTitleCache(clazz, stepSize, cacheStrategy, monitor);
     }
 
     /**
@@ -269,7 +271,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public AuditEventRecord<DefinedTermBase> getPreviousAuditEvent(DefinedTermBase t) {
-        return defaultTermService.getPreviousAuditEvent(t);
+        return defaultService.getPreviousAuditEvent(t);
     }
 
     /**
@@ -279,7 +281,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public int count(Class<? extends DefinedTermBase> clazz) {
-        return defaultTermService.count(clazz);
+        return defaultService.count(clazz);
     }
 
     /**
@@ -294,7 +296,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public Pager<NamedArea> list(NamedAreaLevel level, NamedAreaType type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultTermService.list(level, type, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.list(level, type, pageSize, pageNumber, orderHints, propertyPaths);
     }
 
     /**
@@ -311,7 +313,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public Pager<AuditEventRecord<DefinedTermBase>> pageAuditEvents(Class<? extends DefinedTermBase> clazz, AuditEvent from, AuditEvent to, List<AuditCriterion> criteria, Integer pageSize, Integer pageValue, AuditEventSort sort, List<String> propertyPaths) {
-        return defaultTermService.pageAuditEvents(clazz, from, to, criteria, pageSize, pageValue, sort, propertyPaths);
+        return defaultService.pageAuditEvents(clazz, from, to, criteria, pageSize, pageValue, sort, propertyPaths);
     }
 
     /**
@@ -321,7 +323,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public DefinedTermBase find(LSID lsid) {
-        return defaultTermService.find(lsid);
+        return defaultService.find(lsid);
     }
 
     /**
@@ -330,8 +332,8 @@ public class TransientTermService implements ITermService {
      * @see eu.etaxonomy.cdm.api.service.IService#delete(eu.etaxonomy.cdm.model.common.ICdmBase)
      */
     @Override
-    public UUID delete(DefinedTermBase persistentObject) throws ReferencedObjectUndeletableException{
-        return defaultTermService.delete(persistentObject);
+    public DeleteResult delete(DefinedTermBase persistentObject) {
+        return defaultService.delete(persistentObject);
     }
 
     /**
@@ -345,7 +347,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public List<Object[]> groupMarkers(Class<? extends DefinedTermBase> clazz, Boolean technical, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultTermService.groupMarkers(clazz, technical, pageSize, pageNumber, propertyPaths);
+        return defaultService.groupMarkers(clazz, technical, pageSize, pageNumber, propertyPaths);
     }
 
     /**
@@ -355,7 +357,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public boolean exists(UUID uuid) {
-        return defaultTermService.exists(uuid);
+        return defaultService.exists(uuid);
     }
 
     /**
@@ -366,7 +368,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public DefinedTermBase replace(DefinedTermBase x, DefinedTermBase y) {
-        return defaultTermService.replace(x, y);
+        return defaultService.replace(x, y);
     }
 
     /**
@@ -378,7 +380,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public <T extends DefinedTermBase> Pager<T> getGeneralizationOf(T definedTerm, Integer pageSize, Integer pageNumber) {
-        return defaultTermService.getGeneralizationOf(definedTerm, pageSize, pageNumber);
+        return defaultService.getGeneralizationOf(definedTerm, pageSize, pageNumber);
     }
 
     /**
@@ -388,7 +390,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public List<DefinedTermBase> find(Set<UUID> uuidSet) {
-        return defaultTermService.find(uuidSet);
+        return defaultService.find(uuidSet);
     }
 
     /**
@@ -401,7 +403,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public Pager<IdentifiableSource> getSources(DefinedTermBase t, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultTermService.getSources(t, pageSize, pageNumber, propertyPaths);
+        return defaultService.getSources(t, pageSize, pageNumber, propertyPaths);
     }
 
     /**
@@ -411,7 +413,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public DefinedTermBase find(UUID uuid) {
-        return defaultTermService.find(uuid);
+        return defaultService.find(uuid);
     }
 
     /**
@@ -424,7 +426,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public <T extends DefinedTermBase> Pager<T> getPartOf(Set<T> definedTerms, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultTermService.getPartOf(definedTerms, pageSize, pageNumber, propertyPaths);
+        return defaultService.getPartOf(definedTerms, pageSize, pageNumber, propertyPaths);
     }
 
     /**
@@ -434,7 +436,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public DefinedTermBase find(int id) {
-        return defaultTermService.find(id);
+        return defaultService.find(id);
     }
 
     /**
@@ -447,7 +449,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public Pager<Rights> getRights(DefinedTermBase t, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultTermService.getRights(t, pageSize, pageNumber, propertyPaths);
+        return defaultService.getRights(t, pageSize, pageNumber, propertyPaths);
     }
 
     /**
@@ -458,7 +460,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public int countMarkers(Class<? extends DefinedTermBase> clazz, Boolean technical) {
-        return defaultTermService.countMarkers(clazz, technical);
+        return defaultService.countMarkers(clazz, technical);
     }
 
     /**
@@ -468,7 +470,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public List<DefinedTermBase> findById(Set<Integer> idSet) {
-        return defaultTermService.findById(idSet);
+        return defaultService.findById(idSet);
     }
 
     /**
@@ -480,8 +482,8 @@ public class TransientTermService implements ITermService {
      * @see eu.etaxonomy.cdm.api.service.ITermService#getIncludes(java.util.Set, java.lang.Integer, java.lang.Integer, java.util.List)
      */
     @Override
-    public <T extends DefinedTermBase> Pager<T> getIncludes(Set<T> definedTerms, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
-        return defaultTermService.getIncludes(definedTerms, pageSize, pageNumber, propertyPaths);
+    public <T extends DefinedTermBase> Pager<T> getIncludes(Collection<T> definedTerms, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
+        return defaultService.getIncludes(definedTerms, pageSize, pageNumber, propertyPaths);
     }
 
     /**
@@ -493,7 +495,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public ISourceable getSourcedObjectByIdInSource(Class clazz, String idInSource, String idNamespace) {
-        return defaultTermService.getSourcedObjectByIdInSource(clazz, idInSource, idNamespace);
+        return defaultService.getSourcedObjectByIdInSource(clazz, idInSource, idNamespace);
     }
 
     /**
@@ -502,7 +504,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public Session getSession() {
-        return defaultTermService.getSession();
+        return defaultService.getSession();
     }
 
     /**
@@ -511,7 +513,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public List<UuidAndTitleCache<DefinedTermBase>> getUuidAndTitleCache() {
-        return defaultTermService.getUuidAndTitleCache();
+        return defaultService.getUuidAndTitleCache();
     }
 
     /**
@@ -525,7 +527,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public List<Object[]> group(Class<? extends DefinedTermBase> clazz, Integer limit, Integer start, List<Grouping> groups, List<String> propertyPaths) {
-        return defaultTermService.group(clazz, limit, start, groups, propertyPaths);
+        return defaultService.group(clazz, limit, start, groups, propertyPaths);
     }
 
     /**
@@ -538,7 +540,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public <T extends DefinedTermBase> Pager<T> findByRepresentationText(String label, Class<T> clazz, Integer pageSize, Integer pageNumber) {
-        return defaultTermService.findByRepresentationText(label, clazz, pageSize, pageNumber);
+        return defaultService.findByRepresentationText(label, clazz, pageSize, pageNumber);
     }
 
     /**
@@ -555,7 +557,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public Pager<DefinedTermBase> findByTitle(Class<? extends DefinedTermBase> clazz, String queryString, MatchMode matchmode, List<Criterion> criteria, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultTermService.findByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.findByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
     }
 
     /**
@@ -568,7 +570,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public <T extends DefinedTermBase> Pager<T> findByRepresentationAbbreviation(String abbrev, Class<T> clazz, Integer pageSize, Integer pageNumber) {
-        return defaultTermService.findByRepresentationAbbreviation(abbrev, clazz, pageSize, pageNumber);
+        return defaultService.findByRepresentationAbbreviation(abbrev, clazz, pageSize, pageNumber);
     }
 
     /**
@@ -581,22 +583,8 @@ public class TransientTermService implements ITermService {
      * @see eu.etaxonomy.cdm.api.service.IService#list(java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
      */
     @Override
-    public List<DefinedTermBase> list(Class<? extends DefinedTermBase> type, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultTermService.list(type, limit, start, orderHints, propertyPaths);
-    }
-
-    /**
-     * @param clazz
-     * @param limit
-     * @param start
-     * @param orderHints
-     * @param propertyPaths
-     * @return
-     * @see eu.etaxonomy.cdm.api.service.ITermService#listByTermClass(java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
-     */
-    @Override
-    public <TERM extends DefinedTermBase> List<TERM> listByTermClass(Class<TERM> clazz, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultTermService.listByTermClass(clazz, limit, start, orderHints, propertyPaths);
+    public <S extends DefinedTermBase> List<S> list(Class<S> type, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths) {
+        return defaultService.list(type, limit, start, orderHints, propertyPaths);
     }
 
     /**
@@ -607,7 +595,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public DeleteResult delete(DefinedTermBase term, TermDeletionConfigurator config) {
-        return defaultTermService.delete(term, config);
+        return defaultService.delete(term, config);
     }
 
     /**
@@ -617,7 +605,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public Pager<DefinedTermBase> findByTitle(IIdentifiableEntityServiceConfigurator<DefinedTermBase> configurator) {
-        return defaultTermService.findByTitle(configurator);
+        return defaultService.findByTitle(configurator);
     }
 
     /**
@@ -630,7 +618,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public Integer countByTitle(Class<? extends DefinedTermBase> clazz, String queryString, MatchMode matchmode, List<Criterion> criteria) {
-        return defaultTermService.countByTitle(clazz, queryString, matchmode, criteria);
+        return defaultService.countByTitle(clazz, queryString, matchmode, criteria);
     }
 
     /**
@@ -640,7 +628,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public DefinedTermBase load(UUID uuid) {
-        return defaultTermService.load(uuid);
+        return defaultService.load(uuid);
     }
 
     /**
@@ -651,7 +639,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public DefinedTermBase load(UUID uuid, List<String> propertyPaths) {
-        return defaultTermService.load(uuid, propertyPaths);
+        return defaultService.load(uuid, propertyPaths);
     }
 
     /**
@@ -661,7 +649,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public Integer countByTitle(IIdentifiableEntityServiceConfigurator<DefinedTermBase> configurator) {
-        return defaultTermService.countByTitle(configurator);
+        return defaultService.countByTitle(configurator);
     }
 
     /**
@@ -671,7 +659,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public DefinedTermBase merge(DefinedTermBase transientObject) {
-        return defaultTermService.merge(transientObject);
+        return defaultService.merge(transientObject);
     }
 
     /**
@@ -688,7 +676,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public List<DefinedTermBase> listByTitle(Class<? extends DefinedTermBase> clazz, String queryString, MatchMode matchmode, List<Criterion> criteria, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultTermService.listByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.listByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
     }
 
     /**
@@ -701,8 +689,8 @@ public class TransientTermService implements ITermService {
      * @see eu.etaxonomy.cdm.api.service.IService#page(java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
      */
     @Override
-    public Pager<DefinedTermBase> page(Class<? extends DefinedTermBase> type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultTermService.page(type, pageSize, pageNumber, orderHints, propertyPaths);
+    public <S extends DefinedTermBase> Pager<S> page(Class<S> type, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
+        return defaultService.page(type, pageSize, pageNumber, orderHints, propertyPaths);
     }
 
     /**
@@ -712,7 +700,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public UUID refresh(DefinedTermBase persistentObject) {
-        return defaultTermService.refresh(persistentObject);
+        return defaultService.refresh(persistentObject);
     }
 
     /**
@@ -729,7 +717,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public List<DefinedTermBase> listByReferenceTitle(Class<? extends DefinedTermBase> clazz, String queryString, MatchMode matchmode, List<Criterion> criteria, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultTermService.listByReferenceTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.listByReferenceTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths);
     }
 
     /**
@@ -741,7 +729,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public List<DefinedTermBase> rows(String tableName, int limit, int start) {
-        return defaultTermService.rows(tableName, limit, start);
+        return defaultService.rows(tableName, limit, start);
     }
 
     /**
@@ -786,7 +774,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public Pager<DefinedTermBase> search(Class<? extends DefinedTermBase> clazz, String queryString, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultTermService.search(clazz, queryString, pageSize, pageNumber, orderHints, propertyPaths);
+        return defaultService.search(clazz, queryString, pageSize, pageNumber, orderHints, propertyPaths);
     }
 
     /**
@@ -806,7 +794,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public UUID update(DefinedTermBase transientObject) {
-        return defaultTermService.update(transientObject);
+        return defaultService.update(transientObject);
     }
 
     /**
@@ -821,7 +809,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public List<DefinedTermBase> list(DefinedTermBase example, Set<String> includeProperties, Integer limit, Integer start, List<OrderHint> orderHints, List<String> propertyPaths) {
-        return defaultTermService.list(example, includeProperties, limit, start, orderHints, propertyPaths);
+        return defaultService.list(example, includeProperties, limit, start, orderHints, propertyPaths);
     }
 
     /**
@@ -833,7 +821,7 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public int deduplicate(Class<? extends DefinedTermBase> clazz, IMatchStrategy matchStrategy, IMergeStrategy mergeStrategy) {
-        return defaultTermService.deduplicate(clazz, matchStrategy, mergeStrategy);
+        return defaultService.deduplicate(clazz, matchStrategy, mergeStrategy);
     }
 
     /**
@@ -848,13 +836,39 @@ public class TransientTermService implements ITermService {
      */
     @Override
     public Pager<DefinedTermBase> findTitleCache(Class<? extends DefinedTermBase> clazz, String queryString, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, MatchMode matchMode) {
-        return defaultTermService.findTitleCache(clazz, queryString, pageSize, pageNumber, orderHints, matchMode);
+        return defaultService.findTitleCache(clazz, queryString, pageSize, pageNumber, orderHints, matchMode);
+    }
+
+    @Override
+    public <TERM extends DefinedTermBase> TERM findByIdInVocabulary(String id, UUID vocabularyUuid,
+            Class<TERM> clazz) {
+        return defaultService.findByIdInVocabulary(id, vocabularyUuid, clazz);
     }
 
+       @Override
+       public DeleteResult isDeletable(DefinedTermBase object,
+                       DeleteConfiguratorBase config) {
+               return defaultService.isDeletable(object, config);
+       }
+
+    /* (non-Javadoc)
+     * @see eu.etaxonomy.cdm.api.service.ITermService#listByTermType(eu.etaxonomy.cdm.model.common.TermType, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
+     */
     @Override
-    public <TERM extends DefinedTermBase> TERM getDefinedTermByIdInVocabulary(String id, UUID vocabularyUuid,
-            Class<TERM> clazz, Integer pageSize, Integer pageNumber) {
-        return defaultTermService.getDefinedTermByIdInVocabulary(id, vocabularyUuid, clazz, pageSize, pageNumber);
+    public List<DefinedTermBase<?>> listByTermType(TermType termType, Integer limit, Integer start,
+            List<OrderHint> orderHints, List<String> propertyPaths) {
+        return defaultService.listByTermType(termType, limit, start, orderHints, propertyPaths);
     }
 
+       @Override
+       public DefinedTermBase findWithoutFlush(UUID uuid) {
+               return defaultService.findWithoutFlush(uuid);
+       }
+       
+       
+       @Override
+       public <S extends DefinedTermBase> List<S> listByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths){
+               return defaultService.listByIdentifier(clazz, identifier, identifierType, matchmode, pageSize, pageNumber, orderHints, propertyPaths);
+       }
+
 }