[Franciaflex-magalie-commits] r77 - in trunk/magalie-services/src/main/java/com/franciaflex/magalie/services: . service

5 Apr 2013

Author: bleny
Date: 2013-04-05 15:22:46 +0200 (Fri, 05 Apr 2013)
New Revision: 77

Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions...

Log:
remove delegate code in service context


Modified:
   trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/DefaultMagalieServiceContext.java
   trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieServiceContext.java
   trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java
   trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java
   trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FulfilKanbanService.java
   trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieBarcodeService.java
   trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieUsersService.java
   trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReportService.java
   trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java
   trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SiteErrorsService.java
   trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StoreService.java

Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/DefaultMagalieServiceContext.java
===================================================================

--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/DefaultMagalieServiceContext.java	2013-04-05 13:15:07 UTC (rev 76)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/DefaultMagalieServiceContext.java	2013-04-05 13:22:46 UTC (rev 77)
@@ -4,15 +4,6 @@
 import com.franciaflex.magalie.MagalieTechnicalException;
 import com.franciaflex.magalie.persistence.JpaMagaliePersistenceContext;
 import com.franciaflex.magalie.persistence.MagaliePersistenceContext;
-import com.franciaflex.magalie.persistence.dao.ArticleDao;
-import com.franciaflex.magalie.persistence.dao.DeliveredRequestedArticleDao;
-import com.franciaflex.magalie.persistence.dao.MagalieUserDao;
-import com.franciaflex.magalie.persistence.dao.RequestedArticleDao;
-import com.franciaflex.magalie.persistence.dao.SiteDao;
-import com.franciaflex.magalie.persistence.dao.SiteErrorDao;
-import com.franciaflex.magalie.persistence.dao.StorageMovementDao;
-import com.franciaflex.magalie.persistence.dao.StorageMovementOrderDao;
-import com.franciaflex.magalie.persistence.dao.StoredArticleDao;
 
 import javax.persistence.EntityManager;
 import java.lang.reflect.Constructor;
@@ -93,48 +84,4 @@
         return persistenceContext;
     }
 
-    @Override
-    public MagalieUserDao getMagalieUserDao() {
-        return getPersistenceContext().getMagalieUserDao();
-    }
-
-    @Override
-    public StoredArticleDao getStoredArticleDao() {
-        return getPersistenceContext().getStoredArticleDao();
-    }
-
-    @Override
-    public RequestedArticleDao getRequestedArticleDao() {
-        return getPersistenceContext().getRequestedArticleDao();
-    }
-
-    @Override
-    public ArticleDao getArticleDao() {
-        return getPersistenceContext().getArticleDao();
-    }
-
-    @Override
-    public StorageMovementDao getStorageMovementDao() {
-        return getPersistenceContext().getStorageMovementDao();
-    }
-
-    @Override
-    public SiteErrorDao getSiteErrorDao() {
-        return getPersistenceContext().getSiteErrorDao();
-    }
-
-    @Override
-    public StorageMovementOrderDao getStorageMovementOrderDao() {
-        return getPersistenceContext().getStorageMovementOrderDao();
-    }
-
-    @Override
-    public SiteDao getSiteDao() {
-        return getPersistenceContext().getSiteDao();
-    }
-
-    @Override
-    public DeliveredRequestedArticleDao getDeliveredRequestedArticleDao() {
-        return getPersistenceContext().getDeliveredRequestedArticleDao();
-    }
 }

Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieServiceContext.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieServiceContext.java	2013-04-05 13:15:07 UTC (rev 76)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieServiceContext.java	2013-04-05 13:22:46 UTC (rev 77)
@@ -25,15 +25,6 @@
 
 import com.franciaflex.magalie.MagalieApplicationConfig;
 import com.franciaflex.magalie.persistence.MagaliePersistenceContext;
-import com.franciaflex.magalie.persistence.dao.ArticleDao;
-import com.franciaflex.magalie.persistence.dao.DeliveredRequestedArticleDao;
-import com.franciaflex.magalie.persistence.dao.MagalieUserDao;
-import com.franciaflex.magalie.persistence.dao.RequestedArticleDao;
-import com.franciaflex.magalie.persistence.dao.SiteDao;
-import com.franciaflex.magalie.persistence.dao.SiteErrorDao;
-import com.franciaflex.magalie.persistence.dao.StorageMovementDao;
-import com.franciaflex.magalie.persistence.dao.StorageMovementOrderDao;
-import com.franciaflex.magalie.persistence.dao.StoredArticleDao;
 
 import java.util.Date;
 
@@ -48,24 +39,6 @@
 
     MagaliePersistenceContext getPersistenceContext();
 
