BGBM BDI Projects / cdmlib.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ref #7099 rename model.rights to model.permission
[cdmlib.git] / cdmlib-services / src / main / java / eu / etaxonomy / cdm / api / validation / batch / BatchValidationUtil.java
diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/validation/batch/BatchValidationUtil.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/validation/batch/BatchValidationUtil.java
index 78b7bbcc5ba1e652204ad0887c027e970cb47445..3a34346ab300939c63a3384c369d2b9f268211f9 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/validation/batch/BatchValidationUtil.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/validation/batch/BatchValidationUtil.java
@@ -1,4 +1,3 @@
-// $Id$\r
 /**\r
  * Copyright (C) 2015 EDIT\r
  * European Distributed Institute of Taxonomy\r
@@ -20,40 +19,40 @@ import javax.validation.Validator;
 \r
 import org.apache.log4j.Logger;\r
 \r
-import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;\r
+import eu.etaxonomy.cdm.api.application.ICdmRepository;\r
 import eu.etaxonomy.cdm.api.service.IService;\r
 import eu.etaxonomy.cdm.api.service.ITaxonService;\r
 import eu.etaxonomy.cdm.model.agent.AgentBase;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
-import eu.etaxonomy.cdm.model.common.Group;\r
 import eu.etaxonomy.cdm.model.common.ICdmBase;\r
-import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
-import eu.etaxonomy.cdm.model.common.User;\r
 import eu.etaxonomy.cdm.model.description.DescriptionBase;\r
-import eu.etaxonomy.cdm.model.description.FeatureNode;\r
-import eu.etaxonomy.cdm.model.description.FeatureTree;\r
+import eu.etaxonomy.cdm.model.description.DescriptiveDataSet;\r
 import eu.etaxonomy.cdm.model.description.PolytomousKey;\r
 import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;\r
-import eu.etaxonomy.cdm.model.description.WorkingSet;\r
 import eu.etaxonomy.cdm.model.molecular.Amplification;\r
 import eu.etaxonomy.cdm.model.molecular.Primer;\r
 import eu.etaxonomy.cdm.model.molecular.Sequence;\r
 import eu.etaxonomy.cdm.model.name.NameRelationship;\r
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
+import eu.etaxonomy.cdm.model.name.TaxonName;\r
 import eu.etaxonomy.cdm.model.name.TypeDesignationBase;\r
 import eu.etaxonomy.cdm.model.occurrence.Collection;\r
 import eu.etaxonomy.cdm.model.occurrence.GatheringEvent;\r
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;\r
+import eu.etaxonomy.cdm.model.permission.Group;\r
+import eu.etaxonomy.cdm.model.permission.User;\r
 import eu.etaxonomy.cdm.model.reference.Reference;\r
 import eu.etaxonomy.cdm.model.taxon.Classification;\r
 import eu.etaxonomy.cdm.model.taxon.Synonym;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;\r
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;\r
+import eu.etaxonomy.cdm.model.term.TermNode;\r
+import eu.etaxonomy.cdm.model.term.TermTree;\r
+import eu.etaxonomy.cdm.model.term.TermVocabulary;\r
 \r
 /**\r
  * @author ayco_holleman\r
- * @date 28 jan. 2015\r
+ * @since 28 jan. 2015\r
  *\r
  */\r
 class BatchValidationUtil {\r
@@ -66,26 +65,27 @@ class BatchValidationUtil {
     private static final Logger logger = Logger.getLogger(BatchValidationUtil.class);\r
 \r
     // Ideally retrieved dynamically through reflection, but got stuck on\r
-    // getXXXService methods in ICdmApplicationConfiguration returning proxies\r
+    // getXXXService methods in ICdmRepository returning proxies\r
     // (com.sun.proxy.$Proxy), which is a dead end when attempting to infer\r
     // parameter arguments (e.g. the AgentBase in IAgentService<AgentBase>).\r
     @SuppressWarnings({ "unchecked", "rawtypes" })\r
     public static <T extends ICdmBase, S extends T> List<EntityValidationUnit<T, S>> getAvailableServices(\r
-            ICdmApplicationConfiguration appConfig) {\r
+            ICdmRepository appConfig) {\r
         List<EntityValidationUnit<T, S>> services = new ArrayList<EntityValidationUnit<T, S>>();\r
         services.add(new EntityValidationUnit(AgentBase.class, appConfig.getAgentService()));\r
         services.add(new EntityValidationUnit(Amplification.class, appConfig.getAmplificationService()));\r
         services.add(new EntityValidationUnit(Classification.class, appConfig.getClassificationService()));\r
         services.add(new EntityValidationUnit(Collection.class, appConfig.getCollectionService()));\r
 //        services.add(new EntityValidationUnit(OriginalSourceBase.class, appConfig.getCommonService()));\r
-        services.add(new EntityValidationUnit(DescriptionBase.class, appConfig.getDescriptionService()));\r
-        services.add(new EntityValidationUnit(FeatureNode.class, appConfig.getFeatureNodeService()));\r
-        services.add(new EntityValidationUnit(FeatureTree.class, appConfig.getFeatureTreeService()));\r
+        services.add(new EntityValidationUnit(DescriptionBase.class, appConfig.getDescriptionService()));
+        services.add(new EntityValidationUnit(TermNode.class, appConfig.getTermNodeService()));
+        services.add(new EntityValidationUnit(TermTree.class, appConfig.getTermTreeService()));
+
         services.add(new EntityValidationUnit(Group.class, appConfig.getGroupService()));\r
         // Causes some AOP-related error when calling list() method on it\r
         //services.add(new EntityValidationUnit(DefinedTermBase.class, appConfig.getLocationService()));\r
         services.add(new EntityValidationUnit(Media.class, appConfig.getMediaService()));\r
-        services.add(new EntityValidationUnit(TaxonNameBase.class, appConfig.getNameService()));\r
+        services.add(new EntityValidationUnit(TaxonName.class, appConfig.getNameService()));\r
         services.add(new EntityValidationUnit(SpecimenOrObservationBase.class, appConfig.getOccurrenceService()));\r
         services.add(new EntityValidationUnit(PolytomousKeyNode.class, appConfig.getPolytomousKeyNodeService()));\r
         services.add(new EntityValidationUnit(PolytomousKey.class, appConfig.getPolytomousKeyService()));\r
@@ -97,7 +97,7 @@ class BatchValidationUtil {
         services.add(new EntityValidationUnit(DefinedTermBase.class, appConfig.getTermService()));\r
         services.add(new EntityValidationUnit(User.class, appConfig.getUserService()));\r
         services.add(new EntityValidationUnit(TermVocabulary.class, appConfig.getVocabularyService()));\r
-        services.add(new EntityValidationUnit(WorkingSet.class, appConfig.getWorkingSetService()));\r
+        services.add(new EntityValidationUnit(DescriptiveDataSet.class, appConfig.getDescriptiveDataSetService()));\r
         return services;\r
     }\r
 \r
@@ -106,7 +106,7 @@ class BatchValidationUtil {
         classesToValidate.addAll((List)Arrays.asList(new Class[]{\r
                 Reference.class,\r
                 NameRelationship.class,\r
-                TaxonNameBase.class,\r
+                TaxonName.class,\r
                 TypeDesignationBase.class,\r
                 TaxonBase.class,\r
                 Synonym.class,\r