This is an automated email from the git hooks/post-receive script. New commit to branch feature/spgeed in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 71e8819dfeb162c222a2869988c82e53f209e2a2 Author: Killian <killian.herbreteau@epitech.eu> Date: Fri Oct 25 12:05:03 2019 +0200 adding generic get Spgeed DAO --- .../services/service/PollenServiceSupport.java | 90 +++++++++++++++++++++- .../pollen/services/service/TransverseService.java | 18 ----- .../service/security/SpgeedDummyService.java | 71 ----------------- 3 files changed, 88 insertions(+), 91 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenServiceSupport.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenServiceSupport.java index 37effb9c..fd88b8a9 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenServiceSupport.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenServiceSupport.java @@ -28,10 +28,13 @@ import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.chorem.pollen.persistence.Dao.*; +import org.chorem.pollen.persistence.PollenMapper; import org.chorem.pollen.persistence.PollenPersistenceContext; import org.chorem.pollen.persistence.entity.*; import org.chorem.pollen.services.PollenService; import org.chorem.pollen.services.PollenServiceContext; +import org.chorem.pollen.services.PollenTechnicalException; import org.chorem.pollen.services.PollenUIContext; import org.chorem.pollen.services.bean.PaginationParameterBean; import org.chorem.pollen.services.bean.PaginationResultBean; @@ -44,6 +47,9 @@ import org.chorem.pollen.services.service.security.PollenInvalidPermissionExcept import org.chorem.pollen.services.service.security.PollenPermission; import org.chorem.pollen.services.service.security.PollenSecurityContext; import org.chorem.pollen.services.service.security.SecurityService; +import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; +import org.hibernate.internal.SessionFactoryImpl; +import org.nuiton.spgeed.SqlSession; import org.nuiton.topia.persistence.TopiaDao; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaIdFactory; @@ -51,6 +57,8 @@ import org.nuiton.util.StringUtil; import org.nuiton.util.pagination.PaginationParameter; import org.nuiton.util.pagination.PaginationResult; +import javax.sql.DataSource; +import java.sql.SQLException; import java.util.Collection; import java.util.Date; import java.util.Locale; @@ -69,6 +77,8 @@ public abstract class PollenServiceSupport implements PollenService { private static Map<String, Object> ENTITY_LOCK_BY_ID = Maps.newHashMap(); + protected SqlSession spgeedSession = null; + public static synchronized Object getLock(String id) { return ENTITY_LOCK_BY_ID. computeIfAbsent(id, id2 -> new Object()); } @@ -196,26 +206,72 @@ public abstract class PollenServiceSupport implements PollenService { return getPersistenceContext().getChoiceDao(); } + protected PollenChoiceSpgeedDao getSpgeedChoiceDao() { + return getSpgeedDao(PollenChoiceSpgeedDao.class); + } + + protected SqlSession getSpgeedSqlSession() { + if (spgeedSession == null) { + SessionFactoryImpl hibernateFactory = (SessionFactoryImpl) getPersistenceContext().getHibernateSupport().getHibernateFactory(); + ConnectionProvider connectionProvider = hibernateFactory.getServiceRegistry().getService(ConnectionProvider.class); + DataSource dataSource = connectionProvider.unwrap(DataSource.class); + + try (SqlSession session = new SqlSession(dataSource)) { + spgeedSession = session; + } catch(SQLException e) { + throw new PollenTechnicalException("erreur lors du chargement du Dao de Spgeed", e); + } + } + return spgeedSession; + } + + protected <E extends PollenSpgeedDao> E getSpgeedDao(Class<E> daoClass) { + SqlSession session = getSpgeedSqlSession(); + session.setDefaultMapper(PollenMapper.class); + + return session.getDao(daoClass); + } + protected CommentTopiaDao getCommentDao() { return getPersistenceContext().getCommentDao(); } + protected PollenCommentSpgeedDao getSpgeedCommentDao() { + return getSpgeedDao(PollenCommentSpgeedDao.class); + } + protected FavoriteListTopiaDao getFavoriteListDao() { return getPersistenceContext().getFavoriteListDao(); } + protected PollenFavoriteListSpgeedDao getSpgeedFavoriteListDao() { + return getSpgeedDao(PollenFavoriteListSpgeedDao.class); + } + protected FavoriteListMemberTopiaDao getFavoriteListMemberDao() { return getPersistenceContext().getFavoriteListMemberDao(); } + protected PollenFavoriteListMemberSpgeedDao getSpgeedFavoriteListMemberDao() { + return getSpgeedDao(PollenFavoriteListMemberSpgeedDao.class); + } + protected ChildFavoriteListTopiaDao getChildFavoriteListDao() { return getPersistenceContext().getChildFavoriteListDao(); } + protected PollenChildFavoriteListSpgeedDao getSpgeedChildFavoriteListDao() { + return getSpgeedDao(PollenChildFavoriteListSpgeedDao.class); + } + protected PollTopiaDao getPollDao() { return getPersistenceContext().getPollDao(); } + protected PollenPollSpgeedDao getSpgeedPollDao() { + return getSpgeedDao(PollenPollSpgeedDao.class); + } + protected QuestionTopiaDao getQuestionDao() { return getPersistenceContext().getQuestionDao(); } @@ -224,22 +280,42 @@ public abstract class PollenServiceSupport implements PollenService { return getPersistenceContext().getPollenPrincipalDao(); } + protected PollenPrincipalSpgeedDao getSpgeedPollenPrincipalDao() { + return getSpgeedDao(PollenPrincipalSpgeedDao.class); + } + protected PollenResourceTopiaDao getPollenResourceDao() { return getPersistenceContext().getPollenResourceDao(); } + protected PollenResourceSpgeedDao getSpgeedRessourceDao() { + return getSpgeedDao(PollenResourceSpgeedDao.class); + } + protected PollenUserTopiaDao getPollenUserDao() { return getPersistenceContext().getPollenUserDao(); } + protected PollenUserSpgeedDao getSpgeedUserDao() { + return getSpgeedDao(PollenUserSpgeedDao.class); + } + protected PollenUserEmailAddressTopiaDao getPollenUserEmailAddressDao() { return getPersistenceContext().getPollenUserEmailAddressDao(); } + protected PollenUserEmailAddressSpgeedDao getSpgeedUserEmailAddressDao() { + return getSpgeedDao(PollenUserEmailAddressSpgeedDao.class); + } + protected UserCredentialTopiaDao getUserCredentialDao() { return getPersistenceContext().getUserCredentialDao(); } + protected PollenUserCredentialSpgeedDao getSpgeedUserCredentialDao() { + return getSpgeedDao(PollenUserCredentialSpgeedDao.class); + } + protected ReportTopiaDao getReportTopiaDao() { return getPersistenceContext().getReportDao(); } @@ -248,10 +324,18 @@ public abstract class PollenServiceSupport implements PollenService { return getPersistenceContext().getSessionTokenDao(); } + protected PollenSessionTokenSpgeedDao getSpgeedSessionTokenDao() { + return getSpgeedDao(PollenSessionTokenSpgeedDao.class); + } + protected VoteTopiaDao getVoteDao() { return getPersistenceContext().getVoteDao(); } + protected PollenVoteSpgeedDao getSpgeedVoteDao() { + return getSpgeedDao(PollenVoteSpgeedDao.class); + } + protected VoteToChoiceTopiaDao getVoteToChoiceDao() { return getPersistenceContext().getVoteToChoiceDao(); } @@ -260,6 +344,10 @@ public abstract class PollenServiceSupport implements PollenService { return getPersistenceContext().getVoterListDao(); } + protected PollenVoterListSpgeedDao getSpgeedVoterListDao() { + return getSpgeedDao(PollenVoterListSpgeedDao.class); + } + protected VoterListMemberTopiaDao getVoterListMemberDao() { return getPersistenceContext().getVoterListMemberDao(); } @@ -479,9 +567,7 @@ public abstract class PollenServiceSupport implements PollenService { } protected <E extends TopiaEntity, B extends PollenBean<E>> PaginationResultBean<B> toPaginationListBean(PaginationResult<E> entities, Function<E, B> beanFunction) { - return PollenBeans.toBean(entities, beanFunction); - } protected <E extends TopiaEntity> PollenEntityId<E> getPollenEntityId(E entity) { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/TransverseService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/TransverseService.java index 7347cdcc..b9818a68 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/TransverseService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/TransverseService.java @@ -60,24 +60,6 @@ public class TransverseService extends PollenServiceSupport { return bean; } - public PollenUserBean getSpgeed() { - - SpgeedDummyService spgeedDummyService = new SpgeedDummyService(); - PollenUser user = spgeedDummyService.getPollenUser(); - PollenUserService pollenUserService = newService(PollenUserService.class); - - return pollenUserService.toPollenUserBean(user); - } - - public PollenUserEmailAddressBean getEmail() { - - SpgeedDummyService spgeedDummyService = new SpgeedDummyService(); - PollenUserEmailAddress email = spgeedDummyService.getPollenUserEmailaddress(); - PollenUserService pollenUserService = newService(PollenUserService.class); - - return pollenUserService.toPollenUserEmailAddressBean(email); - } - public PollenStatus getStatus() { long statusStart = System.currentTimeMillis(); List<String> errors = Lists.newArrayList(); diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SpgeedDummyService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SpgeedDummyService.java index 5bbfafc6..32622031 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SpgeedDummyService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SpgeedDummyService.java @@ -48,76 +48,5 @@ public class SpgeedDummyService { } } - public Poll[] getallPoll() { - DataSource ds = getdb(); - - try (SqlSession session = new SqlSession(ds)) { - session.setDefaultMapper(PollenMapper.class); - - PollenPollSpgeedDao dao = session.getDao(PollenPollSpgeedDao.class); - - return (dao.getallpoll()); - } catch(SQLException e) { - throw new PollenTechnicalException("erreur lors du chargement d'un sondage", e); - } - } - - public PollenUser getPollenUser() { - - DataSource ds = getdb(); - - try (SqlSession session = new SqlSession(ds)) { - - PollenUserSpgeedDao dao = session.getDao(PollenUserSpgeedDao.class); - - return (dao.getFirstUser()); - } catch(SQLException e) { - throw new PollenTechnicalException("erreur lors du chargement d'un utilisateur", e); - } - - } - - public PollenUser[] getallPollenUser() { - - DataSource ds = getdb(); - - try (SqlSession session = new SqlSession(ds)) { - - PollenUserSpgeedDao dao = session.getDao(PollenUserSpgeedDao.class); - - return (dao.getallUser()); - } catch(SQLException e) { - throw new PollenTechnicalException("erreur lors du chargement d'un utilisateur", e); - } - - } - - public PollenUserEmailAddress getPollenUserEmailaddress() { - - DataSource ds = getdb(); - - try (SqlSession session = new SqlSession(ds)) { - - PollenUserSpgeedDao dao = session.getDao(PollenUserSpgeedDao.class); - - return (dao.getUserEmail()); - } catch(SQLException e) { - throw new PollenTechnicalException("erreur lors du chargement d'une address mail", e); - } - } - - public int getPollenUsercount() { - - DataSource ds = getdb(); - - try (SqlSession session = new SqlSession(ds)) { - - PollenUserSpgeedDao dao = session.getDao(PollenUserSpgeedDao.class); - - return (dao.getUserCount()); - } catch(SQLException e) { - throw new PollenTechnicalException("erreur lors du chargement d'un utilisateur", e); - } - } } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.