-    MagalieUserDao getMagalieUserDao();
-
-    StoredArticleDao getStoredArticleDao();
-
-    RequestedArticleDao getRequestedArticleDao();
-
-    ArticleDao getArticleDao();
-
-    StorageMovementDao getStorageMovementDao();
-
     MagalieApplicationConfig getMagalieApplicationConfig();
 
-    SiteErrorDao getSiteErrorDao();
-
-    StorageMovementOrderDao getStorageMovementOrderDao();
-
-    SiteDao getSiteDao();
-
-    DeliveredRequestedArticleDao getDeliveredRequestedArticleDao();
-
 }

Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java	2013-04-05 13:15:07 UTC (rev 76)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java	2013-04-05 13:22:46 UTC (rev 77)
@@ -172,7 +172,7 @@
 
     public StorageMovementTask getStorageMovementTask(String storageMovementOrderId) {
 
-        StorageMovementOrderDao dao = serviceContext.getStorageMovementOrderDao();
+        StorageMovementOrderDao dao = serviceContext.getPersistenceContext().getStorageMovementOrderDao();
 
         StorageMovementOrder storageMovementOrder = dao.findById(storageMovementOrderId);
 
@@ -213,13 +213,13 @@
 
     protected List<StoredArticle> getStoredArticles(Article article) {
 
-        StoredArticleDao storedArticleDao = serviceContext.getStoredArticleDao();
+        StoredArticleDao storedArticleDao = serviceContext.getPersistenceContext().getStoredArticleDao();
 
         List<StoredArticle> storedArticles = storedArticleDao.findAllByArticle(article);
 
         // consider storage movements and compute actually available quantities
 
-        StorageMovementDao storageMovementDao = serviceContext.getStorageMovementDao();
+        StorageMovementDao storageMovementDao = serviceContext.getPersistenceContext().getStorageMovementDao();
 
         List<StorageMovement> storageMovements = storageMovementDao.findAllByArticle(article);
 
@@ -273,9 +273,9 @@
         String storageMovementOrderId = confirmation.getStorageMovementOrderId();
 
         StorageMovementOrderDao storageMovementOrderDao =
-                serviceContext.getStorageMovementOrderDao();
+                serviceContext.getPersistenceContext().getStorageMovementOrderDao();
 
-        SiteDao siteDao = serviceContext.getSiteDao();
+        SiteDao siteDao = serviceContext.getPersistenceContext().getSiteDao();
 
         StorageMovementOrder storageMovementOrder =
                 storageMovementOrderDao.findById(storageMovementOrderId);

Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java	2013-04-05 13:15:07 UTC (rev 76)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java	2013-04-05 13:22:46 UTC (rev 77)
@@ -68,7 +68,7 @@
 
             }
 
-            MagalieUserDao magalieUserDao = serviceContext.getMagalieUserDao();
+            MagalieUserDao magalieUserDao = serviceContext.getPersistenceContext().getMagalieUserDao();
 
             Collection<MagalieUser> users = fixtures.fixture("users");
 
@@ -80,7 +80,7 @@
 
             persistenceContext.commit();
 
-            SiteDao siteDao = serviceContext.getSiteDao();
+            SiteDao siteDao = serviceContext.getPersistenceContext().getSiteDao();
 
             Collection<Site> sites = fixtures.fixture("sites");
 
@@ -92,7 +92,7 @@
 
             persistenceContext.commit();
 
-            ArticleDao articleDao = serviceContext.getArticleDao();
+            ArticleDao articleDao = serviceContext.getPersistenceContext().getArticleDao();
 
             Collection<Article> articles = fixtures.fixture("articles");
 
@@ -104,7 +104,7 @@
 
             persistenceContext.commit();
 
-            StoredArticleDao storedArticleDao = serviceContext.getStoredArticleDao();
+            StoredArticleDao storedArticleDao = serviceContext.getPersistenceContext().getStoredArticleDao();
 
             Collection<StoredArticle> storedArticles = fixtures.fixture("storedArticles");
 
@@ -116,7 +116,7 @@
 
             persistenceContext.commit();
 
-            RequestedArticleDao requestedArticleDao = serviceContext.getRequestedArticleDao();
+            RequestedArticleDao requestedArticleDao = serviceContext.getPersistenceContext().getRequestedArticleDao();
 
             Collection<RequestedArticle> requestedArticles = fixtures.fixture("requestedArticles");
 

Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FulfilKanbanService.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FulfilKanbanService.java	2013-04-05 13:15:07 UTC (rev 76)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FulfilKanbanService.java	2013-04-05 13:22:46 UTC (rev 77)
@@ -45,7 +45,7 @@
         ArticleStorageService articleStorageService =
                 serviceContext.newService(ArticleStorageService.class);
 
-        SiteDao siteDao = serviceContext.getSiteDao();
+        SiteDao siteDao = serviceContext.getPersistenceContext().getSiteDao();
 
         Site destinationSite = siteDao.findById(destinationSiteId);
 

Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieBarcodeService.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieBarcodeService.java	2013-04-05 13:15:07 UTC (rev 76)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieBarcodeService.java	2013-04-05 13:22:46 UTC (rev 77)
@@ -43,7 +43,7 @@
 
         String articleCode = Iterables.get(split, 1);
 
-        ArticleDao articleDao = serviceContext.getArticleDao();
+        ArticleDao articleDao = serviceContext.getPersistenceContext().getArticleDao();
 
         Article article = articleDao.findByCode(articleCode);
 

Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieUsersService.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieUsersService.java	2013-04-05 13:15:07 UTC (rev 76)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieUsersService.java	2013-04-05 13:22:46 UTC (rev 77)
@@ -19,7 +19,7 @@
 
     public MagalieUser getMagalieUser(String login) {
 
-        MagalieUserDao dao = serviceContext.getMagalieUserDao();
+        MagalieUserDao dao = serviceContext.getPersistenceContext().getMagalieUserDao();
 
         MagalieUser magalieUser = dao.findByLogin(login);
 
@@ -31,7 +31,7 @@
 
     public List<MagalieUser> getAllMagalieUsers() {
 
-        MagalieUserDao dao = serviceContext.getMagalieUserDao();
+        MagalieUserDao dao = serviceContext.getPersistenceContext().getMagalieUserDao();
 
         List<MagalieUser> allMagalieUsers = dao.findAll();
 

Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReportService.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReportService.java	2013-04-05 13:15:07 UTC (rev 76)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReportService.java	2013-04-05 13:22:46 UTC (rev 77)
@@ -34,7 +34,7 @@
 
         magalieReport.setAllMagalieUsers(allMagalieUsers);
 
-        StorageMovementDao storageMovementDao = serviceContext.getStorageMovementDao();
+        StorageMovementDao storageMovementDao = serviceContext.getPersistenceContext().getStorageMovementDao();
 
         List<StorageMovement> allStorageMovements = storageMovementDao.findAll();
 

Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java	2013-04-05 13:15:07 UTC (rev 76)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java	2013-04-05 13:22:46 UTC (rev 77)
@@ -73,7 +73,7 @@
 
     protected List<RequestedArticle> getRequestedArticles(String storeCode) {
 
-        RequestedArticleDao requestedArticleDao = serviceContext.getRequestedArticleDao();
+        RequestedArticleDao requestedArticleDao = serviceContext.getPersistenceContext().getRequestedArticleDao();
 
         List<RequestedArticle> allRequestedArticles = requestedArticleDao.findAllUndelivered();
 

Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SiteErrorsService.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SiteErrorsService.java	2013-04-05 13:15:07 UTC (rev 76)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SiteErrorsService.java	2013-04-05 13:22:46 UTC (rev 77)
@@ -33,7 +33,7 @@
 
     public void reportError(Site site, MagalieUser magalieUser, Date reportDate) {
 
-        SiteErrorDao siteErrorDao = serviceContext.getSiteErrorDao();
+        SiteErrorDao siteErrorDao = serviceContext.getPersistenceContext().getSiteErrorDao();
 
         SiteError existingSiteError = siteErrorDao.findBySite(site);
 
@@ -62,7 +62,7 @@
 
     public List<Site> getAllSitesInError() {
 
-        SiteErrorDao siteErrorDao = serviceContext.getSiteErrorDao();
+        SiteErrorDao siteErrorDao = serviceContext.getPersistenceContext().getSiteErrorDao();
 
         List<Site> allSitesInError = siteErrorDao.getAllSitesInError();
 
@@ -72,7 +72,7 @@
 
     public List<SiteError> getAllSiteErrors() {
 
-        SiteErrorDao siteErrorDao = serviceContext.getSiteErrorDao();
+        SiteErrorDao siteErrorDao = serviceContext.getPersistenceContext().getSiteErrorDao();
 
         List<SiteError> allSiteErrors = siteErrorDao.findAll();
 

Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StoreService.java
===================================================================
--- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StoreService.java	2013-04-05 13:15:07 UTC (rev 76)
+++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StoreService.java	2013-04-05 13:22:46 UTC (rev 77)
@@ -17,7 +17,7 @@
 
     public List<String> getAllStoreCodes() {
 
-        SiteDao dao = serviceContext.getSiteDao();
+        SiteDao dao = serviceContext.getPersistenceContext().getSiteDao();
 
         return dao.getAllStoreCodes();

    

[Franciaflex-magalie-commits] r77 - in trunk/magalie-services/src/main/java/com/franciaflex/magalie/services: . service

bleny＠users.forge.codelutin.com