[Franciaflex-magalie-commits] r207 - in branches/magalie-eugene/magalie-persistence/src/main: java/com/franciaflex/magalie/persistence/dao xmi

Author: tchemit Date: 2013-05-29 10:55:37 +0200 (Wed, 29 May 2013) New Revision: 207 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: add generic in user dao + notGeneratedValue stereotype Modified: branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractArticleJpaDao.java branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractDeliveredRequestedArticleJpaDao.java branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractDeliveredRequestedListJpaDao.java branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractKanbanJpaDao.java branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractLocationErrorJpaDao.java branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractLocationJpaDao.java branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractMagalieUserJpaDao.java branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractPreparedArticleReceptionJpaDao.java branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractRequestedArticleJpaDao.java branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractRequestedListJpaDao.java branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractStorageMovementJpaDao.java branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractStorageMovementOrderJpaDao.java branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractStoredArticleJpaDao.java branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractSupplierJpaDao.java branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractUnavailableArticleJpaDao.java branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractWarehouseJpaDao.java branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/ArticleDao.java branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/BuildingDao.java branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/DeliveredRequestedArticleDao.java branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/DeliveredRequestedListDao.java branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/KanbanDao.java branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationDao.java branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationErrorDao.java branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/MagalieUserDao.java branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/PreparedArticleReceptionDao.java branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedArticleDao.java branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListDao.java branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementDao.java branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementOrderDao.java branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleDao.java branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/SupplierDao.java branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/UnavailableArticleDao.java branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/WarehouseDao.java branches/magalie-eugene/magalie-persistence/src/main/xmi/magalie.properties Modified: branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractArticleJpaDao.java =================================================================== --- branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractArticleJpaDao.java 2013-05-29 07:29:15 UTC (rev 206) +++ branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractArticleJpaDao.java 2013-05-29 08:55:37 UTC (rev 207) @@ -35,7 +35,7 @@ } @Override - public Article findByCode(String articleCode) { + public E findByCode(String articleCode) { TypedQuery<E> query = createQuery("from Article a where a.code = :code"); query.setParameter(Article.PROPERTY_CODE, articleCode); return findUniqueOrNull(query); Modified: branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractDeliveredRequestedArticleJpaDao.java =================================================================== --- branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractDeliveredRequestedArticleJpaDao.java 2013-05-29 07:29:15 UTC (rev 206) +++ branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractDeliveredRequestedArticleJpaDao.java 2013-05-29 08:55:37 UTC (rev 207) @@ -38,20 +38,20 @@ } @Override - public DeliveredRequestedArticle find(StorageMovementOrder storageMovementOrder) { + public E find(StorageMovementOrder storageMovementOrder) { TypedQuery<E> query = - entityManager.createQuery( - "from DeliveredRequestedArticle dra where dra.storageMovementOrder = :storageMovementOrder", getEntityClass()); + createQuery( + "from DeliveredRequestedArticle dra where dra.storageMovementOrder = :storageMovementOrder"); query.setParameter("storageMovementOrder", storageMovementOrder); return findUniqueOrNull(query); } @Override - public List<DeliveredRequestedArticle> findAll(RequestedList requestedList) { + public List<E> findAll(RequestedList requestedList) { TypedQuery<E> query = - entityManager.createQuery( - "from DeliveredRequestedArticle dra where dra.requestedArticle.requestedList = :requestedList", getEntityClass()); + createQuery( + "from DeliveredRequestedArticle dra where dra.requestedArticle.requestedList = :requestedList"); query.setParameter("requestedList", requestedList); - return (List<DeliveredRequestedArticle>) findAll(query); + return findAll(query); } } Modified: branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractDeliveredRequestedListJpaDao.java =================================================================== --- branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractDeliveredRequestedListJpaDao.java 2013-05-29 07:29:15 UTC (rev 206) +++ branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractDeliveredRequestedListJpaDao.java 2013-05-29 08:55:37 UTC (rev 207) @@ -38,7 +38,7 @@ } @Override - public DeliveredRequestedList findByAffectedTo(MagalieUser affectedTo) { + public E findByAffectedTo(MagalieUser affectedTo) { TypedQuery<E> query = createQuery( "from DeliveredRequestedList drl where drl.status = :affected and drl.affectedTo = :affectedTo"); @@ -52,7 +52,7 @@ } @Override - public DeliveredRequestedList findByRequestedList(RequestedList requestedList) { + public E findByRequestedList(RequestedList requestedList) { TypedQuery<E> query = createQuery( "from DeliveredRequestedList drl where drl.requestedList = :requestedList"); Modified: branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractKanbanJpaDao.java =================================================================== --- branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractKanbanJpaDao.java 2013-05-29 07:29:15 UTC (rev 206) +++ branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractKanbanJpaDao.java 2013-05-29 08:55:37 UTC (rev 207) @@ -37,8 +37,8 @@ } @Override - public Kanban find(Article article, Warehouse warehouse) { - TypedQuery<E> query = entityManager.createQuery("from Kanban k where k.article = :article and k.warehouse = :warehouse", getEntityClass()); + public E find(Article article, Warehouse warehouse) { + TypedQuery<E> query = createQuery("from Kanban k where k.article = :article and k.warehouse = :warehouse"); query.setParameter("article", article); query.setParameter("warehouse", warehouse); return query.getSingleResult(); Modified: branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractLocationErrorJpaDao.java =================================================================== --- branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractLocationErrorJpaDao.java 2013-05-29 07:29:15 UTC (rev 206) +++ branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractLocationErrorJpaDao.java 2013-05-29 08:55:37 UTC (rev 207) @@ -39,7 +39,7 @@ } @Override - public LocationError findByLocation(Location location) { + public E findByLocation(Location location) { TypedQuery<E> query = createQuery("from LocationError se where se.location = :location"); query.setParameter("location", location); return findUniqueOrNull(query); @@ -47,7 +47,8 @@ @Override public List<Location> getAllLocationsInError(Article article) { - Query query = entityManager.createQuery("select se.location from LocationError se where se.article = :article"); + TypedQuery<Location> query = createQuery(Location.class, + "select se.location from LocationError se where se.article = :article"); query.setParameter("article", article); List<Location> allLocationsInError = query.getResultList(); return allLocationsInError; @@ -55,7 +56,7 @@ @Override public List<E> findAll() { - Query query = entityManager.createQuery("from LocationError se order by se.reportDate"); + TypedQuery<E> query = createQuery("from LocationError se order by se.reportDate"); List<E> all = query.getResultList(); return all; } Modified: branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractLocationJpaDao.java =================================================================== --- branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractLocationJpaDao.java 2013-05-29 07:29:15 UTC (rev 206) +++ branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractLocationJpaDao.java 2013-05-29 08:55:37 UTC (rev 207) @@ -39,14 +39,14 @@ } @Override - public Location find(String code, Warehouse warehouse) { + public E find(String code, Warehouse warehouse) { TypedQuery<E> query = createQuery("from Location l where l.code = :code and l.warehouse = :warehouse"); query.setParameter("code", code); query.setParameter("warehouse", warehouse); return findUnique(query); } - protected List<Location> findAllWithoutReception(Building building, Warehouse warehouse) { + protected List<E> findAllWithoutReception(Building building, Warehouse warehouse) { boolean filterOnBuilding = building != null; boolean filterOnWarehouse = warehouse != null; String hql = " from Location l where"; @@ -69,16 +69,16 @@ } query.setParameter("codeForReceptionLocations", Locations.codeForReceptionLocations()); query.setParameter("codeForWarehouseWithoutLocations", Locations.codeForWarehouseWithoutLocations()); - return (List<Location>) findAll(query); + return findAll(query); } @Override - public List<Location> findAllWithoutReception(Building building) { + public List<E> findAllWithoutReception(Building building) { return findAllWithoutReception(building, null); } @Override - public List<Location> findAllWithoutReception(Warehouse warehouse) { + public List<E> findAllWithoutReception(Warehouse warehouse) { return findAllWithoutReception(null, warehouse); } } Modified: branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractMagalieUserJpaDao.java =================================================================== --- branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractMagalieUserJpaDao.java 2013-05-29 07:29:15 UTC (rev 206) +++ branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractMagalieUserJpaDao.java 2013-05-29 08:55:37 UTC (rev 207) @@ -37,7 +37,7 @@ } @Override - public MagalieUser findByLogin(String login) { + public E findByLogin(String login) { TypedQuery<E> query = createQuery("from MagalieUser mu where mu.login = :login"); query.setParameter("login", login); return findUnique(query); @@ -45,7 +45,7 @@ @Override public List<E> findAll() { - Query query = entityManager.createQuery("from MagalieUser mu order by mu.login"); + TypedQuery<E> query = createQuery("from MagalieUser mu order by mu.login"); List<E> resultList = query.getResultList(); return resultList; } Modified: branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractPreparedArticleReceptionJpaDao.java =================================================================== --- branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractPreparedArticleReceptionJpaDao.java 2013-05-29 07:29:15 UTC (rev 206) +++ branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractPreparedArticleReceptionJpaDao.java 2013-05-29 08:55:37 UTC (rev 207) @@ -12,7 +12,7 @@ } @Override - public PreparedArticleReception findByBarcode(String barcode) { + public E findByBarcode(String barcode) { TypedQuery<E> query = createQuery("from PreparedArticleReception par where par.barcode = :barcode"); query.setParameter("barcode", barcode); return findUniqueOrNull(query); Modified: branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractRequestedArticleJpaDao.java =================================================================== --- branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractRequestedArticleJpaDao.java 2013-05-29 07:29:15 UTC (rev 206) +++ branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractRequestedArticleJpaDao.java 2013-05-29 08:55:37 UTC (rev 207) @@ -40,7 +40,7 @@ } @Override - public List<RequestedArticle> findAllUndelivered(Building building, MagalieUser affectedTo, String listType) { + public List<E> findAllUndelivered(Building building, MagalieUser affectedTo, String listType) { TypedQuery<E> query = createQuery( "from RequestedArticle ra where " + " ra not in (select dra.requestedArticle from DeliveredRequestedArticle dra) " @@ -52,14 +52,14 @@ query.setParameter("complete", DeliveredRequestedListStatus.COMPLETE); query.setParameter("affected", DeliveredRequestedListStatus.AFFECTED); query.setParameter("affectedTo", affectedTo); - return (List<RequestedArticle>) findAll(query); + return findAll(query); } @Override - public List<RequestedArticle> findAll(RequestedList requestedList) { + public List<E> findAll(RequestedList requestedList) { TypedQuery<E> query = createQuery("from RequestedArticle ra where ra.requestedList = :requestedList"); query.setParameter("requestedList", requestedList); - return (List<RequestedArticle>) findAll(query); + return findAll(query); } } Modified: branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractRequestedListJpaDao.java =================================================================== --- branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractRequestedListJpaDao.java 2013-05-29 07:29:15 UTC (rev 206) +++ branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractRequestedListJpaDao.java 2013-05-29 08:55:37 UTC (rev 207) @@ -37,7 +37,7 @@ @Override public List<String> findAllDistinctListTypes() { - TypedQuery<String> query = entityManager.createQuery("select distinct rl.listType from RequestedList rl", String.class); + TypedQuery<String> query = createQuery(String.class, "select distinct rl.listType from RequestedList rl"); return query.getResultList(); } } Modified: branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractStorageMovementJpaDao.java =================================================================== --- branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractStorageMovementJpaDao.java 2013-05-29 07:29:15 UTC (rev 206) +++ branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractStorageMovementJpaDao.java 2013-05-29 08:55:37 UTC (rev 207) @@ -29,7 +29,7 @@ import com.franciaflex.magalie.persistence.entity.StorageMovement; import javax.persistence.EntityManager; -import javax.persistence.Query; +import javax.persistence.TypedQuery; import java.util.List; public class AbstractStorageMovementJpaDao<E extends StorageMovement> extends GeneratedStorageMovementJpaDao<E> { @@ -39,15 +39,15 @@ } @Override - public List<StorageMovement> findAllByArticle(Article article) { - Query query = entityManager.createQuery("from StorageMovement sm where sm.article = :article"); + public List<E> findAllByArticle(Article article) { + TypedQuery<E> query = createQuery("from StorageMovement sm where sm.article = :article"); query.setParameter("article", article); return query.getResultList(); } @Override - public List<StorageMovement> findAllInReception(Building building) { - Query query = entityManager.createQuery( + public List<E> findAllInReception(Building building) { + TypedQuery<E> query = createQuery( " from StorageMovement sm" + " where sm.originLocation.code = :codeForReceptionLocations and sm.originLocation.warehouse.building = :building" + " or " + @@ -59,7 +59,7 @@ @Override public List<E> findAll() { - Query query = entityManager.createQuery("from StorageMovement sm order by sm.orderDate"); + TypedQuery<E> query = createQuery("from StorageMovement sm order by sm.orderDate"); return query.getResultList(); } } Modified: branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractStorageMovementOrderJpaDao.java =================================================================== --- branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractStorageMovementOrderJpaDao.java 2013-05-29 07:29:15 UTC (rev 206) +++ branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractStorageMovementOrderJpaDao.java 2013-05-29 08:55:37 UTC (rev 207) @@ -28,7 +28,7 @@ import com.franciaflex.magalie.persistence.entity.StorageMovementOrder; import javax.persistence.EntityManager; -import javax.persistence.Query; +import javax.persistence.TypedQuery; import java.util.List; public class AbstractStorageMovementOrderJpaDao<E extends StorageMovementOrder> extends GeneratedStorageMovementOrderJpaDao<E> { @@ -38,8 +38,8 @@ } @Override - public List<StorageMovementOrder> findNotConfirmedByUser(MagalieUser magalieUser, Building building) { - Query query = entityManager.createQuery( + public List<E> findNotConfirmedByUser(MagalieUser magalieUser, Building building) { + TypedQuery<E> query = createQuery( " select distinct smo" + " from StorageMovementOrder smo" + " inner join smo.storageMovements as sm" + Modified: branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractStoredArticleJpaDao.java =================================================================== --- branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractStoredArticleJpaDao.java 2013-05-29 07:29:15 UTC (rev 206) +++ branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractStoredArticleJpaDao.java 2013-05-29 08:55:37 UTC (rev 207) @@ -39,11 +39,11 @@ } @Override - public List<StoredArticle> findAllForArticleInBuilding(Article article, Building building) { + public List<E> findAllForArticleInBuilding(Article article, Building building) { TypedQuery<E> query = createQuery("from StoredArticle sa where sa.article = :article and sa.location.warehouse.withdrawAllowed = true and sa.location.warehouse.building = :building"); query.setParameter("article", article); query.setParameter("building", building); - List<StoredArticle> resultList = (List<StoredArticle>) findAll(query); + List<E> resultList = findAll(query); for (StoredArticle storedArticle : resultList) { entityManager.detach(storedArticle); } @@ -51,11 +51,11 @@ } @Override - public List<StoredArticle> findAllReceivedForAllSupplier(Building building) { + public List<E> findAllReceivedForAllSupplier(Building building) { TypedQuery<E> query = createQuery("from StoredArticle sa where sa.location.warehouse.building = :building and sa.location.code = :code"); query.setParameter("building", building); query.setParameter("code", Locations.codeForReceptionLocations()); - List<StoredArticle> resultList = (List<StoredArticle>) findAll(query); + List<E> resultList = findAll(query); for (StoredArticle storedArticle : resultList) { entityManager.detach(storedArticle); } @@ -63,12 +63,12 @@ } @Override - public List<StoredArticle> findAllReceivedForSupplier(Building building, String supplierId) { + public List<E> findAllReceivedForSupplier(Building building, String supplierId) { TypedQuery<E> query = createQuery("from StoredArticle sa where sa.location.warehouse.building = :building and sa.location.code = :code and sa.article.supplier.id = :supplierId"); query.setParameter("building", building); query.setParameter("supplierId", supplierId); query.setParameter("code", Locations.codeForReceptionLocations()); - List<StoredArticle> resultList = (List<StoredArticle>) findAll(query); + List<E> resultList = findAll(query); for (StoredArticle storedArticle : resultList) { entityManager.detach(storedArticle); } Modified: branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractSupplierJpaDao.java =================================================================== --- branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractSupplierJpaDao.java 2013-05-29 07:29:15 UTC (rev 206) +++ branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractSupplierJpaDao.java 2013-05-29 08:55:37 UTC (rev 207) @@ -40,11 +40,11 @@ } @Override - public List<Supplier> findAllWithReceivedArticles(Building building) { + public List<E> findAllWithReceivedArticles(Building building) { TypedQuery<E> query = createQuery("select sa.article.supplier from StoredArticle sa where sa.location.code = :code and sa.location.warehouse.building = :building"); query.setParameter(Warehouse.PROPERTY_BUILDING, building); query.setParameter(Location.PROPERTY_CODE, Locations.codeForReceptionLocations()); - return (List<Supplier>) findAll(query); + return findAll(query); } } Modified: branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractUnavailableArticleJpaDao.java =================================================================== --- branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractUnavailableArticleJpaDao.java 2013-05-29 07:29:15 UTC (rev 206) +++ branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractUnavailableArticleJpaDao.java 2013-05-29 08:55:37 UTC (rev 207) @@ -37,7 +37,7 @@ } @Override - public UnavailableArticle findByArticle(Building building, Article article) { + public E findByArticle(Building building, Article article) { TypedQuery<E> query = createQuery("from UnavailableArticle ua where ua.article = :article and ua.building = :building"); query.setParameter(UnavailableArticle.PROPERTY_ARTICLE, article); query.setParameter(UnavailableArticle.PROPERTY_BUILDING, building); Modified: branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractWarehouseJpaDao.java =================================================================== --- branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractWarehouseJpaDao.java 2013-05-29 07:29:15 UTC (rev 206) +++ branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/AbstractWarehouseJpaDao.java 2013-05-29 08:55:37 UTC (rev 207) @@ -38,10 +38,10 @@ } @Override - public List<Warehouse> findAllWithoutLocations(Building building) { - TypedQuery<E> query = entityManager.createQuery("from Warehouse w where w.building = :building and w in (select l.warehouse from Location l where l.code = :code)", getEntityClass()); + public List<E> findAllWithoutLocations(Building building) { + TypedQuery<E> query = createQuery("from Warehouse w where w.building = :building and w in (select l.warehouse from Location l where l.code = :code)"); query.setParameter(Warehouse.PROPERTY_BUILDING, building); query.setParameter(Warehouse.PROPERTY_CODE, Locations.codeForWarehouseWithoutLocations()); - return (List<Warehouse>) query.getResultList(); + return query.getResultList(); } } Modified: branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/ArticleDao.java =================================================================== --- branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/ArticleDao.java 2013-05-29 07:29:15 UTC (rev 206) +++ branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/ArticleDao.java 2013-05-29 08:55:37 UTC (rev 207) @@ -26,8 +26,8 @@ import com.franciaflex.magalie.persistence.entity.Article; /** @author bleny */ -public interface ArticleDao { +public interface ArticleDao<E extends Article> { - Article findByCode(String articleCode); + E findByCode(String articleCode); } Modified: branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/BuildingDao.java =================================================================== --- branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/BuildingDao.java 2013-05-29 07:29:15 UTC (rev 206) +++ branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/BuildingDao.java 2013-05-29 08:55:37 UTC (rev 207) @@ -23,7 +23,9 @@ * #L% */ +import com.franciaflex.magalie.persistence.entity.Building; + /** @author bleny */ -public interface BuildingDao { +public interface BuildingDao<E extends Building> { } Modified: branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/DeliveredRequestedArticleDao.java =================================================================== --- branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/DeliveredRequestedArticleDao.java 2013-05-29 07:29:15 UTC (rev 206) +++ branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/DeliveredRequestedArticleDao.java 2013-05-29 08:55:37 UTC (rev 207) @@ -30,10 +30,10 @@ import java.util.List; /** @author bleny */ -public interface DeliveredRequestedArticleDao { +public interface DeliveredRequestedArticleDao<E extends DeliveredRequestedArticle> { - DeliveredRequestedArticle find(StorageMovementOrder storageMovementOrder); + E find(StorageMovementOrder storageMovementOrder); - List<DeliveredRequestedArticle> findAll(RequestedList requestedList); + List<E> findAll(RequestedList requestedList); } Modified: branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/DeliveredRequestedListDao.java =================================================================== --- branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/DeliveredRequestedListDao.java 2013-05-29 07:29:15 UTC (rev 206) +++ branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/DeliveredRequestedListDao.java 2013-05-29 08:55:37 UTC (rev 207) @@ -28,10 +28,10 @@ import com.franciaflex.magalie.persistence.entity.RequestedList; /** @author bleny */ -public interface DeliveredRequestedListDao { +public interface DeliveredRequestedListDao<E extends DeliveredRequestedList> { - DeliveredRequestedList findByAffectedTo(MagalieUser affectedTo); + E findByAffectedTo(MagalieUser affectedTo); - DeliveredRequestedList findByRequestedList(RequestedList requestedList); + E findByRequestedList(RequestedList requestedList); } Modified: branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/KanbanDao.java =================================================================== --- branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/KanbanDao.java 2013-05-29 07:29:15 UTC (rev 206) +++ branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/KanbanDao.java 2013-05-29 08:55:37 UTC (rev 207) @@ -28,8 +28,8 @@ import com.franciaflex.magalie.persistence.entity.Warehouse; /** @author bleny */ -public interface KanbanDao { +public interface KanbanDao<E extends Kanban> { - public Kanban find(Article article, Warehouse warehouse); + public E find(Article article, Warehouse warehouse); } Modified: branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationDao.java =================================================================== --- branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationDao.java 2013-05-29 07:29:15 UTC (rev 206) +++ branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationDao.java 2013-05-29 08:55:37 UTC (rev 207) @@ -29,11 +29,11 @@ import java.util.List; -public interface LocationDao { +public interface LocationDao<E extends Location> { - Location find(String code, Warehouse warehouse); + E find(String code, Warehouse warehouse); - List<Location> findAllWithoutReception(Building building); + List<E> findAllWithoutReception(Building building); - List<Location> findAllWithoutReception(Warehouse warehouse); + List<E> findAllWithoutReception(Warehouse warehouse); } Modified: branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationErrorDao.java =================================================================== --- branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationErrorDao.java 2013-05-29 07:29:15 UTC (rev 206) +++ branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationErrorDao.java 2013-05-29 08:55:37 UTC (rev 207) @@ -30,12 +30,12 @@ import java.util.List; /** @author bleny */ -public interface LocationErrorDao { +public interface LocationErrorDao<E extends LocationError> { - LocationError findByLocation(Location location); + E findByLocation(Location location); List<Location> getAllLocationsInError(Article article); -// List<LocationError> findAll(); + List<E> findAll(); } Modified: branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/MagalieUserDao.java =================================================================== --- branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/MagalieUserDao.java 2013-05-29 07:29:15 UTC (rev 206) +++ branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/MagalieUserDao.java 2013-05-29 08:55:37 UTC (rev 207) @@ -25,11 +25,13 @@ import com.franciaflex.magalie.persistence.entity.MagalieUser; +import java.util.List; + /** @author bleny */ -public interface MagalieUserDao { +public interface MagalieUserDao<E extends MagalieUser> { - MagalieUser findByLogin(String login); + E findByLogin(String login); -// List<MagalieUser> findAll(); + List<E> findAll(); } Modified: branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/PreparedArticleReceptionDao.java =================================================================== --- branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/PreparedArticleReceptionDao.java 2013-05-29 07:29:15 UTC (rev 206) +++ branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/PreparedArticleReceptionDao.java 2013-05-29 08:55:37 UTC (rev 207) @@ -3,8 +3,7 @@ import com.franciaflex.magalie.persistence.entity.PreparedArticleReception; /** @author bleny */ -public interface PreparedArticleReceptionDao { +public interface PreparedArticleReceptionDao<E extends PreparedArticleReception> { - PreparedArticleReception findByBarcode(String barcode); - + E findByBarcode(String barcode); } Modified: branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedArticleDao.java =================================================================== --- branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedArticleDao.java 2013-05-29 07:29:15 UTC (rev 206) +++ branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedArticleDao.java 2013-05-29 08:55:37 UTC (rev 207) @@ -31,10 +31,10 @@ import java.util.List; /** @author bleny */ -public interface RequestedArticleDao { +public interface RequestedArticleDao<E extends RequestedArticle> { - List<RequestedArticle> findAllUndelivered(Building building, MagalieUser affectedTo, String listType); + List<E> findAllUndelivered(Building building, MagalieUser affectedTo, String listType); - List<RequestedArticle> findAll(RequestedList requestedList); + List<E> findAll(RequestedList requestedList); } Modified: branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListDao.java =================================================================== --- branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListDao.java 2013-05-29 07:29:15 UTC (rev 206) +++ branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListDao.java 2013-05-29 08:55:37 UTC (rev 207) @@ -23,10 +23,12 @@ * #L% */ +import com.franciaflex.magalie.persistence.entity.RequestedList; + import java.util.List; /** @author bleny */ -public interface RequestedListDao { +public interface RequestedListDao<E extends RequestedList> { List<String> findAllDistinctListTypes(); Modified: branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementDao.java =================================================================== --- branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementDao.java 2013-05-29 07:29:15 UTC (rev 206) +++ branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementDao.java 2013-05-29 08:55:37 UTC (rev 207) @@ -30,11 +30,11 @@ import java.util.List; /** @author bleny */ -public interface StorageMovementDao { +public interface StorageMovementDao <E extends StorageMovement>{ - List<StorageMovement> findAllByArticle(Article article); + List<E> findAllByArticle(Article article); -// List<StorageMovement> findAll(); + List<E> findAll(); - List<StorageMovement> findAllInReception(Building building); + List<E> findAllInReception(Building building); } Modified: branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementOrderDao.java =================================================================== --- branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementOrderDao.java 2013-05-29 07:29:15 UTC (rev 206) +++ branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementOrderDao.java 2013-05-29 08:55:37 UTC (rev 207) @@ -29,8 +29,8 @@ import java.util.List; -public interface StorageMovementOrderDao { +public interface StorageMovementOrderDao<E extends StorageMovementOrder> { - public List<StorageMovementOrder> findNotConfirmedByUser(MagalieUser magalieUser, Building building); + public List<E> findNotConfirmedByUser(MagalieUser magalieUser, Building building); } Modified: branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleDao.java =================================================================== --- branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleDao.java 2013-05-29 07:29:15 UTC (rev 206) +++ branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleDao.java 2013-05-29 08:55:37 UTC (rev 207) @@ -29,11 +29,11 @@ import java.util.List; -public interface StoredArticleDao { +public interface StoredArticleDao<E extends StoredArticle> { - List<StoredArticle> findAllForArticleInBuilding(Article article, Building building); + List<E> findAllForArticleInBuilding(Article article, Building building); - List<StoredArticle> findAllReceivedForAllSupplier(Building building); + List<E> findAllReceivedForAllSupplier(Building building); - List<StoredArticle> findAllReceivedForSupplier(Building building, String supplierId); + List<E> findAllReceivedForSupplier(Building building, String supplierId); } Modified: branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/SupplierDao.java =================================================================== --- branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/SupplierDao.java 2013-05-29 07:29:15 UTC (rev 206) +++ branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/SupplierDao.java 2013-05-29 08:55:37 UTC (rev 207) @@ -29,8 +29,8 @@ import java.util.List; /** @author bleny */ -public interface SupplierDao { +public interface SupplierDao<E extends Supplier> { - List<Supplier> findAllWithReceivedArticles(Building building); + List<E> findAllWithReceivedArticles(Building building); } Modified: branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/UnavailableArticleDao.java =================================================================== --- branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/UnavailableArticleDao.java 2013-05-29 07:29:15 UTC (rev 206) +++ branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/UnavailableArticleDao.java 2013-05-29 08:55:37 UTC (rev 207) @@ -28,8 +28,8 @@ import com.franciaflex.magalie.persistence.entity.UnavailableArticle; /** @author bleny */ -public interface UnavailableArticleDao { +public interface UnavailableArticleDao<E extends UnavailableArticle> { - UnavailableArticle findByArticle(Building building, Article article); + E findByArticle(Building building, Article article); } Modified: branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/WarehouseDao.java =================================================================== --- branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/WarehouseDao.java 2013-05-29 07:29:15 UTC (rev 206) +++ branches/magalie-eugene/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/WarehouseDao.java 2013-05-29 08:55:37 UTC (rev 207) @@ -29,8 +29,8 @@ import java.util.List; /** @author bleny */ -public interface WarehouseDao { +public interface WarehouseDao<E extends Warehouse> { - List<Warehouse> findAllWithoutLocations(Building building); + List<E> findAllWithoutLocations(Building building); } Modified: branches/magalie-eugene/magalie-persistence/src/main/xmi/magalie.properties =================================================================== --- branches/magalie-eugene/magalie-persistence/src/main/xmi/magalie.properties 2013-05-29 07:29:15 UTC (rev 206) +++ branches/magalie-eugene/magalie-persistence/src/main/xmi/magalie.properties 2013-05-29 08:55:37 UTC (rev 207) @@ -1,8 +1,12 @@ com.franciaflex.magalie.persistence.entity.Article.attribute.fixedLocations.stereotype=unique -com.franciaflex.magalie.persistence.entity.DeliveredRequestedArticle.class.stereotype=generatedValue -com.franciaflex.magalie.persistence.entity.DeliveredRequestedList.class.stereotype=generatedValue -com.franciaflex.magalie.persistence.entity.Kanban.class.stereotype=generatedValue -com.franciaflex.magalie.persistence.entity.LocationError.class.stereotype=generatedValue -com.franciaflex.magalie.persistence.entity.StorageMovement.class.stereotype=generatedValue -com.franciaflex.magalie.persistence.entity.StorageMovementOrder.class.stereotype=generatedValue -com.franciaflex.magalie.persistence.entity.UnavailableArticle.class.stereotype=generatedValue + +com.franciaflex.magalie.persistence.entity.Article.class.stereotype=notGeneratedValue +com.franciaflex.magalie.persistence.entity.Building.class.stereotype=notGeneratedValue +com.franciaflex.magalie.persistence.entity.Location.class.stereotype=notGeneratedValue +com.franciaflex.magalie.persistence.entity.MagalieUser.class.stereotype=notGeneratedValue +com.franciaflex.magalie.persistence.entity.PreparedArticleReception.class.stereotype=notGeneratedValue +com.franciaflex.magalie.persistence.entity.RequestedArticle.class.stereotype=notGeneratedValue +com.franciaflex.magalie.persistence.entity.RequestedList.class.stereotype=notGeneratedValue +com.franciaflex.magalie.persistence.entity.StoredArticle.class.stereotype=notGeneratedValue +com.franciaflex.magalie.persistence.entity.Supplier.class.stereotype=notGeneratedValue +com.franciaflex.magalie.persistence.entity.Warehouse.class.stereotype=notGeneratedValue