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 02a161e40ada8ebeac9830a67fd108502079bc93 Author: Killian <killian.herbreteau@epitech.eu> Date: Mon Sep 30 11:02:00 2019 +0200 start changing service from topia to spgeed --- .../pollen/services/service/PollenUserService.java | 14 +++++----- .../services/service/security/SpgeedDao.java | 31 ---------------------- .../service/security/SpgeedDummyService.java | 19 ++++++++++--- 3 files changed, 24 insertions(+), 40 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java index ef6ee3c2..f7f5eda1 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java @@ -26,6 +26,8 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.persistence.Dao.PollenPollSpgeedDao; +import org.chorem.pollen.persistence.Dao.PollenUserSpgeedDao; import org.chorem.pollen.persistence.entity.*; import org.chorem.pollen.services.PollenService; import org.chorem.pollen.services.bean.PaginationParameterBean; @@ -36,11 +38,7 @@ import org.chorem.pollen.services.bean.PollenUserEmailAddressBean; import org.chorem.pollen.services.bean.UserCredentialBean; import org.chorem.pollen.services.bean.UsersRight; import org.chorem.pollen.services.bean.resource.ResourceFileBean; -import org.chorem.pollen.services.service.security.PollenDefaultEmailAddressException; -import org.chorem.pollen.services.service.security.PollenEmailNotValidatedException; -import org.chorem.pollen.services.service.security.PollenInvalidEmailActivationTokenException; -import org.chorem.pollen.services.service.security.PollenInvalidPasswordException; -import org.chorem.pollen.services.service.security.PollenSecurityContext; +import org.chorem.pollen.services.service.security.*; import org.nuiton.util.pagination.PaginationOrder; import org.nuiton.util.pagination.PaginationParameter; import org.nuiton.util.pagination.PaginationResult; @@ -64,6 +62,7 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer public PollenUserBean toPollenUserBean(PollenUser entity) { PollenUserBean bean = new PollenUserBean(); + System.out.println(entity); bean.setEntityId(entity.getTopiaId()); bean.setName(entity.getName()); @@ -144,7 +143,10 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer if (!userId.equals(pollenUser.getTopiaId())) { checkIsAdmin(); - pollenUser = getUser0(userId); + SpgeedDummyService spgeedDummyService = new SpgeedDummyService(); + //pollenUser = spgeedDummyService.getSpgeedDao(PollenUserSpgeedDao.class).getUser(userId); + //pollenUser = getUser0(userId); + System.out.println(pollenUser); } return toPollenUserBean(pollenUser); diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SpgeedDao.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SpgeedDao.java deleted file mode 100644 index 8d3dd98b..00000000 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SpgeedDao.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.chorem.pollen.persistence.Dao; - -import org.chorem.pollen.persistence.PollenSpgeedApplicationContext; - -import javax.sql.DataSource; - -public class SpgeedDao { - - DataSource dataSource = null; - - public DataSource getdb() { - - if (dataSource == null) { - PollenSpgeedApplicationContext pollenSpgeedApplicationContext = new PollenSpgeedApplicationContext(); - - PollenServicesConfig pollenServicesConfig = new PollenServicesConfig("pollen-rest-api.properties"); - - String dburl = pollenServicesConfig.getDataSourceUrl(); - String dbpassword = pollenServicesConfig.getDataSourcePassword(); - String dbuser = pollenServicesConfig.getDataSourceUser(); - - pollenSpgeedApplicationContext.setDataSource(dburl, dbuser, dbpassword); - this.dataSource = pollenSpgeedApplicationContext.getDataSource(); - } - return (dataSource); - } - - public static SpgeedUserDao getUserDao() { - - } -} \ No newline at end of file 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 5fb09f43..5bbfafc6 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 @@ -1,13 +1,13 @@ package org.chorem.pollen.services.service.security; +import org.chorem.pollen.persistence.Dao.PollenSpgeedDao; +import org.chorem.pollen.persistence.PollenMapper; import org.chorem.pollen.persistence.PollenSpgeedApplicationContext; import org.chorem.pollen.persistence.Dao.PollenUserSpgeedDao; import org.chorem.pollen.persistence.Dao.PollenPollSpgeedDao; import org.chorem.pollen.persistence.entity.Poll; import org.chorem.pollen.persistence.entity.PollenUser; import org.chorem.pollen.persistence.entity.PollenUserEmailAddress; -import org.chorem.pollen.persistence.entity.Polls; -import org.chorem.pollen.services.PollenServiceContext; import org.chorem.pollen.services.PollenTechnicalException; import org.chorem.pollen.services.config.PollenServicesConfig; import org.nuiton.spgeed.SqlSession; @@ -36,10 +36,23 @@ public class SpgeedDummyService { return (dataSource); } + public <E extends PollenSpgeedDao> E getSpgeedDao(Class<E> daoClass) { + DataSource ds = getdb(); + + try (SqlSession session = new SqlSession(ds)) { + session.setDefaultMapper(PollenMapper.class); + + return session.getDao(daoClass); + } catch(SQLException e) { + throw new PollenTechnicalException("erreur lors du chargement du Dao de Spgeed", e); + } + } + public Poll[] getallPoll() { DataSource ds = getdb(); try (SqlSession session = new SqlSession(ds)) { + session.setDefaultMapper(PollenMapper.class); PollenPollSpgeedDao dao = session.getDao(PollenPollSpgeedDao.class); @@ -57,7 +70,7 @@ public class SpgeedDummyService { PollenUserSpgeedDao dao = session.getDao(PollenUserSpgeedDao.class); - return (dao.getUser()); + return (dao.getFirstUser()); } 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>.