r50 - in trunk: tutti-persistence/src/main/java/fr/ifremer/tutti/persistence tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence tutti-service/src/main/java/fr/ifremer/tutti/service - Tutti-commits

12 Dec 2012

Author: tchemit
Date: 2012-12-12 23:26:24 +0100 (Wed, 12 Dec 2012)
New Revision: 50

Url: http://forge.codelutin.com/projects/tutti/repository/revisions/50

Log:
add delete species batch (for not valid one when saving them)

Modified:
   trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java
   trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java
   trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java

Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java
===================================================================

--- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java	2012-12-12 22:25:46 UTC (rev 49)
+++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java	2012-12-12 22:26:24 UTC (rev 50)
@@ -142,6 +142,8 @@
 
     SpeciesBatch saveSpeciesBatch(SpeciesBatch bean);
 
+    void deleteSpeciesBatch(String id);
+
     List<SpeciesBatchFrequency> getAllSpeciesBatchFrequency(
             String speciesBatchId);
 
@@ -195,5 +197,4 @@
     AccidentelBatch createAccidentelBatch(AccidentelBatch bean);
 
     AccidentelBatch saveAccidentelBatch(AccidentelBatch bean);
-
 }

Modified: trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java
===================================================================
--- trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java	2012-12-12 22:25:46 UTC (rev 49)
+++ trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java	2012-12-12 22:26:24 UTC (rev 50)
@@ -37,12 +37,12 @@
 import fr.ifremer.tutti.persistence.entities.TuttiEntities;
 import fr.ifremer.tutti.persistence.entities.data.AccidentelBatch;
 import fr.ifremer.tutti.persistence.entities.data.BenthosBatch;
+import fr.ifremer.tutti.persistence.entities.data.Cruise;
 import fr.ifremer.tutti.persistence.entities.data.FishingOperation;
 import fr.ifremer.tutti.persistence.entities.data.FishingOperationAware;
 import fr.ifremer.tutti.persistence.entities.data.MacroDechetBatch;
 import fr.ifremer.tutti.persistence.entities.data.PlanctonBatch;
 import fr.ifremer.tutti.persistence.entities.data.Program;
-import fr.ifremer.tutti.persistence.entities.data.Cruise;
 import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch;
 import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequency;
 import fr.ifremer.tutti.persistence.entities.referential.BeaufortScale;
@@ -362,6 +362,11 @@
     }
 
     @Override
+    public void deleteSpeciesBatch(String id) {
+        remove(SpeciesBatch.class, id);
+    }
+
+    @Override
     public List<SpeciesBatchFrequency> getAllSpeciesBatchFrequency(final String speciesBatchId) {
         List<SpeciesBatchFrequency> result = Lists.newArrayList(Iterables.filter(getData(SpeciesBatchFrequency.class), new Predicate<SpeciesBatchFrequency>() {
             @Override
@@ -725,6 +730,14 @@
         return result;
     }
 
+    protected <B extends IdAware> void remove(Class<B> type, String id) {
+        Preconditions.checkNotNull(id, "Can't delete a null id");
+        B bean = getBean(type, id);
+        Preconditions.checkNotNull(bean, "Can't delete a null bean");
+        cache.remove(type, bean);
+        persistToFile(type);
+    }
+
     protected <B extends IdAware> B getBean(Class<B> type, String id) {
         B result = TuttiEntities.findById(getData(type), id);
         return result;

Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java	2012-12-12 22:25:46 UTC (rev 49)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java	2012-12-12 22:26:24 UTC (rev 50)
@@ -28,21 +28,21 @@
 import fr.ifremer.tutti.persistence.TuttiPersistence;
 import fr.ifremer.tutti.persistence.entities.data.AccidentelBatch;
 import fr.ifremer.tutti.persistence.entities.data.BenthosBatch;
-import fr.ifremer.tutti.persistence.entities.data.Program;
 import fr.ifremer.tutti.persistence.entities.data.Cruise;
 import fr.ifremer.tutti.persistence.entities.data.FishingOperation;
 import fr.ifremer.tutti.persistence.entities.data.MacroDechetBatch;
 import fr.ifremer.tutti.persistence.entities.data.PlanctonBatch;
+import fr.ifremer.tutti.persistence.entities.data.Program;
 import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch;
 import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequency;
-import fr.ifremer.tutti.persistence.entities.referential.Person;
-import fr.ifremer.tutti.persistence.entities.referential.Strata;
 import fr.ifremer.tutti.persistence.entities.referential.BeaufortScale;
 import fr.ifremer.tutti.persistence.entities.referential.Country;
 import fr.ifremer.tutti.persistence.entities.referential.Gear;
+import fr.ifremer.tutti.persistence.entities.referential.Person;
 import fr.ifremer.tutti.persistence.entities.referential.SeaState;
 import fr.ifremer.tutti.persistence.entities.referential.Sex;
 import fr.ifremer.tutti.persistence.entities.referential.Species;
+import fr.ifremer.tutti.persistence.entities.referential.Strata;
 import fr.ifremer.tutti.persistence.entities.referential.Vessel;
 import fr.ifremer.tutti.persistence.entities.referential.WeightCategory;
 import fr.ifremer.tutti.persistence.entities.referential.Zone;
@@ -311,6 +311,12 @@
     }
 
     @Override
+    public void deleteSpeciesBatch(String id) {
+        checkDriverExists();
+        driver.deleteSpeciesBatch(id);
+    }
+
+    @Override
     public List<SpeciesBatchFrequency> getAllSpeciesBatchFrequency(String speciesBatchId) {
         checkDriverExists();
         return driver.getAllSpeciesBatchFrequency(speciesBatchId);

    

r50 - in trunk: tutti-persistence/src/main/java/fr/ifremer/tutti/persistence tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence tutti-service/src/main/java/fr/ifremer/tutti/service

tchemit＠users.forge.codelutin.com

tags

participants (1)