ref #9359 upgrade cdmlib to log4j 2

[cdmlib.git] / cdmlib-io / src / main / java / eu / etaxonomy / cdm / io / jaxb / CdmIDResolver.java

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/CdmIDResolver.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/CdmIDResolver.java
index 638104d973ec0228d258c78b2e41e1644f057cca..63685a73c3896b83408aead8eff7218f0ba019bf 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/CdmIDResolver.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/CdmIDResolver.java
@@ -6,7 +6,7 @@ import java.util.concurrent.Callable;
 \r
 import javax.xml.bind.ValidationEventHandler;\r
 \r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
 import org.springframework.beans.factory.annotation.Autowired;\r
 import org.xml.sax.SAXException;\r
 \r
@@ -15,7 +15,6 @@ import com.sun.xml.bind.IDResolver;
 import eu.etaxonomy.cdm.api.service.IAgentService;\r
 import eu.etaxonomy.cdm.api.service.ICollectionService;\r
 import eu.etaxonomy.cdm.api.service.IDescriptionService;\r
-import eu.etaxonomy.cdm.api.service.IFeatureTreeService;\r
 import eu.etaxonomy.cdm.api.service.IMediaService;\r
 import eu.etaxonomy.cdm.api.service.INameService;\r
 import eu.etaxonomy.cdm.api.service.IOccurrenceService;\r
@@ -23,6 +22,7 @@ import eu.etaxonomy.cdm.api.service.IReferenceService;
 import eu.etaxonomy.cdm.api.service.IService;\r
 import eu.etaxonomy.cdm.api.service.ITaxonService;\r
 import eu.etaxonomy.cdm.api.service.ITermService;\r
+import eu.etaxonomy.cdm.api.service.ITermTreeService;\r
 import eu.etaxonomy.cdm.api.service.IUserService;\r
 import eu.etaxonomy.cdm.api.service.IVocabularyService;\r
 import eu.etaxonomy.cdm.jaxb.UUIDAdapter;\r
@@ -34,39 +34,40 @@ import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
 import eu.etaxonomy.cdm.model.name.TaxonName;\r
 import eu.etaxonomy.cdm.model.occurrence.Collection;\r
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;\r
+import eu.etaxonomy.cdm.model.permission.User;\r
 import eu.etaxonomy.cdm.model.reference.Reference;\r
-import eu.etaxonomy.cdm.model.rights.User;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
 import eu.etaxonomy.cdm.model.term.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.term.TermTree;\r
 import eu.etaxonomy.cdm.model.term.TermVocabulary;\r
 \r
 public class CdmIDResolver extends IDResolver {\r
-       private static final Logger logger = Logger.getLogger(CdmIDResolver.class);\r
 \r
-       IUserService userService;\r
+    private static final Logger logger = LogManager.getLogger(CdmIDResolver.class);\r
 \r
-       IAgentService agentService;\r
+    private IUserService userService;\r
 \r
-       ITermService termService;\r
+    private IAgentService agentService;\r
 \r
-       IVocabularyService vocabularyService;\r
+    private ITermService termService;\r
 \r
-       IDescriptionService descriptionService;\r
+    private IVocabularyService vocabularyService;\r
 \r
-       IFeatureTreeService featureTreeService;\r
+    private IDescriptionService descriptionService;\r
 \r
-       IMediaService mediaService;\r
+    private ITermTreeService termTreeService;\r
 \r
-       INameService nameService;\r
+    private IMediaService mediaService;\r
 \r
-       IOccurrenceService occurrenceService;\r
+    private INameService nameService;\r
 \r
-       ICollectionService collectionService;\r
+    private IOccurrenceService occurrenceService;\r
 \r
-       IReferenceService referenceService;\r
+    private ICollectionService collectionService;\r
 \r
-       ITaxonService taxonService;\r
+    private IReferenceService referenceService;\r
+\r
+    private ITaxonService taxonService;\r
 \r
        @Autowired\r
        public void setUserService(IUserService userService) {\r
@@ -94,8 +95,8 @@ public class CdmIDResolver extends IDResolver {
        }\r
 \r
        @Autowired\r
-       public void setFeatureTreeService(IFeatureTreeService featureTreeService) {\r
-               this.featureTreeService = featureTreeService;\r
+       public void setTermTreeService(ITermTreeService termTreeService) {\r
+               this.termTreeService = termTreeService;\r
        }\r
 \r
        @Autowired\r
@@ -140,15 +141,15 @@ public class CdmIDResolver extends IDResolver {
        @Override\r
        public void bind(String id, Object obj) throws SAXException {\r
                if(idmap==null) {\r
-                       idmap = new HashMap<String,Object>();\r
+                       idmap = new HashMap<>();\r
                }\r
                idmap.put(id,obj);\r
        }\r
 \r
 \r
        @Override\r
-       public Callable<?> resolve(final String id, final Class targetType) throws SAXException {\r
-               return new Callable() {\r
+       public Callable<Object> resolve(final String id, final Class targetType) throws SAXException {\r
+               return new Callable<Object>() {\r
                @Override\r
             public Object call() throws Exception {\r
                  logger.info("Resolving " + id + " for class " + targetType);\r
@@ -169,7 +170,7 @@ public class CdmIDResolver extends IDResolver {
                                  } else if(DescriptionBase.class.isAssignableFrom(targetType)) {\r
                                          return resolveObject(uuid, targetType, descriptionService);\r
                                  } else if(TermTree.class.isAssignableFrom(targetType)) {\r
-                                         return resolveObject(uuid, targetType, featureTreeService);\r
+                                         return resolveObject(uuid, targetType, termTreeService);\r
                                  } else if(Media.class.isAssignableFrom(targetType)) {\r
                                          return resolveObject(uuid, targetType, mediaService);\r
                                  } else if(TaxonName.class.isAssignableFrom(targetType)) {\r
@@ -198,11 +199,11 @@ public class CdmIDResolver extends IDResolver {
                                           *\r
                                           */\r
 \r
-                                         AgentBase agent = agentService.find(uuid);\r
+                                         AgentBase<?> agent = agentService.find(uuid);\r
                                          if(agent != null) {\r
                                                  return agent;\r
                                          }\r
-                                         DefinedTermBase term = termService.find(uuid);\r
+                                         DefinedTermBase<?> term = termService.find(uuid);\r
                                          if(term != null) {\r
                                                  return term;\r
                                          }\r
@@ -220,10 +221,10 @@ public class CdmIDResolver extends IDResolver {
        }\r
 \r
        private Object resolveObject(UUID uuid, Class targetType, IService service) throws SAXException {\r
-               Object object = service.find(uuid);\r
-                 if(object == null) {\r
-                         throw new SAXException(targetType.getSimpleName() + " with " + uuid + " not found");\r
-                 }\r
-                 return object;\r
+           Object object = service.find(uuid);\r
+               if(object == null) {\r
+                   throw new SAXException(targetType.getSimpleName() + " with " + uuid + " not found");\r
+               }\r
+               return object;\r
        }\r
 }\r