[tutti] branch develop updated (63f77bd -> bde1145)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 63f77bd refs #5997: [IMPORT] Améliorer la gestion des référentiels temporaires (ne pas utiliser un service spring pour du code non transactionnel... sinon gresse degradation des performances) new bde1145 fix! The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit bde11456c6ea004d2407afbf634785a95088fcfb Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Nov 4 16:49:18 2014 +0100 fix! Summary of changes: .../service/referential/GearPersistenceServiceImpl.java | 13 ++----------- .../referential/ReferentialPersistenceServiceSupport.java | 9 --------- 2 files changed, 2 insertions(+), 20 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit bde11456c6ea004d2407afbf634785a95088fcfb Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Nov 4 16:49:18 2014 +0100 fix! --- .../service/referential/GearPersistenceServiceImpl.java | 13 ++----------- .../referential/ReferentialPersistenceServiceSupport.java | 9 --------- 2 files changed, 2 insertions(+), 20 deletions(-) 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 c5b9af0..b37d9c0 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 @@ -74,15 +74,6 @@ public class GearPersistenceServiceImpl extends ReferentialPersistenceServiceSup } - protected boolean isTemporaryGear(Gear gear) { - - Preconditions.checkNotNull(gear); - Preconditions.checkNotNull(gear.getId()); - - return isStatusTemporary(gear) && gear.getIdAsInt() < 0; - - } - @Override public boolean isTemporaryGearUsed(Integer id) { Long count = queryUniqueTyped("countGearInGearPhysicalFeatures", "id", IntegerType.INSTANCE, id); @@ -115,8 +106,8 @@ public class GearPersistenceServiceImpl extends ReferentialPersistenceServiceSup Preconditions.checkNotNull(source); Preconditions.checkNotNull(target); - Preconditions.checkState(isTemporaryGear(source)); - Preconditions.checkState(!isTemporaryGear(target)); + Preconditions.checkState(Gears.isTemporary(source)); + Preconditions.checkState(!Gears.isTemporary(target)); Integer sourceId = source.getIdAsInt(); Integer targetId = target.getIdAsInt(); 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 9228784..93ec432 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 @@ -1,6 +1,5 @@ package fr.ifremer.tutti.persistence.service.referential; -import com.google.common.base.Preconditions; import fr.ifremer.adagio.core.dao.referential.StatusCode; import fr.ifremer.adagio.core.dao.referential.StatusDao; import fr.ifremer.adagio.core.service.technical.CacheService; @@ -27,14 +26,6 @@ public abstract class ReferentialPersistenceServiceSupport extends AbstractPersi @Resource(name = "cacheService") protected CacheService cacheService; - protected boolean isStatusTemporary(TuttiReferentialEntity entity) { - - Preconditions.checkNotNull(entity.getStatus()); - - return StatusCode.TEMPORARY.getValue().equals(entity.getStatus().getId()); - - } - protected Iterator<Object[]> queryListWithStatus(String queryName, Object... params) { Query query = createQuery(queryName, params); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm