Skip to content

Antti Väyrynen / Moya

Go to a project
Commit c0a45173 by Juho Juopperi
Options

Lime in the coconut

1 parent 79ff9107
Inline Side-by-side
Showing with 766 additions and 188 deletions
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/AccountEventBean.java
...@@ -21,6 +21,7 @@ import fi.insomnia.bortal.enums.apps.SpecialPermission; ...@@ -21,6 +21,7 @@ import fi.insomnia.bortal.enums.apps.SpecialPermission;
import fi.insomnia.bortal.enums.apps.UserPermission; import fi.insomnia.bortal.enums.apps.UserPermission;
import fi.insomnia.bortal.facade.AccountEventFacade; import fi.insomnia.bortal.facade.AccountEventFacade;
import fi.insomnia.bortal.model.AccountEvent; import fi.insomnia.bortal.model.AccountEvent;
import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.Product; import fi.insomnia.bortal.model.Product;
import fi.insomnia.bortal.model.Role; import fi.insomnia.bortal.model.Role;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.User;
...@@ -81,7 +82,7 @@ public class AccountEventBean implements AccountEventBeanLocal { ...@@ -81,7 +82,7 @@ public class AccountEventBean implements AccountEventBeanLocal {
} }
@Override @Override
public List<Role> getRolesFromAccountEvents(User u) { public List<Role> getRolesFromAccountEvents(IUser u) {
return accountfacade.findProvidedRoles(eventBean.getCurrentEvent(), u); return accountfacade.findProvidedRoles(eventBean.getCurrentEvent(), u);
} }
...@@ -92,7 +93,7 @@ public class AccountEventBean implements AccountEventBeanLocal { ...@@ -92,7 +93,7 @@ public class AccountEventBean implements AccountEventBeanLocal {
@RolesAllowed(ShopPermission.S_SHOP_PRODUCTS) @RolesAllowed(ShopPermission.S_SHOP_PRODUCTS)
public void shopCash(User shoppingUser, Map<Product, BigDecimal> shopMap, boolean buyInstant) { public void shopCash(User shoppingUser, Map<Product, BigDecimal> shopMap, boolean buyInstant) {
logger.debug("Shoping cash. buyinstant {}", buyInstant); logger.debug("Shoping cash. buyinstant {}", buyInstant);
User seller = permbean.getCurrentUser(); IUser seller = permbean.getCurrentUser();
shoppingUser = userbean.findById(shoppingUser.getId()); shoppingUser = userbean.findById(shoppingUser.getId());
BigDecimal tot = BigDecimal.ZERO; BigDecimal tot = BigDecimal.ZERO;
...@@ -131,7 +132,7 @@ public class AccountEventBean implements AccountEventBeanLocal { ...@@ -131,7 +132,7 @@ public class AccountEventBean implements AccountEventBeanLocal {
@Override @Override
@RolesAllowed(SpecialPermission.S_USER) @RolesAllowed(SpecialPermission.S_USER)
public BigDecimal getAccountBalance(User user) { public BigDecimal getAccountBalance(IUser user) {
if (user == null) { if (user == null) {
user = permbean.getCurrentUser(); user = permbean.getCurrentUser();
} }
...@@ -153,7 +154,7 @@ public class AccountEventBean implements AccountEventBeanLocal { ...@@ -153,7 +154,7 @@ public class AccountEventBean implements AccountEventBeanLocal {
@Override @Override
@RolesAllowed(SpecialPermission.S_USER) @RolesAllowed(SpecialPermission.S_USER)
public List<AccountEvent> getAccountEvents(User user) { public List<AccountEvent> getAccountEvents(IUser user) {
if (user == null) { if (user == null) {
user = permbean.getCurrentUser(); user = permbean.getCurrentUser();
} }
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/BillBean.java
...@@ -25,9 +25,9 @@ import fi.insomnia.bortal.facade.UserFacade; ...@@ -25,9 +25,9 @@ import fi.insomnia.bortal.facade.UserFacade;
import fi.insomnia.bortal.model.AccountEvent; import fi.insomnia.bortal.model.AccountEvent;
import fi.insomnia.bortal.model.Bill; import fi.insomnia.bortal.model.Bill;
import fi.insomnia.bortal.model.BillLine; import fi.insomnia.bortal.model.BillLine;
import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.LanEvent; import fi.insomnia.bortal.model.LanEvent;
import fi.insomnia.bortal.model.Product; import fi.insomnia.bortal.model.Product;
import fi.insomnia.bortal.model.User;
import fi.insomnia.bortal.util.MailMessage; import fi.insomnia.bortal.util.MailMessage;
import fi.insomnia.bortal.utilities.I18n; import fi.insomnia.bortal.utilities.I18n;
...@@ -86,7 +86,7 @@ public class BillBean implements BillBeanLocal { ...@@ -86,7 +86,7 @@ public class BillBean implements BillBeanLocal {
return null; return null;
} }
Bill bill = billFacade.find(id); Bill bill = billFacade.find(id);
User currentuser = permbean.getCurrentUser(); IUser currentuser = permbean.getCurrentUser();
logger.debug("bill {} user {}", bill, currentuser); logger.debug("bill {} user {}", bill, currentuser);
if (bill != null && !currentuser.equals(bill.getUser()) && !permbean.hasPermission(BillPermission.READ_ALL)) { if (bill != null && !currentuser.equals(bill.getUser()) && !permbean.hasPermission(BillPermission.READ_ALL)) {
...@@ -255,7 +255,7 @@ public class BillBean implements BillBeanLocal { ...@@ -255,7 +255,7 @@ public class BillBean implements BillBeanLocal {
@Override @Override
@RolesAllowed({ BillPermission.S_VIEW_OWN, BillPermission.S_READ_ALL }) @RolesAllowed({ BillPermission.S_VIEW_OWN, BillPermission.S_READ_ALL })
public List<Bill> find(User user) { public List<Bill> find(IUser user) {
if (!permbean.isCurrentUser(user) && !permbean.hasPermission(BillPermission.READ_ALL)) { if (!permbean.isCurrentUser(user) && !permbean.hasPermission(BillPermission.READ_ALL)) {
loggingBean.logMessage(SecurityLogType.permissionDenied, permbean.getCurrentUser(), "Not enought rights to get bill list for user "); loggingBean.logMessage(SecurityLogType.permissionDenied, permbean.getCurrentUser(), "Not enought rights to get bill list for user ");
throw new EJBAccessException("Could not list bills for another user"); throw new EJBAccessException("Could not list bills for another user");
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/CardTemplateBean.java
...@@ -21,6 +21,7 @@ import fi.insomnia.bortal.facade.CardTemplateFacade; ...@@ -21,6 +21,7 @@ import fi.insomnia.bortal.facade.CardTemplateFacade;
import fi.insomnia.bortal.facade.PrintedCardFacade; import fi.insomnia.bortal.facade.PrintedCardFacade;
import fi.insomnia.bortal.facade.UserFacade; import fi.insomnia.bortal.facade.UserFacade;
import fi.insomnia.bortal.model.CardTemplate; import fi.insomnia.bortal.model.CardTemplate;
import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.LanEvent; import fi.insomnia.bortal.model.LanEvent;
import fi.insomnia.bortal.model.PrintedCard; import fi.insomnia.bortal.model.PrintedCard;
import fi.insomnia.bortal.model.Role; import fi.insomnia.bortal.model.Role;
...@@ -149,7 +150,7 @@ public class CardTemplateBean implements CardTemplateBeanLocal { ...@@ -149,7 +150,7 @@ public class CardTemplateBean implements CardTemplateBeanLocal {
logger.info("User {} has too little power old role {} New role {}", new Object[] { user.getLogin(), existingPower, newPower }); logger.info("User {} has too little power old role {} New role {}", new Object[] { user.getLogin(), existingPower, newPower });
} else if (existingPower > newPower) { } else if (existingPower > newPower) {
MailMessage msg = new MailMessage(); MailMessage msg = new MailMessage();
User admin = eventBean.getCurrentEvent().getOrganiser().getAdmin(); IUser admin = eventBean.getCurrentEvent().getOrganiser().getAdmin();
String adminmail = admin.getEmail(); String adminmail = admin.getEmail();
msg.setFromAddress(adminmail); msg.setFromAddress(adminmail);
...@@ -214,7 +215,7 @@ public class CardTemplateBean implements CardTemplateBeanLocal { ...@@ -214,7 +215,7 @@ public class CardTemplateBean implements CardTemplateBeanLocal {
} }
@Override @Override
public List<PrintedCard> getCards(User user) { public List<PrintedCard> getCards(IUser user) {
return printedcardfacade.getCards(user); return printedcardfacade.getCards(user);
} }
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/EventBean.java
...@@ -17,11 +17,11 @@ import fi.insomnia.bortal.facade.EventOrganiserFacade; ...@@ -17,11 +17,11 @@ import fi.insomnia.bortal.facade.EventOrganiserFacade;
import fi.insomnia.bortal.facade.LanEventDomainFacade; import fi.insomnia.bortal.facade.LanEventDomainFacade;
import fi.insomnia.bortal.facade.LanEventPropertyFacade; import fi.insomnia.bortal.facade.LanEventPropertyFacade;
import fi.insomnia.bortal.model.EventOrganiser; import fi.insomnia.bortal.model.EventOrganiser;
import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.LanEvent; import fi.insomnia.bortal.model.LanEvent;
import fi.insomnia.bortal.model.LanEventDomain; import fi.insomnia.bortal.model.LanEventDomain;
import fi.insomnia.bortal.model.LanEventProperty; import fi.insomnia.bortal.model.LanEventProperty;
import fi.insomnia.bortal.model.LanEventPropertyKey; import fi.insomnia.bortal.model.LanEventPropertyKey;
import fi.insomnia.bortal.model.User;
/** /**
* Session Bean implementation class EventBean * Session Bean implementation class EventBean
...@@ -82,7 +82,7 @@ public class EventBean implements EventBeanLocal { ...@@ -82,7 +82,7 @@ public class EventBean implements EventBeanLocal {
settings = new EventOrganiser(); settings = new EventOrganiser();
settings.setOrganisation(DEFAULT_ORGANISATION_NAME); settings.setOrganisation(DEFAULT_ORGANISATION_NAME);
User defaultUser = permbean.getAnonUser(); IUser defaultUser = permbean.getAnonUser();
settings.setAdmin(defaultUser); settings.setAdmin(defaultUser);
eventOrganiserFacade.create(settings); eventOrganiserFacade.create(settings);
} }
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/EventOrganiserBean.java
...@@ -11,8 +11,8 @@ import fi.insomnia.bortal.enums.apps.SpecialPermission; ...@@ -11,8 +11,8 @@ import fi.insomnia.bortal.enums.apps.SpecialPermission;
import fi.insomnia.bortal.facade.EventFacade; import fi.insomnia.bortal.facade.EventFacade;
import fi.insomnia.bortal.facade.EventOrganiserFacade; import fi.insomnia.bortal.facade.EventOrganiserFacade;
import fi.insomnia.bortal.model.EventOrganiser; import fi.insomnia.bortal.model.EventOrganiser;
import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.LanEvent; import fi.insomnia.bortal.model.LanEvent;
import fi.insomnia.bortal.model.User;
/** /**
* Session Bean implementation class EventOrganiserBean * Session Bean implementation class EventOrganiserBean
...@@ -71,7 +71,7 @@ public class EventOrganiserBean implements EventOrganiserBeanLocal { ...@@ -71,7 +71,7 @@ public class EventOrganiserBean implements EventOrganiserBeanLocal {
} }
@Override @Override
public List<EventOrganiser> getOrganisations(User user) { public List<EventOrganiser> getOrganisations(IUser user) {
return eventorgfacade.find(user); return eventorgfacade.find(user);
} }
} }
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/JaasBean.java
...@@ -17,6 +17,7 @@ import fi.insomnia.bortal.enums.apps.SpecialPermission; ...@@ -17,6 +17,7 @@ import fi.insomnia.bortal.enums.apps.SpecialPermission;
import fi.insomnia.bortal.enums.apps.UserPermission; import fi.insomnia.bortal.enums.apps.UserPermission;
import fi.insomnia.bortal.facade.UserFacade; import fi.insomnia.bortal.facade.UserFacade;
import fi.insomnia.bortal.model.ApplicationPermission; import fi.insomnia.bortal.model.ApplicationPermission;
import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.LanEvent; import fi.insomnia.bortal.model.LanEvent;
import fi.insomnia.bortal.model.Role; import fi.insomnia.bortal.model.Role;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.User;
...@@ -41,10 +42,10 @@ public class JaasBean implements JaasBeanLocal, JaasBeanRemote { ...@@ -41,10 +42,10 @@ public class JaasBean implements JaasBeanLocal, JaasBeanRemote {
@EJB @EJB
private EventBeanLocal eventbean; private EventBeanLocal eventbean;
public User tryLogin(String username, String password) { public IUser tryLogin(String username, String password) {
User user = userfacade.findByLogin(username.trim()); IUser user = userfacade.findByLogin(username.trim());
User ret = null; IUser ret = null;
if (user != null) { if (user != null) {
if (user.isAnonymous()) { if (user.isAnonymous()) {
logger.info("logging in as anonymous!!!"); logger.info("logging in as anonymous!!!");
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/LoggingBean.java
...@@ -13,9 +13,9 @@ import org.slf4j.Logger; ...@@ -13,9 +13,9 @@ import org.slf4j.Logger;
import fi.insomnia.bortal.facade.LogEntryFacade; import fi.insomnia.bortal.facade.LogEntryFacade;
import fi.insomnia.bortal.facade.LogEntryTypeFacade; import fi.insomnia.bortal.facade.LogEntryTypeFacade;
import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.LogEntry; import fi.insomnia.bortal.model.LogEntry;
import fi.insomnia.bortal.model.LogEntryType; import fi.insomnia.bortal.model.LogEntryType;
import fi.insomnia.bortal.model.User;
/** /**
* Session Bean implementation class SercurityBean * Session Bean implementation class SercurityBean
...@@ -84,7 +84,7 @@ public class LoggingBean implements LoggingBeanLocal { ...@@ -84,7 +84,7 @@ public class LoggingBean implements LoggingBeanLocal {
// } // }
@Override @Override
public LogEntry logMessage(SecurityLogType paramType, User user, String... description) { public LogEntry logMessage(SecurityLogType paramType, IUser user, String... description) {
LogEntry entry = null; LogEntry entry = null;
try { try {
String desc = toString(description); String desc = toString(description);
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/PermissionBean.java
...@@ -22,7 +22,10 @@ import fi.insomnia.bortal.enums.apps.ShopPermission; ...@@ -22,7 +22,10 @@ import fi.insomnia.bortal.enums.apps.ShopPermission;
import fi.insomnia.bortal.enums.apps.SpecialPermission; import fi.insomnia.bortal.enums.apps.SpecialPermission;
import fi.insomnia.bortal.enums.apps.TerminalPermission; import fi.insomnia.bortal.enums.apps.TerminalPermission;
import fi.insomnia.bortal.enums.apps.UserPermission; import fi.insomnia.bortal.enums.apps.UserPermission;
import fi.insomnia.bortal.facade.EventUserFacade;
import fi.insomnia.bortal.facade.UserFacade; import fi.insomnia.bortal.facade.UserFacade;
import fi.insomnia.bortal.model.EventUser;
import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.User;
@Stateless @Stateless
...@@ -90,6 +93,9 @@ public class PermissionBean implements PermissionBeanLocal { ...@@ -90,6 +93,9 @@ public class PermissionBean implements PermissionBeanLocal {
@EJB @EJB
private UserFacade userfacade; private UserFacade userfacade;
@EJB
private EventUserFacade eventUserFacade;
// //
// @Override // @Override
// public boolean hasPermission(String perm) { // public boolean hasPermission(String perm) {
...@@ -139,7 +145,7 @@ public class PermissionBean implements PermissionBeanLocal { ...@@ -139,7 +145,7 @@ public class PermissionBean implements PermissionBeanLocal {
// } // }
@Override @Override
public boolean isCurrentUser(User user) { public boolean isCurrentUser(IUser user) {
return (context.getCallerPrincipal() == null || user == null) ? false : context.getCallerPrincipal().getName().equals(user.getLogin()); return (context.getCallerPrincipal() == null || user == null) ? false : context.getCallerPrincipal().getName().equals(user.getLogin());
} }
...@@ -150,10 +156,10 @@ public class PermissionBean implements PermissionBeanLocal { ...@@ -150,10 +156,10 @@ public class PermissionBean implements PermissionBeanLocal {
} }
@Override @Override
public User getCurrentUser() { public EventUser getCurrentUser() {
Principal principal = context.getCallerPrincipal(); Principal principal = context.getCallerPrincipal();
User ret = userfacade.findByLogin(principal.getName()); EventUser ret = userfacade.findByLogin(principal.getName());
if (ret == null) { if (ret == null) {
ret = getAnonUser(); ret = getAnonUser();
} }
...@@ -178,6 +184,19 @@ public class PermissionBean implements PermissionBeanLocal { ...@@ -178,6 +184,19 @@ public class PermissionBean implements PermissionBeanLocal {
return defaultUser; return defaultUser;
} }
@Override
public EventUser getAnonEventUser() {
EventUser defaultUser = eventUserFacade.findByLogin(User.ANONYMOUS_LOGINNAME);
if (defaultUser == null) {
defaultUser = new EventUser();
defaultUser.setLogin(User.ANONYMOUS_LOGINNAME);
defaultUser.setNick(User.ANONYMOUS_LOGINNAME);
eventUserFacade.create(defaultUser);
}
return defaultUser;
}
public String getPrincipal() { public String getPrincipal() {
Principal principal = context.getCallerPrincipal(); Principal principal = context.getCallerPrincipal();
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/PlaceBean.java
...@@ -37,7 +37,9 @@ import fi.insomnia.bortal.facade.PlaceFacade; ...@@ -37,7 +37,9 @@ import fi.insomnia.bortal.facade.PlaceFacade;
import fi.insomnia.bortal.facade.PlaceGroupFacade; import fi.insomnia.bortal.facade.PlaceGroupFacade;
import fi.insomnia.bortal.facade.UserFacade; import fi.insomnia.bortal.facade.UserFacade;
import fi.insomnia.bortal.model.EventMap; import fi.insomnia.bortal.model.EventMap;
import fi.insomnia.bortal.model.EventUser;
import fi.insomnia.bortal.model.GroupMembership; import fi.insomnia.bortal.model.GroupMembership;
import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.LanEvent; import fi.insomnia.bortal.model.LanEvent;
import fi.insomnia.bortal.model.Place; import fi.insomnia.bortal.model.Place;
import fi.insomnia.bortal.model.PlaceGroup; import fi.insomnia.bortal.model.PlaceGroup;
...@@ -109,13 +111,13 @@ public class PlaceBean implements PlaceBeanLocal { ...@@ -109,13 +111,13 @@ public class PlaceBean implements PlaceBeanLocal {
@RolesAllowed(MapPermission.S_MANAGE_OTHERS) @RolesAllowed(MapPermission.S_MANAGE_OTHERS)
@Override @Override
public BigDecimal getTotalReservationPrice(User user, Place newPlace) public BigDecimal getTotalReservationPrice(IUser user, Place newPlace)
{ {
return addAndCalcPrice(user, newPlace); return addAndCalcPrice(user, newPlace);
} }
private BigDecimal addAndCalcPrice(User user, Place newPlace) { private BigDecimal addAndCalcPrice(IUser user, Place newPlace) {
Set<Place> places = new HashSet<Place>(); Set<Place> places = new HashSet<Place>();
places.addAll(placeFacade.findUsersReservations(eventBean.getCurrentEvent(), user)); places.addAll(placeFacade.findUsersReservations(eventBean.getCurrentEvent(), user));
...@@ -272,7 +274,7 @@ public class PlaceBean implements PlaceBeanLocal { ...@@ -272,7 +274,7 @@ public class PlaceBean implements PlaceBeanLocal {
} }
// This method should not be available in the local bean client // This method should not be available in the local bean client
void lockPlaceProduct(User user, Product prod, BigDecimal quantity) { void lockPlaceProduct(EventUser user, Product prod, BigDecimal quantity) {
int loop = quantity.intValue(); int loop = quantity.intValue();
// BigDecimal loop = BigDecimal.ZERO; // BigDecimal loop = BigDecimal.ZERO;
...@@ -312,7 +314,7 @@ public class PlaceBean implements PlaceBeanLocal { ...@@ -312,7 +314,7 @@ public class PlaceBean implements PlaceBeanLocal {
pgfacade.create(pg); pgfacade.create(pg);
} }
private void buy(Place p, PlaceGroup pg, User user) { private void buy(Place p, PlaceGroup pg, IUser user) {
p.setGroup(pg); p.setGroup(pg);
p.setReleaseTime(null); p.setReleaseTime(null);
// Current user temporarily used at place reservation. When buying // Current user temporarily used at place reservation. When buying
...@@ -414,7 +416,7 @@ public class PlaceBean implements PlaceBeanLocal { ...@@ -414,7 +416,7 @@ public class PlaceBean implements PlaceBeanLocal {
@RolesAllowed(MapPermission.S_BUY_PLACES) @RolesAllowed(MapPermission.S_BUY_PLACES)
public boolean releasePlace(Place place) { public boolean releasePlace(Place place) {
place = placeFacade.find(place.getId()); place = placeFacade.find(place.getId());
User user = permbean.getCurrentUser(); IUser user = permbean.getCurrentUser();
if (place.getGroup() != null || place.getCurrentUser() == null || (!permbean.hasPermission(MapPermission.MANAGE_OTHERS) && !place.getCurrentUser().equals(user))) { if (place.getGroup() != null || place.getCurrentUser() == null || (!permbean.hasPermission(MapPermission.MANAGE_OTHERS) && !place.getCurrentUser().equals(user))) {
return false; return false;
} }
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/PlaceGroupBean.java
...@@ -26,8 +26,8 @@ import fi.insomnia.bortal.enums.apps.SpecialPermission; ...@@ -26,8 +26,8 @@ import fi.insomnia.bortal.enums.apps.SpecialPermission;
import fi.insomnia.bortal.facade.GroupMembershipFacade; import fi.insomnia.bortal.facade.GroupMembershipFacade;
import fi.insomnia.bortal.facade.PlaceGroupFacade; import fi.insomnia.bortal.facade.PlaceGroupFacade;
import fi.insomnia.bortal.model.GroupMembership; import fi.insomnia.bortal.model.GroupMembership;
import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.PlaceGroup; import fi.insomnia.bortal.model.PlaceGroup;
import fi.insomnia.bortal.model.User;
/** /**
* Session Bean implementation class PlaceGroupBean * Session Bean implementation class PlaceGroupBean
...@@ -76,7 +76,7 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal { ...@@ -76,7 +76,7 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal {
@Override @Override
@RolesAllowed(SpecialPermission.S_USER) @RolesAllowed(SpecialPermission.S_USER)
public List<GroupMembership> getMembershipsAndCreations(User user) { public List<GroupMembership> getMembershipsAndCreations(IUser user) {
if (user == null) { if (user == null) {
user = permbean.getCurrentUser(); user = permbean.getCurrentUser();
} else if (!permbean.isCurrentUser(user) && !permbean.hasPermission(MapPermission.MANAGE_OTHERS)) { } else if (!permbean.isCurrentUser(user) && !permbean.hasPermission(MapPermission.MANAGE_OTHERS)) {
...@@ -88,7 +88,7 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal { ...@@ -88,7 +88,7 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal {
@Override @Override
@RolesAllowed(SpecialPermission.S_USER) @RolesAllowed(SpecialPermission.S_USER)
public List<GroupMembership> getMemberships(User user) { public List<GroupMembership> getMemberships(IUser user) {
if (user == null) { if (user == null) {
user = permbean.getCurrentUser(); user = permbean.getCurrentUser();
} else if (!permbean.isCurrentUser(user) && !permbean.hasPermission(MapPermission.MANAGE_OTHERS)) { } else if (!permbean.isCurrentUser(user) && !permbean.hasPermission(MapPermission.MANAGE_OTHERS)) {
...@@ -100,7 +100,7 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal { ...@@ -100,7 +100,7 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal {
@Override @Override
@RolesAllowed(MapPermission.S_BUY_PLACES) @RolesAllowed(MapPermission.S_BUY_PLACES)
public boolean associateToToken(User user, String token) { public boolean associateToToken(IUser user, String token) {
if (!permbean.isCurrentUser(user) && !permbean.hasPermission(MapPermission.MANAGE_OTHERS)) { if (!permbean.isCurrentUser(user) && !permbean.hasPermission(MapPermission.MANAGE_OTHERS)) {
throw new EJBAccessException(); throw new EJBAccessException();
...@@ -121,7 +121,7 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal { ...@@ -121,7 +121,7 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal {
@Override @Override
@RolesAllowed(SpecialPermission.S_USER) @RolesAllowed(SpecialPermission.S_USER)
public void getGroupMembershipPdf(User usr, OutputStream ostream) { public void getGroupMembershipPdf(IUser usr, OutputStream ostream) {
List<GroupMembership> memberships = getMembershipsAndCreations(usr); List<GroupMembership> memberships = getMembershipsAndCreations(usr);
try { try {
PDF pdf = new PDF(ostream); PDF pdf = new PDF(ostream);
...@@ -191,7 +191,7 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal { ...@@ -191,7 +191,7 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal {
@Override @Override
@RolesAllowed(SpecialPermission.S_USER) @RolesAllowed(SpecialPermission.S_USER)
public List<PlaceGroup> getPlacegroups(User user) { public List<PlaceGroup> getPlacegroups(IUser user) {
return pgfacade.find(user); return pgfacade.find(user);
} }
} }
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/TestDataBean.java
...@@ -25,6 +25,7 @@ import fi.insomnia.bortal.model.Bill; ...@@ -25,6 +25,7 @@ import fi.insomnia.bortal.model.Bill;
import fi.insomnia.bortal.model.Compo; import fi.insomnia.bortal.model.Compo;
import fi.insomnia.bortal.model.CompoEntry; import fi.insomnia.bortal.model.CompoEntry;
import fi.insomnia.bortal.model.EventMap; import fi.insomnia.bortal.model.EventMap;
import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.LanEvent; import fi.insomnia.bortal.model.LanEvent;
import fi.insomnia.bortal.model.Place; import fi.insomnia.bortal.model.Place;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.User;
...@@ -94,7 +95,7 @@ public class TestDataBean implements TestDataBeanLocal { ...@@ -94,7 +95,7 @@ public class TestDataBean implements TestDataBeanLocal {
} }
@Override @Override
public User createUser() { public IUser createUser() {
User u = new User(); User u = new User();
u.setActive(true); u.setActive(true);
...@@ -119,7 +120,7 @@ public class TestDataBean implements TestDataBeanLocal { ...@@ -119,7 +120,7 @@ public class TestDataBean implements TestDataBeanLocal {
} }
@Override @Override
public User createAdmin() { public IUser createAdmin() {
User u = new User(); User u = new User();
...@@ -310,7 +311,7 @@ public class TestDataBean implements TestDataBeanLocal { ...@@ -310,7 +311,7 @@ public class TestDataBean implements TestDataBeanLocal {
} }
@Override @Override
public Bill createBill(User u) { public Bill createBill(IUser u) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; return null;
} }
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/UserBean.java
...@@ -34,6 +34,7 @@ import fi.insomnia.bortal.facade.RoleFacade; ...@@ -34,6 +34,7 @@ import fi.insomnia.bortal.facade.RoleFacade;
import fi.insomnia.bortal.facade.UserFacade; import fi.insomnia.bortal.facade.UserFacade;
import fi.insomnia.bortal.facade.UserImageFacade; import fi.insomnia.bortal.facade.UserImageFacade;
import fi.insomnia.bortal.model.GroupMembership; import fi.insomnia.bortal.model.GroupMembership;
import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.LanEvent; import fi.insomnia.bortal.model.LanEvent;
import fi.insomnia.bortal.model.LanEventPropertyKey; import fi.insomnia.bortal.model.LanEventPropertyKey;
import fi.insomnia.bortal.model.PlaceGroup; import fi.insomnia.bortal.model.PlaceGroup;
...@@ -125,7 +126,7 @@ public class UserBean implements UserBeanLocal { ...@@ -125,7 +126,7 @@ public class UserBean implements UserBeanLocal {
@Override @Override
public List<Role> findUsersRoles(User u) { public List<Role> findUsersRoles(User u) {
User currusr = permbean.getCurrentUser(); IUser currusr = permbean.getCurrentUser();
if (!currusr.equals(u) && !permbean.hasPermission(UserPermission.MODIFY)) { if (!currusr.equals(u) && !permbean.hasPermission(UserPermission.MODIFY)) {
loggerbean.logMessage(SecurityLogType.permissionDenied, permbean.getCurrentUser(), "User tried to fetc another users roles: " + u); loggerbean.logMessage(SecurityLogType.permissionDenied, permbean.getCurrentUser(), "User tried to fetc another users roles: " + u);
throw new EJBAccessException("Not enough rights to find roles"); throw new EJBAccessException("Not enough rights to find roles");
...@@ -185,7 +186,7 @@ public class UserBean implements UserBeanLocal { ...@@ -185,7 +186,7 @@ public class UserBean implements UserBeanLocal {
user = userFacade.merge(user); user = userFacade.merge(user);
logger.debug("uploading image to userid {}", user); logger.debug("uploading image to userid {}", user);
User curruser = permbean.getCurrentUser(); IUser curruser = permbean.getCurrentUser();
if (!curruser.equals(user) && !permbean.hasPermission(UserPermission.MODIFY)) { if (!curruser.equals(user) && !permbean.hasPermission(UserPermission.MODIFY)) {
loggerbean.logMessage(SecurityLogType.permissionDenied, curruser, "user tried to save picture to userid " + user + " without sufficient permissions!"); loggerbean.logMessage(SecurityLogType.permissionDenied, curruser, "user tried to save picture to userid " + user + " without sufficient permissions!");
throw new EJBAccessException("No permission to upload image as another user"); throw new EJBAccessException("No permission to upload image as another user");
...@@ -235,7 +236,7 @@ public class UserBean implements UserBeanLocal { ...@@ -235,7 +236,7 @@ public class UserBean implements UserBeanLocal {
@Override @Override
@RolesAllowed(UserPermission.S_CREATE_NEW) @RolesAllowed(UserPermission.S_CREATE_NEW)
public User createNewUser(User user, String password) { public IUser createNewUser(User user, String password) {
user.resetPassword(password); user.resetPassword(password);
// Tallennetaan olio kantaan... // Tallennetaan olio kantaan...
...@@ -394,7 +395,7 @@ public class UserBean implements UserBeanLocal { ...@@ -394,7 +395,7 @@ public class UserBean implements UserBeanLocal {
@Override @Override
public boolean userExists(String login) { public boolean userExists(String login) {
User usr = userFacade.findByLogin(login); IUser usr = userFacade.findByLogin(login);
return usr != null; return usr != null;
} }
} }
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/UserUtilBean.java
...@@ -8,7 +8,7 @@ import org.slf4j.Logger; ...@@ -8,7 +8,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import fi.insomnia.bortal.facade.UserFacade; import fi.insomnia.bortal.facade.UserFacade;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.IUser;
/** /**
* Session Bean implementation class UserUtilBean * Session Bean implementation class UserUtilBean
...@@ -34,12 +34,12 @@ public class UserUtilBean implements UserUtilBeanLocal { ...@@ -34,12 +34,12 @@ public class UserUtilBean implements UserUtilBeanLocal {
@Override @Override
public void convertUsernames() { public void convertUsernames() {
for (User u : userbean.getUsers()) { for (IUser u : userbean.getUsers()) {
if (u.getLogin().trim().isEmpty()) { if (u.getLogin().trim().isEmpty()) {
logger.warn("User {} has empty login..."); logger.warn("User {} has empty login...");
continue; continue;
} }
User testU = userfacade.findByLogin(u.getLogin().toLowerCase()); IUser testU = userfacade.findByLogin(u.getLogin().toLowerCase());
if (testU == null || testU.equals(u)) { if (testU == null || testU.equals(u)) {
u.setLogin(u.getLogin().toLowerCase()); u.setLogin(u.getLogin().toLowerCase());
logger.info("Converted user {}", u.getLogin()); logger.info("Converted user {}", u.getLogin());
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/AccountEventFacade.java
...@@ -12,11 +12,11 @@ import javax.persistence.criteria.Root; ...@@ -12,11 +12,11 @@ import javax.persistence.criteria.Root;
import fi.insomnia.bortal.beans.EventBeanLocal; import fi.insomnia.bortal.beans.EventBeanLocal;
import fi.insomnia.bortal.model.AccountEvent; import fi.insomnia.bortal.model.AccountEvent;
import fi.insomnia.bortal.model.AccountEvent_; import fi.insomnia.bortal.model.AccountEvent_;
import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.LanEvent; import fi.insomnia.bortal.model.LanEvent;
import fi.insomnia.bortal.model.Product_; import fi.insomnia.bortal.model.Product_;
import fi.insomnia.bortal.model.Role; import fi.insomnia.bortal.model.Role;
import fi.insomnia.bortal.model.Role_; import fi.insomnia.bortal.model.Role_;
import fi.insomnia.bortal.model.User;
@Stateless @Stateless
@LocalBean @LocalBean
...@@ -29,7 +29,7 @@ public class AccountEventFacade extends IntegerPkGenericFacade<AccountEvent> { ...@@ -29,7 +29,7 @@ public class AccountEventFacade extends IntegerPkGenericFacade<AccountEvent> {
@EJB @EJB
private EventBeanLocal eventbean; private EventBeanLocal eventbean;
public List<Role> findProvidedRoles(LanEvent event, User u) { public List<Role> findProvidedRoles(LanEvent event, IUser u) {
CriteriaBuilder cb = getEm().getCriteriaBuilder(); CriteriaBuilder cb = getEm().getCriteriaBuilder();
CriteriaQuery<Role> cq = cb.createQuery(Role.class); CriteriaQuery<Role> cq = cb.createQuery(Role.class);
...@@ -48,7 +48,7 @@ public class AccountEventFacade extends IntegerPkGenericFacade<AccountEvent> { ...@@ -48,7 +48,7 @@ public class AccountEventFacade extends IntegerPkGenericFacade<AccountEvent> {
return getEm().createQuery(cq).getResultList(); return getEm().createQuery(cq).getResultList();
} }
public List<AccountEvent> getAccountEvents(User user) { public List<AccountEvent> getAccountEvents(IUser user) {
CriteriaBuilder cb = getEm().getCriteriaBuilder(); CriteriaBuilder cb = getEm().getCriteriaBuilder();
CriteriaQuery<AccountEvent> cq = cb.createQuery(AccountEvent.class); CriteriaQuery<AccountEvent> cq = cb.createQuery(AccountEvent.class);
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/BillFacade.java
...@@ -12,7 +12,7 @@ import javax.persistence.criteria.Root; ...@@ -12,7 +12,7 @@ import javax.persistence.criteria.Root;
import fi.insomnia.bortal.beans.EventBeanLocal; import fi.insomnia.bortal.beans.EventBeanLocal;
import fi.insomnia.bortal.model.Bill; import fi.insomnia.bortal.model.Bill;
import fi.insomnia.bortal.model.Bill_; import fi.insomnia.bortal.model.Bill_;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.IUser;
@Stateless @Stateless
@LocalBean @LocalBean
...@@ -53,7 +53,7 @@ public class BillFacade extends IntegerPkGenericFacade<Bill> { ...@@ -53,7 +53,7 @@ public class BillFacade extends IntegerPkGenericFacade<Bill> {
return getEm().createQuery(cq).getResultList(); return getEm().createQuery(cq).getResultList();
} }
public List<Bill> find(User user) { public List<Bill> find(IUser user) {
CriteriaBuilder cb = getEm().getCriteriaBuilder(); CriteriaBuilder cb = getEm().getCriteriaBuilder();
CriteriaQuery<Bill> cq = cb.createQuery(Bill.class); CriteriaQuery<Bill> cq = cb.createQuery(Bill.class);
Root<Bill> root = cq.from(Bill.class); Root<Bill> root = cq.from(Bill.class);
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/EventOrganiserFacade.java
...@@ -10,7 +10,7 @@ import javax.persistence.criteria.Root; ...@@ -10,7 +10,7 @@ import javax.persistence.criteria.Root;
import fi.insomnia.bortal.model.EventOrganiser; import fi.insomnia.bortal.model.EventOrganiser;
import fi.insomnia.bortal.model.EventOrganiser_; import fi.insomnia.bortal.model.EventOrganiser_;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.IUser;
@Stateless @Stateless
@LocalBean @LocalBean
...@@ -39,7 +39,7 @@ public class EventOrganiserFacade extends IntegerPkGenericFacade<EventOrganiser> ...@@ -39,7 +39,7 @@ public class EventOrganiserFacade extends IntegerPkGenericFacade<EventOrganiser>
return getEm().createQuery(cq).getResultList(); return getEm().createQuery(cq).getResultList();
} }
public List<EventOrganiser> find(User user) { public List<EventOrganiser> find(IUser user) {
CriteriaBuilder cb = getEm().getCriteriaBuilder(); CriteriaBuilder cb = getEm().getCriteriaBuilder();
CriteriaQuery<EventOrganiser> cq = cb.createQuery(EventOrganiser.class); CriteriaQuery<EventOrganiser> cq = cb.createQuery(EventOrganiser.class);
Root<EventOrganiser> root = cq.from(EventOrganiser.class); Root<EventOrganiser> root = cq.from(EventOrganiser.class);
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/EventUserFacade.java 0 → 100644
package fi.insomnia.bortal.facade;
import javax.ejb.EJB;
import javax.ejb.LocalBean;
import javax.ejb.Stateless;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root;
import fi.insomnia.bortal.beans.EventBeanLocal;
import fi.insomnia.bortal.model.EventUser;
import fi.insomnia.bortal.model.EventUser_;
import fi.insomnia.bortal.model.User_;
/**
* Session Bean implementation class EventUserFacade
*/
@Stateless
@LocalBean
public class EventUserFacade extends IntegerPkGenericFacade<EventUser> {
@EJB
private EventBeanLocal eventBean;
public EventUserFacade() {
super(EventUser.class);
}
public EventUser findByLogin(String login) {
CriteriaBuilder cb = getEm().getCriteriaBuilder();
CriteriaQuery<EventUser> cq = cb.createQuery(EventUser.class);
Root<EventUser> root = cq.from(EventUser.class);
cq.where(
cb.equal(root.get(EventUser_.user).get(User_.login), login),
cb.equal(root.get(EventUser_.event),
eventBean.getCurrentEvent()));
return getSingleNullableResult(getEm().createQuery(cq));
}
}
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/GroupMembershipFacade.java
...@@ -16,10 +16,10 @@ import org.slf4j.LoggerFactory; ...@@ -16,10 +16,10 @@ import org.slf4j.LoggerFactory;
import fi.insomnia.bortal.beans.EventBeanLocal; import fi.insomnia.bortal.beans.EventBeanLocal;
import fi.insomnia.bortal.model.GroupMembership; import fi.insomnia.bortal.model.GroupMembership;
import fi.insomnia.bortal.model.GroupMembership_; import fi.insomnia.bortal.model.GroupMembership_;
import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.PlaceGroup; import fi.insomnia.bortal.model.PlaceGroup;
import fi.insomnia.bortal.model.PlaceGroup_; import fi.insomnia.bortal.model.PlaceGroup_;
import fi.insomnia.bortal.model.Place_; import fi.insomnia.bortal.model.Place_;
import fi.insomnia.bortal.model.User;
import fi.insomnia.bortal.utilities.PasswordFunctions; import fi.insomnia.bortal.utilities.PasswordFunctions;
@Stateless @Stateless
...@@ -66,7 +66,7 @@ public class GroupMembershipFacade extends IntegerPkGenericFacade<GroupMembershi ...@@ -66,7 +66,7 @@ public class GroupMembershipFacade extends IntegerPkGenericFacade<GroupMembershi
return getSingleNullableResult(getEm().createQuery(cq)); return getSingleNullableResult(getEm().createQuery(cq));
} }
public List<GroupMembership> findMemberOrCreator(User user) { public List<GroupMembership> findMemberOrCreator(IUser user) {
CriteriaBuilder cb = getEm().getCriteriaBuilder(); CriteriaBuilder cb = getEm().getCriteriaBuilder();
CriteriaQuery<GroupMembership> cq = cb.createQuery(GroupMembership.class); CriteriaQuery<GroupMembership> cq = cb.createQuery(GroupMembership.class);
Root<GroupMembership> root = cq.from(GroupMembership.class); Root<GroupMembership> root = cq.from(GroupMembership.class);
...@@ -87,7 +87,7 @@ public class GroupMembershipFacade extends IntegerPkGenericFacade<GroupMembershi ...@@ -87,7 +87,7 @@ public class GroupMembershipFacade extends IntegerPkGenericFacade<GroupMembershi
return getEm().createQuery(cq).getResultList(); return getEm().createQuery(cq).getResultList();
} }
public List<GroupMembership> findMemberships(User user) { public List<GroupMembership> findMemberships(IUser user) {
CriteriaBuilder cb = getEm().getCriteriaBuilder(); CriteriaBuilder cb = getEm().getCriteriaBuilder();
CriteriaQuery<GroupMembership> cq = cb.createQuery(GroupMembership.class); CriteriaQuery<GroupMembership> cq = cb.createQuery(GroupMembership.class);
Root<GroupMembership> root = cq.from(GroupMembership.class); Root<GroupMembership> root = cq.from(GroupMembership.class);
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/PlaceFacade.java
...@@ -16,10 +16,10 @@ import org.slf4j.LoggerFactory; ...@@ -16,10 +16,10 @@ import org.slf4j.LoggerFactory;
import fi.insomnia.bortal.model.EventMap; import fi.insomnia.bortal.model.EventMap;
import fi.insomnia.bortal.model.EventMap_; import fi.insomnia.bortal.model.EventMap_;
import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.LanEvent; import fi.insomnia.bortal.model.LanEvent;
import fi.insomnia.bortal.model.Place; import fi.insomnia.bortal.model.Place;
import fi.insomnia.bortal.model.Place_; import fi.insomnia.bortal.model.Place_;
import fi.insomnia.bortal.model.User;
@Stateless @Stateless
@LocalBean @LocalBean
...@@ -57,7 +57,7 @@ public class PlaceFacade extends IntegerPkGenericFacade<Place> { ...@@ -57,7 +57,7 @@ public class PlaceFacade extends IntegerPkGenericFacade<Place> {
} }
} }
public List<Place> findUsersReservations(LanEvent event, User user) { public List<Place> findUsersReservations(LanEvent event, IUser user) {
CriteriaBuilder cb = getEm().getCriteriaBuilder(); CriteriaBuilder cb = getEm().getCriteriaBuilder();
CriteriaQuery<Place> cq = cb.createQuery(Place.class); CriteriaQuery<Place> cq = cb.createQuery(Place.class);
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/PlaceGroupFacade.java
...@@ -10,9 +10,9 @@ import javax.persistence.criteria.CriteriaQuery; ...@@ -10,9 +10,9 @@ import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root; import javax.persistence.criteria.Root;
import fi.insomnia.bortal.beans.EventBeanLocal; import fi.insomnia.bortal.beans.EventBeanLocal;
import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.PlaceGroup; import fi.insomnia.bortal.model.PlaceGroup;
import fi.insomnia.bortal.model.PlaceGroup_; import fi.insomnia.bortal.model.PlaceGroup_;
import fi.insomnia.bortal.model.User;
@Stateless @Stateless
@LocalBean @LocalBean
...@@ -26,7 +26,7 @@ public class PlaceGroupFacade extends IntegerPkGenericFacade<PlaceGroup> { ...@@ -26,7 +26,7 @@ public class PlaceGroupFacade extends IntegerPkGenericFacade<PlaceGroup> {
super(PlaceGroup.class); super(PlaceGroup.class);
} }
public List<PlaceGroup> find(User user) { public List<PlaceGroup> find(IUser user) {
CriteriaBuilder cb = getEm().getCriteriaBuilder(); CriteriaBuilder cb = getEm().getCriteriaBuilder();
CriteriaQuery<PlaceGroup> cq = cb.createQuery(PlaceGroup.class); CriteriaQuery<PlaceGroup> cq = cb.createQuery(PlaceGroup.class);
Root<PlaceGroup> root = cq.from(PlaceGroup.class); Root<PlaceGroup> root = cq.from(PlaceGroup.class);
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/PrintedCardFacade.java
...@@ -10,10 +10,10 @@ import javax.persistence.criteria.CriteriaQuery; ...@@ -10,10 +10,10 @@ import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root; import javax.persistence.criteria.Root;
import fi.insomnia.bortal.beans.EventBeanLocal; import fi.insomnia.bortal.beans.EventBeanLocal;
import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.LanEvent; import fi.insomnia.bortal.model.LanEvent;
import fi.insomnia.bortal.model.PrintedCard; import fi.insomnia.bortal.model.PrintedCard;
import fi.insomnia.bortal.model.PrintedCard_; import fi.insomnia.bortal.model.PrintedCard_;
import fi.insomnia.bortal.model.User;
@Stateless @Stateless
@LocalBean @LocalBean
...@@ -51,7 +51,7 @@ public class PrintedCardFacade extends IntegerPkGenericFacade<PrintedCard> { ...@@ -51,7 +51,7 @@ public class PrintedCardFacade extends IntegerPkGenericFacade<PrintedCard> {
} }
public List<PrintedCard> getCards(User user) { public List<PrintedCard> getCards(IUser user) {
CriteriaBuilder cb = getEm().getCriteriaBuilder(); CriteriaBuilder cb = getEm().getCriteriaBuilder();
CriteriaQuery<PrintedCard> cq = cb.createQuery(PrintedCard.class); CriteriaQuery<PrintedCard> cq = cb.createQuery(PrintedCard.class);
Root<PrintedCard> root = cq.from(PrintedCard.class); Root<PrintedCard> root = cq.from(PrintedCard.class);
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/SitePageFacade.java
...@@ -13,6 +13,7 @@ import javax.persistence.criteria.Predicate; ...@@ -13,6 +13,7 @@ import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root; import javax.persistence.criteria.Root;
import fi.insomnia.bortal.beans.EventBeanLocal; import fi.insomnia.bortal.beans.EventBeanLocal;
import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.PageContent; import fi.insomnia.bortal.model.PageContent;
import fi.insomnia.bortal.model.PageContent_; import fi.insomnia.bortal.model.PageContent_;
import fi.insomnia.bortal.model.Role; import fi.insomnia.bortal.model.Role;
...@@ -44,7 +45,7 @@ public class SitePageFacade extends IntegerPkGenericFacade<SitePage> { ...@@ -44,7 +45,7 @@ public class SitePageFacade extends IntegerPkGenericFacade<SitePage> {
// return getSingleNullableResult(getEm().createQuery(cq)); // return getSingleNullableResult(getEm().createQuery(cq));
// } // }
public List<SitePage> findForUser(User user, SitePage siteroot) { public List<SitePage> findForUser(IUser user, SitePage siteroot) {
CriteriaBuilder cb = getEm().getCriteriaBuilder(); CriteriaBuilder cb = getEm().getCriteriaBuilder();
CriteriaQuery<SitePage> cq = cb.createQuery(SitePage.class); CriteriaQuery<SitePage> cq = cb.createQuery(SitePage.class);
Root<SitePage> root = cq.from(SitePage.class); Root<SitePage> root = cq.from(SitePage.class);
......
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/AccountEventBeanLocal.java
...@@ -7,6 +7,7 @@ import java.util.Map; ...@@ -7,6 +7,7 @@ import java.util.Map;
import javax.ejb.Local; import javax.ejb.Local;
import fi.insomnia.bortal.model.AccountEvent; import fi.insomnia.bortal.model.AccountEvent;
import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.Product; import fi.insomnia.bortal.model.Product;
import fi.insomnia.bortal.model.Role; import fi.insomnia.bortal.model.Role;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.User;
...@@ -20,13 +21,13 @@ public interface AccountEventBeanLocal { ...@@ -20,13 +21,13 @@ public interface AccountEventBeanLocal {
AccountEvent find(Integer id); AccountEvent find(Integer id);
List<Role> getRolesFromAccountEvents(User u); List<Role> getRolesFromAccountEvents(IUser u);
void shopCash(User shoppingUser, Map<Product, BigDecimal> void shopCash(User shoppingUser, Map<Product, BigDecimal>
shopMap, boolean buyInstant); shopMap, boolean buyInstant);
BigDecimal getAccountBalance(User user); BigDecimal getAccountBalance(IUser user);
List<AccountEvent> getAccountEvents(User user); List<AccountEvent> getAccountEvents(IUser user);
} }
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/BillBeanLocal.java
...@@ -9,7 +9,7 @@ import javax.ejb.Local; ...@@ -9,7 +9,7 @@ import javax.ejb.Local;
import fi.insomnia.bortal.bortal.views.BillSummary; import fi.insomnia.bortal.bortal.views.BillSummary;
import fi.insomnia.bortal.model.Bill; import fi.insomnia.bortal.model.Bill;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.IUser;
@Local @Local
public interface BillBeanLocal { public interface BillBeanLocal {
...@@ -34,6 +34,6 @@ public interface BillBeanLocal { ...@@ -34,6 +34,6 @@ public interface BillBeanLocal {
Bill save(Bill bill); Bill save(Bill bill);
List<Bill> find(User user); List<Bill> find(IUser user);
} }
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/CardTemplateBeanLocal.java
...@@ -6,6 +6,7 @@ import java.util.List; ...@@ -6,6 +6,7 @@ import java.util.List;
import javax.ejb.Local; import javax.ejb.Local;
import fi.insomnia.bortal.model.CardTemplate; import fi.insomnia.bortal.model.CardTemplate;
import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.PrintedCard; import fi.insomnia.bortal.model.PrintedCard;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.User;
import fi.insomnia.bortal.utilities.jsf.EntityFinderBean; import fi.insomnia.bortal.utilities.jsf.EntityFinderBean;
...@@ -33,7 +34,7 @@ public interface CardTemplateBeanLocal extends EntityFinderBean<CardTemplate> { ...@@ -33,7 +34,7 @@ public interface CardTemplateBeanLocal extends EntityFinderBean<CardTemplate> {
PrintedCard getCard(Integer idParam); PrintedCard getCard(Integer idParam);
List<PrintedCard> getCards(User user); List<PrintedCard> getCards(IUser user);
CardTemplate saveImage(CardTemplate cardTemplate, byte[] bytes) throws IOException; CardTemplate saveImage(CardTemplate cardTemplate, byte[] bytes) throws IOException;
......
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/EventOrganiserBeanLocal.java
...@@ -5,8 +5,8 @@ import java.util.List; ...@@ -5,8 +5,8 @@ import java.util.List;
import javax.ejb.Local; import javax.ejb.Local;
import fi.insomnia.bortal.model.EventOrganiser; import fi.insomnia.bortal.model.EventOrganiser;
import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.LanEvent; import fi.insomnia.bortal.model.LanEvent;
import fi.insomnia.bortal.model.User;
@Local @Local
public interface EventOrganiserBeanLocal { public interface EventOrganiserBeanLocal {
...@@ -21,6 +21,6 @@ public interface EventOrganiserBeanLocal { ...@@ -21,6 +21,6 @@ public interface EventOrganiserBeanLocal {
LanEvent findEvent(Integer eventid); LanEvent findEvent(Integer eventid);
List<EventOrganiser> getOrganisations(User user); List<EventOrganiser> getOrganisations(IUser user);
} }
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/LoggingBeanLocal.java
...@@ -2,12 +2,12 @@ package fi.insomnia.bortal.beans; ...@@ -2,12 +2,12 @@ package fi.insomnia.bortal.beans;
import javax.ejb.Local; import javax.ejb.Local;
import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.LogEntry; import fi.insomnia.bortal.model.LogEntry;
import fi.insomnia.bortal.model.User;
@Local @Local
public interface LoggingBeanLocal { public interface LoggingBeanLocal {
LogEntry logMessage(SecurityLogType paramType, User user, String... description); LogEntry logMessage(SecurityLogType paramType, IUser user, String... description);
} }
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/PermissionBeanLocal.java
...@@ -4,6 +4,7 @@ import javax.ejb.Local; ...@@ -4,6 +4,7 @@ import javax.ejb.Local;
import javax.resource.spi.IllegalStateException; import javax.resource.spi.IllegalStateException;
import fi.insomnia.bortal.enums.apps.IAppPermission; import fi.insomnia.bortal.enums.apps.IAppPermission;
import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.User;
@Local @Local
...@@ -15,7 +16,7 @@ public interface PermissionBeanLocal { ...@@ -15,7 +16,7 @@ public interface PermissionBeanLocal {
boolean isLoggedIn(); boolean isLoggedIn();
boolean isCurrentUser(User thisuser); boolean isCurrentUser(IUser thisuser);
// boolean fatalPermission(IAppPermission perm, Object... failmessage); // boolean fatalPermission(IAppPermission perm, Object... failmessage);
......
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/PlaceBeanLocal.java
...@@ -11,6 +11,7 @@ import javax.ejb.Local; ...@@ -11,6 +11,7 @@ import javax.ejb.Local;
import fi.insomnia.bortal.exceptions.BortalCatchableException; import fi.insomnia.bortal.exceptions.BortalCatchableException;
import fi.insomnia.bortal.model.EventMap; import fi.insomnia.bortal.model.EventMap;
import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.Place; import fi.insomnia.bortal.model.Place;
import fi.insomnia.bortal.model.PlaceGroup; import fi.insomnia.bortal.model.PlaceGroup;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.User;
...@@ -43,7 +44,7 @@ public interface PlaceBeanLocal { ...@@ -43,7 +44,7 @@ public interface PlaceBeanLocal {
void unbuyPlace(Place place); void unbuyPlace(Place place);
BigDecimal getTotalReservationPrice(User user, Place newPlace); BigDecimal getTotalReservationPrice(IUser user, Place newPlace);
BigDecimal getTotalReservationPrice(Place newPlace); BigDecimal getTotalReservationPrice(Place newPlace);
......
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/PlaceGroupBeanLocal.java
...@@ -6,8 +6,8 @@ import java.util.List; ...@@ -6,8 +6,8 @@ import java.util.List;
import javax.ejb.Local; import javax.ejb.Local;
import fi.insomnia.bortal.model.GroupMembership; import fi.insomnia.bortal.model.GroupMembership;
import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.PlaceGroup; import fi.insomnia.bortal.model.PlaceGroup;
import fi.insomnia.bortal.model.User;
@Local @Local
public interface PlaceGroupBeanLocal { public interface PlaceGroupBeanLocal {
...@@ -18,16 +18,16 @@ public interface PlaceGroupBeanLocal { ...@@ -18,16 +18,16 @@ public interface PlaceGroupBeanLocal {
// List<GroupMembership> getMemberships(User user); // List<GroupMembership> getMemberships(User user);
boolean associateToToken(User user, String token); boolean associateToToken(IUser user, String token);
void releaseAndGenerateToken(GroupMembership gmem); void releaseAndGenerateToken(GroupMembership gmem);
List<GroupMembership> getMembershipsAndCreations(User user); List<GroupMembership> getMembershipsAndCreations(IUser user);
List<GroupMembership> getMemberships(User user); List<GroupMembership> getMemberships(IUser user);
List<PlaceGroup> getPlacegroups(User user); List<PlaceGroup> getPlacegroups(IUser user);
void getGroupMembershipPdf(User usr, OutputStream ostream); void getGroupMembershipPdf(IUser usr, OutputStream ostream);
} }
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/TestDataBeanLocal.java
...@@ -4,7 +4,7 @@ import javax.ejb.Local; ...@@ -4,7 +4,7 @@ import javax.ejb.Local;
import fi.insomnia.bortal.model.Bill; import fi.insomnia.bortal.model.Bill;
import fi.insomnia.bortal.model.EventMap; import fi.insomnia.bortal.model.EventMap;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.IUser;
@Local @Local
public interface TestDataBeanLocal { public interface TestDataBeanLocal {
...@@ -13,15 +13,15 @@ public interface TestDataBeanLocal { ...@@ -13,15 +13,15 @@ public interface TestDataBeanLocal {
void generateTestPlaces(EventMap map); void generateTestPlaces(EventMap map);
Bill createBill(User u); Bill createBill(IUser u);
User createUser(); IUser createUser();
// public void printPlacesInfo(); // public void printPlacesInfo();
void generateTestCompos(); void generateTestCompos();
User createAdmin(); IUser createAdmin();
// EventMap readMap(long bytes); // EventMap readMap(long bytes);
......
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/UserBeanLocal.java
...@@ -6,6 +6,7 @@ import java.util.List; ...@@ -6,6 +6,7 @@ import java.util.List;
import javax.ejb.Local; import javax.ejb.Local;
import fi.insomnia.bortal.model.GroupMembership; import fi.insomnia.bortal.model.GroupMembership;
import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.Role; import fi.insomnia.bortal.model.Role;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.User;
import fi.insomnia.bortal.model.UserImage; import fi.insomnia.bortal.model.UserImage;
...@@ -24,7 +25,7 @@ public interface UserBeanLocal { ...@@ -24,7 +25,7 @@ public interface UserBeanLocal {
UserImage findUserImage(int id); UserImage findUserImage(int id);
User createNewUser(User user, String password); IUser createNewUser(User user, String password);
User findPasswordResetUser(Integer id, String hash); User findPasswordResetUser(Integer id, String hash);
......
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/salespoint/SalesSession.java
package fi.insomnia.bortal.salespoint; package fi.insomnia.bortal.salespoint;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.IUser;
public class SalesSession { public class SalesSession {
User cashierUser; IUser cashierUser;
User customerUser; IUser customerUser;
Cart shoppingCart; Cart shoppingCart;
} }
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/util/MailMessage.java
...@@ -5,7 +5,7 @@ import java.io.UnsupportedEncodingException; ...@@ -5,7 +5,7 @@ import java.io.UnsupportedEncodingException;
import javax.mail.internet.InternetAddress; import javax.mail.internet.InternetAddress;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.IUser;
public class MailMessage implements Serializable { public class MailMessage implements Serializable {
/** /**
...@@ -99,7 +99,7 @@ public class MailMessage implements Serializable { ...@@ -99,7 +99,7 @@ public class MailMessage implements Serializable {
return charset; return charset;
} }
public void setTo(User user) { public void setTo(IUser user) {
setToName(user.getWholeName()); setToName(user.getWholeName());
setToAddress(user.getEmail()); setToAddress(user.getEmail());
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/AccountEvent.java
...@@ -81,14 +81,14 @@ public class AccountEvent extends GenericEntity { ...@@ -81,14 +81,14 @@ public class AccountEvent extends GenericEntity {
*/ */
@JoinColumn(name = "user_id", referencedColumnName = "id", nullable = false) @JoinColumn(name = "user_id", referencedColumnName = "id", nullable = false)
@ManyToOne(optional = false) @ManyToOne(optional = false)
private User user; private EventUser user;
/** /**
* Who sold the items to the user. * Who sold the items to the user.
*/ */
@JoinColumn(name = "seller_user_id", referencedColumnName = "id") @JoinColumn(name = "seller_user_id", referencedColumnName = "id")
@ManyToOne(optional = true) @ManyToOne(optional = true)
private User seller; private EventUser seller;
/** /**
* What discounts user has for this account event. Some magic is applied to * What discounts user has for this account event. Some magic is applied to
...@@ -111,7 +111,7 @@ public class AccountEvent extends GenericEntity { ...@@ -111,7 +111,7 @@ public class AccountEvent extends GenericEntity {
public AccountEvent() { public AccountEvent() {
} }
public AccountEvent(User u, Product prod, BigDecimal unitPrice, BigDecimal quantity, Calendar eventTime) { public AccountEvent(EventUser u, Product prod, BigDecimal unitPrice, BigDecimal quantity, Calendar eventTime) {
this.setUnitPrice(unitPrice); this.setUnitPrice(unitPrice);
this.setQuantity(quantity); this.setQuantity(quantity);
...@@ -136,11 +136,11 @@ public class AccountEvent extends GenericEntity { ...@@ -136,11 +136,11 @@ public class AccountEvent extends GenericEntity {
this.delivered = delivered; this.delivered = delivered;
} }
public User getUser() { public EventUser getUser() {
return user; return user;
} }
public void setUser(User usersId) { public void setUser(EventUser usersId) {
this.user = usersId; this.user = usersId;
} }
...@@ -168,11 +168,11 @@ public class AccountEvent extends GenericEntity { ...@@ -168,11 +168,11 @@ public class AccountEvent extends GenericEntity {
return product; return product;
} }
public void setSeller(User seller) { public void setSeller(EventUser seller) {
this.seller = seller; this.seller = seller;
} }
public User getSeller() { public EventUser getSeller() {
return seller; return seller;
} }
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/ActionLogMessage.java
...@@ -35,7 +35,7 @@ public class ActionLogMessage extends GenericEntity { ...@@ -35,7 +35,7 @@ public class ActionLogMessage extends GenericEntity {
private Date time = new Date(); private Date time = new Date();
@JoinColumn(name = "user_id") @JoinColumn(name = "user_id")
private User user; private IUser user;
@JoinColumn(name = "crew", nullable = false) @JoinColumn(name = "crew", nullable = false)
private Role crew; private Role crew;
...@@ -60,11 +60,11 @@ public class ActionLogMessage extends GenericEntity { ...@@ -60,11 +60,11 @@ public class ActionLogMessage extends GenericEntity {
this.time = time; this.time = time;
} }
public User getUser() { public IUser getUser() {
return user; return user;
} }
public void setUser(User user) { public void setUser(IUser user) {
this.user = user; this.user = user;
} }
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/ActionLogMessageResponse.java
...@@ -27,7 +27,7 @@ public class ActionLogMessageResponse extends GenericEntity { ...@@ -27,7 +27,7 @@ public class ActionLogMessageResponse extends GenericEntity {
private Date time = new Date(); private Date time = new Date();
@JoinColumn(name = "user_id") @JoinColumn(name = "user_id")
private User user; private IUser user;
@Column(name = "message", nullable = false) @Column(name = "message", nullable = false)
private String message; private String message;
...@@ -48,11 +48,11 @@ public class ActionLogMessageResponse extends GenericEntity { ...@@ -48,11 +48,11 @@ public class ActionLogMessageResponse extends GenericEntity {
this.time = time; this.time = time;
} }
public User getUser() { public IUser getUser() {
return user; return user;
} }
public void setUser(User user) { public void setUser(IUser user) {
this.user = user; this.user = user;
} }
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntry.java
...@@ -74,7 +74,7 @@ public class CompoEntry extends GenericEntity { ...@@ -74,7 +74,7 @@ public class CompoEntry extends GenericEntity {
@JoinColumn(name = "creator_user_id", referencedColumnName = "id") @JoinColumn(name = "creator_user_id", referencedColumnName = "id")
@ManyToOne @ManyToOne
private User creator; private EventUser creator;
public CompoEntry() { public CompoEntry() {
super(); super();
...@@ -159,11 +159,11 @@ public class CompoEntry extends GenericEntity { ...@@ -159,11 +159,11 @@ public class CompoEntry extends GenericEntity {
this.compo = composId; this.compo = composId;
} }
public User getCreator() { public EventUser getCreator() {
return creator; return creator;
} }
public void setCreator(User creator) { public void setCreator(EventUser creator) {
this.creator = creator; this.creator = creator;
} }
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntryParticipant.java
...@@ -38,7 +38,7 @@ public class CompoEntryParticipant extends GenericEntity { ...@@ -38,7 +38,7 @@ public class CompoEntryParticipant extends GenericEntity {
@JoinColumn(name = "user_id", referencedColumnName = "id", nullable = false, updatable = false) @JoinColumn(name = "user_id", referencedColumnName = "id", nullable = false, updatable = false)
@ManyToOne(optional = false) @ManyToOne(optional = false)
private User user; private EventUser user;
public CompoEntry getEntry() { public CompoEntry getEntry() {
return entry; return entry;
...@@ -48,7 +48,7 @@ public class CompoEntryParticipant extends GenericEntity { ...@@ -48,7 +48,7 @@ public class CompoEntryParticipant extends GenericEntity {
this.entry = entry; this.entry = entry;
} }
public CompoEntryParticipant(CompoEntry entry, User participant) { public CompoEntryParticipant(CompoEntry entry, EventUser participant) {
super(); super();
this.entry = entry; this.entry = entry;
this.user = participant; this.user = participant;
...@@ -66,11 +66,11 @@ public class CompoEntryParticipant extends GenericEntity { ...@@ -66,11 +66,11 @@ public class CompoEntryParticipant extends GenericEntity {
this.role = role; this.role = role;
} }
public User getUser() { public EventUser getUser() {
return user; return user;
} }
public void setUser(User user) { public void setUser(EventUser user) {
this.user = user; this.user = user;
} }
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventOrganiser.java
...@@ -36,7 +36,7 @@ public class EventOrganiser extends GenericEntity { ...@@ -36,7 +36,7 @@ public class EventOrganiser extends GenericEntity {
@ManyToOne() @ManyToOne()
@JoinColumn(name = "admin_user_id", referencedColumnName = "id", nullable = false) @JoinColumn(name = "admin_user_id", referencedColumnName = "id", nullable = false)
private User admin; private EventUser admin;
@Column(nullable = false, name = "bill_address1") @Column(nullable = false, name = "bill_address1")
private String billAddress1 = ""; private String billAddress1 = "";
...@@ -96,7 +96,7 @@ public class EventOrganiser extends GenericEntity { ...@@ -96,7 +96,7 @@ public class EventOrganiser extends GenericEntity {
/** /**
* @return the admin * @return the admin
*/ */
public User getAdmin() { public EventUser getAdmin() {
return admin; return admin;
} }
...@@ -104,7 +104,7 @@ public class EventOrganiser extends GenericEntity { ...@@ -104,7 +104,7 @@ public class EventOrganiser extends GenericEntity {
* @param admin * @param admin
* the admin to set * the admin to set
*/ */
public void setAdmin(User admin) { public void setAdmin(EventUser admin) {
this.admin = admin; this.admin = admin;
} }
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventUser.java
package fi.insomnia.bortal.model; package fi.insomnia.bortal.model;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar;
import java.util.List; import java.util.List;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
...@@ -18,10 +19,12 @@ import javax.persistence.UniqueConstraint; ...@@ -18,10 +19,12 @@ import javax.persistence.UniqueConstraint;
import org.eclipse.persistence.annotations.OptimisticLocking; import org.eclipse.persistence.annotations.OptimisticLocking;
import org.eclipse.persistence.annotations.OptimisticLockingType; import org.eclipse.persistence.annotations.OptimisticLockingType;
import fi.insomnia.bortal.enums.Gender;
@Entity @Entity
@Table(name = "event_users", uniqueConstraints = @UniqueConstraint(columnNames = { EventUser.USER_ID_COLUMN, EventUser.EVENT_ID_COLUMN })) @Table(name = "event_users", uniqueConstraints = @UniqueConstraint(columnNames = { EventUser.USER_ID_COLUMN, EventUser.EVENT_ID_COLUMN }))
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS) @OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class EventUser extends GenericEntity { public class EventUser extends GenericEntity implements IUser {
protected static final String USER_ID_COLUMN = "user_id"; protected static final String USER_ID_COLUMN = "user_id";
protected static final String EVENT_ID_COLUMN = "event_id"; protected static final String EVENT_ID_COLUMN = "event_id";
...@@ -228,4 +231,224 @@ public class EventUser extends GenericEntity { ...@@ -228,4 +231,224 @@ public class EventUser extends GenericEntity {
@OneToMany(mappedBy = "user") @OneToMany(mappedBy = "user")
private List<PollAnswer> pollAnswers; private List<PollAnswer> pollAnswers;
@Override
public Calendar getCreated() {
return user.getCreated();
}
@Override
public void setCreated(Calendar created) {
user.setCreated(created);
}
@Override
public boolean getActive() {
return user.getActive();
}
@Override
public void setActive(boolean active) {
user.setActive(active);
}
@Override
public String getPassword() {
return user.getPassword();
}
@Override
public void setPassword(String password) {
user.setPassword(password);
}
@Override
public String getWholeName() {
return user.getWholeName();
}
@Override
public String getLastname() {
return user.getLastname();
}
@Override
public void setLastname(String lastname) {
user.setLastname(lastname);
}
@Override
public String getFirstnames() {
return user.getFirstnames();
}
@Override
public void setFirstnames(String firstnames) {
user.setFirstnames(firstnames);
}
@Override
public Calendar getBirthday() {
return user.getBirthday();
}
@Override
public void setBirthday(Calendar birthday) {
user.setBirthday(birthday);
}
@Override
public String getNick() {
return user.getNick();
}
@Override
public void setNick(String nick) {
user.setNick(nick);
}
@Override
public String getEmail() {
return user.getEmail();
}
@Override
public void setEmail(String email) {
user.setEmail(email);
}
@Override
public String getAddress() {
return getAddress();
}
@Override
public void setAddress(String address) {
user.setAddress(address);
}
@Override
public String getZip() {
return user.getZip();
}
@Override
public void setZip(String zip) {
user.setZip(zip);
}
@Override
public String getTown() {
return user.getTown();
}
@Override
public void setTown(String town) {
user.setTown(town);
}
@Override
public String getPhone() {
return user.getPhone();
}
@Override
public void setPhone(String phone) {
user.setPhone(phone);
}
@Override
public String getLogin() {
return user.getLogin();
}
@Override
public void setLogin(String login) {
user.setLogin(login);
}
@Override
public List<UserImage> getUserImageList() {
return user.getUserImageList();
}
@Override
public void setUserImageList(List<UserImage> userImageList) {
user.setUserImageList(userImageList);
}
@Override
public String getConfirmHash() {
return user.getConfirmHash();
}
@Override
public void setConfirmHash(String confirmHash) {
user.setConfirmHash(confirmHash);
}
@Override
public Calendar getConfirmTime() {
return user.getConfirmTime();
}
@Override
public void setConfirmTime(Calendar confirmTime) {
user.setConfirmTime(confirmTime);
}
@Override
public void resetPassword(String password) {
user.resetPassword(password);
}
@Override
public boolean checkPassword(String plainPassword) {
return user.checkPassword(plainPassword);
}
@Override
public void setSuperadmin(boolean superadmin) {
user.setSuperadmin(superadmin);
}
@Override
public boolean isSuperadmin() {
return user.isSuperadmin();
}
@Override
public void setPostalTown(String postalTown) {
user.setPostalTown(postalTown);
}
@Override
public String getPostalTown() {
return user.getPostalTown();
}
@Override
public void setGender(Gender gender) {
user.setGender(gender);
}
@Override
public Gender getGender() {
return user.getGender();
}
@Override
public void setCurrentImage(UserImage currentImage) {
user.setCurrentImage(currentImage);
}
@Override
public UserImage getCurrentImage() {
return user.getCurrentImage();
}
@Override
public boolean isAnonymous() {
return user.isAnonymous();
}
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/GroupMembership.java
...@@ -55,7 +55,7 @@ public class GroupMembership extends GenericEntity { ...@@ -55,7 +55,7 @@ public class GroupMembership extends GenericEntity {
@JoinColumn(name = "user_id", referencedColumnName = "id") @JoinColumn(name = "user_id", referencedColumnName = "id")
@ManyToOne @ManyToOne
private User user; private EventUser user;
@Column(name = "entered_event") @Column(name = "entered_event")
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
...@@ -111,11 +111,11 @@ public class GroupMembership extends GenericEntity { ...@@ -111,11 +111,11 @@ public class GroupMembership extends GenericEntity {
this.placeReservation = placeReservation; this.placeReservation = placeReservation;
} }
public User getUser() { public EventUser getUser() {
return user; return user;
} }
public void setUser(User usersId) { public void setUser(EventUser usersId) {
this.user = usersId; this.user = usersId;
} }
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/IUser.java 0 → 100644
package fi.insomnia.bortal.model;
import java.util.Calendar;
import java.util.List;
import fi.insomnia.bortal.enums.Gender;
public interface IUser {
public abstract Calendar getCreated();
public abstract void setCreated(Calendar created);
public abstract boolean getActive();
public abstract void setActive(boolean active);
public abstract String getPassword();
public abstract void setPassword(String password);
public abstract String getWholeName();
public abstract String getLastname();
public abstract void setLastname(String lastname);
public abstract String getFirstnames();
public abstract void setFirstnames(String firstnames);
public abstract Calendar getBirthday();
public abstract void setBirthday(Calendar birthday);
public abstract String getNick();
public abstract void setNick(String nick);
public abstract String getEmail();
public abstract void setEmail(String email);
public abstract String getAddress();
public abstract void setAddress(String address);
public abstract String getZip();
public abstract void setZip(String zip);
public abstract String getTown();
public abstract void setTown(String town);
public abstract String getPhone();
public abstract void setPhone(String phone);
public abstract String getLogin();
public abstract void setLogin(String login);
public abstract List<UserImage> getUserImageList();
public abstract void setUserImageList(List<UserImage> userImageList);
/**
* @return the confirmHash
*/
public abstract String getConfirmHash();
/**
* @param confirmHash
* the confirmHash to set
*/
public abstract void setConfirmHash(String confirmHash);
/**
* @return the confirmTime
*/
public abstract Calendar getConfirmTime();
/**
* @param confirmTime
* the confirmTime to set
*/
public abstract void setConfirmTime(Calendar confirmTime);
public abstract void resetPassword(String password);
public abstract boolean checkPassword(String plainPassword);
public abstract void setSuperadmin(boolean superadmin);
public abstract boolean isSuperadmin();
public abstract void setPostalTown(String postalTown);
public abstract String getPostalTown();
public abstract void setGender(Gender gender);
public abstract Gender getGender();
public abstract void setCurrentImage(UserImage currentImage);
public abstract UserImage getCurrentImage();
public abstract boolean isAnonymous();
}
\ No newline at end of file
code/LanBortalDatabase/src/fi/insomnia/bortal/model/News.java
...@@ -46,7 +46,7 @@ public class News extends GenericEntity { ...@@ -46,7 +46,7 @@ public class News extends GenericEntity {
@ManyToOne() @ManyToOne()
@JoinColumn(nullable = false) @JoinColumn(nullable = false)
private User creator; private EventUser creator;
public Date getPublish() { public Date getPublish() {
return publish; return publish;
...@@ -82,7 +82,7 @@ public class News extends GenericEntity { ...@@ -82,7 +82,7 @@ public class News extends GenericEntity {
this.priority = priority; this.priority = priority;
} }
public News(NewsGroup newsgroup, User creator) { public News(NewsGroup newsgroup, EventUser creator) {
super(); super();
this.creator = creator; this.creator = creator;
group = newsgroup; group = newsgroup;
...@@ -128,11 +128,11 @@ public class News extends GenericEntity { ...@@ -128,11 +128,11 @@ public class News extends GenericEntity {
this.group = newsGroupsId; this.group = newsGroupsId;
} }
public User getCreator() { public EventUser getCreator() {
return creator; return creator;
} }
public void setCreator(User creator) { public void setCreator(EventUser creator) {
this.creator = creator; this.creator = creator;
} }
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Place.java
...@@ -98,7 +98,7 @@ public class Place extends GenericEntity { ...@@ -98,7 +98,7 @@ public class Place extends GenericEntity {
*/ */
@JoinColumn(name = "current_user_id", referencedColumnName = "id") @JoinColumn(name = "current_user_id", referencedColumnName = "id")
@ManyToOne @ManyToOne
private User currentUser; private EventUser currentUser;
public Place() { public Place() {
super(); super();
...@@ -184,11 +184,11 @@ public class Place extends GenericEntity { ...@@ -184,11 +184,11 @@ public class Place extends GenericEntity {
this.product = productsId; this.product = productsId;
} }
public User getCurrentUser() { public EventUser getCurrentUser() {
return currentUser; return currentUser;
} }
public void setCurrentUser(User usersId) { public void setCurrentUser(EventUser usersId) {
this.currentUser = usersId; this.currentUser = usersId;
} }
...@@ -239,7 +239,7 @@ public class Place extends GenericEntity { ...@@ -239,7 +239,7 @@ public class Place extends GenericEntity {
* *
* @return Is the place reserved ( not bought for user) * @return Is the place reserved ( not bought for user)
*/ */
public boolean isReservedFor(User u) { public boolean isReservedFor(IUser u) {
return (u.equals(getCurrentUser()) && getGroup() == null); return (u.equals(getCurrentUser()) && getGroup() == null);
} }
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/PlaceGroup.java
...@@ -74,7 +74,7 @@ public class PlaceGroup extends GenericEntity { ...@@ -74,7 +74,7 @@ public class PlaceGroup extends GenericEntity {
@JoinColumn(name = "creator_user_id", referencedColumnName = "id") @JoinColumn(name = "creator_user_id", referencedColumnName = "id")
@ManyToOne @ManyToOne
private User creator; private EventUser creator;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "placeGroup") @OneToMany(cascade = CascadeType.ALL, mappedBy = "placeGroup")
private List<GroupMembership> members = new ArrayList<GroupMembership>(); private List<GroupMembership> members = new ArrayList<GroupMembership>();
...@@ -143,11 +143,11 @@ public class PlaceGroup extends GenericEntity { ...@@ -143,11 +143,11 @@ public class PlaceGroup extends GenericEntity {
this.details = groupDetails; this.details = groupDetails;
} }
public User getCreator() { public EventUser getCreator() {
return creator; return creator;
} }
public void setCreator(User groupCreator) { public void setCreator(EventUser groupCreator) {
this.creator = groupCreator; this.creator = groupCreator;
} }
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/PollAnswer.java
...@@ -35,7 +35,7 @@ public class PollAnswer extends GenericEntity implements Serializable { ...@@ -35,7 +35,7 @@ public class PollAnswer extends GenericEntity implements Serializable {
@ManyToOne @ManyToOne
@JoinColumn(name = "user_id", referencedColumnName = "id", nullable = false) @JoinColumn(name = "user_id", referencedColumnName = "id", nullable = false)
private User user; private EventUser user;
public PollAnswer() { public PollAnswer() {
super(); super();
...@@ -83,11 +83,11 @@ public class PollAnswer extends GenericEntity implements Serializable { ...@@ -83,11 +83,11 @@ public class PollAnswer extends GenericEntity implements Serializable {
return choice; return choice;
} }
public void setUser(User user) { public void setUser(EventUser user) {
this.user = user; this.user = user;
} }
public User getUser() { public EventUser getUser() {
return user; return user;
} }
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/User.java
...@@ -34,7 +34,7 @@ import fi.insomnia.bortal.utilities.PasswordFunctions; ...@@ -34,7 +34,7 @@ import fi.insomnia.bortal.utilities.PasswordFunctions;
@Entity @Entity
@Table(name = "users") @Table(name = "users")
@OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS) @OptimisticLocking(type = OptimisticLockingType.CHANGED_COLUMNS)
public class User extends GenericEntity { public class User extends GenericEntity implements IUser {
public static final String ANONYMOUS_LOGINNAME = "anonymous"; public static final String ANONYMOUS_LOGINNAME = "anonymous";
private static final long serialVersionUID = -1632200627103418206L; private static final long serialVersionUID = -1632200627103418206L;
...@@ -109,32 +109,60 @@ public class User extends GenericEntity { ...@@ -109,32 +109,60 @@ public class User extends GenericEntity {
@Transient @Transient
private static final Logger logger = LoggerFactory.getLogger(User.class); private static final Logger logger = LoggerFactory.getLogger(User.class);
/* (non-Javadoc)
* @see fi.insomnia.bortal.model.IUser#getCreated()
*/
@Override
public Calendar getCreated() { public Calendar getCreated() {
return created; return created;
} }
/* (non-Javadoc)
* @see fi.insomnia.bortal.model.IUser#setCreated(java.util.Calendar)
*/
@Override
public void setCreated(Calendar created) { public void setCreated(Calendar created) {
this.created = created; this.created = created;
} }
/* (non-Javadoc)
* @see fi.insomnia.bortal.model.IUser#getActive()
*/
@Override
public boolean getActive() { public boolean getActive() {
return active; return active;
} }
/* (non-Javadoc)
* @see fi.insomnia.bortal.model.IUser#setActive(boolean)
*/
@Override
public void setActive(boolean active) { public void setActive(boolean active) {
this.active = active; this.active = active;
} }
/* (non-Javadoc)
* @see fi.insomnia.bortal.model.IUser#getPassword()
*/
@Override
public String getPassword() { public String getPassword() {
logger.warn("Directly reading raw User password"); logger.warn("Directly reading raw User password");
return password; return password;
} }
/* (non-Javadoc)
* @see fi.insomnia.bortal.model.IUser#setPassword(java.lang.String)
*/
@Override
public void setPassword(String password) { public void setPassword(String password) {
logger.warn("Directly settings raw User password"); logger.warn("Directly settings raw User password");
this.password = password; this.password = password;
} }
/* (non-Javadoc)
* @see fi.insomnia.bortal.model.IUser#getWholeName()
*/
@Override
public String getWholeName() { public String getWholeName() {
String ret = new StringBuilder().append(firstnames).append(" ").append(lastname).toString().trim(); String ret = new StringBuilder().append(firstnames).append(" ").append(lastname).toString().trim();
if (ret.isEmpty()) { if (ret.isEmpty()) {
...@@ -143,82 +171,162 @@ public class User extends GenericEntity { ...@@ -143,82 +171,162 @@ public class User extends GenericEntity {
return ret; return ret;
} }
/* (non-Javadoc)
* @see fi.insomnia.bortal.model.IUser#getLastname()
*/
@Override
public String getLastname() { public String getLastname() {
return lastname; return lastname;
} }
/* (non-Javadoc)
* @see fi.insomnia.bortal.model.IUser#setLastname(java.lang.String)
*/
@Override
public void setLastname(String lastname) { public void setLastname(String lastname) {
this.lastname = lastname; this.lastname = lastname;
} }
/* (non-Javadoc)
* @see fi.insomnia.bortal.model.IUser#getFirstnames()
*/
@Override
public String getFirstnames() { public String getFirstnames() {
return firstnames; return firstnames;
} }
/* (non-Javadoc)
* @see fi.insomnia.bortal.model.IUser#setFirstnames(java.lang.String)
*/
@Override
public void setFirstnames(String firstnames) { public void setFirstnames(String firstnames) {
this.firstnames = firstnames; this.firstnames = firstnames;
} }
/* (non-Javadoc)
* @see fi.insomnia.bortal.model.IUser#getBirthday()
*/
@Override
public Calendar getBirthday() { public Calendar getBirthday() {
return birthday; return birthday;
} }
/* (non-Javadoc)
* @see fi.insomnia.bortal.model.IUser#setBirthday(java.util.Calendar)
*/
@Override
public void setBirthday(Calendar birthday) { public void setBirthday(Calendar birthday) {
this.birthday = birthday; this.birthday = birthday;
} }
/* (non-Javadoc)
* @see fi.insomnia.bortal.model.IUser#getNick()
*/
@Override
public String getNick() { public String getNick() {
return nick; return nick;
} }
/* (non-Javadoc)
* @see fi.insomnia.bortal.model.IUser#setNick(java.lang.String)
*/
@Override
public void setNick(String nick) { public void setNick(String nick) {
this.nick = nick; this.nick = nick;
} }
/* (non-Javadoc)
* @see fi.insomnia.bortal.model.IUser#getEmail()
*/
@Override
public String getEmail() { public String getEmail() {
return email; return email;
} }
/* (non-Javadoc)
* @see fi.insomnia.bortal.model.IUser#setEmail(java.lang.String)
*/
@Override
public void setEmail(String email) { public void setEmail(String email) {
this.email = email; this.email = email;
} }
/* (non-Javadoc)
* @see fi.insomnia.bortal.model.IUser#getAddress()
*/
@Override
public String getAddress() { public String getAddress() {
return address; return address;
} }
/* (non-Javadoc)
* @see fi.insomnia.bortal.model.IUser#setAddress(java.lang.String)
*/
@Override
public void setAddress(String address) { public void setAddress(String address) {
this.address = address; this.address = address;
} }
/* (non-Javadoc)
* @see fi.insomnia.bortal.model.IUser#getZip()
*/
@Override
public String getZip() { public String getZip() {
return zip; return zip;
} }
/* (non-Javadoc)
* @see fi.insomnia.bortal.model.IUser#setZip(java.lang.String)
*/
@Override
public void setZip(String zip) { public void setZip(String zip) {
this.zip = zip; this.zip = zip;
} }
/* (non-Javadoc)
* @see fi.insomnia.bortal.model.IUser#getTown()
*/
@Override
public String getTown() { public String getTown() {
return town; return town;
} }
/* (non-Javadoc)
* @see fi.insomnia.bortal.model.IUser#setTown(java.lang.String)
*/
@Override
public void setTown(String town) { public void setTown(String town) {
this.town = town; this.town = town;
} }
/* (non-Javadoc)
* @see fi.insomnia.bortal.model.IUser#getPhone()
*/
@Override
public String getPhone() { public String getPhone() {
return phone; return phone;
} }
/* (non-Javadoc)
* @see fi.insomnia.bortal.model.IUser#setPhone(java.lang.String)
*/
@Override
public void setPhone(String phone) { public void setPhone(String phone) {
this.phone = phone; this.phone = phone;
} }
/* (non-Javadoc)
* @see fi.insomnia.bortal.model.IUser#getLogin()
*/
@Override
public String getLogin() { public String getLogin() {
return login; return login;
} }
/* (non-Javadoc)
* @see fi.insomnia.bortal.model.IUser#setLogin(java.lang.String)
*/
@Override
public void setLogin(String login) { public void setLogin(String login) {
// Do not allow anonymous userchange // Do not allow anonymous userchange
if (!isAnonymous()) { if (!isAnonymous()) {
...@@ -231,82 +339,132 @@ public class User extends GenericEntity { ...@@ -231,82 +339,132 @@ public class User extends GenericEntity {
} }
/* (non-Javadoc)
* @see fi.insomnia.bortal.model.IUser#getUserImageList()
*/
@Override
public List<UserImage> getUserImageList() { public List<UserImage> getUserImageList() {
return userImageList; return userImageList;
} }
/* (non-Javadoc)
* @see fi.insomnia.bortal.model.IUser#setUserImageList(java.util.List)
*/
@Override
public void setUserImageList(List<UserImage> userImageList) { public void setUserImageList(List<UserImage> userImageList) {
this.userImageList = userImageList; this.userImageList = userImageList;
} }
/** /* (non-Javadoc)
* @return the confirmHash * @see fi.insomnia.bortal.model.IUser#getConfirmHash()
*/ */
@Override
public String getConfirmHash() { public String getConfirmHash() {
return confirmHash; return confirmHash;
} }
/** /* (non-Javadoc)
* @param confirmHash * @see fi.insomnia.bortal.model.IUser#setConfirmHash(java.lang.String)
* the confirmHash to set
*/ */
@Override
public void setConfirmHash(String confirmHash) { public void setConfirmHash(String confirmHash) {
this.confirmHash = confirmHash; this.confirmHash = confirmHash;
} }
/** /* (non-Javadoc)
* @return the confirmTime * @see fi.insomnia.bortal.model.IUser#getConfirmTime()
*/ */
@Override
public Calendar getConfirmTime() { public Calendar getConfirmTime() {
return confirmTime; return confirmTime;
} }
/** /* (non-Javadoc)
* @param confirmTime * @see fi.insomnia.bortal.model.IUser#setConfirmTime(java.util.Calendar)
* the confirmTime to set
*/ */
@Override
public void setConfirmTime(Calendar confirmTime) { public void setConfirmTime(Calendar confirmTime) {
this.confirmTime = confirmTime; this.confirmTime = confirmTime;
} }
/* (non-Javadoc)
* @see fi.insomnia.bortal.model.IUser#resetPassword(java.lang.String)
*/
@Override
public void resetPassword(String password) { public void resetPassword(String password) {
String newEncryptedPassword = PasswordFunctions.getEncryptedPassword(password); String newEncryptedPassword = PasswordFunctions.getEncryptedPassword(password);
this.password = newEncryptedPassword; // Bypass setter this.password = newEncryptedPassword; // Bypass setter
} }
/* (non-Javadoc)
* @see fi.insomnia.bortal.model.IUser#checkPassword(java.lang.String)
*/
@Override
public boolean checkPassword(String plainPassword) { public boolean checkPassword(String plainPassword) {
boolean matches = PasswordFunctions.checkPlainPassword(plainPassword, this.password); boolean matches = PasswordFunctions.checkPlainPassword(plainPassword, this.password);
return matches; return matches;
} }
/* (non-Javadoc)
* @see fi.insomnia.bortal.model.IUser#setSuperadmin(boolean)
*/
@Override
public void setSuperadmin(boolean superadmin) { public void setSuperadmin(boolean superadmin) {
this.superadmin = superadmin; this.superadmin = superadmin;
} }
/* (non-Javadoc)
* @see fi.insomnia.bortal.model.IUser#isSuperadmin()
*/
@Override
public boolean isSuperadmin() { public boolean isSuperadmin() {
return superadmin; return superadmin;
} }
/* (non-Javadoc)
* @see fi.insomnia.bortal.model.IUser#setPostalTown(java.lang.String)
*/
@Override
public void setPostalTown(String postalTown) { public void setPostalTown(String postalTown) {
this.postalTown = postalTown; this.postalTown = postalTown;
} }
/* (non-Javadoc)
* @see fi.insomnia.bortal.model.IUser#getPostalTown()
*/
@Override
public String getPostalTown() { public String getPostalTown() {
return postalTown; return postalTown;
} }
/* (non-Javadoc)
* @see fi.insomnia.bortal.model.IUser#setGender(fi.insomnia.bortal.enums.Gender)
*/
@Override
public void setGender(Gender gender) { public void setGender(Gender gender) {
this.gender = gender; this.gender = gender;
} }
/* (non-Javadoc)
* @see fi.insomnia.bortal.model.IUser#getGender()
*/
@Override
public Gender getGender() { public Gender getGender() {
return gender; return gender;
} }
/* (non-Javadoc)
* @see fi.insomnia.bortal.model.IUser#setCurrentImage(fi.insomnia.bortal.model.UserImage)
*/
@Override
public void setCurrentImage(UserImage currentImage) { public void setCurrentImage(UserImage currentImage) {
this.currentImage = currentImage; this.currentImage = currentImage;
} }
/* (non-Javadoc)
* @see fi.insomnia.bortal.model.IUser#getCurrentImage()
*/
@Override
public UserImage getCurrentImage() { public UserImage getCurrentImage() {
return currentImage; return currentImage;
} }
...@@ -314,6 +472,10 @@ public class User extends GenericEntity { ...@@ -314,6 +472,10 @@ public class User extends GenericEntity {
@Transient @Transient
private Boolean isAnon; private Boolean isAnon;
/* (non-Javadoc)
* @see fi.insomnia.bortal.model.IUser#isAnonymous()
*/
@Override
public boolean isAnonymous() { public boolean isAnonymous() {
if (isAnon == null) { if (isAnon == null) {
isAnon = ANONYMOUS_LOGINNAME.equals(login); isAnon = ANONYMOUS_LOGINNAME.equals(login);
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/UserNote.java
...@@ -16,7 +16,7 @@ public class UserNote extends GenericEntity { ...@@ -16,7 +16,7 @@ public class UserNote extends GenericEntity {
@ManyToOne @ManyToOne
@JoinColumn(nullable = false) @JoinColumn(nullable = false)
private User user; private EventUser user;
@ManyToOne @ManyToOne
@JoinColumn(nullable = false) @JoinColumn(nullable = false)
...@@ -30,11 +30,11 @@ public class UserNote extends GenericEntity { ...@@ -30,11 +30,11 @@ public class UserNote extends GenericEntity {
@Enumerated(EnumType.STRING) @Enumerated(EnumType.STRING)
private UserNoteType notetype; private UserNoteType notetype;
public User getUser() { public EventUser getUser() {
return user; return user;
} }
public void setUser(User user) { public void setUser(EventUser user) {
this.user = user; this.user = user;
} }
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Vote.java
...@@ -48,7 +48,7 @@ public class Vote extends GenericEntity { ...@@ -48,7 +48,7 @@ public class Vote extends GenericEntity {
@JoinColumn(name = VOTER_USER_ID, referencedColumnName = "id", nullable = false) @JoinColumn(name = VOTER_USER_ID, referencedColumnName = "id", nullable = false)
@ManyToOne(optional = false) @ManyToOne(optional = false)
private User voter; private EventUser voter;
public Vote(LanEvent event, Calendar voteTime) { public Vote(LanEvent event, Calendar voteTime) {
super(); super();
...@@ -93,7 +93,7 @@ public class Vote extends GenericEntity { ...@@ -93,7 +93,7 @@ public class Vote extends GenericEntity {
/** /**
* @return the voter * @return the voter
*/ */
public User getVoter() { public EventUser getVoter() {
return voter; return voter;
} }
...@@ -101,7 +101,7 @@ public class Vote extends GenericEntity { ...@@ -101,7 +101,7 @@ public class Vote extends GenericEntity {
* @param voter * @param voter
* the voter to set * the voter to set
*/ */
public void setVoter(User voter) { public void setVoter(EventUser voter) {
this.voter = voter; this.voter = voter;
} }
......
code/LanBortalTerminalWeb/src/fi/insomnia/bortal/terminal/handler/SessionHandler.java
...@@ -17,7 +17,7 @@ import fi.insomnia.bortal.beans.PermissionBeanLocal; ...@@ -17,7 +17,7 @@ import fi.insomnia.bortal.beans.PermissionBeanLocal;
import fi.insomnia.bortal.beans.RoleBeanLocal; import fi.insomnia.bortal.beans.RoleBeanLocal;
import fi.insomnia.bortal.clientutils.BortalLocalContextHolder; import fi.insomnia.bortal.clientutils.BortalLocalContextHolder;
import fi.insomnia.bortal.enums.apps.IAppPermission; import fi.insomnia.bortal.enums.apps.IAppPermission;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.IUser;
@Named() @Named()
@RequestScoped @RequestScoped
...@@ -85,7 +85,7 @@ public class SessionHandler { ...@@ -85,7 +85,7 @@ public class SessionHandler {
} }
public User getCurrentUser() { public IUser getCurrentUser() {
return permbean.getCurrentUser(); return permbean.getCurrentUser();
} }
......
code/LanBortalWeb/src/fi/insomnia/bortal/handler/SessionHandler.java
...@@ -22,7 +22,7 @@ import fi.insomnia.bortal.beans.PermissionBeanLocal; ...@@ -22,7 +22,7 @@ import fi.insomnia.bortal.beans.PermissionBeanLocal;
import fi.insomnia.bortal.beans.RoleBeanLocal; import fi.insomnia.bortal.beans.RoleBeanLocal;
import fi.insomnia.bortal.clientutils.BortalLocalContextHolder; import fi.insomnia.bortal.clientutils.BortalLocalContextHolder;
import fi.insomnia.bortal.enums.apps.IAppPermission; import fi.insomnia.bortal.enums.apps.IAppPermission;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.IUser;
/** /**
* *
...@@ -125,7 +125,7 @@ public class SessionHandler { ...@@ -125,7 +125,7 @@ public class SessionHandler {
} }
public User getCurrentUser() { public IUser getCurrentUser() {
return permbean.getCurrentUser(); return permbean.getCurrentUser();
} }
......
code/LanBortalWeb/src/fi/insomnia/bortal/servlet/PlaceMap.java
...@@ -33,8 +33,8 @@ import fi.insomnia.bortal.beans.PlaceMapBeanLocal; ...@@ -33,8 +33,8 @@ import fi.insomnia.bortal.beans.PlaceMapBeanLocal;
import fi.insomnia.bortal.beans.SecurityLogType; import fi.insomnia.bortal.beans.SecurityLogType;
import fi.insomnia.bortal.enums.apps.MapPermission; import fi.insomnia.bortal.enums.apps.MapPermission;
import fi.insomnia.bortal.model.EventMap; import fi.insomnia.bortal.model.EventMap;
import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.Place; import fi.insomnia.bortal.model.Place;
import fi.insomnia.bortal.model.User;
/** /**
* *
...@@ -149,7 +149,7 @@ public class PlaceMap extends HttpServlet { ...@@ -149,7 +149,7 @@ public class PlaceMap extends HttpServlet {
// logger.debug("Got map object {}", map); // logger.debug("Got map object {}", map);
List<Place> places = map.getPlaces(); List<Place> places = map.getPlaces();
User user = permbean.getCurrentUser(); IUser user = permbean.getCurrentUser();
// List<Place> selectedPlaces = placemapBean.findSelectedPlaces(map); // List<Place> selectedPlaces = placemapBean.findSelectedPlaces(map);
BufferedImage image = ImageIO.read(new ByteArrayInputStream(map BufferedImage image = ImageIO.read(new ByteArrayInputStream(map
...@@ -241,7 +241,7 @@ public class PlaceMap extends HttpServlet { ...@@ -241,7 +241,7 @@ public class PlaceMap extends HttpServlet {
private static final Color LOCKED_COLOR = Color.DARK_GRAY; private static final Color LOCKED_COLOR = Color.DARK_GRAY;
private static final int BORDER_WIDTH = 2; private static final int BORDER_WIDTH = 2;
private static void drawPlace(Place p, Graphics2D g, User user) { private static void drawPlace(Place p, Graphics2D g, IUser user) {
if (p.isDisabled()) { if (p.isDisabled()) {
return; return;
} }
......
code/LanBortalWeb/src/fi/insomnia/bortal/servlet/UserCardServlet.java
...@@ -21,8 +21,8 @@ import fi.insomnia.bortal.beans.CardTemplateBeanLocal; ...@@ -21,8 +21,8 @@ import fi.insomnia.bortal.beans.CardTemplateBeanLocal;
import fi.insomnia.bortal.beans.PermissionBeanLocal; import fi.insomnia.bortal.beans.PermissionBeanLocal;
import fi.insomnia.bortal.beans.UserBeanLocal; import fi.insomnia.bortal.beans.UserBeanLocal;
import fi.insomnia.bortal.enums.apps.UserPermission; import fi.insomnia.bortal.enums.apps.UserPermission;
import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.PrintedCard; import fi.insomnia.bortal.model.PrintedCard;
import fi.insomnia.bortal.model.User;
/** /**
* Servlet implementation class UploadServlet * Servlet implementation class UploadServlet
...@@ -86,7 +86,7 @@ public class UserCardServlet extends GenericImageServlet { ...@@ -86,7 +86,7 @@ public class UserCardServlet extends GenericImageServlet {
private byte[] mkCard(PrintedCard card) throws IOException { private byte[] mkCard(PrintedCard card) throws IOException {
User user = card.getUser(); IUser user = card.getUser();
BufferedImage face = ImageIO.read(new ByteArrayInputStream(user.getCurrentImage().getImageData())); BufferedImage face = ImageIO.read(new ByteArrayInputStream(user.getCurrentImage().getImageData()));
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/game/GameView.java
...@@ -6,7 +6,7 @@ import javax.inject.Inject; ...@@ -6,7 +6,7 @@ import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
import fi.insomnia.bortal.beans.NewsBeanLocal; import fi.insomnia.bortal.beans.NewsBeanLocal;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.web.annotations.SelectedUser; import fi.insomnia.bortal.web.annotations.SelectedUser;
import fi.insomnia.bortal.web.cdiview.GenericCDIView; import fi.insomnia.bortal.web.cdiview.GenericCDIView;
...@@ -19,6 +19,6 @@ public class GameView extends GenericCDIView { ...@@ -19,6 +19,6 @@ public class GameView extends GenericCDIView {
@Inject @Inject
@SelectedUser @SelectedUser
private User user; private IUser user;
} }
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/map/MapView.java
...@@ -17,7 +17,7 @@ import fi.insomnia.bortal.beans.PlaceBeanLocal; ...@@ -17,7 +17,7 @@ import fi.insomnia.bortal.beans.PlaceBeanLocal;
import fi.insomnia.bortal.beans.PlaceMapBeanLocal; import fi.insomnia.bortal.beans.PlaceMapBeanLocal;
import fi.insomnia.bortal.enums.apps.MapPermission; import fi.insomnia.bortal.enums.apps.MapPermission;
import fi.insomnia.bortal.model.EventMap; import fi.insomnia.bortal.model.EventMap;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.web.annotations.SelectedUser; import fi.insomnia.bortal.web.annotations.SelectedUser;
import fi.insomnia.bortal.web.cdiview.GenericCDIView; import fi.insomnia.bortal.web.cdiview.GenericCDIView;
...@@ -31,7 +31,7 @@ public class MapView extends GenericCDIView { ...@@ -31,7 +31,7 @@ public class MapView extends GenericCDIView {
@Inject @Inject
@SelectedUser @SelectedUser
private User user; private IUser user;
private EventMap activeMap; private EventMap activeMap;
...@@ -106,11 +106,11 @@ public class MapView extends GenericCDIView { ...@@ -106,11 +106,11 @@ public class MapView extends GenericCDIView {
this.activeMap = activeMap; this.activeMap = activeMap;
} }
public void setUser(User user) { public void setUser(IUser user) {
this.user = user; this.user = user;
} }
public User getUser() { public IUser getUser() {
return user; return user;
} }
} }
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/map/PlacegroupView.java
...@@ -12,9 +12,9 @@ import javax.inject.Named; ...@@ -12,9 +12,9 @@ import javax.inject.Named;
import fi.insomnia.bortal.beans.PlaceGroupBeanLocal; import fi.insomnia.bortal.beans.PlaceGroupBeanLocal;
import fi.insomnia.bortal.enums.apps.MapPermission; import fi.insomnia.bortal.enums.apps.MapPermission;
import fi.insomnia.bortal.model.GroupMembership; import fi.insomnia.bortal.model.GroupMembership;
import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.Place; import fi.insomnia.bortal.model.Place;
import fi.insomnia.bortal.model.PlaceGroup; import fi.insomnia.bortal.model.PlaceGroup;
import fi.insomnia.bortal.model.User;
import fi.insomnia.bortal.web.annotations.SelectedUser; import fi.insomnia.bortal.web.annotations.SelectedUser;
import fi.insomnia.bortal.web.cdiview.GenericCDIView; import fi.insomnia.bortal.web.cdiview.GenericCDIView;
...@@ -28,7 +28,7 @@ public class PlacegroupView extends GenericCDIView { ...@@ -28,7 +28,7 @@ public class PlacegroupView extends GenericCDIView {
// private UserView userview; // private UserView userview;
@Inject @Inject
@SelectedUser @SelectedUser
private User user; private IUser user;
@EJB @EJB
private transient PlaceGroupBeanLocal placegroupBean; private transient PlaceGroupBeanLocal placegroupBean;
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/map/TokenView.java
...@@ -7,7 +7,7 @@ import javax.inject.Named; ...@@ -7,7 +7,7 @@ import javax.inject.Named;
import fi.insomnia.bortal.beans.PlaceGroupBeanLocal; import fi.insomnia.bortal.beans.PlaceGroupBeanLocal;
import fi.insomnia.bortal.enums.apps.MapPermission; import fi.insomnia.bortal.enums.apps.MapPermission;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.web.annotations.SelectedUser; import fi.insomnia.bortal.web.annotations.SelectedUser;
import fi.insomnia.bortal.web.cdiview.GenericCDIView; import fi.insomnia.bortal.web.cdiview.GenericCDIView;
...@@ -21,7 +21,7 @@ public class TokenView extends GenericCDIView { ...@@ -21,7 +21,7 @@ public class TokenView extends GenericCDIView {
@Inject @Inject
@SelectedUser @SelectedUser
private User user; private IUser user;
@EJB @EJB
private transient PlaceGroupBeanLocal placegroupbean; private transient PlaceGroupBeanLocal placegroupbean;
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/organisation/EventOrgView.java
...@@ -12,9 +12,9 @@ import javax.inject.Named; ...@@ -12,9 +12,9 @@ import javax.inject.Named;
import fi.insomnia.bortal.beans.EventBeanLocal; import fi.insomnia.bortal.beans.EventBeanLocal;
import fi.insomnia.bortal.beans.EventOrganiserBeanLocal; import fi.insomnia.bortal.beans.EventOrganiserBeanLocal;
import fi.insomnia.bortal.model.EventOrganiser; import fi.insomnia.bortal.model.EventOrganiser;
import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.LanEvent; import fi.insomnia.bortal.model.LanEvent;
import fi.insomnia.bortal.model.LanEventDomain; import fi.insomnia.bortal.model.LanEventDomain;
import fi.insomnia.bortal.model.User;
import fi.insomnia.bortal.web.annotations.LoggedIn; import fi.insomnia.bortal.web.annotations.LoggedIn;
import fi.insomnia.bortal.web.cdiview.GenericCDIView; import fi.insomnia.bortal.web.cdiview.GenericCDIView;
...@@ -31,7 +31,7 @@ public class EventOrgView extends GenericCDIView { ...@@ -31,7 +31,7 @@ public class EventOrgView extends GenericCDIView {
@LoggedIn @LoggedIn
@Inject @Inject
private User user; private IUser user;
private EventOrganiser eventorg; private EventOrganiser eventorg;
private Integer orgId; private Integer orgId;
...@@ -145,11 +145,11 @@ public class EventOrgView extends GenericCDIView { ...@@ -145,11 +145,11 @@ public class EventOrgView extends GenericCDIView {
return orgId; return orgId;
} }
public void setUser(User user) { public void setUser(IUser user) {
this.user = user; this.user = user;
} }
public User getUser() { public IUser getUser() {
return user; return user;
} }
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/shop/BillListView.java
...@@ -13,7 +13,7 @@ import fi.insomnia.bortal.beans.BillBeanLocal; ...@@ -13,7 +13,7 @@ import fi.insomnia.bortal.beans.BillBeanLocal;
import fi.insomnia.bortal.bortal.views.BillSummary; import fi.insomnia.bortal.bortal.views.BillSummary;
import fi.insomnia.bortal.enums.apps.BillPermission; import fi.insomnia.bortal.enums.apps.BillPermission;
import fi.insomnia.bortal.model.Bill; import fi.insomnia.bortal.model.Bill;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.web.annotations.SelectedUser; import fi.insomnia.bortal.web.annotations.SelectedUser;
import fi.insomnia.bortal.web.cdiview.GenericCDIView; import fi.insomnia.bortal.web.cdiview.GenericCDIView;
...@@ -28,7 +28,7 @@ public class BillListView extends GenericCDIView { ...@@ -28,7 +28,7 @@ public class BillListView extends GenericCDIView {
@Inject @Inject
@SelectedUser @SelectedUser
private User user; private IUser user;
@EJB @EJB
private transient BillBeanLocal billbean; private transient BillBeanLocal billbean;
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/shop/InviteAcceptView.java
...@@ -7,6 +7,7 @@ import javax.inject.Named; ...@@ -7,6 +7,7 @@ import javax.inject.Named;
import fi.insomnia.bortal.beans.UserBeanLocal; import fi.insomnia.bortal.beans.UserBeanLocal;
import fi.insomnia.bortal.model.GroupMembership; import fi.insomnia.bortal.model.GroupMembership;
import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.User;
import fi.insomnia.bortal.web.cdiview.GenericCDIView; import fi.insomnia.bortal.web.cdiview.GenericCDIView;
import fi.insomnia.bortal.web.cdiview.user.UserView; import fi.insomnia.bortal.web.cdiview.user.UserView;
...@@ -69,7 +70,7 @@ public class InviteAcceptView extends GenericCDIView { ...@@ -69,7 +70,7 @@ public class InviteAcceptView extends GenericCDIView {
this.user = user; this.user = user;
} }
public User getUser() { public IUser getUser() {
return user; return user;
} }
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/shop/ProductShopView.java
...@@ -17,6 +17,7 @@ import fi.insomnia.bortal.beans.EventBeanLocal; ...@@ -17,6 +17,7 @@ import fi.insomnia.bortal.beans.EventBeanLocal;
import fi.insomnia.bortal.beans.ProductBeanLocal; import fi.insomnia.bortal.beans.ProductBeanLocal;
import fi.insomnia.bortal.enums.apps.ShopPermission; import fi.insomnia.bortal.enums.apps.ShopPermission;
import fi.insomnia.bortal.model.Bill; import fi.insomnia.bortal.model.Bill;
import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.User;
import fi.insomnia.bortal.web.annotations.SelectedUser; import fi.insomnia.bortal.web.annotations.SelectedUser;
import fi.insomnia.bortal.web.cdiview.GenericCDIView; import fi.insomnia.bortal.web.cdiview.GenericCDIView;
...@@ -113,7 +114,7 @@ public class ProductShopView extends GenericCDIView { ...@@ -113,7 +114,7 @@ public class ProductShopView extends GenericCDIView {
this.user = user; this.user = user;
} }
public User getUser() { public IUser getUser() {
return user; return user;
} }
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/user/CardView.java
...@@ -17,7 +17,7 @@ import fi.insomnia.bortal.beans.CardTemplateBeanLocal; ...@@ -17,7 +17,7 @@ import fi.insomnia.bortal.beans.CardTemplateBeanLocal;
import fi.insomnia.bortal.beans.EventBeanLocal; import fi.insomnia.bortal.beans.EventBeanLocal;
import fi.insomnia.bortal.enums.apps.UserPermission; import fi.insomnia.bortal.enums.apps.UserPermission;
import fi.insomnia.bortal.model.CardTemplate; import fi.insomnia.bortal.model.CardTemplate;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.utilities.I18n; import fi.insomnia.bortal.utilities.I18n;
import fi.insomnia.bortal.web.annotations.SelectedUser; import fi.insomnia.bortal.web.annotations.SelectedUser;
import fi.insomnia.bortal.web.cdiview.GenericCDIView; import fi.insomnia.bortal.web.cdiview.GenericCDIView;
...@@ -37,7 +37,7 @@ public class CardView extends GenericCDIView { ...@@ -37,7 +37,7 @@ public class CardView extends GenericCDIView {
private EventBeanLocal eventBean; private EventBeanLocal eventBean;
@Inject @Inject
@SelectedUser @SelectedUser
private User user; private IUser user;
private Integer cardid; private Integer cardid;
...@@ -114,11 +114,11 @@ public class CardView extends GenericCDIView { ...@@ -114,11 +114,11 @@ public class CardView extends GenericCDIView {
return null; return null;
} }
public User getUser() { public IUser getUser() {
return user; return user;
} }
public void setUser(User user) { public void setUser(IUser user) {
this.user = user; this.user = user;
} }
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/user/ImportWrapper.java
...@@ -7,18 +7,19 @@ import java.util.List; ...@@ -7,18 +7,19 @@ import java.util.List;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.User;
public class ImportWrapper implements Serializable { public class ImportWrapper implements Serializable {
private static final long serialVersionUID = 6812020704989137912L; private static final long serialVersionUID = 6812020704989137912L;
private final User user; private final IUser user;
private final ArrayList<User> potential; private final ArrayList<User> potential;
private User selected; private User selected;
private Boolean skip = false; private Boolean skip = false;
private static final Logger logger = LoggerFactory.getLogger(ImportWrapper.class); private static final Logger logger = LoggerFactory.getLogger(ImportWrapper.class);
public ImportWrapper(User usr) { public ImportWrapper(IUser usr) {
user = usr; user = usr;
potential = new ArrayList<User>(); potential = new ArrayList<User>();
selected = new User(); selected = new User();
...@@ -29,7 +30,7 @@ public class ImportWrapper implements Serializable { ...@@ -29,7 +30,7 @@ public class ImportWrapper implements Serializable {
potential.addAll(results); potential.addAll(results);
} }
public User getUser() { public IUser getUser() {
return user; return user;
} }
...@@ -37,7 +38,7 @@ public class ImportWrapper implements Serializable { ...@@ -37,7 +38,7 @@ public class ImportWrapper implements Serializable {
return potential; return potential;
} }
public User getSelected() { public IUser getSelected() {
return selected; return selected;
} }
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/user/PasswordResetView.java
...@@ -10,6 +10,7 @@ import org.slf4j.Logger; ...@@ -10,6 +10,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import fi.insomnia.bortal.beans.UserBeanLocal; import fi.insomnia.bortal.beans.UserBeanLocal;
import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.User;
import fi.insomnia.bortal.web.cdiview.GenericCDIView; import fi.insomnia.bortal.web.cdiview.GenericCDIView;
...@@ -115,7 +116,7 @@ public class PasswordResetView extends GenericCDIView { ...@@ -115,7 +116,7 @@ public class PasswordResetView extends GenericCDIView {
this.confirm = confirm; this.confirm = confirm;
} }
public User getUser() { public IUser getUser() {
return user; return user;
} }
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/user/PasswordView.java
...@@ -7,6 +7,7 @@ import javax.inject.Named; ...@@ -7,6 +7,7 @@ import javax.inject.Named;
import fi.insomnia.bortal.beans.UserBeanLocal; import fi.insomnia.bortal.beans.UserBeanLocal;
import fi.insomnia.bortal.enums.apps.UserPermission; import fi.insomnia.bortal.enums.apps.UserPermission;
import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.User;
import fi.insomnia.bortal.web.annotations.SelectedUser; import fi.insomnia.bortal.web.annotations.SelectedUser;
import fi.insomnia.bortal.web.cdiview.GenericCDIView; import fi.insomnia.bortal.web.cdiview.GenericCDIView;
...@@ -44,7 +45,7 @@ public class PasswordView extends GenericCDIView { ...@@ -44,7 +45,7 @@ public class PasswordView extends GenericCDIView {
return "permissionDenied"; return "permissionDenied";
} }
public User getUser() { public IUser getUser() {
return user; return user;
} }
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/user/UserCardView.java
...@@ -7,8 +7,8 @@ import javax.inject.Inject; ...@@ -7,8 +7,8 @@ import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
import fi.insomnia.bortal.beans.CardTemplateBeanLocal; import fi.insomnia.bortal.beans.CardTemplateBeanLocal;
import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.PrintedCard; import fi.insomnia.bortal.model.PrintedCard;
import fi.insomnia.bortal.model.User;
import fi.insomnia.bortal.web.annotations.SelectedUser; import fi.insomnia.bortal.web.annotations.SelectedUser;
import fi.insomnia.bortal.web.cdiview.GenericCDIView; import fi.insomnia.bortal.web.cdiview.GenericCDIView;
...@@ -22,15 +22,15 @@ public class UserCardView extends GenericCDIView { ...@@ -22,15 +22,15 @@ public class UserCardView extends GenericCDIView {
@Inject @Inject
@SelectedUser @SelectedUser
private User user; private IUser user;
private ListDataModel<PrintedCard> printedCards; private ListDataModel<PrintedCard> printedCards;
public User getUser() { public IUser getUser() {
return user; return user;
} }
public void setUser(User user) { public void setUser(IUser user) {
this.user = user; this.user = user;
} }
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/user/UserView.java
...@@ -22,6 +22,7 @@ import fi.insomnia.bortal.beans.RoleBeanLocal; ...@@ -22,6 +22,7 @@ import fi.insomnia.bortal.beans.RoleBeanLocal;
import fi.insomnia.bortal.beans.UserBeanLocal; import fi.insomnia.bortal.beans.UserBeanLocal;
import fi.insomnia.bortal.enums.apps.UserPermission; import fi.insomnia.bortal.enums.apps.UserPermission;
import fi.insomnia.bortal.model.AccountEvent; import fi.insomnia.bortal.model.AccountEvent;
import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.PrintedCard; import fi.insomnia.bortal.model.PrintedCard;
import fi.insomnia.bortal.model.Role; import fi.insomnia.bortal.model.Role;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.User;
...@@ -224,7 +225,7 @@ public class UserView extends GenericCDIView { ...@@ -224,7 +225,7 @@ public class UserView extends GenericCDIView {
this.user = user; this.user = user;
} }
public User getUser() { public IUser getUser() {
return user; return user;
} }
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/converter/UserConverter.java
...@@ -5,6 +5,7 @@ import javax.faces.bean.RequestScoped; ...@@ -5,6 +5,7 @@ import javax.faces.bean.RequestScoped;
import javax.inject.Named; import javax.inject.Named;
import fi.insomnia.bortal.beans.UserBeanLocal; import fi.insomnia.bortal.beans.UserBeanLocal;
import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.User;
import fi.insomnia.bortal.utilities.jsf.GenericIntegerEntityConverter; import fi.insomnia.bortal.utilities.jsf.GenericIntegerEntityConverter;
...@@ -16,7 +17,7 @@ public class UserConverter extends GenericIntegerEntityConverter<User> { ...@@ -16,7 +17,7 @@ public class UserConverter extends GenericIntegerEntityConverter<User> {
private UserBeanLocal userbean; private UserBeanLocal userbean;
@Override @Override
protected User find(Integer id) { protected IUser find(Integer id) {
return userbean.findById(id); return userbean.findById(id);
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!