diff --git a/src/main/java/dk/kb/cop3/backend/crud/services/GeoProvisioningService.java b/src/main/java/dk/kb/cop3/backend/crud/services/GeoProvisioningService.java index a14ce81..c1bde1c 100644 --- a/src/main/java/dk/kb/cop3/backend/crud/services/GeoProvisioningService.java +++ b/src/main/java/dk/kb/cop3/backend/crud/services/GeoProvisioningService.java @@ -19,7 +19,7 @@ public class GeoProvisioningService { Logger LOGGER = Logger.getLogger(GeoProvisioningService.class); - private static final ApplicationContext COPII_CONTEXT = new ClassPathXmlApplicationContext("copII-dao-context.xml"); + private static final ApplicationContext COPIII_CONTEXT = new ClassPathXmlApplicationContext("copIII-dao-context.xml"); public GeoProvisioningService() { @@ -28,7 +28,7 @@ public GeoProvisioningService() { public DSFLAreas getArea(double lat, double lng) throws AreaNotFoundException { LOGGER.debug("lat: "+ lat); LOGGER.debug("lng: "+ lng); - GeoInfoDao geoInfoDao = (GeoInfoDao) COPII_CONTEXT.getBean("geoInfoDao"); + GeoInfoDao geoInfoDao = (GeoInfoDao) COPIII_CONTEXT.getBean("geoInfoDao"); String area = geoInfoDao.getAreaDetails(lat, lng)[1].toString(); DSFLAreas enumArea = Areas.getAreaEnumByName(area); return enumArea; @@ -37,7 +37,7 @@ public DSFLAreas getArea(double lat, double lng) throws AreaNotFoundException { public Object[] getAreaDetailsForPoint(double lat, double lng) throws AreaNotFoundException { LOGGER.debug("lat: "+ lat); LOGGER.debug("lng: " + lng); - GeoInfoDao geoInfoDao = (GeoInfoDao) COPII_CONTEXT.getBean("geoInfoDao"); + GeoInfoDao geoInfoDao = (GeoInfoDao) COPIII_CONTEXT.getBean("geoInfoDao"); return geoInfoDao.getAreaDetails(lat, lng); } } diff --git a/src/main/java/dk/kb/cop3/backend/crud/services/UserProvisioningService.java b/src/main/java/dk/kb/cop3/backend/crud/services/UserProvisioningService.java index c6cafe5..cfa3e65 100644 --- a/src/main/java/dk/kb/cop3/backend/crud/services/UserProvisioningService.java +++ b/src/main/java/dk/kb/cop3/backend/crud/services/UserProvisioningService.java @@ -30,7 +30,7 @@ public class UserProvisioningService { Logger LOGGER = LoggerFactory.getLogger(UserProvisioningService.class); - private static final ApplicationContext COPII_CONTEXT = new ClassPathXmlApplicationContext("copII-dao-context.xml"); + private static final ApplicationContext COPIII_CONTEXT = new ClassPathXmlApplicationContext("copIII-dao-context.xml"); public UserProvisioningService() {} @@ -43,7 +43,7 @@ public UserProvisioningService() {} */ public void createUser(User user) throws UserProvisioningServiceException { - UserDao userDao = (UserDao) COPII_CONTEXT.getBean("userDao"); + UserDao userDao = (UserDao) COPIII_CONTEXT.getBean("userDao"); LOGGER.trace("createUser successfully retrieved UserDao from Spring application context"); try { @@ -66,7 +66,7 @@ public void createUser(User user) throws UserProvisioningServiceException { */ public User getUserByPid(String pid) throws UserProvisioningServiceException { - UserDao userDao = (UserDao) COPII_CONTEXT.getBean("userDao"); + UserDao userDao = (UserDao) COPIII_CONTEXT.getBean("userDao"); LOGGER.trace("getUserByPid successfully retrieved UserDao from Spring application context"); User user; try { @@ -91,7 +91,7 @@ public User getUserByPid(String pid) throws UserProvisioningServiceException { */ public String getUserNameByPid(String pid) throws UserProvisioningServiceException { - UserDao userDao = (UserDao) COPII_CONTEXT.getBean("userDao"); + UserDao userDao = (UserDao) COPIII_CONTEXT.getBean("userDao"); LOGGER.trace("getUserByPid successfully retrieved UserDao from Spring application context"); String userName = null; try { @@ -117,7 +117,7 @@ public String getUserNameByPid(String pid) throws UserProvisioningServiceExcepti * @return the list of Hibernate Users. */ public List getUsersForTopList(int numberOfUsers) { - UserDao userDao = (UserDao) COPII_CONTEXT.getBean("userDao"); + UserDao userDao = (UserDao) COPIII_CONTEXT.getBean("userDao"); List x = userDao.getUsers(numberOfUsers); return x; @@ -131,7 +131,7 @@ public List getUsersForTopList(int numberOfUsers) { * @return the list of Hibernate Users. */ public List getUsersFromAreaForTopList(int numberOfUsers, DSFLAreas aSpecificArea) { - UserDao userDao = (UserDao) COPII_CONTEXT.getBean("userDao"); + UserDao userDao = (UserDao) COPIII_CONTEXT.getBean("userDao"); List x = userDao.getUsers(numberOfUsers, aSpecificArea); return x; @@ -147,7 +147,7 @@ public List getUsersFromAreaForTopList(int numberOfUsers, DSFLAreas aSpeci */ public UserRole getUserRole(int userRoleId) throws UserProvisioningServiceException { - UserRoleDao userRoleDao = (UserRoleDao) COPII_CONTEXT.getBean("userRoleDao"); + UserRoleDao userRoleDao = (UserRoleDao) COPIII_CONTEXT.getBean("userRoleDao"); UserRole userRole; try { LOGGER.debug("Calling DAO layer to get user role {}", userRoleId); @@ -163,7 +163,7 @@ public UserRole getUserRole(int userRoleId) throws UserProvisioningServiceExcept @Deprecated public void updateScore(String pid, String points) { LOGGER.debug("adding " + points + " points for user " + pid); - UserDao userDao = (UserDao) COPII_CONTEXT.getBean("userDao"); + UserDao userDao = (UserDao) COPIII_CONTEXT.getBean("userDao"); User user = userDao.getUser(pid); LOGGER.debug("user: " + user); @@ -180,7 +180,7 @@ public void updateScore(String pid, String points) { */ public void updateScore(String pid, String points, DSFLAreas aSpecificArea) { LOGGER.debug("adding " + points + " points for user " + pid); - UserDao userDao = (UserDao) COPII_CONTEXT.getBean("userDao"); + UserDao userDao = (UserDao) COPIII_CONTEXT.getBean("userDao"); LOGGER.debug("aSpecificArea = {}", aSpecificArea.toString()); User user = userDao.getUser(pid); diff --git a/src/main/resources/copIII-dao-context.xml b/src/main/resources/copIII-dao-context.xml new file mode 100644 index 0000000..1e4398c --- /dev/null +++ b/src/main/resources/copIII-dao-context.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + hibernate.dialect=org.hibernate.spatial.dialect.postgis.PostgisPG95Dialect + + + + + + + + + + + + + + + + + + + + + + + + +