Author: tchemit Date: 2013-02-05 15:44:38 +0100 (Tue, 05 Feb 2013) New Revision: 335 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/335 Log: #1838: [REFERENTIEL] - Import / Export des r?\195?\169f?\195?\169rentiels (add import api) Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 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 trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceTest.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 2013-02-05 14:29:36 UTC (rev 334) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2013-02-05 14:44:38 UTC (rev 335) @@ -136,18 +136,18 @@ List<Vessel> getAllFishingVessel(); /** - * Get all species with no {@link Species#cruiseCode} filled. + * Get all species with no {@link Species#surveyCode} filled. * - * @return all species with no {@code cruiseCode} filled at all. + * @return all species with no {@code surveyCode} filled at all. * @since 0.1 */ List<Species> getAllSpecies(); /** - * Get all species with {@link Species#cruiseCode} filled by optional protocol. + * Get all species with {@link Species#surveyCode} filled by optional protocol. * * @param protocol optional protocol to fill some species cruisecode. - * @return all species with {@code cruiseCode} filled for species definied in protocol. + * @return all species with {@code surveyCode} filled for species definied in protocol. * @since 1.0 */ List<Species> getAllSpecies(TuttiProtocol protocol); @@ -184,6 +184,46 @@ boolean isSortedQualitativeValue(CaracteristicQualitativeValue value); + /** + * Import given temporary species. + * + * @param species species to import + * @return imported species + * @since 1.0 + */ + @Transactional(readOnly = false) + List<Species> importTemporarySpecies(List<Species> species); + + /** + * Import given temporary vessels. + * + * @param vessels vessels to import + * @return imported vessels + * @since 1.0 + */ + @Transactional(readOnly = false) + List<Vessel> importTemporaryVessel(List<Vessel> vessels); + + /** + * Import given temporary persons. + * + * @param persons persons to import + * @return imported persons + * @since 1.0 + */ + @Transactional(readOnly = false) + List<Person> importTemporaryPerson(List<Person> persons); + + /** + * Import given temporary gears. + * + * @param gears gears to import + * @return imported gears + * @since 1.0 + */ + @Transactional(readOnly = false) + List<Gear> importTemporaryGear(List<Gear> gears); + //------------------------------------------------------------------------// //-- Program methods --// //------------------------------------------------------------------------// Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java 2013-02-05 14:29:36 UTC (rev 334) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java 2013-02-05 14:44:38 UTC (rev 335) @@ -58,6 +58,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.persistence.entities.referential.Species; +import fr.ifremer.tutti.persistence.entities.referential.Status; import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.persistence.entities.referential.Zone; import org.apache.commons.io.FileUtils; @@ -254,10 +255,10 @@ @Override public List<Species> getAllSpecies(TuttiProtocol protocol) { List<Species> result = getAllSpecies(); - if (protocol!=null && !protocol.isSpeciesEmpty()) { - Map<String, Species> map =TuttiEntities.splitById(result); + if (protocol != null && !protocol.isSpeciesEmpty()) { + Map<String, Species> map = TuttiEntities.splitById(result); for (SpeciesProtocol speciesProtocol : protocol.getSpecies()) { - map.get(speciesProtocol.getSpeciesId()).setCruiseCode(speciesProtocol.getCruiseCode()); + map.get(speciesProtocol.getSpeciesId()).setSurveyCode(speciesProtocol.getSurveyCode()); } } return result; @@ -379,7 +380,72 @@ return value != null && value.getId().equals("311"); } + @Override + public List<Species> importTemporarySpecies(List<Species> species) { + Status status = new Status(); + status.setId("2"); + String name = getKey(Species.class, null); + for (Species toCreate : species) { + Species created = create(name, toCreate, false); + created.setStatus(status); + } + persistToFile(name); + } + + @Override + public List<Vessel> importTemporaryVessel(List<Vessel> vessels) { + Status status = new Status(); + status.setId("2"); + + String nameScientific = getKey(Vessel.class, "Scientific"); + String nameFishing = getKey(Vessel.class, "Fishing"); + for (Vessel toCreate : vessels) { + Vessel created; + if (toCreate.isScientificVessel()) { + created = create(nameScientific, toCreate, false); + } else { + created = create(nameFishing, toCreate, false); + } + created.setStatus(status); + } + persistToFile(nameScientific); + persistToFile(nameFishing); + } + + @Override + public List<Person> importTemporaryPerson(List<Person> persons) { + Status status = new Status(); + status.setId("2"); + + String name = getKey(Person.class, null); + for (Person toCreate : persons) { + Person created = create(name, toCreate, false); + created.setStatus(status); + } + persistToFile(name); + } + + @Override + public List<Gear> importTemporaryGear(List<Gear> gears) { + Status status = new Status(); + status.setId("2"); + + String nameScientific = getKey(Gear.class, "Scientific"); + String nameFishing = getKey(Gear.class, "Fishing"); + for (Gear toCreate : gears) { + Gear created; + if (toCreate.isScientificGear()) { + created = create(nameScientific, toCreate, false); + } else { + created = create(nameFishing, toCreate, false); + } + created.setStatus(status); + } + persistToFile(nameScientific); + persistToFile(nameFishing); + } + //------------------------------------------------------------------------// //-- Program methods --// //------------------------------------------------------------------------// Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2013-02-05 14:29:36 UTC (rev 334) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2013-02-05 14:44:38 UTC (rev 335) @@ -61,6 +61,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; import java.io.IOException; import java.util.List; @@ -210,7 +211,7 @@ if (protocol != null && !protocol.isSpeciesEmpty()) { Map<String, Species> map = TuttiEntities.splitById(result); for (SpeciesProtocol speciesProtocol : protocol.getSpecies()) { - map.get(speciesProtocol.getSpeciesId()).setCruiseCode(speciesProtocol.getCruiseCode()); + map.get(speciesProtocol.getSpeciesId()).setSurveyCode(speciesProtocol.getSurveyCode()); } } return result; @@ -286,6 +287,30 @@ return referentialService.getGear(gearId); } + @Override + @Transactional(readOnly = false) + public void importTemporarySpecies(List<Species> species) { + referentialService.importTemporarySpecies(species); + } + + @Override + @Transactional(readOnly = false) + public void importTemporaryVessel(List<Vessel> vessels) { + referentialService.importTemporaryVessel(vessels); + } + + @Override + @Transactional(readOnly = false) + public void importTemporaryPerson(List<Person> persons) { + referentialService.importTemporaryPerson(persons); + } + + @Override + @Transactional(readOnly = false) + public void importTemporaryGear(List<Gear> gears) { + referentialService.importTemporaryGear(gears); + } + //------------------------------------------------------------------------// //-- Program methods --// //------------------------------------------------------------------------// 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-02-05 14:29:36 UTC (rev 334) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java 2013-02-05 14:44:38 UTC (rev 335) @@ -169,4 +169,40 @@ Caracteristic getCaracteristic(Integer pmfmId); boolean isSortedQualitativeValue(CaracteristicQualitativeValue value); + + /** + * Import given temporary species. + * + * @param species species to import + * @since 1.0 + */ + @Transactional(readOnly = false) + List<Species> importTemporarySpecies(List<Species> species); + + /** + * Import given temporary vessels. + * + * @param vessels vessels to import + * @since 1.0 + */ + @Transactional(readOnly = false) + List<Vessel> importTemporaryVessel(List<Vessel> vessels); + + /** + * Import given temporary persons. + * + * @param persons persons to import + * @since 1.0 + */ + @Transactional(readOnly = false) + List<Person> importTemporaryPerson(List<Person> persons); + + /** + * Import given temporary gears. + * + * @param gears gears to import + * @since 1.0 + */ + @Transactional(readOnly = false) + List<Gear> importTemporaryGear(List<Gear> gears); } 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-02-05 14:29:36 UTC (rev 334) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-02-05 14:44:38 UTC (rev 335) @@ -421,8 +421,7 @@ Caracteristic result = getCaracteristic(pmfmId); // Search the qualitative value to skip - for (Iterator iterator = result.getQualitativeValue().iterator(); iterator.hasNext(); ) { - CaracteristicQualitativeValue qv = (CaracteristicQualitativeValue) iterator.next(); + for (CaracteristicQualitativeValue qv : result.getQualitativeValue()) { if (qv != null && qv.getId() != null && enumeration.QUALITATIVE_UNSORTED_ID.equals(Integer.valueOf(qv.getId()))) { result.removeQualitativeValue(qv); @@ -462,6 +461,30 @@ return target; } + @Override + public List<Species> importTemporarySpecies(List<Species> species) { + //TODO + return null; + } + + @Override + public List<Vessel> importTemporaryVessel(List<Vessel> vessels) { + //TODO + return null; + } + + @Override + public List<Person> importTemporaryPerson(List<Person> persons) { + //TODO + return null; + } + + @Override + public List<Gear> importTemporaryGear(List<Gear> gears) { + //TODO + return null; + } + //------------------------------------------------------------------------// //-- Internal methods --// //------------------------------------------------------------------------// Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo =================================================================== (Binary files differ) Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java 2013-02-05 14:29:36 UTC (rev 334) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java 2013-02-05 14:44:38 UTC (rev 335) @@ -69,7 +69,7 @@ "- !SpeciesProtocol\n" + " id: 1\n" + " calcifySampleEnabled: true\n" + - " cruiseCode: BAR\n" + + " surveyCode: BAR\n" + " lengthStepPmfmId: 1394\n" + " maturityEnabled: true\n" + " sexEnabled: true\n" + @@ -80,7 +80,7 @@ " ageEnabled: true\n" + " calcifySampleEnabled: true\n" + " countIfNoFrequencyEnabled: true\n" + - " cruiseCode: CHIN\n" + + " surveyCode: CHIN\n" + " lengthStepPmfmId: 323\n" + " maturityEnabled: true\n" + " sexEnabled: true\n" + @@ -146,7 +146,7 @@ Assert.assertNotNull(sp1); Assert.assertEquals("1", sp1.getId()); Assert.assertEquals("11242", sp1.getSpeciesId()); - Assert.assertEquals("BAR", sp1.getCruiseCode()); + Assert.assertEquals("BAR", sp1.getSurveyCode()); Assert.assertEquals("1394", sp1.getLengthStepPmfmId()); Assert.assertFalse(sp1.isAgeEnabled()); Assert.assertTrue(sp1.isCalcifySampleEnabled()); @@ -160,7 +160,7 @@ Assert.assertNotNull(sp2); Assert.assertEquals("2", sp2.getId()); Assert.assertEquals("3835", sp2.getSpeciesId()); - Assert.assertEquals("CHIN", sp2.getCruiseCode()); + Assert.assertEquals("CHIN", sp2.getSurveyCode()); Assert.assertEquals("323", sp2.getLengthStepPmfmId()); Assert.assertTrue(sp2.isAgeEnabled()); Assert.assertTrue(sp2.isCalcifySampleEnabled()); @@ -185,7 +185,7 @@ SpeciesProtocol sp1 = new SpeciesProtocol(); sp1.setId("1"); sp1.setSpeciesId("11242"); - sp1.setCruiseCode("BAR"); + sp1.setSurveyCode("BAR"); sp1.setLengthStepPmfmId("1394"); sp1.setCalcifySampleEnabled(true); sp1.setMaturityEnabled(true); @@ -196,7 +196,7 @@ SpeciesProtocol sp2 = new SpeciesProtocol(); sp2.setId("2"); sp2.setSpeciesId("3835"); - sp2.setCruiseCode("CHIN"); + sp2.setSurveyCode("CHIN"); sp2.setLengthStepPmfmId("323"); sp2.setAgeEnabled(true); sp2.setCalcifySampleEnabled(true); Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceTest.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceTest.java 2013-02-05 14:29:36 UTC (rev 334) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceTest.java 2013-02-05 14:44:38 UTC (rev 335) @@ -25,6 +25,7 @@ */ import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import fr.ifremer.adagio.core.service.technical.CacheService; import fr.ifremer.tutti.persistence.DatabaseFixtures; import fr.ifremer.tutti.persistence.DatabaseResource; @@ -46,6 +47,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.ClassRule; +import org.junit.Ignore; import org.junit.Test; import org.nuiton.util.ApplicationConfig; @@ -320,6 +322,227 @@ persist(Caracteristic.class, CaracteristicEnum.MacroWasteSizeCategory.name(), result); } + @Ignore + @Test + public void importSpecies() { + List<Species> species = Lists.newArrayList(); + + long timestamp1 = System.nanoTime(); + Species sp1 = new Species(); + sp1.setId("Don't care" + timestamp1); + sp1.setRefTaxCode("Don't care" + timestamp1); + sp1.setSurveyCode("Don't care" + timestamp1); + sp1.setName("Genus name" + timestamp1); + species.add(sp1); + + long timestamp2 = System.nanoTime(); + Species sp2 = new Species(); + sp2.setId("Don't care" + timestamp2); + sp2.setRefTaxCode("Don't care" + timestamp2); + sp2.setSurveyCode("Don't care" + timestamp2); + sp2.setName("Genus name" + timestamp2); + species.add(sp2); + + Assert.assertNull(service.getSpecies(sp1.getId())); + Assert.assertNull(service.getSpecies(sp2.getId())); + + List<Species> speciesList = service.importTemporarySpecies(species); + Assert.assertNotNull(speciesList); + Assert.assertEquals(2, speciesList.size()); + + Species createdSp1 = speciesList.get(0); + Assert.assertNotNull(createdSp1); + Assert.assertEquals(sp1.getName(), createdSp1.getName()); + Assert.assertNotNull(createdSp1.getRefTaxCode()); + Assert.assertNotSame(sp1.getRefTaxCode(), createdSp1.getRefTaxCode()); + Assert.assertNull(createdSp1.getSurveyCode()); + Assert.assertNotNull(createdSp1.getId()); + Assert.assertNotSame(sp1.getId(), createdSp1.getId()); + Assert.assertEquals(createdSp1, service.getSpecies(createdSp1.getId())); + + Species createdSp2 = speciesList.get(1); + Assert.assertNotNull(createdSp2); + Assert.assertEquals(sp2.getName(), createdSp2.getName()); + Assert.assertNull(createdSp2.getRefTaxCode()); + Assert.assertNull(createdSp2.getSurveyCode()); + Assert.assertNotNull(createdSp2.getId()); + Assert.assertNotSame(sp2.getId(), createdSp2.getId()); + Assert.assertEquals(createdSp2, service.getSpecies(createdSp2.getId())); + } + + @Ignore + @Test + public void importVessel() { + List<Vessel> vessels = Lists.newArrayList(); + + // scientificVessel + long timestamp1 = System.nanoTime(); + Vessel v1 = new Vessel(); + v1.setId("Don't care" + timestamp1); + v1.setName("Name" + timestamp1); + v1.setInternalRegistrationCode("Immat" + timestamp1); + v1.setScientificVessel(true); + vessels.add(v1); + + // fishingVessel + long timestamp2 = System.nanoTime(); + Vessel v2 = new Vessel(); + v2.setId("Don't care" + timestamp2); + v2.setName("Name" + timestamp2); + v2.setInternalRegistrationCode("Immat" + timestamp2); + v1.setScientificVessel(false); + vessels.add(v2); + + Assert.assertNull(service.getVessel(v1.getId())); + Assert.assertNull(service.getVessel(v2.getId())); + + List<Vessel> vesselList = service.importTemporaryVessel(vessels); + + Assert.assertNotNull(vesselList); + Assert.assertEquals(2, vesselList.size()); + + List<Vessel> allScientificVessel = service.getAllScientificVessel(); + List<Vessel> allFishingVessel = service.getAllFishingVessel(); + + Vessel createdV1 = vesselList.get(0); + Assert.assertNotNull(createdV1); + Assert.assertEquals(v1.getName(), createdV1.getName()); + Assert.assertEquals(v1.getInternalRegistrationCode(), createdV1.getInternalRegistrationCode()); + Assert.assertNotNull(createdV1.getId()); + Assert.assertNotSame(v1.getId(), createdV1.getId()); + Assert.assertEquals(createdV1, service.getVessel(createdV1.getId())); + + Assert.assertTrue(allScientificVessel.contains(createdV1)); + Assert.assertFalse(allFishingVessel.contains(createdV1)); + + Vessel createdV2 = vesselList.get(1); + Assert.assertNotNull(createdV2); + Assert.assertEquals(v2.getName(), createdV2.getName()); + Assert.assertEquals(v2.getInternalRegistrationCode(), createdV2.getInternalRegistrationCode()); + Assert.assertNotNull(createdV2.getId()); + Assert.assertNotSame(v2.getId(), createdV2.getId()); + Assert.assertEquals(createdV2, service.getVessel(createdV2.getId())); + Assert.assertFalse(allScientificVessel.contains(createdV1)); + Assert.assertTrue(allFishingVessel.contains(createdV1)); + } + + @Ignore + @Test + public void importPerson() { + List<Person> persons = Lists.newArrayList(); + + long timestamp1 = System.nanoTime(); + Person p1 = new Person(); + p1.setId("Don't care" + timestamp1); + p1.setName("Don't care" + timestamp1); + p1.setFirstName("FirstName" + timestamp1); + p1.setLastName("MastName" + timestamp1); + p1.setDescription("Dont care" + timestamp1); + p1.setDescription("Dont care" + timestamp1); + persons.add(p1); + + long timestamp2 = System.nanoTime(); + Person p2 = new Person(); + p2.setId("Don't care" + timestamp2); + p2.setName("Don't care" + timestamp2); + p2.setFirstName("FirstName" + timestamp2); + p2.setLastName("LastName" + timestamp2); + p2.setDescription("Don't care" + timestamp2); + p2.setDepartment("Don't care" + timestamp2); + persons.add(p2); + + Assert.assertNull(service.getSpecies(p1.getId())); + Assert.assertNull(service.getSpecies(p2.getId())); + + List<Person> personList = service.importTemporaryPerson(persons); + + Assert.assertNotNull(personList); + Assert.assertEquals(2, personList.size()); + + Person createdP1 = personList.get(0); + Assert.assertNotNull(createdP1); + Assert.assertEquals(p1.getFirstName(), createdP1.getFirstName()); + Assert.assertEquals(p1.getLastName(), createdP1.getLastName()); + + Assert.assertNull(createdP1.getName()); + Assert.assertNull(createdP1.getDepartment()); + Assert.assertNull(createdP1.getDescription()); + + Assert.assertNotNull(createdP1.getId()); + Assert.assertNotSame(p1.getId(), createdP1.getId()); + + Assert.assertEquals(createdP1, service.getPerson(Integer.valueOf(createdP1.getId()))); + + + Person createdP2 = personList.get(1); + Assert.assertNotNull(createdP2); + Assert.assertEquals(p2.getFirstName(), createdP2.getFirstName()); + Assert.assertEquals(p2.getLastName(), createdP2.getLastName()); + + Assert.assertNull(createdP1.getName()); + Assert.assertNull(createdP1.getDepartment()); + Assert.assertNull(createdP1.getDescription()); + + Assert.assertNotNull(createdP2.getId()); + Assert.assertNotSame(p2.getId(), createdP2.getId()); + + Assert.assertEquals(createdP2, service.getPerson(Integer.valueOf(createdP2.getId()))); + } + + @Ignore + @Test + public void importGear() { + List<Gear> gears = Lists.newArrayList(); + + // scientific gear + long timestamp1 = System.nanoTime(); + Gear g1 = new Gear(); + g1.setId("Don't care" + timestamp1); + g1.setDescription("Don't care" + timestamp1); + g1.setScientificGear(true); + g1.setName("Name" + timestamp1); + g1.setLabel("Label" + timestamp1); + gears.add(g1); + + // fishing gear + long timestamp2 = System.nanoTime(); + Gear g2 = new Gear(); + g2.setId("Don't care" + timestamp2); + g2.setDescription("Don't care" + timestamp2); + g2.setName("Name" + timestamp2); + g2.setLabel("Label" + timestamp2); + g1.setScientificGear(false); + + gears.add(g2); + + List<Gear> gearList = service.importTemporaryGear(gears); + + List<Gear> allScientificGear = service.getAllScientificGear(); + List<Gear> allFishingGear = service.getAllFishingGear(); + + Gear createdG1 = gearList.get(0); + Assert.assertNotNull(createdG1); + Assert.assertEquals(g1.getName(), createdG1.getName()); + Assert.assertEquals(g1.getLabel(), createdG1.getLabel()); + + Assert.assertNotNull(createdG1.getId()); + Assert.assertNotSame(g1.getId(), createdG1.getId()); + Assert.assertEquals(createdG1, service.getGear(Integer.valueOf(createdG1.getId()))); + Assert.assertTrue(allScientificGear.contains(createdG1)); + Assert.assertFalse(allFishingGear.contains(createdG1)); + + Gear createdG2 = gearList.get(1); + Assert.assertNotNull(createdG2); + Assert.assertEquals(g2.getName(), createdG2.getName()); + Assert.assertEquals(g2.getLabel(), createdG2.getLabel()); + + Assert.assertNotNull(createdG2.getId()); + Assert.assertNotSame(g2.getId(), createdG2.getId()); + Assert.assertEquals(createdG2, service.getGear(Integer.valueOf(createdG2.getId()))); + Assert.assertFalse(allScientificGear.contains(createdG1)); + Assert.assertTrue(allFishingGear.contains(createdG1)); + } + protected <S extends IdAware> void persistList(Class<S> type, List<S> result) { persistList(type, null, 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 2013-02-05 14:29:36 UTC (rev 334) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2013-02-05 14:44:38 UTC (rev 335) @@ -312,6 +312,26 @@ return driver.getGear(gearCode); } + @Override + public List<Species> importTemporarySpecies(List<Species> species) { + return driver.importTemporarySpecies(species); + } + + @Override + public List<Vessel> importTemporaryVessel(List<Vessel> vessels) { + return driver.importTemporaryVessel(vessels); + } + + @Override + public List<Person> importTemporaryPerson(List<Person> persons) { + return driver.importTemporaryPerson(persons); + } + + @Override + public List<Gear> importTemporaryGear(List<Gear> gears) { + return driver.importTemporaryGear(gears); + } + //------------------------------------------------------------------------// //-- Program methods --// //------------------------------------------------------------------------// @@ -484,6 +504,11 @@ } @Override + public void changeSpeciesBatchSpecies(String batchId, Species species) { + driver.changeSpeciesBatchSpecies(batchId, species); + } + + @Override public List<SpeciesBatchFrequency> getAllSpeciesBatchFrequency(String speciesBatchId) { return driver.getAllSpeciesBatchFrequency(speciesBatchId); }