Author: tchemit Date: 2013-11-19 08:51:45 +0100 (Tue, 19 Nov 2013) New Revision: 1362 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1362 Log: fixes #3823: [TECH] Temps d'affichage d'un trait trop lent Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java 2013-11-18 09:09:03 UTC (rev 1361) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java 2013-11-19 07:51:45 UTC (rev 1362) @@ -172,7 +172,7 @@ * @see Species#getRefTaxCode() * @since 0.3 */ - @Cacheable(value = "referentSpeciesById", key = "#referenceTaxonId", condition = "#referenceTaxonId != null") + @Cacheable(value = "referentSpeciesById", key = "#referenceTaxonId") Species getSpeciesByReferenceTaxonId(Integer referenceTaxonId); /** @@ -187,7 +187,7 @@ * @see Species#getVernacularCode() * @since 2.0 */ - @Cacheable(value = "referentSpeciesByIdVernacular", key = "#referenceTaxonId", condition = "#referenceTaxonId != null") + @Cacheable(value = "referentSpeciesByIdVernacular", key = "#referenceTaxonId") Species getSpeciesByReferenceTaxonIdWithVernacularCode(Integer referenceTaxonId); /** Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-11-18 09:09:03 UTC (rev 1361) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-11-19 07:51:45 UTC (rev 1362) @@ -436,9 +436,9 @@ } @Override - public Species getSpeciesByReferenceTaxonId(Integer speciesId) { + public Species getSpeciesByReferenceTaxonId(Integer referenceTaxonId) { Species result = getSpeciesByReferenceTaxonId( - speciesId, + referenceTaxonId, enumeration.TRANSCRIBING_TYPE_ID_REFTAX); if (result != null) { result.setRefTaxCode(result.getExternalCode()); @@ -447,9 +447,9 @@ } @Override - public Species getSpeciesByReferenceTaxonIdWithVernacularCode(Integer speciesId) { + public Species getSpeciesByReferenceTaxonIdWithVernacularCode(Integer referenceTaxonId) { Species result = getSpeciesByReferenceTaxonId( - speciesId, + referenceTaxonId, enumeration.TRANSCRIBING_TYPE_ID_VERNACULAIRE); if (result != null) { result.setVernacularCode(result.getExternalCode()); @@ -457,12 +457,12 @@ return result; } - protected Species getSpeciesByReferenceTaxonId(Integer speciesId, + protected Species getSpeciesByReferenceTaxonId(Integer referenceTaxonId, Integer transcribingTypeId) { Species target; try { TaxonRefVO source = taxonNameDao.getTaxonNameReferent( - speciesId, transcribingTypeId); + referenceTaxonId, transcribingTypeId); target = loadSpecies(source); } catch (DataRetrievalFailureException drfe) { target = null; @@ -769,7 +769,7 @@ // Fill the result bean Person result = Persons.newPerson(); - result.setId(target.getId().toString()); + result.setId(target.getId()); result.setLastName(source.getLastName()); result.setFirstName(source.getFirstName()); setStatus(status, result); @@ -792,7 +792,7 @@ // Add to cache Cache cache = cacheService.getCache("referentSpeciesById"); - cache.put(Integer.valueOf(result.getId()), result); + cache.put(result.getIdAsInt(), result); return result; } @@ -813,7 +813,7 @@ // Fill the result bean Gear result = Gears.newGear(); - result.setId(target.getId().toString()); + result.setId(target.getId()); result.setLabel(source.getLabel()); result.setName(source.getName()); result.setScientificGear(source.isScientificGear()); @@ -843,7 +843,7 @@ Integer pmfmId = (Integer) source[0]; Caracteristic result = Caracteristics.newCaracteristic(); - result.setId(pmfmId.toString()); + result.setId(pmfmId); result.setParameterName((String) source[1]); result.setMatrixName((String) source[2]); result.setFractionName((String) source[3]); @@ -892,7 +892,7 @@ protected Species loadSpecies(TaxonRefVO source) { Species target = Speciess.newSpecies(); - target.setId(String.valueOf(source.getTaxonNameId())); + target.setId(source.getTaxonNameId()); target.setName(source.getName()); target.setExternalCode(source.getExternalCode()); target.setReferenceTaxonId(source.getReferenceTaxonId()); @@ -941,7 +941,7 @@ protected TuttiLocation loadLocation(Object[] source) { TuttiLocation target = TuttiLocations.newTuttiLocation(); - target.setId(String.valueOf(source[0])); + target.setId((Integer) source[0]); target.setLabel((String) source[1]); target.setName((String) source[2]); setStatus((fr.ifremer.adagio.core.dao.referential.Status) source[3], target);