This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit 660b269d892d61e759e804d3972cb6e6e30ee722 Author: Brendan Le Ny <bleny@codelutin.com> Date: Thu Jan 22 10:44:37 2015 +0100 On supprime les appels à findByTopiaId --- .../main/java/fr/ifremer/wao/services/service/BoatsService.java | 4 ++-- .../java/fr/ifremer/wao/services/service/SamplingPlanService.java | 8 ++++---- .../wao/services/service/administration/CompaniesService.java | 2 +- .../ifremer/wao/services/service/administration/NewsService.java | 4 ++-- .../wao/services/service/administration/OrganisationsService.java | 2 +- .../wao/services/service/administration/WaoUsersService.java | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsService.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsService.java index 71458de..f34ebcd 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsService.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsService.java @@ -232,8 +232,8 @@ public class BoatsService extends WaoServiceSupport { if (optionalBoatInfos.isPresent()) { boatInfos = optionalBoatInfos.get(); } else { - Boat boat = getBoatDao().findByTopiaId(boatId); - Company company = getCompanyDao().findByTopiaId(companyId); + Boat boat = getBoatDao().forTopiaIdEquals(boatId).findUnique(); + Company company = getCompanyDao().forTopiaIdEquals(companyId).findUnique(); boatInfos = new BoatInfosImpl(); boatInfos.setBoat(boat); boatInfos.setCompany(company); diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java index 435b15c..82e27ec 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java @@ -101,7 +101,7 @@ public class SamplingPlanService extends WaoServiceSupport { public SampleRow getSampleRow(String sampleRowId) { - SampleRow sampleRow = getSampleRowDao().findByTopiaId(sampleRowId); + SampleRow sampleRow = getSampleRowDao().forTopiaIdEquals(sampleRowId).findUnique(); return sampleRow; @@ -254,7 +254,7 @@ public class SamplingPlanService extends WaoServiceSupport { SampleRowTopiaDao dao = getSampleRowDao(); - SampleRow sampleRow = dao.findByTopiaId(sampleRowId); + SampleRow sampleRow = dao.forTopiaIdEquals(sampleRowId).findUnique(); SampleMonthTopiaDao sampleMonthDao = getSampleMonthDao(); for (SampleMonth sampleMonth : sampleRow.getSampleMonth()) { @@ -308,11 +308,11 @@ public class SamplingPlanService extends WaoServiceSupport { SampleRowTopiaDao sampleRowDao = getSampleRowDao(); - SampleRow sampleRowMemento = sampleRowDao.findByTopiaId(sampleRowId); + SampleRow sampleRowMemento = sampleRowDao.forTopiaIdEquals(sampleRowId).findUnique(); sampleRowDao.detach(sampleRowMemento); updateSampleRowCommand.setSampleRowMemento(sampleRowMemento); - SampleRow sampleRow = sampleRowDao.findByTopiaId(sampleRowId); + SampleRow sampleRow = sampleRowDao.forTopiaIdEquals(sampleRowId).findUnique(); updateSampleRowCommand.setSampleRow(sampleRow); updateSampleRowCommand.setCreation(false); diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/CompaniesService.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/CompaniesService.java index adac21b..53bee08 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/CompaniesService.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/CompaniesService.java @@ -45,7 +45,7 @@ public class CompaniesService extends WaoServiceSupport { CompanyTopiaDao dao = getPersistenceContext().getCompanyDao(); - Company company = dao.findByTopiaId(companyId); + Company company = dao.forTopiaIdEquals(companyId).findUnique(); return company; diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/NewsService.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/NewsService.java index d3b8bde..91aca8a 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/NewsService.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/NewsService.java @@ -66,7 +66,7 @@ public class NewsService extends WaoServiceSupport { NewsTopiaDao newsDao = getNewsDao(); - News news = newsDao.findByTopiaId(newsId); + News news = newsDao.forTopiaIdEquals(newsId).findUnique(); newsDao.delete(news); @@ -78,7 +78,7 @@ public class NewsService extends WaoServiceSupport { NewsTopiaDao newsDao = getNewsDao(); - News news = newsDao.findByTopiaId(newsId); + News news = newsDao.forTopiaIdEquals(newsId).findUnique(); return news; diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/OrganisationsService.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/OrganisationsService.java index 0f531f8..8782025 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/OrganisationsService.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/OrganisationsService.java @@ -45,7 +45,7 @@ public class OrganisationsService extends WaoServiceSupport { OrganisationTopiaDao dao = getPersistenceContext().getOrganisationDao(); - Organisation organisation = dao.findByTopiaId(organisationId); + Organisation organisation = dao.forTopiaIdEquals(organisationId).findUnique(); Map<Class<? extends TopiaEntity>,List<? extends TopiaEntity>> allUsages = dao.findAllUsages(organisation); diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java index 4978185..6bead99 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java @@ -77,7 +77,7 @@ public class WaoUsersService extends WaoServiceSupport { WaoUserTopiaDao dao = getWaoUserDao(); - WaoUser waouser = dao.findByTopiaId(waoUserId); + WaoUser waouser = dao.forTopiaIdEquals(waoUserId).findUnique(); return waouser; @@ -230,7 +230,7 @@ public class WaoUsersService extends WaoServiceSupport { WaoUserTopiaDao dao = getWaoUserDao(); - WaoUser waoUser = dao.findByTopiaId(waoUserId); + WaoUser waoUser = dao.forTopiaIdEquals(waoUserId).findUnique(); waoUser.setOrganisation(null); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.