Cleanup

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/dto/NameCatalogueController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/dto/NameCatalogueController.java
index c1d7e09cfa43a309d8afa53e59d75901762324b8..ea595b63966cbb020778c8d3aab805820d3089a1 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/dto/NameCatalogueController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/dto/NameCatalogueController.java
@@ -8,8 +8,6 @@
 */
 package eu.etaxonomy.cdm.remote.controller.dto;
 
-import io.swagger.annotations.Api;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -74,6 +72,7 @@ import eu.etaxonomy.cdm.remote.dto.namecatalogue.NameInformation;
 import eu.etaxonomy.cdm.remote.dto.namecatalogue.NameSearch;
 import eu.etaxonomy.cdm.remote.dto.namecatalogue.TaxonInformation;
 import eu.etaxonomy.cdm.remote.view.HtmlView;
+import io.swagger.annotations.Api;
 
 /**
  * The controller class for the namespace 'name_catalogue'. This web service namespace
@@ -810,7 +809,7 @@ public class NameCatalogueController extends AbstractController<TaxonNameBase, I
             logger.info("doGetTaxonInformation()" + request.getRequestURI() + " for taxon uuid \""
                     + taxonUuid);
             // find name by uuid
-            TaxonBase tb = taxonService.findTaxonByUuid(UUID.fromString(taxonUuid),
+            TaxonBase<?> tb = taxonService.findTaxonByUuid(UUID.fromString(taxonUuid),
                     TAXON_INFORMATION_INIT_STRATEGY);
 
             // if search is successful then get related information, else return error
@@ -822,11 +821,11 @@ public class NameCatalogueController extends AbstractController<TaxonNameBase, I
                     Taxon taxon = (Taxon) tb;
                     // build classification map
                     boolean includeUuids = Arrays.asList(includes).contains(INCLUDE_CLUUIDS);
-                    Map classificationMap = getClassification(taxon, classificationType, includeUuids);
+                    Map<String,Map> classificationMap = getClassification(taxon, classificationType, includeUuids);
 
                     logger.info("taxon uuid " + taxon.getUuid().toString() + " original hash code : " + System.identityHashCode(taxon) + ", name class " + taxon.getName().getClass().getName());
                     // update taxon information object with taxon related data
-                    NonViralName nvn = CdmBase.deproxy(taxon.getName(),NonViralName.class);
+                    NonViralName<?> nvn = CdmBase.deproxy(taxon.getName(),NonViralName.class);
 
                     String secTitle = "" ;
                     String modified = "";