This is an automated email from the git hooks/post-receive script. New commit to branch support/3.13.x in repository tutti. See http://git.codelutin.com/tutti.git commit 972bafeee24d3b60f5177e8c3e35a2b1e30cd7ed Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Mar 28 11:43:46 2015 +0100 ne pas remonter dans les requetes hibernate l'objet status mais uniquement que le code status --- .../CaracteristicPersistenceServiceImpl.java | 4 ++-- .../referential/GearPersistenceServiceImpl.java | 12 +++++------ .../LocationPersistenceServiceImpl.java | 11 ++++++---- .../referential/PersonPersistenceServiceImpl.java | 12 +++++------ .../ReferentialPersistenceServiceSupport.java | 10 ++++++++- .../referential/SpeciesPersistenceServiceImpl.java | 3 +-- .../referential/VesselPersistenceServiceImpl.java | 10 ++++----- .../src/main/resources/queries-failsafe.hbm.xml | 24 +++++++++++----------- 8 files changed, 45 insertions(+), 41 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceServiceImpl.java index d90e163..d65bd78 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceServiceImpl.java @@ -285,7 +285,7 @@ public class CaracteristicPersistenceServiceImpl extends ReferentialPersistenceS result.setMaximumNumberDecimals((Integer) source[8]); result.setPrecision((Float) source[9]); result.setUnit((String) source[10]); - setStatus((fr.ifremer.adagio.core.dao.referential.Status) source[11], result); + setStatus((String) source[11], result); if (Caracteristics.isQualitativeCaracteristic(result)) { @@ -302,7 +302,7 @@ public class CaracteristicPersistenceServiceImpl extends ReferentialPersistenceS target2.setId(String.valueOf(source2[0])); target2.setName(String.valueOf(source2[1])); target2.setDescription(String.valueOf(source2[2])); - setStatus((fr.ifremer.adagio.core.dao.referential.Status) source2[3], target2); + setStatus((String) source2[3], target2); values.add(target2); } result.setQualitativeValue(Collections.unmodifiableList(values)); diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceServiceImpl.java index 04e6673..a8bf8b2 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceServiceImpl.java @@ -115,10 +115,8 @@ public class GearPersistenceServiceImpl extends ReferentialPersistenceServiceSup List<Gear> result = Lists.newArrayList(); - fr.ifremer.adagio.core.dao.referential.Status status = - statusDao.load(StatusCode.TEMPORARY.getValue()); for (Gear source : gears) { - source = importTemporaryGear(source, status); + source = importTemporaryGear(source, StatusCode.TEMPORARY.getValue()); result.add(source); } return Collections.unmodifiableList(result); @@ -179,7 +177,7 @@ public class GearPersistenceServiceImpl extends ReferentialPersistenceServiceSup } - protected Gear importTemporaryGear(Gear source, fr.ifremer.adagio.core.dao.referential.Status status) { + protected Gear importTemporaryGear(Gear source, String statusCode) { Preconditions.checkNotNull(source); Preconditions.checkNotNull(source.getLabel()); @@ -206,12 +204,12 @@ public class GearPersistenceServiceImpl extends ReferentialPersistenceServiceSup result.setLabel(source.getLabel()); result.setName(source.getName()); result.setScientificGear(source.isScientificGear()); - setStatus(status, result); + setStatus(statusCode, result); return result; } - protected Gear loadGear(Object[] source) { + protected Gear loadGear(Object... source) { Gear result = Gears.newGear(); result.setId(String.valueOf(source[0])); @@ -224,7 +222,7 @@ public class GearPersistenceServiceImpl extends ReferentialPersistenceServiceSup } result.setScientificGear(scientific); - setStatus((fr.ifremer.adagio.core.dao.referential.Status) source[4], result); + setStatus((String) source[4], result); return result; } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/LocationPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/LocationPersistenceServiceImpl.java index 67301db..cd70ed1 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/LocationPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/LocationPersistenceServiceImpl.java @@ -182,10 +182,12 @@ public class LocationPersistenceServiceImpl extends ReferentialPersistenceServic "locationById", "locationId", IntegerType.INSTANCE, Integer.valueOf(id) ); + TuttiLocation target; if (source == null) { - return null; + target = null; + } else { + target = loadLocation(source); } - TuttiLocation target = loadLocation(source); return target; } @@ -216,12 +218,13 @@ public class LocationPersistenceServiceImpl extends ReferentialPersistenceServic return result; } - protected TuttiLocation loadLocation(Object[] source) { + protected TuttiLocation loadLocation(Object... source) { TuttiLocation target = TuttiLocations.newTuttiLocation(); 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); + String statusCode = (String) source[3]; + setStatus(statusCode, target); return target; } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceServiceImpl.java index 8e7cce6..adbe186 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceServiceImpl.java @@ -117,10 +117,8 @@ public class PersonPersistenceServiceImpl extends ReferentialPersistenceServiceS List<Person> result = Lists.newArrayList(); - fr.ifremer.adagio.core.dao.referential.Status status = - statusDao.load(StatusCode.TEMPORARY.getValue()); for (Person source : persons) { - source = importTemporaryPerson(source, status); + source = importTemporaryPerson(source, StatusCode.TEMPORARY.getValue()); result.add(source); } return Collections.unmodifiableList(result); @@ -190,19 +188,19 @@ public class PersonPersistenceServiceImpl extends ReferentialPersistenceServiceS } - protected Person loadPerson(Object[] source) { + protected Person loadPerson(Object... source) { Person target = Persons.newPerson(); target.setId(String.valueOf(source[0])); target.setLastName((String) source[1]); target.setFirstName((String) source[2]); target.setDepartment((String) source[3]); - setStatus((fr.ifremer.adagio.core.dao.referential.Status) source[4], target); + setStatus((String) source[4], target); return target; } - protected Person importTemporaryPerson(Person source, fr.ifremer.adagio.core.dao.referential.Status status) { + protected Person importTemporaryPerson(Person source, String statusCode) { Preconditions.checkNotNull(source); Preconditions.checkNotNull(source.getFirstName()); @@ -223,7 +221,7 @@ public class PersonPersistenceServiceImpl extends ReferentialPersistenceServiceS // Fill the result bean result.setLastName(source.getLastName()); result.setFirstName(source.getFirstName()); - setStatus(status, result); + setStatus(statusCode, result); return result; } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/ReferentialPersistenceServiceSupport.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/ReferentialPersistenceServiceSupport.java index c5d0727..4158e93 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/ReferentialPersistenceServiceSupport.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/ReferentialPersistenceServiceSupport.java @@ -45,7 +45,7 @@ import java.util.Iterator; public abstract class ReferentialPersistenceServiceSupport extends AbstractPersistenceService { @Resource(name = "statusDao") - protected StatusDao statusDao; + private StatusDao statusDao; @Resource(name = "cacheService") protected CacheService cacheService; @@ -77,4 +77,12 @@ public abstract class ReferentialPersistenceServiceSupport extends AbstractPersi entity.setStatus(newStatus); } + protected <E extends TuttiReferentialEntity> void setStatus(String statusCode, E entity) { + Status newStatus = Statuss.newStatus(); + fr.ifremer.adagio.core.dao.referential.Status status = statusDao.load(statusCode); + newStatus.setId(status.getCode()); + newStatus.setName(status.getName()); + entity.setStatus(newStatus); + } + } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceServiceImpl.java index e2d5e80..60a01cc 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceServiceImpl.java @@ -276,8 +276,7 @@ public class SpeciesPersistenceServiceImpl extends ReferentialPersistenceService target.setExternalCode(source.getExternalCode()); target.setReferenceTaxonId(source.getReferenceTaxonId()); target.setReferenceTaxon(source.getIsReference()); - fr.ifremer.adagio.core.dao.referential.Status status = statusDao.load(source.getStatus().getValue()); - setStatus(status, target); + setStatus(source.getStatus().getValue(), target); return target; } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/VesselPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/VesselPersistenceServiceImpl.java index 82673d7..552212b 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/VesselPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/VesselPersistenceServiceImpl.java @@ -194,8 +194,6 @@ public class VesselPersistenceServiceImpl extends ReferentialPersistenceServiceS List<Vessel> result = Lists.newArrayList(); - fr.ifremer.adagio.core.dao.referential.Status status = - statusDao.load(StatusCode.TEMPORARY.getValue()); Integer countryLocationId = locationDao.getLocationIdByLabelAndLocationLevel( LocationLabel.FRANCE.getValue(), @@ -205,7 +203,7 @@ public class VesselPersistenceServiceImpl extends ReferentialPersistenceServiceS } for (Vessel source : vessels) { - source = importTemporaryVessel(source, countryLocationId, status); + source = importTemporaryVessel(source, countryLocationId, StatusCode.TEMPORARY.getValue()); result.add(source); } return Collections.unmodifiableList(result); @@ -294,7 +292,7 @@ public class VesselPersistenceServiceImpl extends ReferentialPersistenceServiceS } - protected Vessel importTemporaryVessel(Vessel source, Integer registrationLocationId, fr.ifremer.adagio.core.dao.referential.Status status) { + protected Vessel importTemporaryVessel(Vessel source, Integer registrationLocationId, String statusCode) { Preconditions.checkNotNull(source); Preconditions.checkNotNull(source.getName()); @@ -322,7 +320,7 @@ public class VesselPersistenceServiceImpl extends ReferentialPersistenceServiceS result.setRegistrationCode(source.getRegistrationCode()); result.setInternationalRegistrationCode(source.getInternationalRegistrationCode()); result.setScientificVessel(source.isScientificVessel()); - setStatus(status, result); + setStatus(statusCode, result); return result; } @@ -335,7 +333,7 @@ public class VesselPersistenceServiceImpl extends ReferentialPersistenceServiceS target.setInternationalRegistrationCode((String) source[2]); target.setName((String) source[3]); target.setScientificVessel(scientificVessel); - setStatus((fr.ifremer.adagio.core.dao.referential.Status) source[4], target); + setStatus((String) source[4], target); return target; } diff --git a/tutti-persistence/src/main/resources/queries-failsafe.hbm.xml b/tutti-persistence/src/main/resources/queries-failsafe.hbm.xml index 80cb2b4..4008380 100644 --- a/tutti-persistence/src/main/resources/queries-failsafe.hbm.xml +++ b/tutti-persistence/src/main/resources/queries-failsafe.hbm.xml @@ -1000,7 +1000,7 @@ p.maximumNumberDecimals, p.precision, case when (p.unit.id = :unitIdNone) then '' else p.unit.symbol end AS symbol, - p.status AS status + p.status.code AS statusCode FROM PmfmImpl p WHERE p.status.code IN (:statusValidCode, :statusTemporaryCode) @@ -1020,7 +1020,7 @@ qv.id AS id, qv.name, case when (qv.description is null OR qv.name = qv.description) then qv.name else concat(qv.name, ' - ', qv.description) end AS description, - qv.status AS status + qv.status.code AS statusCode FROM PmfmImpl p JOIN p.qualitativeValues qv WHERE @@ -1047,7 +1047,7 @@ p.maximumNumberDecimals, p.precision, case when (p.unit.id = :unitIdNone) then '' else p.unit.symbol end AS symbol, - p.status AS status + p.status.code AS statusCode FROM PmfmImpl p WHERE p.status.code IN (:statusValidCode, :statusTemporaryCode) @@ -1065,7 +1065,7 @@ l.id as locationId, l.label as locationLabel, l.name as locationName, - l.status as status + l.status.code as statusCode FROM LocationImpl l WHERE l.locationLevel.id = :locationLevelId @@ -1085,7 +1085,7 @@ l.id as locationId, l.label as locationLabel, l.name as locationName, - l.status as status + l.status.code as statusCode FROM LocationImpl l WHERE @@ -1130,7 +1130,7 @@ l.id as locationId, l.label as locationLabel, l.name as locationName, - l.status as status + l.status.code as statusCode FROM LocationImpl l, LocationHierarchyImpl lh @@ -1158,7 +1158,7 @@ vrp.registrationCode AS nationalRegistrationCode, vrp.internationalRegistrationCode as internationalRegistrationCode, vf.name AS vesselName, - v.status AS status + v.status.code AS statusCode FROM VesselImpl v INNER JOIN v.vesselRegistrationPeriods AS vrp @@ -1186,7 +1186,7 @@ vrp.registrationCode AS nationalRegistrationCode, vrp.internationalRegistrationCode as internationalRegistrationCode, vf.name AS vesselName, - v.status AS status + v.status.code AS statusCode FROM VesselImpl v INNER JOIN v.vesselRegistrationPeriods AS vrp @@ -1213,7 +1213,7 @@ g.label, g.name, g.gearClassification, - g.status AS status + g.status.code AS statusCode FROM GearImpl g WHERE g.gearClassification.id= :gearClassificiationId @@ -1232,7 +1232,7 @@ g.label, g.name, g.gearClassification, - g.status AS status + g.status.code AS statusCode FROM GearImpl g WHERE g.id = :gearId @@ -1248,7 +1248,7 @@ p.lastname, p.firstname, p.department.code, - p.status + p.status.code as statusCode FROM PersonImpl p LEFT OUTER JOIN p.profils pp @@ -1277,7 +1277,7 @@ p.lastname, p.firstname, p.department.code, - p.status + p.status.code as statusCode FROM PersonImpl p WHERE p.id = :personId ]]> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.