Index: src/main/java/com/napa/pulse/dao/impl/MajorAccountSiteDAOImpl.java =================================================================== diff -u -r647bee08d0156bddecb02ac9277d382c91245b35 -rb8a5ab967d445a2351975a4a420103a3c331dada --- src/main/java/com/napa/pulse/dao/impl/MajorAccountSiteDAOImpl.java (.../MajorAccountSiteDAOImpl.java) (revision 647bee08d0156bddecb02ac9277d382c91245b35) +++ src/main/java/com/napa/pulse/dao/impl/MajorAccountSiteDAOImpl.java (.../MajorAccountSiteDAOImpl.java) (revision b8a5ab967d445a2351975a4a420103a3c331dada) @@ -109,7 +109,7 @@ } @Override - public void updateSitesMajorAcccount(Long[] siteIds, Long invCollTemplateId) { + public void updateSitesMajorAccount(Long[] siteIds, Long invCollTemplateId) { NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(jdbcTemplate); MapSqlParameterSource parameters = new MapSqlParameterSource(); parameters.addValue("invCollTemplateId", invCollTemplateId); Index: src/main/java/com/napa/pulse/dao/impl/ParametersDAOImpl.java =================================================================== diff -u -rd5ba118de982d4833be1be9845e0a80ada95008d -rb8a5ab967d445a2351975a4a420103a3c331dada --- src/main/java/com/napa/pulse/dao/impl/ParametersDAOImpl.java (.../ParametersDAOImpl.java) (revision d5ba118de982d4833be1be9845e0a80ada95008d) +++ src/main/java/com/napa/pulse/dao/impl/ParametersDAOImpl.java (.../ParametersDAOImpl.java) (revision b8a5ab967d445a2351975a4a420103a3c331dada) @@ -148,10 +148,10 @@ } /* (non-Javadoc) - * @see com.napa.pulse.dao.interfaces.ParametersDAO#loadSiteParamForHierachyIds(int, int) + * @see com.napa.pulse.dao.interfaces.ParametersDAO#loadSiteParamForHierarchyIds(int, int) */ @Override - public List loadSiteParamForHierachyIds(int siteId, Integer[] nodeIds, Integer sessionId) { + public List loadSiteParamForHierarchyIds(int siteId, Integer[] nodeIds, Integer sessionId) { Map ptsRecommendations = commonService.getPTSRecommendations(); Index: src/main/java/com/napa/pulse/dao/interfaces/AcoDAO.java =================================================================== diff -u -r3985830da990714ff02eaf811201524792b5f8d7 -rb8a5ab967d445a2351975a4a420103a3c331dada --- src/main/java/com/napa/pulse/dao/interfaces/AcoDAO.java (.../AcoDAO.java) (revision 3985830da990714ff02eaf811201524792b5f8d7) +++ src/main/java/com/napa/pulse/dao/interfaces/AcoDAO.java (.../AcoDAO.java) (revision b8a5ab967d445a2351975a4a420103a3c331dada) @@ -1,35 +1,36 @@ package com.napa.pulse.dao.interfaces; -import java.util.List; - import com.napa.pulse.dto.AcoCoverageData; import com.napa.pulse.dto.AcoDashboardData; import com.napa.pulse.dto.AcoReviewPageData; import com.napa.pulse.dto.AcoValidation; +import java.util.List; + public interface AcoDAO { - void xferBlendingData(int sessionId, int siteId, int hierarchyId) throws Exception; - - AcoValidation acoValidationChecks(Integer[] sites); - - void updateSiteHierarchy(int siteId, int hierarchyId, int status, int userId); - - void updateACOSlider(int sessionId, int siteId, int hierarchyId, double offset); - - void acoChangeLineStatus(int siteId, int parentId, int hierarchyId, String statusCode); - - List getAcoDashboardList(int sessionId, int siteId, String nodeIds); - - List getAcoCoverageData(int sessionId, int siteId, String nodeIds); - - void updateAcoSessionStatus(int sessionId, int hierarchyId, int acoStatusId); - - List getAcoReviewTableData(int sessionId, int siteId, int pageNumber, int recordsPerPage); - - int getAcoReviewTableDataCnt(int sessionId, int siteId); - - void updateOrder(int sessionId, int siteId, int productId, int orderQty); - - void updateKeep(int sessionId, int siteId, int productId, int keepQty); -} + void xferBlendingData(int sessionId, int siteId, int hierarchyId) throws Exception; + + AcoValidation acoValidationChecks(Integer[] sites); + + void updateSiteHierarchy(int siteId, int hierarchyId, int status, int userId); + + void updateACOSlider(int sessionId, int siteId, int hierarchyId, double offset); + + void acoChangeLineStatus(int siteId, int parentId, int hierarchyId, String statusCode); + + List getAcoDashboardList(int sessionId, int siteId, String nodeIds); + + List getAcoCoverageData(int sessionId, int siteId, String nodeIds); + + void updateAcoSessionStatus(int sessionId, int hierarchyId, int acoStatusId); + + List getAcoReviewTableData(int sessionId, int siteId, int pageNumber, int recordsPerPage); + + int getAcoReviewTableDataCnt(int sessionId, int siteId); + + void updateOrder(int sessionId, int siteId, int productId, int orderQty); + + void updateKeep(int sessionId, int siteId, int productId, int keepQty); + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/dao/interfaces/AdHocRefreshDAO.java =================================================================== diff -u -r06afce5c6766e4a201850c86ad997c159e6290f1 -rb8a5ab967d445a2351975a4a420103a3c331dada --- src/main/java/com/napa/pulse/dao/interfaces/AdHocRefreshDAO.java (.../AdHocRefreshDAO.java) (revision 06afce5c6766e4a201850c86ad997c159e6290f1) +++ src/main/java/com/napa/pulse/dao/interfaces/AdHocRefreshDAO.java (.../AdHocRefreshDAO.java) (revision b8a5ab967d445a2351975a4a420103a3c331dada) @@ -1,51 +1,53 @@ -/** - * - */ package com.napa.pulse.dao.interfaces; -import java.text.ParseException; -import java.util.List; -import java.util.Map; - import com.napa.pulse.dto.AdhocRefreshStatus; import com.napa.pulse.entity.security.User; import com.napa.pulse.exception.PulseException; +import java.util.List; +import java.util.Map; + /** * @author Tathagata - * */ public interface AdHocRefreshDAO { - /** - * @param user - * @param sites - * @param reasonId - * @param environment - * @param requestorId - * @return - * @throws PulseException - * @throws ParseException - */ - Integer runAdHocRefresh(User user, Integer[] sites, Integer reasonId, String environment, - Integer requestorId) throws PulseException; + /** + * @param user + * @param sites + * @param reasonId + * @param environment + * @param requestorId + * @return + * @throws PulseException + */ + Integer runAdHocRefresh(User user, Integer[] sites, Integer reasonId, String environment, Integer requestorId) + throws PulseException; - /** - * @return - * @throws PulseException - */ - List> getStateOfQueue(User user) throws PulseException; + /** + * @param user + * @return + * @throws PulseException + */ + List> getStateOfQueue(User user) throws PulseException; - /** - * @return - * @throws PulseException - */ - Boolean restrictedWindow() throws PulseException; + /** + * @return + * @throws PulseException + */ + Boolean restrictedWindow() throws PulseException; - /** - * @return - */ - AdhocRefreshStatus getRefreshStatus(int siteCount) throws PulseException; - - void updateSvcStatus(int requestId, String status); -} + /** + * @param siteCount + * @return + * @throws PulseException + */ + AdhocRefreshStatus getRefreshStatus(int siteCount) throws PulseException; + + /** + * @param requestId + * @param status + */ + void updateSvcStatus(int requestId, String status); + +} \ No newline at end of file FishEye: Tag b8a5ab967d445a2351975a4a420103a3c331dada refers to a dead (removed) revision in file `src/main/java/com/napa/pulse/dao/interfaces/AppExceptionDao.java'. FishEye: No comparison available. Pass `N' to diff? Index: src/main/java/com/napa/pulse/dao/interfaces/FeatureAccessDAO.java =================================================================== diff -u -r02dc98b890901f842c0bab7fa03fe6e7ec65e03c -rb8a5ab967d445a2351975a4a420103a3c331dada --- src/main/java/com/napa/pulse/dao/interfaces/FeatureAccessDAO.java (.../FeatureAccessDAO.java) (revision 02dc98b890901f842c0bab7fa03fe6e7ec65e03c) +++ src/main/java/com/napa/pulse/dao/interfaces/FeatureAccessDAO.java (.../FeatureAccessDAO.java) (revision b8a5ab967d445a2351975a4a420103a3c331dada) @@ -1,31 +1,34 @@ package com.napa.pulse.dao.interfaces; +import com.napa.pulse.dto.ActionResult; + import java.util.List; import java.util.Map; -import com.napa.pulse.dto.ActionResult; - public interface FeatureAccessDAO { - - /** - * - * @return - */ - List> getAccessItems(); - - /** - * - * @return - */ - List> getRoleAccess(); - - /** - * - * @param accessItemId - * @param roleIdsArray - * @return - */ - ActionResult updateFeatureAccess(Integer accessItemId, Integer[] roleIdsArray); - ActionResult updateItemStatus(Integer accessItemId, String statusCode); -} + /** + * @return + */ + List> getAccessItems(); + + /** + * @return + */ + List> getRoleAccess(); + + /** + * @param accessItemId + * @param roleIdsArray + * @return + */ + ActionResult updateFeatureAccess(Integer accessItemId, Integer[] roleIdsArray); + + /** + * @param accessItemId + * @param statusCode + * @return + */ + ActionResult updateItemStatus(Integer accessItemId, String statusCode); + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/dao/interfaces/LoginDAO.java =================================================================== diff -u -r2e80f396c9f148c045cb5c736dc137f67b6c1ebe -rb8a5ab967d445a2351975a4a420103a3c331dada --- src/main/java/com/napa/pulse/dao/interfaces/LoginDAO.java (.../LoginDAO.java) (revision 2e80f396c9f148c045cb5c736dc137f67b6c1ebe) +++ src/main/java/com/napa/pulse/dao/interfaces/LoginDAO.java (.../LoginDAO.java) (revision b8a5ab967d445a2351975a4a420103a3c331dada) @@ -4,5 +4,6 @@ public interface LoginDAO { - void addUserLoginRecord(UserLoginRecord record); -} + void addUserLoginRecord(UserLoginRecord record); + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/dao/interfaces/MIOExternalDAO.java =================================================================== diff -u -rfab91e28e659471aec6b27f5278652da26cc2667 -rb8a5ab967d445a2351975a4a420103a3c331dada --- src/main/java/com/napa/pulse/dao/interfaces/MIOExternalDAO.java (.../MIOExternalDAO.java) (revision fab91e28e659471aec6b27f5278652da26cc2667) +++ src/main/java/com/napa/pulse/dao/interfaces/MIOExternalDAO.java (.../MIOExternalDAO.java) (revision b8a5ab967d445a2351975a4a420103a3c331dada) @@ -6,5 +6,6 @@ public interface MIOExternalDAO { - List> getMIOReturnData(Date targetDt) throws Exception; -} + List> getMIOReturnData(Date targetDt) throws Exception; + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/dao/interfaces/MajorAccountSiteDAO.java =================================================================== diff -u -r03563aacf47cbe55e38cb27650d618c6ad8340bf -rb8a5ab967d445a2351975a4a420103a3c331dada --- src/main/java/com/napa/pulse/dao/interfaces/MajorAccountSiteDAO.java (.../MajorAccountSiteDAO.java) (revision 03563aacf47cbe55e38cb27650d618c6ad8340bf) +++ src/main/java/com/napa/pulse/dao/interfaces/MajorAccountSiteDAO.java (.../MajorAccountSiteDAO.java) (revision b8a5ab967d445a2351975a4a420103a3c331dada) @@ -1,21 +1,21 @@ package com.napa.pulse.dao.interfaces; -import java.sql.SQLException; - import com.napa.pulse.dto.MajorAccountSiteDTO; import com.napa.pulse.dto.SiteInvCollTemplate; import com.napa.pulse.entity.security.User; +import java.sql.SQLException; + public interface MajorAccountSiteDAO { + int createSite(User user, MajorAccountSiteDTO site) throws Exception; - int createSite(User user, MajorAccountSiteDTO site) throws Exception; + void updateSite(User user, MajorAccountSiteDTO site); - void updateSite(User user, MajorAccountSiteDTO site); + MajorAccountSiteDTO getSiteDetails(long siteId); - MajorAccountSiteDTO getSiteDetails(long siteId); + void updateSitesMajorAccount(Long[] siteIds, Long investmentCollectionTemplateId); - void updateSitesMajorAcccount(Long[] siteIds, Long investmentCollectionTemplateId); + Iterable getInvCollTemplatesForSites(Integer[] siteIds) throws SQLException; - Iterable getInvCollTemplatesForSites(Integer[] siteIds) throws SQLException; -} +} \ No newline at end of file Index: src/main/java/com/napa/pulse/dao/interfaces/MarketSelectionDAO.java =================================================================== diff -u -r2e80f396c9f148c045cb5c736dc137f67b6c1ebe -rb8a5ab967d445a2351975a4a420103a3c331dada --- src/main/java/com/napa/pulse/dao/interfaces/MarketSelectionDAO.java (.../MarketSelectionDAO.java) (revision 2e80f396c9f148c045cb5c736dc137f67b6c1ebe) +++ src/main/java/com/napa/pulse/dao/interfaces/MarketSelectionDAO.java (.../MarketSelectionDAO.java) (revision b8a5ab967d445a2351975a4a420103a3c331dada) @@ -1,27 +1,28 @@ package com.napa.pulse.dao.interfaces; +import com.napa.pulse.dto.ZipcodeDTO; + import java.util.List; import java.util.Map; -import com.napa.pulse.dto.ZipcodeDTO; - public interface MarketSelectionDAO { - List> getTop100AppsList(Integer siteId); - - List> getAllZipCodeDetails(Integer siteId) throws Exception; - - List> getSiteCoordinatesForSession(Integer sessionId); - - List> getSessionTop100AppsList(Integer sessionId, Integer siteId); - - List> getTop100AppsList(String[] zipCodes); - - List> getSessionAllZipCodeDetails(Integer sessionId, Integer siteId) throws Exception; - - List> getSiteCoordinates(Integer[] list); + List> getTop100AppsList(Integer siteId); - List validateZipcodes(String[] list) throws Exception; + List> getAllZipCodeDetails(Integer siteId) throws Exception; - void updateZipcode(Integer siteId, String[] list); -} + List> getSiteCoordinatesForSession(Integer sessionId); + + List> getSessionTop100AppsList(Integer sessionId, Integer siteId); + + List> getTop100AppsList(String[] zipCodes); + + List> getSessionAllZipCodeDetails(Integer sessionId, Integer siteId) throws Exception; + + List> getSiteCoordinates(Integer[] list); + + List validateZipcodes(String[] list) throws Exception; + + void updateZipcode(Integer siteId, String[] list); + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/dao/interfaces/MessagesDAO.java =================================================================== diff -u -r12591950ace19045c6c8d0e271f58d59888b1df7 -rb8a5ab967d445a2351975a4a420103a3c331dada --- src/main/java/com/napa/pulse/dao/interfaces/MessagesDAO.java (.../MessagesDAO.java) (revision 12591950ace19045c6c8d0e271f58d59888b1df7) +++ src/main/java/com/napa/pulse/dao/interfaces/MessagesDAO.java (.../MessagesDAO.java) (revision b8a5ab967d445a2351975a4a420103a3c331dada) @@ -1,64 +1,62 @@ package com.napa.pulse.dao.interfaces; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - import com.napa.pulse.dto.ActionResult; import com.napa.pulse.dto.ImagesDTO; import com.napa.pulse.dto.MessageTextDTO; import com.napa.pulse.dto.Messages; import com.napa.pulse.entity.security.User; +import javax.servlet.http.HttpServletRequest; +import java.util.List; +import java.util.Map; + /** * @author Diana Ivan - * */ public interface MessagesDAO { - - /** - * @return - */ - List> getMessagesTypes(); - - /** - * @param userId - * @param messageId - * @param starred - * @param deleted - * @param read - * @return - */ - int updateMessageFlags(Integer userId, Integer messageId, Boolean starred, Boolean deleted, Boolean read); - - /** - * @param toUserId - * @return - */ - List getMessageDetails(User toUserId); - - /** - * @param messages - * @return - */ - ActionResult publishMessage(Messages messages); - /** - * @return - */ - List getAllUsers(); - - /** - * @param request - * @return - */ - ImagesDTO getImages(HttpServletRequest request); - - /** - * - * @param msgTxtId - * @return - */ - MessageTextDTO getMessageText(int msgTxtId); -} + /** + * @return + */ + List> getMessagesTypes(); + + /** + * @param userId + * @param messageId + * @param starred + * @param deleted + * @param read + * @return + */ + int updateMessageFlags(Integer userId, Integer messageId, Boolean starred, Boolean deleted, Boolean read); + + /** + * @param toUserId + * @return + */ + List getMessageDetails(User toUserId); + + /** + * @param messages + * @return + */ + ActionResult publishMessage(Messages messages); + + /** + * @return + */ + List getAllUsers(); + + /** + * @param request + * @return + */ + ImagesDTO getImages(HttpServletRequest request); + + /** + * @param msgTxtId + * @return + */ + MessageTextDTO getMessageText(int msgTxtId); + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/dao/interfaces/NicheStockingDAO.java =================================================================== diff -u -rf43afa853378a7b68afc7aac57054e3608f0494e -rb8a5ab967d445a2351975a4a420103a3c331dada --- src/main/java/com/napa/pulse/dao/interfaces/NicheStockingDAO.java (.../NicheStockingDAO.java) (revision f43afa853378a7b68afc7aac57054e3608f0494e) +++ src/main/java/com/napa/pulse/dao/interfaces/NicheStockingDAO.java (.../NicheStockingDAO.java) (revision b8a5ab967d445a2351975a4a420103a3c331dada) @@ -1,25 +1,21 @@ -/** - * - */ package com.napa.pulse.dao.interfaces; -import java.util.List; - import com.napa.pulse.dto.NicheCategoryDTO; import com.napa.pulse.dto.NicheCategoryHierarchyDTO; import com.napa.pulse.dto.NicheStockingDTO; import com.napa.pulse.entity.security.User; import com.napa.pulse.exception.PulseException; +import java.util.List; + /** * @author PCTR98154 - * */ public interface NicheStockingDAO { - List getNicheStockingSite(int siteId, User user); - - void updateNicheStockingSite(Integer siteId, NicheCategoryDTO[] nicheArray, NicheCategoryHierarchyDTO[] hierarchyArray) - throws PulseException; + List getNicheStockingSite(int siteId, User user); -} + void updateNicheStockingSite(Integer siteId, NicheCategoryDTO[] nicheArray, + NicheCategoryHierarchyDTO[] hierarchyArray) throws PulseException; + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/dao/interfaces/OrderMultipleSitesDAO.java =================================================================== diff -u -rf43afa853378a7b68afc7aac57054e3608f0494e -rb8a5ab967d445a2351975a4a420103a3c331dada --- src/main/java/com/napa/pulse/dao/interfaces/OrderMultipleSitesDAO.java (.../OrderMultipleSitesDAO.java) (revision f43afa853378a7b68afc7aac57054e3608f0494e) +++ src/main/java/com/napa/pulse/dao/interfaces/OrderMultipleSitesDAO.java (.../OrderMultipleSitesDAO.java) (revision b8a5ab967d445a2351975a4a420103a3c331dada) @@ -4,7 +4,7 @@ import com.napa.pulse.exception.PulseException; public interface OrderMultipleSitesDAO { - void updateOrderQty(OrderMultipleSitesDto oms) throws PulseException; + void updateOrderQty(OrderMultipleSitesDto oms) throws PulseException; -} +} \ No newline at end of file Index: src/main/java/com/napa/pulse/dao/interfaces/ParametersDAO.java =================================================================== diff -u -rd5ba118de982d4833be1be9845e0a80ada95008d -rb8a5ab967d445a2351975a4a420103a3c331dada --- src/main/java/com/napa/pulse/dao/interfaces/ParametersDAO.java (.../ParametersDAO.java) (revision d5ba118de982d4833be1be9845e0a80ada95008d) +++ src/main/java/com/napa/pulse/dao/interfaces/ParametersDAO.java (.../ParametersDAO.java) (revision b8a5ab967d445a2351975a4a420103a3c331dada) @@ -1,46 +1,54 @@ package com.napa.pulse.dao.interfaces; -import java.util.List; -import java.util.Map; - import com.napa.pulse.dto.ParameterStatDataDTO; import com.napa.pulse.dto.SiteParameterDTO; import com.napa.pulse.entity.pulseui.HierarchyItem; import com.napa.pulse.entity.security.User; import com.napa.pulse.exception.PulseException; +import java.util.List; +import java.util.Map; + /** * Handles communication with the underlying persistence system (DB). * Executes CRUD operations for parameters page + * * @author Diana Ivan * Created: Dec 10, 2014 */ public interface ParametersDAO { - - Map getHierarchyTree(User user); - List getLevel4ChildrenBySite(int node, int siteId, User user); - - List loadSiteParamForHierachyIds(int siteId, Integer[] nodeArray, Integer sessionId); - - // methods to save the updated param values - void saveSliderValue(int siteId, int nodeId, Integer sessionId, float newOffset, int userId) throws PulseException; - void revertToRecommended(int siteId, int nodeId, Integer sessionId, int userId) throws PulseException; - List> getBarChartData(int siteId, int nodeId); - void linkToParent(int siteId, int nodeId, Integer sessionId, int userId) throws PulseException; - void linkAllChildren(int siteId, int nodeId, Integer sessionId, int userId) throws PulseException; - void unlinkFromParent(int siteId, int nodeId, int userId) throws PulseException; - Map doNotStock(int nodeId, int siteId, boolean doNotStock, Integer sessionId, int userId) throws PulseException; - - ParameterStatDataDTO loadStatDataForHierarchyId(int siteId, int nodeId, Integer sessionId); - - List loadStatDataForHierarchyIds(int siteId, Integer[] nodeArray,Integer sessionId); - - void updateIgnoreStock(User user, int siteId, int nodeId, int period, Integer sessionId) throws PulseException; - - void unreviewedHierarchy(int siteId, int nodeId, Integer sessionId) throws PulseException; - - void updateGlobalIgnoreStock(int siteId, int isp) throws PulseException; - - void resetAllToRecommended(int siteId) throws PulseException; -} + Map getHierarchyTree(User user); + + List getLevel4ChildrenBySite(int node, int siteId, User user); + + List loadSiteParamForHierarchyIds(int siteId, Integer[] nodeArray, Integer sessionId); + + // methods to save the updated param values + void saveSliderValue(int siteId, int nodeId, Integer sessionId, float newOffset, int userId) throws PulseException; + + void revertToRecommended(int siteId, int nodeId, Integer sessionId, int userId) throws PulseException; + + List> getBarChartData(int siteId, int nodeId); + + void linkToParent(int siteId, int nodeId, Integer sessionId, int userId) throws PulseException; + + void linkAllChildren(int siteId, int nodeId, Integer sessionId, int userId) throws PulseException; + + void unlinkFromParent(int siteId, int nodeId, int userId) throws PulseException; + + Map doNotStock(int nodeId, int siteId, boolean doNotStock, Integer sessionId, int userId) throws PulseException; + + ParameterStatDataDTO loadStatDataForHierarchyId(int siteId, int nodeId, Integer sessionId); + + List loadStatDataForHierarchyIds(int siteId, Integer[] nodeArray, Integer sessionId); + + void updateIgnoreStock(User user, int siteId, int nodeId, int period, Integer sessionId) throws PulseException; + + void unreviewedHierarchy(int siteId, int nodeId, Integer sessionId) throws PulseException; + + void updateGlobalIgnoreStock(int siteId, int isp) throws PulseException; + + void resetAllToRecommended(int siteId) throws PulseException; + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/dao/interfaces/ProductGroupDAO.java =================================================================== diff -u -ra850f5724ef12baace2d91c332662b9f98e9de84 -rb8a5ab967d445a2351975a4a420103a3c331dada --- src/main/java/com/napa/pulse/dao/interfaces/ProductGroupDAO.java (.../ProductGroupDAO.java) (revision a850f5724ef12baace2d91c332662b9f98e9de84) +++ src/main/java/com/napa/pulse/dao/interfaces/ProductGroupDAO.java (.../ProductGroupDAO.java) (revision b8a5ab967d445a2351975a4a420103a3c331dada) @@ -1,31 +1,40 @@ package com.napa.pulse.dao.interfaces; -import java.util.List; -import java.util.Map; - import com.napa.pulse.dto.ProductGroupDTO; import com.napa.pulse.dto.ProductGroupHierarchy; import com.napa.pulse.entity.pulseui.HierarchyItem; import com.napa.pulse.entity.pulseui.ProductGroupType; import com.napa.pulse.entity.security.User; +import java.util.List; +import java.util.Map; + public interface ProductGroupDAO { - List getProductGroups(Integer userId); - Map getProductsByGroup(Integer groupId, User user); - Map getFullHierarchy(User user); - - boolean isProductGroupForUser(Integer userId, Integer groupId); - List getProductGroupTypes(User user); - - Integer create(Integer userId, String groupName, Integer productGroupTypeId, List listOfHierarchies); - - void addProductsToGroup(Integer userId, Integer groupId, List newListOfHierarchies); - boolean checkProductGroupExists(String groupName, Integer userId); - void saveKeyline(Integer userId, Integer siteId, List hierarchyIdList); - Map getKeyline(Integer siteId, User user); - void deleteProductGrp(Integer productGroupId); - - void updateProductGroup(Integer userId, Integer productGroupId, String newGroupName, Boolean newGlobalFlag); - void updateProductGroupMapping(Integer productGroupId, List newListOfHierarchies); -} + List getProductGroups(Integer userId); + + Map getProductsByGroup(Integer groupId, User user); + + Map getFullHierarchy(User user); + + boolean isProductGroupForUser(Integer userId, Integer groupId); + + List getProductGroupTypes(User user); + + Integer create(Integer userId, String groupName, Integer productGroupTypeId, List listOfHierarchies); + + void addProductsToGroup(Integer userId, Integer groupId, List newListOfHierarchies); + + boolean checkProductGroupExists(String groupName, Integer userId); + + void saveKeyline(Integer userId, Integer siteId, List hierarchyIdList); + + Map getKeyline(Integer siteId, User user); + + void deleteProductGrp(Integer productGroupId); + + void updateProductGroup(Integer userId, Integer productGroupId, String newGroupName, Boolean newGlobalFlag); + + void updateProductGroupMapping(Integer productGroupId, List newListOfHierarchies); + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/dao/interfaces/PulseUtilityDao.java =================================================================== diff -u -r2e80f396c9f148c045cb5c736dc137f67b6c1ebe -rb8a5ab967d445a2351975a4a420103a3c331dada --- src/main/java/com/napa/pulse/dao/interfaces/PulseUtilityDao.java (.../PulseUtilityDao.java) (revision 2e80f396c9f148c045cb5c736dc137f67b6c1ebe) +++ src/main/java/com/napa/pulse/dao/interfaces/PulseUtilityDao.java (.../PulseUtilityDao.java) (revision b8a5ab967d445a2351975a4a420103a3c331dada) @@ -1,27 +1,23 @@ -/** - * - */ package com.napa.pulse.dao.interfaces; import java.sql.SQLException; import java.util.Map; /** * @author PCTR98154 - * */ public interface PulseUtilityDao { - /** - * @return - * @throws SQLException - */ - Map getConnectionStats() throws SQLException; + /** + * @return + * @throws SQLException + */ + Map getConnectionStats() throws SQLException; - /** - * @return - * @throws SQLException - */ - boolean healthCheck() throws SQLException; + /** + * @return + * @throws SQLException + */ + boolean healthCheck() throws SQLException; -} +} \ No newline at end of file Index: src/main/java/com/napa/pulse/dao/interfaces/ReportsDAO.java =================================================================== diff -u -r47001b70e8fa8e1ba24a282cfb3d628c2442f490 -rb8a5ab967d445a2351975a4a420103a3c331dada --- src/main/java/com/napa/pulse/dao/interfaces/ReportsDAO.java (.../ReportsDAO.java) (revision 47001b70e8fa8e1ba24a282cfb3d628c2442f490) +++ src/main/java/com/napa/pulse/dao/interfaces/ReportsDAO.java (.../ReportsDAO.java) (revision b8a5ab967d445a2351975a4a420103a3c331dada) @@ -1,15 +1,17 @@ package com.napa.pulse.dao.interfaces; -import java.util.List; - import com.napa.pulse.dto.ReportsDTO; import com.napa.pulse.entity.security.User; +import java.util.List; + public interface ReportsDAO { - /** - * @return - */ - List getReports(User user); -} + /** + * @param user + * @return + */ + List getReports(User user); + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/dao/interfaces/ReviewDAO.java =================================================================== diff -u -r12591950ace19045c6c8d0e271f58d59888b1df7 -rb8a5ab967d445a2351975a4a420103a3c331dada --- src/main/java/com/napa/pulse/dao/interfaces/ReviewDAO.java (.../ReviewDAO.java) (revision 12591950ace19045c6c8d0e271f58d59888b1df7) +++ src/main/java/com/napa/pulse/dao/interfaces/ReviewDAO.java (.../ReviewDAO.java) (revision b8a5ab967d445a2351975a4a420103a3c331dada) @@ -1,6 +1,3 @@ -/** - * - */ package com.napa.pulse.dao.interfaces; import com.napa.pulse.dto.ActionResult; @@ -15,29 +12,25 @@ /** * @author Tathagata - * + *

* Created 05/12/2015 - * */ public interface ReviewDAO { /** - * * @param skuTableWidgetData * @param user * @return */ List> getSKUTableData(SKUTableWidgetData skuTableWidgetData, User user); /** - * * @param skuTableWidgetData * @return */ List> getSKUTableDataCount(SKUTableWidgetData skuTableWidgetData); /** - * * @param sessionId * @param productId * @param siteId @@ -76,7 +69,6 @@ List> getProductImageUrl(int productId); /** - * * @param user * @param sessionId * @param siteId @@ -98,7 +90,6 @@ boolean isSimilarPartEdit) throws PulseException; /** - * * @param user * @param mapFlag * @param sessionId @@ -112,7 +103,6 @@ Integer productId, Integer vehicleCount) throws PulseException; /** - * * @param userId * @param mapFlag * @param sessionId @@ -126,22 +116,19 @@ Integer productId, Integer vehicleCount) throws PulseException; /** - * * @param siteId * @param productId * @return */ List> getVehicleRegistrationTab(int siteId, int productId); /** - * * @param productId * @return */ List> getVehicleApplicationRegistrationTab(int productId); /** - * * @param siteId * @param productId * @return @@ -155,7 +142,6 @@ List> getTopThreeFactors(int productId, int siteId, User user); /** - * * @param user * @param sessionId * @param productId @@ -165,7 +151,6 @@ Integer productId); /** - * * @param user * @param sessionId * @param productId @@ -175,7 +160,6 @@ Integer productId); /** - * * @param sessionId * @param skuListArr * @return @@ -184,14 +168,12 @@ SkuList[] skuListArr); /** - * * @param skuTableWidgetData * @return */ ActionResultItem>> updateSkuTableWidgetSetReviewedFilter(SKUTableWidgetData skuTableWidgetData); /** - * * @param sessionId * @param siteId * @param productId @@ -202,7 +184,6 @@ Integer vehicleCount, boolean f); /** - * * @param sessionId * @param siteId * @param productId @@ -213,10 +194,9 @@ Integer vehicleCount, boolean f); /** - * * @param productId * @return */ List> getProductDimension(int productId); -} +} \ No newline at end of file Index: src/main/java/com/napa/pulse/dao/interfaces/SessionAnalysisDAO.java =================================================================== diff -u -r2e80f396c9f148c045cb5c736dc137f67b6c1ebe -rb8a5ab967d445a2351975a4a420103a3c331dada --- src/main/java/com/napa/pulse/dao/interfaces/SessionAnalysisDAO.java (.../SessionAnalysisDAO.java) (revision 2e80f396c9f148c045cb5c736dc137f67b6c1ebe) +++ src/main/java/com/napa/pulse/dao/interfaces/SessionAnalysisDAO.java (.../SessionAnalysisDAO.java) (revision b8a5ab967d445a2351975a4a420103a3c331dada) @@ -1,27 +1,28 @@ package com.napa.pulse.dao.interfaces; -import java.util.List; -import java.util.Map; - import com.napa.pulse.dto.SessAnalysisStockingCatagoryDTO; import com.napa.pulse.dto.SessionAnalysisReturnBreakdownDTO; import com.napa.pulse.entity.security.User; +import java.util.List; +import java.util.Map; + public interface SessionAnalysisDAO { - Integer getExpensiveItem(Integer sessionId); - - List> getRedUnlinkSliderCount(Integer sessionId); - - SessAnalysisStockingCatagoryDTO getStockingCatagoryCount(Integer sessionId); - - Integer getLargeOrderQty(Integer sessionId); - - List> getHighSkuEdit(User user, Integer sessionId); + Integer getExpensiveItem(Integer sessionId); - List> getNicheStockingCategory(User user, Integer sessionId); - - List> getPotentialHub(Integer sessionId); - - List getReturnBreakdown(Integer sessionId); -} + List> getRedUnlinkSliderCount(Integer sessionId); + + SessAnalysisStockingCatagoryDTO getStockingCatagoryCount(Integer sessionId); + + Integer getLargeOrderQty(Integer sessionId); + + List> getHighSkuEdit(User user, Integer sessionId); + + List> getNicheStockingCategory(User user, Integer sessionId); + + List> getPotentialHub(Integer sessionId); + + List getReturnBreakdown(Integer sessionId); + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/dao/interfaces/SessionDAO.java =================================================================== diff -u -r8763519f7c64a6399dceb925c8e0fce447949d06 -rb8a5ab967d445a2351975a4a420103a3c331dada --- src/main/java/com/napa/pulse/dao/interfaces/SessionDAO.java (.../SessionDAO.java) (revision 8763519f7c64a6399dceb925c8e0fce447949d06) +++ src/main/java/com/napa/pulse/dao/interfaces/SessionDAO.java (.../SessionDAO.java) (revision b8a5ab967d445a2351975a4a420103a3c331dada) @@ -1,6 +1,3 @@ -/** - * - */ package com.napa.pulse.dao.interfaces; import com.napa.pulse.dto.*; @@ -16,12 +13,10 @@ /** * @author TATHA - * */ public interface SessionDAO { /** - * * @param statusTypes * @param siteIds * @param siteGroups @@ -39,29 +34,25 @@ User user, String userAccessSites, String[] finalizeDateArray) throws Exception; /** - * * @param user * @param userAccessSites * @return */ List> getAllSessions(User user, String userAccessSites); /** - * * @param siteGroupId * @return */ String getSiteGroupName(int siteGroupId); /** - * * @param siteId * @return */ String getSiteName(int siteId); /** - * * @param transmissionId * @param type * @param newStatus @@ -108,7 +99,6 @@ List> getSessionSiteList(User user, String userAccessSites); /** - * * @param sessionId * @param siteId * @param user @@ -123,7 +113,6 @@ List> getSessionSiteGroupList(Integer userId); /** - * * @param userId * @param perCarOrder * @param includeFleets @@ -170,7 +159,6 @@ void finalizeSession(Integer userId, Integer sessionId, Transmission[] transmissionArray); /** - * * @param userId * @param sessionId * @param transmissionArray @@ -207,7 +195,6 @@ void updateSessionTransmissions(Integer userId, Integer sessionId, Transmission[] transmissions); /** - * * @param sessionId * @param pageNumber * @param numberOfRecordsPerPage @@ -243,7 +230,6 @@ HttpServletResponse response, User user) throws Exception; /** - * * @param sessionId * @param isReturns * @param isOrders @@ -318,7 +304,6 @@ List> getSessonOrderReturnTotalsDetails(int sessionId); /** - * * @param sessionId * @param isOrders * @param isReturns @@ -334,6 +319,7 @@ /** * Returns the first level only of hierarchical names in a session + * * @param sessionId * @param user * @return @@ -342,6 +328,7 @@ /** * Returns the N level of hierarchical (not first) names in a session + * * @param sessionId * @param hierarchyId * @param user @@ -384,15 +371,13 @@ */ List getSessionSiteParameters(Integer sessionId, Integer siteId, Integer[] nodeIds); - /** * @param sessionId * @param user * @return */ String getSessionState(Integer sessionId, User user); - /** * @param sessionId * @param userId @@ -408,7 +393,6 @@ */ boolean validateUserSessionAccess(Integer sessionId, Integer userId, String userAccessSites); - /** * @param siteGroupObj * @param userAccessSites @@ -445,7 +429,6 @@ List> getProductGroupsForSession(Integer sessionId); /** - * * @param sessionId * @return */ @@ -465,21 +448,18 @@ List> getExecutiveSummaryData(int sessionId); /** - * * @param sessionId * @return */ List> getCustomSkuSessionProducts(int sessionId); /** - * * @param sessionId * @return */ List> getCubicFeet(int sessionId); /** - * * @param sessionId * @param requestDatesArr * @param messageText @@ -489,7 +469,6 @@ ActionResult requestFinalizeSession(int sessionId, RequestDatesDTO[] requestDatesArr, String messageText, User user); /** - * * @param sessionId * @param reasonText * @param userId @@ -498,36 +477,31 @@ ActionResult rejectFinalizeSession(int sessionId, String reasonText, int userId); /** - * * @param sessionId * @return */ SessionModificationInfoDTO wasSessionModified(int sessionId); /** - * * @param sessionId * @return * @throws Exception */ void updateSession(int sessionId) throws Exception; /** - * * @param sessionId * @return */ List getSessionTransmissionStatus(Integer sessionId); /** - * * @param user * @return */ List getFailedTransmissions(User user); /** - * * @param sessionId * @param siteId * @param hierarchyId @@ -536,7 +510,6 @@ void updateSession(int sessionId, int siteId, int hierarchyId) throws Exception; /** - * * @param user * @param sessionId * @param userAccessSites @@ -546,14 +519,12 @@ BigDecimal recreateSession(User user, Integer sessionId, String userAccessSites) throws Exception; /** - * * @param user * @return */ List getExpiringSessions(User user); /** - * * @param user * @param sessionId * @param siteId @@ -567,44 +538,38 @@ Boolean declineOrder, Boolean declineReturn) throws PulseException; /** - * * @param sessionId * @return */ boolean revertDeclineOrderReturns(int sessionId); /** - * * @param sessionId */ void createDeferredSessionImmediately(int sessionId); /** - * * @param user * @return */ SessionLimit getSessionlimits(User user); /** - * * @param sitesArray * @return */ List getSiteLimits(Integer[] sitesArray); /** - * * @param siteGroupObj * @return */ Integer[] getGroupSites(int siteGroupObj); /** - * * @param sessionId * @return */ boolean isACO(int sessionId); -} +} \ No newline at end of file Index: src/main/java/com/napa/pulse/dao/interfaces/SiteDAO.java =================================================================== diff -u -r7af2fde0a5b1a5f091b6870a46be6490a1987512 -rb8a5ab967d445a2351975a4a420103a3c331dada --- src/main/java/com/napa/pulse/dao/interfaces/SiteDAO.java (.../SiteDAO.java) (revision 7af2fde0a5b1a5f091b6870a46be6490a1987512) +++ src/main/java/com/napa/pulse/dao/interfaces/SiteDAO.java (.../SiteDAO.java) (revision b8a5ab967d445a2351975a4a420103a3c331dada) @@ -1,12 +1,12 @@ package com.napa.pulse.dao.interfaces; -import java.util.List; - import com.napa.pulse.entity.pulseui.Site; import com.napa.pulse.entity.security.User; +import java.util.List; + public interface SiteDAO { - List getUserSites(User user, String userAccessSites, int userId); + List getUserSites(User user, String userAccessSites, int userId); -} +} \ No newline at end of file Index: src/main/java/com/napa/pulse/dao/interfaces/SiteGroupDAO.java =================================================================== diff -u -r56d0e741404ef78cb4d78776474e62e23d4dda32 -rb8a5ab967d445a2351975a4a420103a3c331dada --- src/main/java/com/napa/pulse/dao/interfaces/SiteGroupDAO.java (.../SiteGroupDAO.java) (revision 56d0e741404ef78cb4d78776474e62e23d4dda32) +++ src/main/java/com/napa/pulse/dao/interfaces/SiteGroupDAO.java (.../SiteGroupDAO.java) (revision b8a5ab967d445a2351975a4a420103a3c331dada) @@ -1,44 +1,41 @@ package com.napa.pulse.dao.interfaces; -import java.util.List; -import java.util.Map; - import com.napa.pulse.entity.pulseui.SiteGroup; import com.napa.pulse.entity.security.User; +import java.util.List; +import java.util.Map; + public interface SiteGroupDAO { -// List findUserSiteGroups(Integer userId); + List> findUserSiteGroups(User user, String userAccessSites) throws Exception; - List> findUserSiteGroups(User user, String userAccessSites) throws Exception; + Integer create(SiteGroup siteGroup, String siteGroupTypeCode, List siteList); - Integer create(SiteGroup siteGroup, String siteGroupTypeCode, List siteList); + void addSitesToGroup(int siteGrpId, List unexistedList); -// List findUserGroupsByType(Integer userId, Integer typeId); + void replaceGroupSites(int siteGroupId, List siteIdList); - void addSitesToGroup(int siteGrpId, List unexistedList); + void deleteSiteGroup(int siteGroupId); - void replaceGroupSites(int siteGroupId, List siteIdList); + List> getSiteGroupsTypes(User user); - void deleteSiteGroup(int siteGroupId); - - List> getSiteGroupsTypes(User user); + List> getSitesByGroup(Integer groupId, User user, String userAccessSites, int userId) throws Exception; - List> getSitesByGroup(Integer groupId, User user, String userAccessSites, int userId) throws Exception; - - int getSiteCount(int siteGroupId, User user, String userAccessSites) throws Exception; - - List> getSiteGroupsInventorySnapShot(User user, String userAccessSites); - - List> getInventorySnapShotData(User user, String userAccessSites, int groupId); - - List> getInventorySnapShotCustomGroupData(Integer[] siteIds); + int getSiteCount(int siteGroupId, User user, String userAccessSites) throws Exception; - List> getSiteAddresses(User user, String[] siteIds); - - List> getSitesByType(User user, String siteTypeCode) throws Exception; - - boolean checkGroupNameUnique(String groupName, User user); - - void updateGroupName(Integer siteGroupId, String newSiteGroupName); -} + List> getSiteGroupsInventorySnapShot(User user, String userAccessSites); + + List> getInventorySnapShotData(User user, String userAccessSites, int groupId); + + List> getInventorySnapShotCustomGroupData(Integer[] siteIds); + + List> getSiteAddresses(User user, String[] siteIds); + + List> getSitesByType(User user, String siteTypeCode) throws Exception; + + boolean checkGroupNameUnique(String groupName, User user); + + void updateGroupName(Integer siteGroupId, String newSiteGroupName); + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/dao/interfaces/SiteQueueDAO.java =================================================================== diff -u -r6e1148e8a8b1b66a7d127a36c4fc3d3aaaaefc98 -rb8a5ab967d445a2351975a4a420103a3c331dada --- src/main/java/com/napa/pulse/dao/interfaces/SiteQueueDAO.java (.../SiteQueueDAO.java) (revision 6e1148e8a8b1b66a7d127a36c4fc3d3aaaaefc98) +++ src/main/java/com/napa/pulse/dao/interfaces/SiteQueueDAO.java (.../SiteQueueDAO.java) (revision b8a5ab967d445a2351975a4a420103a3c331dada) @@ -1,32 +1,33 @@ package com.napa.pulse.dao.interfaces; -import java.util.List; - import com.napa.pulse.dto.SiteQueueDTO; +import java.util.List; + public interface SiteQueueDAO { - int getQueueId(); - - void add(int id, int reason, int userId, String metaData); - - void add(int id, int reason, int userId); - - void addMapping(int id, int siteId); - - void addMapping(int id, int siteId, String siteIdType); - - void processing(int id); - - void completed(int id); - - void error(int id); - - String siteIsQueued(int siteId); - - String siteIsQueued(String siteList); - - String siteIsQueuedExceptSlider(int siteId); - - List getSiteQueue(); -} + int getQueueId(); + + void add(int id, int reason, int userId, String metaData); + + void add(int id, int reason, int userId); + + void addMapping(int id, int siteId); + + void addMapping(int id, int siteId, String siteIdType); + + void processing(int id); + + void completed(int id); + + void error(int id); + + String siteIsQueued(int siteId); + + String siteIsQueued(String siteList); + + String siteIsQueuedExceptSlider(int siteId); + + List getSiteQueue(); + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/dao/interfaces/SiteTypeDAO.java =================================================================== diff -u -rf43afa853378a7b68afc7aac57054e3608f0494e -rb8a5ab967d445a2351975a4a420103a3c331dada --- src/main/java/com/napa/pulse/dao/interfaces/SiteTypeDAO.java (.../SiteTypeDAO.java) (revision f43afa853378a7b68afc7aac57054e3608f0494e) +++ src/main/java/com/napa/pulse/dao/interfaces/SiteTypeDAO.java (.../SiteTypeDAO.java) (revision b8a5ab967d445a2351975a4a420103a3c331dada) @@ -1,11 +1,12 @@ package com.napa.pulse.dao.interfaces; -import java.util.List; - import com.napa.pulse.entity.pulseui.SiteType; import com.napa.pulse.entity.security.User; +import java.util.List; + public interface SiteTypeDAO { - - List findAll(User user); -} + + List findAll(User user); + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/dao/interfaces/SystemDAO.java =================================================================== diff -u -r5ad29e2f0ccc2c845c20cc8bf7ff0f4d10b9924d -rb8a5ab967d445a2351975a4a420103a3c331dada --- src/main/java/com/napa/pulse/dao/interfaces/SystemDAO.java (.../SystemDAO.java) (revision 5ad29e2f0ccc2c845c20cc8bf7ff0f4d10b9924d) +++ src/main/java/com/napa/pulse/dao/interfaces/SystemDAO.java (.../SystemDAO.java) (revision b8a5ab967d445a2351975a4a420103a3c331dada) @@ -1,29 +1,30 @@ package com.napa.pulse.dao.interfaces; -import java.util.List; - import com.napa.pulse.dto.ActionResult; import com.napa.pulse.dto.SystemStatusDTO; import com.napa.pulse.entity.pulseui.SystemCategory; import com.napa.pulse.entity.pulseui.SystemCategoryDetails; +import java.util.List; + public interface SystemDAO { - List findBySiteId(int siteId); + List findBySiteId(int siteId); - boolean assignSystemToSite(Integer siteId, Integer systemId, Boolean use); - - boolean assignSystemsToSite(Integer siteId, Integer[] systemIds, Boolean use); + boolean assignSystemToSite(Integer siteId, Integer systemId, Boolean use); - SystemCategoryDetails getSystemDetail(Integer systemId); + boolean assignSystemsToSite(Integer siteId, Integer[] systemIds, Boolean use); - boolean updateAllSiteSystems(Integer siteId, Boolean use); + SystemCategoryDetails getSystemDetail(Integer systemId); - SystemStatusDTO getStatus(Integer sessionId); - - ActionResult executeSystems(int userId, int sessionId); - - ActionResult setOutdatedStatus(Integer sessionId); - - boolean isSystems(Integer sessionId); -} + boolean updateAllSiteSystems(Integer siteId, Boolean use); + + SystemStatusDTO getStatus(Integer sessionId); + + ActionResult executeSystems(int userId, int sessionId); + + ActionResult setOutdatedStatus(Integer sessionId); + + boolean isSystems(Integer sessionId); + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/dao/interfaces/TransferDAO.java =================================================================== diff -u -re882628d94e7acee04fb43609e874affcd8c50d6 -rb8a5ab967d445a2351975a4a420103a3c331dada --- src/main/java/com/napa/pulse/dao/interfaces/TransferDAO.java (.../TransferDAO.java) (revision e882628d94e7acee04fb43609e874affcd8c50d6) +++ src/main/java/com/napa/pulse/dao/interfaces/TransferDAO.java (.../TransferDAO.java) (revision b8a5ab967d445a2351975a4a420103a3c331dada) @@ -1,26 +1,23 @@ package com.napa.pulse.dao.interfaces; +import com.napa.pulse.dto.*; + import java.util.List; -import com.napa.pulse.dto.TransferDTO; -import com.napa.pulse.dto.TransferDetailDTO; -import com.napa.pulse.dto.TransferMappingDTO; -import com.napa.pulse.dto.TransferSiteDTO; -import com.napa.pulse.dto.TransferSiteDetailsDTO; - public interface TransferDAO { - List getTransferSites(Integer[] sourceSitesArray); - - void saveTransferSites(TransferSiteDTO[] transferSitesDTOArray); - - TransferDetailDTO getTransferDetail(Integer sourceSite); + List getTransferSites(Integer[] sourceSitesArray); - void saveTransferSiteHierarchies(TransferMappingDTO[] transferMappingDTOArray); + void saveTransferSites(TransferSiteDTO[] transferSitesDTOArray); - List getTransferSiteHierarchies(Long[] sourceSitesArray); + TransferDetailDTO getTransferDetail(Integer sourceSite); - TransferSiteDetailsDTO getTransferHierarchyDetail(Integer sourceSite); + void saveTransferSiteHierarchies(TransferMappingDTO[] transferMappingDTOArray); - void deleteTransferMap(Integer transferMapId); -} + List getTransferSiteHierarchies(Long[] sourceSitesArray); + + TransferSiteDetailsDTO getTransferHierarchyDetail(Integer sourceSite); + + void deleteTransferMap(Integer transferMapId); + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/dao/interfaces/TransferMapDAO.java =================================================================== diff -u -raf96735a57ead4fc0f4121425b74d38b5656e7e4 -rb8a5ab967d445a2351975a4a420103a3c331dada --- src/main/java/com/napa/pulse/dao/interfaces/TransferMapDAO.java (.../TransferMapDAO.java) (revision af96735a57ead4fc0f4121425b74d38b5656e7e4) +++ src/main/java/com/napa/pulse/dao/interfaces/TransferMapDAO.java (.../TransferMapDAO.java) (revision b8a5ab967d445a2351975a4a420103a3c331dada) @@ -1,22 +1,39 @@ package com.napa.pulse.dao.interfaces; -import java.util.ArrayList; -import java.util.List; - import com.napa.pulse.dto.ActionResult; import com.napa.pulse.dto.TransferMapActionDTO; import com.napa.pulse.dto.TransferMapDTO; import com.napa.pulse.dto.TransferMappingHub; +import java.util.ArrayList; +import java.util.List; + public interface TransferMapDAO { - List getTransferMaps(Integer sourceSite); - TransferMapActionDTO createNewTransferMap(Integer hubSiteId, String name, Integer userId); - ArrayList getTransferMapHierarchy(Integer transferMapId); - - /** - * - * @param transferMappingHub - * @return - */ - ActionResult updateTransferMap(TransferMappingHub transferMappingHub); -} + + /** + * @param sourceSite + * @return + */ + List getTransferMaps(Integer sourceSite); + + /** + * @param hubSiteId + * @param name + * @param userId + * @return + */ + TransferMapActionDTO createNewTransferMap(Integer hubSiteId, String name, Integer userId); + + /** + * @param transferMapId + * @return + */ + ArrayList getTransferMapHierarchy(Integer transferMapId); + + /** + * @param transferMappingHub + * @return + */ + ActionResult updateTransferMap(TransferMappingHub transferMappingHub); + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/dao/interfaces/TransmissionDAO.java =================================================================== diff -u -rf43afa853378a7b68afc7aac57054e3608f0494e -rb8a5ab967d445a2351975a4a420103a3c331dada --- src/main/java/com/napa/pulse/dao/interfaces/TransmissionDAO.java (.../TransmissionDAO.java) (revision f43afa853378a7b68afc7aac57054e3608f0494e) +++ src/main/java/com/napa/pulse/dao/interfaces/TransmissionDAO.java (.../TransmissionDAO.java) (revision b8a5ab967d445a2351975a4a420103a3c331dada) @@ -1,15 +1,15 @@ package com.napa.pulse.dao.interfaces; - import com.napa.pulse.dto.TransmissionStatus; /** * Handles communication with the underlying persistence system (DB). + * * @author Diana Ivan * Created: May 10, 2015 */ public interface TransmissionDAO { - String updateTransmissionStatus(TransmissionStatus[] transmissionArray); - -} + String updateTransmissionStatus(TransmissionStatus[] transmissionArray); + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/dao/interfaces/UserDAO.java =================================================================== diff -u -r2e80f396c9f148c045cb5c736dc137f67b6c1ebe -rb8a5ab967d445a2351975a4a420103a3c331dada --- src/main/java/com/napa/pulse/dao/interfaces/UserDAO.java (.../UserDAO.java) (revision 2e80f396c9f148c045cb5c736dc137f67b6c1ebe) +++ src/main/java/com/napa/pulse/dao/interfaces/UserDAO.java (.../UserDAO.java) (revision b8a5ab967d445a2351975a4a420103a3c331dada) @@ -1,16 +1,17 @@ package com.napa.pulse.dao.interfaces; -import java.util.List; - import com.napa.pulse.entity.security.User; +import java.util.List; + public interface UserDAO { - User getUserByLogin(String login); - - boolean isSystemLocked(); - - String getSystemLockedMessage(); + User getUserByLogin(String login); - List getAllAdminUsers(); -} + boolean isSystemLocked(); + + String getSystemLockedMessage(); + + List getAllAdminUsers(); + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/dao/interfaces/VirtualSiteDAO.java =================================================================== diff -u -rb1b67b9a68753ee5fec4614691fcc0805c28f347 -rb8a5ab967d445a2351975a4a420103a3c331dada --- src/main/java/com/napa/pulse/dao/interfaces/VirtualSiteDAO.java (.../VirtualSiteDAO.java) (revision b1b67b9a68753ee5fec4614691fcc0805c28f347) +++ src/main/java/com/napa/pulse/dao/interfaces/VirtualSiteDAO.java (.../VirtualSiteDAO.java) (revision b8a5ab967d445a2351975a4a420103a3c331dada) @@ -1,13 +1,9 @@ -/** - * - */ package com.napa.pulse.dao.interfaces; import com.napa.pulse.dto.UserDCs; import com.napa.pulse.dto.UserSiteTypes; import com.napa.pulse.entity.pulseui.Site; import com.napa.pulse.entity.security.User; -import com.napa.pulse.exception.PulseException; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -18,7 +14,6 @@ /** * @author Mr T - * */ public interface VirtualSiteDAO { @@ -36,13 +31,12 @@ * @param latitude * @param longitude * @param dcAbbrev - * @throws PulseException */ void createVirtualSite(User user, String siteTypeCode, int dcSiteId, String name, String address1, String address2, - String city, String state, String country, String postalCode, BigDecimal latitude, BigDecimal longitude, String dcAbbrev); + String city, String state, String country, String postalCode, BigDecimal latitude, + BigDecimal longitude, String dcAbbrev); /** - * * @param user * @param siteId * @param name @@ -56,25 +50,23 @@ * @param longitude */ void updateVirtualSite(User user, int siteId, String name, String address1, String address2, - String city, String state, String country, String postalCode, BigDecimal latitude, BigDecimal longitude); + String city, String state, String country, String postalCode, BigDecimal latitude, + BigDecimal longitude); /** * @param siteId - * @throws PulseException */ void deleteVirtualSite(int siteId); /** * @param user * @return - * @throws PulseException */ List getUserDCs(User user); /** * @param user * @return - * @throws PulseException */ List getUserSiteTypes(User user); @@ -85,10 +77,12 @@ List> getVirtualSiteDetail(int siteId); /** - * @param + * @param sessionId * @param siteId * @param response * @param user + * @throws IOException + * @throws SQLException */ void exportVirtualSite(int sessionId, int siteId, HttpServletResponse response, User user) throws IOException, SQLException; @@ -99,6 +93,10 @@ */ List getSites(User user, String userAccessSitesNoVS, int siteId); + /** + * @param virtualSiteId + * @param actualSiteId + */ void linkVirtualSite(int virtualSiteId, int actualSiteId); -} +} \ No newline at end of file FishEye: Tag b8a5ab967d445a2351975a4a420103a3c331dada refers to a dead (removed) revision in file `src/main/java/com/napa/pulse/entity/pulseui/AppException.java'. FishEye: No comparison available. Pass `N' to diff? Index: src/main/java/com/napa/pulse/service/impl/MajorAccountServiceImpl.java =================================================================== diff -u -rbe92f77f11e0334ea9b3a6ad6df77288d58fbfee -rb8a5ab967d445a2351975a4a420103a3c331dada --- src/main/java/com/napa/pulse/service/impl/MajorAccountServiceImpl.java (.../MajorAccountServiceImpl.java) (revision be92f77f11e0334ea9b3a6ad6df77288d58fbfee) +++ src/main/java/com/napa/pulse/service/impl/MajorAccountServiceImpl.java (.../MajorAccountServiceImpl.java) (revision b8a5ab967d445a2351975a4a420103a3c331dada) @@ -194,7 +194,7 @@ @Override public void updateInvestmentCollectionForSites(Long investmentCollectionTemplateId, Long[] siteIds) { - majorAccountSiteDao.updateSitesMajorAcccount(siteIds, investmentCollectionTemplateId); + majorAccountSiteDao.updateSitesMajorAccount(siteIds, investmentCollectionTemplateId); } @Override Index: src/main/java/com/napa/pulse/service/impl/ParametersServiceImpl.java =================================================================== diff -u -rbe92f77f11e0334ea9b3a6ad6df77288d58fbfee -rb8a5ab967d445a2351975a4a420103a3c331dada --- src/main/java/com/napa/pulse/service/impl/ParametersServiceImpl.java (.../ParametersServiceImpl.java) (revision be92f77f11e0334ea9b3a6ad6df77288d58fbfee) +++ src/main/java/com/napa/pulse/service/impl/ParametersServiceImpl.java (.../ParametersServiceImpl.java) (revision b8a5ab967d445a2351975a4a420103a3c331dada) @@ -41,7 +41,7 @@ @Override public List loadSiteParamForHierachyIds(int siteId, Integer[] nodeArray, Integer sessionId) { - return parametersDao.loadSiteParamForHierachyIds(siteId, nodeArray, sessionId); + return parametersDao.loadSiteParamForHierarchyIds(siteId, nodeArray, sessionId); } @Override