Skip to content

Antti Väyrynen / Moya

Go to a project
Commit 041f6e04 by Tuomas Riihimäki
Options

No functional changes! Only cleanup

1 parent ecbd924c
Expand all
Inline Side-by-side
Showing with 285 additions and 420 deletions
code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/ActionLogBeanLocal.java
...@@ -17,15 +17,14 @@ ...@@ -17,15 +17,14 @@
* *
*/ */
package fi.codecrew.moya.beans; package fi.codecrew.moya.beans;
import java.util.ArrayList; import java.util.List;
import java.util.List;
import javax.ejb.Local;
import javax.ejb.Local;
import fi.codecrew.moya.enums.ActionLogMessageState;
import fi.codecrew.moya.enums.ActionLogMessageState; import fi.codecrew.moya.model.ActionLogMessage;
import fi.codecrew.moya.model.ActionLogMessage; import fi.codecrew.moya.model.ActionLogMessageResponse;
import fi.codecrew.moya.model.ActionLogMessageResponse; import fi.codecrew.moya.model.ActionLogMessageTag;
import fi.codecrew.moya.model.ActionLogMessageTag;
import fi.codecrew.moya.model.Role; import fi.codecrew.moya.model.Role;
@Local @Local
......
code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/DiscountBeanLocal.java
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
package fi.codecrew.moya.beans; package fi.codecrew.moya.beans;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
......
code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/LectureBeanLocal.java
...@@ -21,7 +21,6 @@ package fi.codecrew.moya.beans; ...@@ -21,7 +21,6 @@ package fi.codecrew.moya.beans;
import java.util.List; import java.util.List;
import javax.ejb.Local; import javax.ejb.Local;
import javax.faces.model.ListDataModel;
import fi.codecrew.moya.model.EventUser; import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.Lecture; import fi.codecrew.moya.model.Lecture;
......
code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/ReaderBeanLocal.java
...@@ -22,7 +22,6 @@ import java.util.List; ...@@ -22,7 +22,6 @@ import java.util.List;
import javax.ejb.Local; import javax.ejb.Local;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.PrintedCard; import fi.codecrew.moya.model.PrintedCard;
import fi.codecrew.moya.model.Reader; import fi.codecrew.moya.model.Reader;
import fi.codecrew.moya.model.ReaderEvent; import fi.codecrew.moya.model.ReaderEvent;
......
code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/StatisticsBeanLocal.java
...@@ -24,7 +24,6 @@ import java.util.Map; ...@@ -24,7 +24,6 @@ import java.util.Map;
import javax.ejb.Local; import javax.ejb.Local;
import fi.codecrew.moya.beans.StatisticsBeanLocal.ProductSlotcountMover;
import fi.codecrew.moya.model.Product; import fi.codecrew.moya.model.Product;
@Local @Local
......
code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/TicketBeanLocal.java
...@@ -18,13 +18,12 @@ ...@@ -18,13 +18,12 @@
*/ */
package fi.codecrew.moya.beans; package fi.codecrew.moya.beans;
import fi.codecrew.moya.model.EventUser; import java.util.List;
import fi.codecrew.moya.model.GroupMembership;
import fi.codecrew.moya.model.PlaceGroup;
import javax.ejb.Local; import javax.ejb.Local;
import java.io.OutputStream;
import java.util.List; import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.GroupMembership;
@Local @Local
public interface TicketBeanLocal { public interface TicketBeanLocal {
......
code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/map/QueueBeanLocal.java
...@@ -2,10 +2,6 @@ package fi.codecrew.moya.beans.map; ...@@ -2,10 +2,6 @@ package fi.codecrew.moya.beans.map;
import java.util.Collection; import java.util.Collection;
import java.util.Date; import java.util.Date;
import java.util.List;
import java.util.Set;
import java.util.concurrent.ConcurrentSkipListSet;
import java.util.concurrent.LinkedBlockingQueue;
import javax.ejb.Local; import javax.ejb.Local;
......
code/moya-beans-client/ejbModule/fi/codecrew/moya/util/CheckoutBank.java
...@@ -34,6 +34,7 @@ public class CheckoutBank { ...@@ -34,6 +34,7 @@ public class CheckoutBank {
private final String icon; private final String icon;
private final String name; private final String name;
private final List<Valuepair> postParams = new ArrayList<Valuepair>(); private final List<Valuepair> postParams = new ArrayList<Valuepair>();
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(CheckoutBank.class); private static final Logger logger = LoggerFactory.getLogger(CheckoutBank.class);
public CheckoutBank(Node bank) { public CheckoutBank(Node bank) {
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/ApiApplicationBean.java
...@@ -18,6 +18,13 @@ ...@@ -18,6 +18,13 @@
*/ */
package fi.codecrew.moya.beans; package fi.codecrew.moya.beans;
import java.util.Calendar;
import javax.ejb.EJB;
import javax.ejb.EJBAccessException;
import javax.ejb.LocalBean;
import javax.ejb.Singleton;
import fi.codecrew.moya.facade.ApiApplicationFacade; import fi.codecrew.moya.facade.ApiApplicationFacade;
import fi.codecrew.moya.facade.ApiApplicationInstanceFacade; import fi.codecrew.moya.facade.ApiApplicationInstanceFacade;
import fi.codecrew.moya.model.ApiApplication; import fi.codecrew.moya.model.ApiApplication;
...@@ -25,14 +32,6 @@ import fi.codecrew.moya.model.ApiApplicationInstance; ...@@ -25,14 +32,6 @@ import fi.codecrew.moya.model.ApiApplicationInstance;
import fi.codecrew.moya.model.EventUser; import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.utilities.PasswordFunctions; import fi.codecrew.moya.utilities.PasswordFunctions;
import fi.codecrew.moya.utilities.moyamessage.MoyaEventType; import fi.codecrew.moya.utilities.moyamessage.MoyaEventType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import javax.ejb.*;
import java.util.*;
import java.util.Map.Entry;
/** /**
* Session Bean implementation class RestAuthBean * Session Bean implementation class RestAuthBean
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/CardPrintBean.java
...@@ -18,56 +18,54 @@ ...@@ -18,56 +18,54 @@
*/ */
package fi.codecrew.moya.beans; package fi.codecrew.moya.beans;
import java.awt.Color; import java.awt.Color;
import java.awt.Font; import java.awt.Font;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.geom.AffineTransform; import java.awt.image.BufferedImage;
import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream;
import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream;
import java.io.ByteArrayOutputStream; import java.io.IOException;
import java.io.IOException; import java.util.ArrayList;
import java.util.ArrayList; import java.util.HashMap;
import java.util.HashMap; import java.util.Iterator;
import java.util.Iterator; import java.util.List;
import java.util.List;
import javax.ejb.EJB;
import javax.ejb.EJB; import javax.ejb.LocalBean;
import javax.ejb.LocalBean; import javax.ejb.Stateless;
import javax.ejb.Stateless; import javax.imageio.IIOImage;
import javax.imageio.IIOImage; import javax.imageio.ImageIO;
import javax.imageio.ImageIO; import javax.imageio.ImageTypeSpecifier;
import javax.imageio.ImageTypeSpecifier; import javax.imageio.ImageWriteParam;
import javax.imageio.ImageWriteParam; import javax.imageio.ImageWriter;
import javax.imageio.ImageWriter; import javax.imageio.metadata.IIOInvalidTreeException;
import javax.imageio.metadata.IIOInvalidTreeException; import javax.imageio.metadata.IIOMetadata;
import javax.imageio.metadata.IIOMetadata; import javax.imageio.metadata.IIOMetadataNode;
import javax.imageio.metadata.IIOMetadataNode; import javax.imageio.stream.ImageOutputStream;
import javax.imageio.stream.ImageOutputStream;
import org.slf4j.Logger;
import org.slf4j.Logger; import org.slf4j.LoggerFactory;
import org.slf4j.LoggerFactory;
import com.pdfjet.CoreFont;
import com.pdfjet.CoreFont; import com.pdfjet.Image;
import com.pdfjet.Image; import com.pdfjet.ImageType;
import com.pdfjet.ImageType; import com.pdfjet.PDF;
import com.pdfjet.PDF; import com.pdfjet.Page;
import com.pdfjet.Page; import com.pdfjet.TextLine;
import com.pdfjet.TextLine;
import fi.codecrew.moya.enums.CardObjectDataType;
import fi.codecrew.moya.enums.CardObjectDataType; import fi.codecrew.moya.enums.CardTextAlignment;
import fi.codecrew.moya.enums.CardTextAlignment; import fi.codecrew.moya.enums.CardTextDataType;
import fi.codecrew.moya.enums.CardTextDataType; import fi.codecrew.moya.enums.CardTextStyle;
import fi.codecrew.moya.enums.CardTextStyle; import fi.codecrew.moya.facade.CardTemplateFacade;
import fi.codecrew.moya.facade.CardTemplateFacade; import fi.codecrew.moya.facade.EventUserFacade;
import fi.codecrew.moya.facade.EventUserFacade; import fi.codecrew.moya.facade.PrintedCardFacade;
import fi.codecrew.moya.facade.PrintedCardFacade; import fi.codecrew.moya.model.CardObjectData;
import fi.codecrew.moya.facade.UserFacade; import fi.codecrew.moya.model.CardTemplate;
import fi.codecrew.moya.model.CardObjectData; import fi.codecrew.moya.model.CardTextData;
import fi.codecrew.moya.model.CardTemplate; import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.CardTextData; import fi.codecrew.moya.model.GenericEntity;
import fi.codecrew.moya.model.EventUser; import fi.codecrew.moya.model.PrintedCard;
import fi.codecrew.moya.model.GenericEntity;
import fi.codecrew.moya.model.PrintedCard;
import fi.codecrew.moya.util.MassPrintResult; import fi.codecrew.moya.util.MassPrintResult;
/** /**
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/DiscountBean.java
...@@ -20,7 +20,6 @@ package fi.codecrew.moya.beans; ...@@ -20,7 +20,6 @@ package fi.codecrew.moya.beans;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/EventBean.java
...@@ -50,7 +50,6 @@ import fi.codecrew.moya.model.LanEventPrivateProperty; ...@@ -50,7 +50,6 @@ import fi.codecrew.moya.model.LanEventPrivateProperty;
import fi.codecrew.moya.model.LanEventPrivatePropertyKey; import fi.codecrew.moya.model.LanEventPrivatePropertyKey;
import fi.codecrew.moya.model.LanEventProperty; import fi.codecrew.moya.model.LanEventProperty;
import fi.codecrew.moya.model.LanEventPropertyKey; import fi.codecrew.moya.model.LanEventPropertyKey;
import fi.codecrew.moya.utilities.moyamessage.MoyaEventType;
/** /**
* Session Bean implementation class EventBean * Session Bean implementation class EventBean
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/HelpBean.java
...@@ -18,8 +18,15 @@ ...@@ -18,8 +18,15 @@
*/ */
package fi.codecrew.moya.beans; package fi.codecrew.moya.beans;
import java.util.Calendar;
import java.util.Locale;
import javax.annotation.security.RolesAllowed;
import javax.ejb.EJB;
import javax.ejb.LocalBean;
import javax.ejb.Stateless;
import fi.codecrew.moya.enums.ValidLocale; import fi.codecrew.moya.enums.ValidLocale;
import fi.codecrew.moya.enums.apps.SpecialPermission;
import fi.codecrew.moya.enums.apps.UserPermission; import fi.codecrew.moya.enums.apps.UserPermission;
import fi.codecrew.moya.facade.HelpFacade; import fi.codecrew.moya.facade.HelpFacade;
import fi.codecrew.moya.facade.HelpTextFacade; import fi.codecrew.moya.facade.HelpTextFacade;
...@@ -28,13 +35,6 @@ import fi.codecrew.moya.model.Help; ...@@ -28,13 +35,6 @@ import fi.codecrew.moya.model.Help;
import fi.codecrew.moya.model.HelpText; import fi.codecrew.moya.model.HelpText;
import fi.codecrew.moya.model.HelpTextHistory; import fi.codecrew.moya.model.HelpTextHistory;
import javax.annotation.security.RolesAllowed;
import javax.ejb.EJB;
import javax.ejb.LocalBean;
import javax.ejb.Stateless;
import java.util.Calendar;
import java.util.Locale;
/** /**
* Session Bean implementation class SitePageBean * Session Bean implementation class SitePageBean
*/ */
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/LectureBean.java
...@@ -20,7 +20,6 @@ package fi.codecrew.moya.beans; ...@@ -20,7 +20,6 @@ package fi.codecrew.moya.beans;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Set;
import javax.annotation.security.DeclareRoles; import javax.annotation.security.DeclareRoles;
import javax.annotation.security.RolesAllowed; import javax.annotation.security.RolesAllowed;
...@@ -31,7 +30,6 @@ import org.slf4j.Logger; ...@@ -31,7 +30,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import fi.codecrew.moya.enums.apps.LecturePermission; import fi.codecrew.moya.enums.apps.LecturePermission;
import fi.codecrew.moya.enums.apps.UserPermission;
import fi.codecrew.moya.facade.EventUserFacade; import fi.codecrew.moya.facade.EventUserFacade;
import fi.codecrew.moya.facade.LectureFacade; import fi.codecrew.moya.facade.LectureFacade;
import fi.codecrew.moya.facade.LectureGroupFacade; import fi.codecrew.moya.facade.LectureGroupFacade;
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/NetworkAssociationBean.java
...@@ -37,7 +37,6 @@ import fi.codecrew.moya.model.EventUser; ...@@ -37,7 +37,6 @@ import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.GroupMembership; import fi.codecrew.moya.model.GroupMembership;
import fi.codecrew.moya.model.NetworkAssociation; import fi.codecrew.moya.model.NetworkAssociation;
import fi.codecrew.moya.model.Place; import fi.codecrew.moya.model.Place;
import fi.codecrew.moya.model.PrintedCard;
import fi.codecrew.moya.model.Role; import fi.codecrew.moya.model.Role;
/** /**
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/OrgRoleBean.java
...@@ -41,7 +41,6 @@ import fi.codecrew.moya.model.OrgRole; ...@@ -41,7 +41,6 @@ import fi.codecrew.moya.model.OrgRole;
import fi.codecrew.moya.model.OrgRoleRequest; import fi.codecrew.moya.model.OrgRoleRequest;
import fi.codecrew.moya.model.Role; import fi.codecrew.moya.model.Role;
import fi.codecrew.moya.model.User; import fi.codecrew.moya.model.User;
import fi.codecrew.moya.utilities.jpa.GenericFacade;
/** /**
* Session Bean implementation class OrgRoleBean * Session Bean implementation class OrgRoleBean
...@@ -55,6 +54,7 @@ import fi.codecrew.moya.utilities.jpa.GenericFacade; ...@@ -55,6 +54,7 @@ import fi.codecrew.moya.utilities.jpa.GenericFacade;
}) })
public class OrgRoleBean implements OrgRoleBeanLocal { public class OrgRoleBean implements OrgRoleBeanLocal {
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(OrgRoleBean.class); private static final Logger logger = LoggerFactory.getLogger(OrgRoleBean.class);
@EJB @EJB
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/PermissionBean.java
...@@ -110,6 +110,7 @@ import fi.codecrew.moya.model.User; ...@@ -110,6 +110,7 @@ import fi.codecrew.moya.model.User;
@LocalBean @LocalBean
public class PermissionBean implements PermissionBeanLocal { public class PermissionBean implements PermissionBeanLocal {
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(PermissionBean.class); private static final Logger logger = LoggerFactory.getLogger(PermissionBean.class);
@Resource @Resource
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/PlaceBean.java
...@@ -49,8 +49,6 @@ import javax.ejb.Stateless; ...@@ -49,8 +49,6 @@ import javax.ejb.Stateless;
import javax.ejb.Timeout; import javax.ejb.Timeout;
import javax.ejb.Timer; import javax.ejb.Timer;
import javax.ejb.TimerService; import javax.ejb.TimerService;
import javax.xml.registry.infomodel.Slot;
import fi.codecrew.moya.facade.*; import fi.codecrew.moya.facade.*;
import fi.codecrew.moya.model.*; import fi.codecrew.moya.model.*;
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/PlaceGroupBean.java
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
package fi.codecrew.moya.beans; package fi.codecrew.moya.beans;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.List; import java.util.List;
...@@ -29,8 +28,6 @@ import javax.ejb.EJB; ...@@ -29,8 +28,6 @@ import javax.ejb.EJB;
import javax.ejb.EJBAccessException; import javax.ejb.EJBAccessException;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import fi.codecrew.moya.model.*;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -48,6 +45,11 @@ import fi.codecrew.moya.enums.apps.SpecialPermission; ...@@ -48,6 +45,11 @@ import fi.codecrew.moya.enums.apps.SpecialPermission;
import fi.codecrew.moya.facade.EventUserFacade; import fi.codecrew.moya.facade.EventUserFacade;
import fi.codecrew.moya.facade.GroupMembershipFacade; import fi.codecrew.moya.facade.GroupMembershipFacade;
import fi.codecrew.moya.facade.PlaceGroupFacade; import fi.codecrew.moya.facade.PlaceGroupFacade;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.GroupMembership;
import fi.codecrew.moya.model.LanEventPropertyKey;
import fi.codecrew.moya.model.PlaceGroup;
import fi.codecrew.moya.model.User;
import fi.codecrew.moya.utilities.BarcodeUtils; import fi.codecrew.moya.utilities.BarcodeUtils;
import fi.codecrew.moya.utilities.moyamessage.MoyaEventType; import fi.codecrew.moya.utilities.moyamessage.MoyaEventType;
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/ProductBean.java
...@@ -57,7 +57,6 @@ import fi.codecrew.moya.facade.PlaceSlotFacade; ...@@ -57,7 +57,6 @@ import fi.codecrew.moya.facade.PlaceSlotFacade;
import fi.codecrew.moya.facade.ProductFacade; import fi.codecrew.moya.facade.ProductFacade;
import fi.codecrew.moya.facade.UserFacade; import fi.codecrew.moya.facade.UserFacade;
import fi.codecrew.moya.model.AccountEvent; import fi.codecrew.moya.model.AccountEvent;
import fi.codecrew.moya.model.Bill;
import fi.codecrew.moya.model.Discount; import fi.codecrew.moya.model.Discount;
import fi.codecrew.moya.model.EventUser; import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.InventoryEvent; import fi.codecrew.moya.model.InventoryEvent;
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/ReaderBean.java
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
package fi.codecrew.moya.beans; package fi.codecrew.moya.beans;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.regex.Pattern; import java.util.regex.Pattern;
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/SessionMgmtBean.java
...@@ -21,7 +21,6 @@ package fi.codecrew.moya.beans; ...@@ -21,7 +21,6 @@ package fi.codecrew.moya.beans;
import java.util.Collections; import java.util.Collections;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentSkipListMap;
import javax.annotation.security.DeclareRoles; import javax.annotation.security.DeclareRoles;
import javax.annotation.security.RolesAllowed; import javax.annotation.security.RolesAllowed;
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/SitePageBean.java
...@@ -41,7 +41,6 @@ import fi.codecrew.moya.model.LanEvent; ...@@ -41,7 +41,6 @@ import fi.codecrew.moya.model.LanEvent;
import fi.codecrew.moya.model.PageContent; import fi.codecrew.moya.model.PageContent;
import fi.codecrew.moya.model.Role; import fi.codecrew.moya.model.Role;
import fi.codecrew.moya.model.SitePage; import fi.codecrew.moya.model.SitePage;
import fi.codecrew.moya.utilities.jpa.GenericFacade;
/** /**
* Session Bean implementation class SitePageBean * Session Bean implementation class SitePageBean
...@@ -74,7 +73,6 @@ public class SitePageBean implements SitePageBeanLocal { ...@@ -74,7 +73,6 @@ public class SitePageBean implements SitePageBeanLocal {
@EJB @EJB
private UserBean userbean; private UserBean userbean;
@SuppressWarnings("unused")
private Logger logger = LoggerFactory.getLogger(SitePageBean.class); private Logger logger = LoggerFactory.getLogger(SitePageBean.class);
@EJB @EJB
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/TicketBean.java
...@@ -19,36 +19,39 @@ ...@@ -19,36 +19,39 @@
package fi.codecrew.moya.beans; package fi.codecrew.moya.beans;
import com.pdfjet.*; import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.security.DeclareRoles;
import javax.ejb.EJB;
import javax.ejb.Stateless;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.pdfjet.A5;
import com.pdfjet.CoreFont;
import com.pdfjet.Font;
import com.pdfjet.Image;
import com.pdfjet.PDF;
import com.pdfjet.Page;
import com.pdfjet.TextLine;
import fi.codecrew.moya.enums.apps.MapPermission; import fi.codecrew.moya.enums.apps.MapPermission;
import fi.codecrew.moya.enums.apps.SpecialPermission; import fi.codecrew.moya.enums.apps.SpecialPermission;
import fi.codecrew.moya.facade.EventUserFacade; import fi.codecrew.moya.facade.EventUserFacade;
import fi.codecrew.moya.facade.GroupMembershipFacade; import fi.codecrew.moya.facade.GroupMembershipFacade;
import fi.codecrew.moya.facade.PlaceGroupFacade; import fi.codecrew.moya.facade.PlaceGroupFacade;
import fi.codecrew.moya.model.*; import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.GroupMembership;
import fi.codecrew.moya.model.LanEventPropertyKey;
import fi.codecrew.moya.util.MailMessage; import fi.codecrew.moya.util.MailMessage;
import fi.codecrew.moya.util.MailMessageAttachment; import fi.codecrew.moya.util.MailMessageAttachment;
import fi.codecrew.moya.utilities.BarcodeUtils;
import fi.codecrew.moya.utilities.moyamessage.MoyaEventType;
import net.glxn.qrgen.*;
import net.glxn.qrgen.QRCode; import net.glxn.qrgen.QRCode;
import net.glxn.qrgen.image.ImageType; import net.glxn.qrgen.image.ImageType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.annotation.security.DeclareRoles;
import javax.annotation.security.RolesAllowed;
import javax.ejb.EJB;
import javax.ejb.EJBAccessException;
import javax.ejb.Stateless;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.OutputStream;
import java.security.acl.Group;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
/** /**
* Session Bean implementation class PlaceGroupBean * Session Bean implementation class PlaceGroupBean
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/VerkkomaksutFiBean.java
...@@ -18,13 +18,10 @@ ...@@ -18,13 +18,10 @@
*/ */
package fi.codecrew.moya.beans; package fi.codecrew.moya.beans;
import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.StringWriter; import java.io.StringWriter;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Arrays;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
...@@ -46,14 +43,11 @@ import javax.xml.parsers.ParserConfigurationException; ...@@ -46,14 +43,11 @@ import javax.xml.parsers.ParserConfigurationException;
import org.apache.http.HttpResponse; import org.apache.http.HttpResponse;
import org.apache.http.auth.AuthScope; import org.apache.http.auth.AuthScope;
import org.apache.http.auth.UsernamePasswordCredentials; import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.auth.params.AuthPNames;
import org.apache.http.client.CredentialsProvider; import org.apache.http.client.CredentialsProvider;
import org.apache.http.client.methods.HttpPost; import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.params.AuthPolicy;
import org.apache.http.entity.StringEntity; import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.BasicCredentialsProvider; import org.apache.http.impl.client.BasicCredentialsProvider;
import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.impl.client.HttpClientBuilder;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/VipBean.java
...@@ -18,7 +18,6 @@ import fi.codecrew.moya.enums.apps.VipPermission; ...@@ -18,7 +18,6 @@ import fi.codecrew.moya.enums.apps.VipPermission;
import fi.codecrew.moya.facade.VipFacade; import fi.codecrew.moya.facade.VipFacade;
import fi.codecrew.moya.facade.VipProductDeliveryFacade; import fi.codecrew.moya.facade.VipProductDeliveryFacade;
import fi.codecrew.moya.facade.VipProductFacade; import fi.codecrew.moya.facade.VipProductFacade;
import fi.codecrew.moya.model.LanEvent;
import fi.codecrew.moya.model.Vip; import fi.codecrew.moya.model.Vip;
import fi.codecrew.moya.model.VipProduct; import fi.codecrew.moya.model.VipProduct;
import fi.codecrew.moya.model.VipProductDelivery; import fi.codecrew.moya.model.VipProductDelivery;
...@@ -30,6 +29,7 @@ import fi.codecrew.moya.utilities.SearchResult; ...@@ -30,6 +29,7 @@ import fi.codecrew.moya.utilities.SearchResult;
@DeclareRoles({ VipPermission.S_VIEW, VipPermission.S_USAGE, VipPermission.S_EDIT }) @DeclareRoles({ VipPermission.S_VIEW, VipPermission.S_USAGE, VipPermission.S_EDIT })
public class VipBean implements VipBeanLocal { public class VipBean implements VipBeanLocal {
@SuppressWarnings("unused")
private static final Logger log = LoggerFactory.getLogger(VipBean.class); private static final Logger log = LoggerFactory.getLogger(VipBean.class);
// @EJB // @EJB
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/moyamessage/IrcBotMoyaEventTopicListener.java
...@@ -2,26 +2,13 @@ package fi.codecrew.moya.beans.moyamessage; ...@@ -2,26 +2,13 @@ package fi.codecrew.moya.beans.moyamessage;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.ejb.MessageDriven; import javax.ejb.MessageDriven;
import javax.jms.JMSException;
import javax.jms.Message; import javax.jms.Message;
import javax.jms.MessageListener; import javax.jms.MessageListener;
import fi.codecrew.moya.utilities.moyamessage.MoyaEventType;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import fi.codecrew.moya.beans.BotBean; import fi.codecrew.moya.beans.BotBean;
import fi.codecrew.moya.facade.EventFacade;
import fi.codecrew.moya.facade.EventUserFacade;
import fi.codecrew.moya.facade.UserFacade;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.LanEvent;
import fi.codecrew.moya.model.User;
import fi.codecrew.moya.utilities.moyamessage.MoyaEventMessage;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/** /**
* Message-Driven Bean implementation class for: IrcBotTopicListener * Message-Driven Bean implementation class for: IrcBotTopicListener
...@@ -29,6 +16,7 @@ import java.util.List; ...@@ -29,6 +16,7 @@ import java.util.List;
@MessageDriven(mappedName = MoyaEventSender.MOYA_EVENT_SENDER_TOPIC) @MessageDriven(mappedName = MoyaEventSender.MOYA_EVENT_SENDER_TOPIC)
public class IrcBotMoyaEventTopicListener implements MessageListener { public class IrcBotMoyaEventTopicListener implements MessageListener {
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(IrcBotMoyaEventTopicListener.class); private static final Logger logger = LoggerFactory.getLogger(IrcBotMoyaEventTopicListener.class);
@EJB @EJB
......
code/moya-beans/ejbModule/fi/codecrew/moya/beanutil/DecimalXMLAdapter.java
...@@ -20,8 +20,6 @@ package fi.codecrew.moya.beanutil; ...@@ -20,8 +20,6 @@ package fi.codecrew.moya.beanutil;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode; import java.math.RoundingMode;
import java.text.NumberFormat;
import java.util.Locale;
import javax.xml.bind.annotation.adapters.XmlAdapter; import javax.xml.bind.annotation.adapters.XmlAdapter;
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/CardObjectDataFacade.java
...@@ -27,13 +27,10 @@ import javax.persistence.criteria.CriteriaBuilder; ...@@ -27,13 +27,10 @@ import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root; import javax.persistence.criteria.Root;
import fi.codecrew.moya.model.CardObjectData;
import fi.codecrew.moya.model.CardObjectData_;
import fi.codecrew.moya.model.CardTemplate_;
import fi.codecrew.moya.model.CardTextData;
import fi.codecrew.moya.model.CardTextData_;
import fi.codecrew.moya.beans.CardTemplateBeanLocal; import fi.codecrew.moya.beans.CardTemplateBeanLocal;
import fi.codecrew.moya.beans.EventBeanLocal; import fi.codecrew.moya.beans.EventBeanLocal;
import fi.codecrew.moya.model.CardObjectData;
import fi.codecrew.moya.model.CardObjectData_;
import fi.codecrew.moya.model.CardTemplate; import fi.codecrew.moya.model.CardTemplate;
@Stateless @Stateless
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/CardTextDataFacade.java
...@@ -27,12 +27,11 @@ import javax.persistence.criteria.CriteriaBuilder; ...@@ -27,12 +27,11 @@ import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root; import javax.persistence.criteria.Root;
import fi.codecrew.moya.model.CardTemplate_;
import fi.codecrew.moya.model.CardTextData;
import fi.codecrew.moya.model.CardTextData_;
import fi.codecrew.moya.beans.CardTemplateBeanLocal; import fi.codecrew.moya.beans.CardTemplateBeanLocal;
import fi.codecrew.moya.beans.EventBeanLocal; import fi.codecrew.moya.beans.EventBeanLocal;
import fi.codecrew.moya.model.CardTemplate; import fi.codecrew.moya.model.CardTemplate;
import fi.codecrew.moya.model.CardTextData;
import fi.codecrew.moya.model.CardTextData_;
@Stateless @Stateless
@LocalBean @LocalBean
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/EventMapFacade.java
...@@ -34,7 +34,6 @@ import fi.codecrew.moya.enums.apps.MapPermission; ...@@ -34,7 +34,6 @@ import fi.codecrew.moya.enums.apps.MapPermission;
import fi.codecrew.moya.model.EventMap; import fi.codecrew.moya.model.EventMap;
import fi.codecrew.moya.model.EventMap_; import fi.codecrew.moya.model.EventMap_;
import fi.codecrew.moya.model.EventOrganiser; import fi.codecrew.moya.model.EventOrganiser;
import fi.codecrew.moya.model.LanEvent;
import fi.codecrew.moya.model.LanEvent_; import fi.codecrew.moya.model.LanEvent_;
@Stateless @Stateless
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/GameIDFacade.java
...@@ -18,29 +18,16 @@ ...@@ -18,29 +18,16 @@
*/ */
package fi.codecrew.moya.facade; package fi.codecrew.moya.facade;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import javax.ejb.LocalBean; import javax.ejb.LocalBean;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root; import javax.persistence.criteria.Root;
import fi.codecrew.moya.enums.TournamentStatus;
import fi.codecrew.moya.model.EventUser; import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.GameID; import fi.codecrew.moya.model.GameID;
import fi.codecrew.moya.model.GameID_; import fi.codecrew.moya.model.GameID_;
import fi.codecrew.moya.model.LanEvent;
import fi.codecrew.moya.model.Tournament;
import fi.codecrew.moya.model.TournamentGame; import fi.codecrew.moya.model.TournamentGame;
import fi.codecrew.moya.model.TournamentParticipant;
import fi.codecrew.moya.model.TournamentRule;
import fi.codecrew.moya.model.TournamentRule_;
import fi.codecrew.moya.model.Tournament_;
import fi.codecrew.moya.model.User;
import fi.codecrew.moya.model.User_;
@Stateless @Stateless
@LocalBean @LocalBean
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/GroupMembershipFacade.java
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
*/ */
package fi.codecrew.moya.facade; package fi.codecrew.moya.facade;
import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.List; import java.util.List;
...@@ -40,7 +39,6 @@ import fi.codecrew.moya.model.GroupMembership_; ...@@ -40,7 +39,6 @@ import fi.codecrew.moya.model.GroupMembership_;
import fi.codecrew.moya.model.PlaceGroup; import fi.codecrew.moya.model.PlaceGroup;
import fi.codecrew.moya.model.PlaceGroup_; import fi.codecrew.moya.model.PlaceGroup_;
import fi.codecrew.moya.model.Place_; import fi.codecrew.moya.model.Place_;
import fi.codecrew.moya.model.Product;
import fi.codecrew.moya.utilities.PasswordFunctions; import fi.codecrew.moya.utilities.PasswordFunctions;
@Stateless @Stateless
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/HelpTextFacade.java
...@@ -19,19 +19,21 @@ ...@@ -19,19 +19,21 @@
package fi.codecrew.moya.facade; package fi.codecrew.moya.facade;
import fi.codecrew.moya.enums.ValidLocale;
import fi.codecrew.moya.model.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.ejb.LocalBean; import javax.ejb.LocalBean;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import javax.persistence.TypedQuery; import javax.persistence.TypedQuery;
import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Root; import javax.persistence.criteria.Root;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fi.codecrew.moya.enums.ValidLocale;
import fi.codecrew.moya.model.HelpText;
import fi.codecrew.moya.model.HelpText_;
import fi.codecrew.moya.model.Help_;
/** /**
* Created by tuukka on 19/12/15. * Created by tuukka on 19/12/15.
*/ */
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/HelpTextHistoryFacade.java
...@@ -19,13 +19,13 @@ ...@@ -19,13 +19,13 @@
package fi.codecrew.moya.facade; package fi.codecrew.moya.facade;
import fi.codecrew.moya.model.HelpText; import javax.ejb.LocalBean;
import fi.codecrew.moya.model.HelpTextHistory; import javax.ejb.Stateless;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import javax.ejb.LocalBean; import fi.codecrew.moya.model.HelpTextHistory;
import javax.ejb.Stateless;
/** /**
* Created by tuukka on 19/12/15. * Created by tuukka on 19/12/15.
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/LanEventFacade.java
...@@ -20,16 +20,8 @@ package fi.codecrew.moya.facade; ...@@ -20,16 +20,8 @@ package fi.codecrew.moya.facade;
import javax.ejb.LocalBean; import javax.ejb.LocalBean;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import javax.persistence.TypedQuery;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Root;
import fi.codecrew.moya.model.LanEvent; import fi.codecrew.moya.model.LanEvent;
import fi.codecrew.moya.model.LanEventDomain_;
import fi.codecrew.moya.model.LanEvent_;
import fi.codecrew.moya.model.LanEventDomain;
@Stateless @Stateless
@LocalBean @LocalBean
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/LogEntryTypeFacade.java
...@@ -22,7 +22,6 @@ import javax.ejb.LocalBean; ...@@ -22,7 +22,6 @@ import javax.ejb.LocalBean;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import javax.persistence.TypedQuery; import javax.persistence.TypedQuery;
import fi.codecrew.moya.beans.SecurityLogType;
import fi.codecrew.moya.model.LogEntryType; import fi.codecrew.moya.model.LogEntryType;
import fi.codecrew.moya.utilities.moyamessage.MoyaEventType; import fi.codecrew.moya.utilities.moyamessage.MoyaEventType;
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/OrgRoleFacade.java
...@@ -18,8 +18,6 @@ ...@@ -18,8 +18,6 @@
*/ */
package fi.codecrew.moya.facade; package fi.codecrew.moya.facade;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List; import java.util.List;
import javax.ejb.EJB; import javax.ejb.EJB;
...@@ -29,7 +27,6 @@ import javax.persistence.criteria.CriteriaBuilder; ...@@ -29,7 +27,6 @@ import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.ListJoin; import javax.persistence.criteria.ListJoin;
import javax.persistence.criteria.Root; import javax.persistence.criteria.Root;
import javax.persistence.criteria.Subquery;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -54,6 +51,7 @@ public class OrgRoleFacade extends IntegerPkGenericFacade<OrgRole> { ...@@ -54,6 +51,7 @@ public class OrgRoleFacade extends IntegerPkGenericFacade<OrgRole> {
@EJB @EJB
private EventBeanLocal eventBean; private EventBeanLocal eventBean;
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(OrgRoleFacade.class); private static final Logger logger = LoggerFactory.getLogger(OrgRoleFacade.class);
public OrgRoleFacade() { public OrgRoleFacade() {
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/PlaceFacade.java
...@@ -34,7 +34,6 @@ import fi.codecrew.moya.model.*; ...@@ -34,7 +34,6 @@ import fi.codecrew.moya.model.*;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import fi.codecrew.moya.beans.EventBeanLocal;
import fi.codecrew.moya.beans.LoggingBeanLocal; import fi.codecrew.moya.beans.LoggingBeanLocal;
import fi.codecrew.moya.utilities.moyamessage.MoyaEventType; import fi.codecrew.moya.utilities.moyamessage.MoyaEventType;
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/PlaceSlotFacade.java
...@@ -52,6 +52,7 @@ import fi.codecrew.moya.model.Product_; ...@@ -52,6 +52,7 @@ import fi.codecrew.moya.model.Product_;
@LocalBean @LocalBean
public class PlaceSlotFacade extends IntegerPkGenericFacade<PlaceSlot> { public class PlaceSlotFacade extends IntegerPkGenericFacade<PlaceSlot> {
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(PlaceSlotFacade.class); private static final Logger logger = LoggerFactory.getLogger(PlaceSlotFacade.class);
@EJB @EJB
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/PrintedCardFacade.java
...@@ -38,8 +38,6 @@ import fi.codecrew.moya.model.CardCode; ...@@ -38,8 +38,6 @@ import fi.codecrew.moya.model.CardCode;
import fi.codecrew.moya.model.CardCode_; import fi.codecrew.moya.model.CardCode_;
import fi.codecrew.moya.model.CardTemplate_; import fi.codecrew.moya.model.CardTemplate_;
import fi.codecrew.moya.model.EventUser; import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.GroupMembership;
import fi.codecrew.moya.model.GroupMembership_;
import fi.codecrew.moya.model.LanEvent; import fi.codecrew.moya.model.LanEvent;
import fi.codecrew.moya.model.PrintedCard; import fi.codecrew.moya.model.PrintedCard;
import fi.codecrew.moya.model.PrintedCard_; import fi.codecrew.moya.model.PrintedCard_;
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/RoleFacade.java
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
*/ */
package fi.codecrew.moya.facade; package fi.codecrew.moya.facade;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.ejb.EJB; import javax.ejb.EJB;
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/SitePageFacade.java
...@@ -51,6 +51,7 @@ public class SitePageFacade extends IntegerPkGenericFacade<SitePage> { ...@@ -51,6 +51,7 @@ public class SitePageFacade extends IntegerPkGenericFacade<SitePage> {
@EJB @EJB
private EventBeanLocal eventbean; private EventBeanLocal eventbean;
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(SitePageFacade.class); private static final Logger logger = LoggerFactory.getLogger(SitePageFacade.class);
public SitePageFacade() { public SitePageFacade() {
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/TournamentFacade.java
...@@ -18,8 +18,6 @@ ...@@ -18,8 +18,6 @@
*/ */
package fi.codecrew.moya.facade; package fi.codecrew.moya.facade;
import java.util.Calendar;
import java.util.Date;
import java.util.List; import java.util.List;
import javax.ejb.LocalBean; import javax.ejb.LocalBean;
...@@ -29,13 +27,9 @@ import javax.persistence.criteria.CriteriaQuery; ...@@ -29,13 +27,9 @@ import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root; import javax.persistence.criteria.Root;
import fi.codecrew.moya.enums.TournamentStatus; import fi.codecrew.moya.enums.TournamentStatus;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.LanEvent; import fi.codecrew.moya.model.LanEvent;
import fi.codecrew.moya.model.Tournament; import fi.codecrew.moya.model.Tournament;
import fi.codecrew.moya.model.TournamentParticipant;
import fi.codecrew.moya.model.Tournament_; import fi.codecrew.moya.model.Tournament_;
import fi.codecrew.moya.model.User;
import fi.codecrew.moya.model.User_;
@Stateless @Stateless
@LocalBean @LocalBean
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/TournamentGameFacade.java
...@@ -30,8 +30,6 @@ import javax.persistence.criteria.Root; ...@@ -30,8 +30,6 @@ import javax.persistence.criteria.Root;
import fi.codecrew.moya.beans.EventBean; import fi.codecrew.moya.beans.EventBean;
import fi.codecrew.moya.model.TournamentGame; import fi.codecrew.moya.model.TournamentGame;
import fi.codecrew.moya.model.TournamentGame_; import fi.codecrew.moya.model.TournamentGame_;
import fi.codecrew.moya.model.TournamentRule;
import fi.codecrew.moya.model.TournamentRule_;
@Stateless @Stateless
@LocalBean @LocalBean
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/TournamentParticipantFacade.java
...@@ -27,8 +27,6 @@ import javax.persistence.criteria.CriteriaQuery; ...@@ -27,8 +27,6 @@ import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root; import javax.persistence.criteria.Root;
import fi.codecrew.moya.model.EventUser; import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.TournamentGame;
import fi.codecrew.moya.model.TournamentGame_;
import fi.codecrew.moya.model.TournamentParticipant; import fi.codecrew.moya.model.TournamentParticipant;
import fi.codecrew.moya.model.TournamentParticipant_; import fi.codecrew.moya.model.TournamentParticipant_;
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/TournamentRuleFacade.java
...@@ -20,16 +20,12 @@ package fi.codecrew.moya.facade; ...@@ -20,16 +20,12 @@ package fi.codecrew.moya.facade;
import java.util.List; import java.util.List;
import javax.ejb.EJB;
import javax.ejb.LocalBean; import javax.ejb.LocalBean;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root; import javax.persistence.criteria.Root;
import fi.codecrew.moya.beans.EventBean;
import fi.codecrew.moya.model.Role;
import fi.codecrew.moya.model.Role_;
import fi.codecrew.moya.model.TournamentGame; import fi.codecrew.moya.model.TournamentGame;
import fi.codecrew.moya.model.TournamentRule; import fi.codecrew.moya.model.TournamentRule;
import fi.codecrew.moya.model.TournamentRule_; import fi.codecrew.moya.model.TournamentRule_;
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/TournamentTeamMemberFacade.java
...@@ -21,7 +21,6 @@ package fi.codecrew.moya.facade; ...@@ -21,7 +21,6 @@ package fi.codecrew.moya.facade;
import javax.ejb.LocalBean; import javax.ejb.LocalBean;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import fi.codecrew.moya.model.TournamentMatchResult;
import fi.codecrew.moya.model.TournamentTeamMember; import fi.codecrew.moya.model.TournamentTeamMember;
@Stateless @Stateless
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/UserFacade.java
...@@ -30,7 +30,6 @@ import javax.persistence.criteria.CriteriaQuery; ...@@ -30,7 +30,6 @@ import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root; import javax.persistence.criteria.Root;
import javax.persistence.metamodel.SingularAttribute; import javax.persistence.metamodel.SingularAttribute;
import fi.codecrew.moya.model.EventUser;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/VipFacade.java
...@@ -15,19 +15,12 @@ import javax.persistence.criteria.Root; ...@@ -15,19 +15,12 @@ import javax.persistence.criteria.Root;
import javax.persistence.metamodel.SingularAttribute; import javax.persistence.metamodel.SingularAttribute;
import fi.codecrew.moya.beans.EventBeanLocal; import fi.codecrew.moya.beans.EventBeanLocal;
import fi.codecrew.moya.facade.callbacks.EventLimiter;
import fi.codecrew.moya.facade.callbacks.OrderCallback;
import fi.codecrew.moya.facade.callbacks.StringSearchPredicateCreator; import fi.codecrew.moya.facade.callbacks.StringSearchPredicateCreator;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.EventUser_;
import fi.codecrew.moya.model.LanEvent; import fi.codecrew.moya.model.LanEvent;
import fi.codecrew.moya.model.User;
import fi.codecrew.moya.model.User_;
import fi.codecrew.moya.model.Vip; import fi.codecrew.moya.model.Vip;
import fi.codecrew.moya.model.Vip_; import fi.codecrew.moya.model.Vip_;
import fi.codecrew.moya.utilities.SearchQuery; import fi.codecrew.moya.utilities.SearchQuery;
import fi.codecrew.moya.utilities.SearchResult; import fi.codecrew.moya.utilities.SearchResult;
import fi.codecrew.moya.utilities.SearchQuery.QuerySortOrder;
import fi.codecrew.moya.utilities.jpa.FacadeCallback; import fi.codecrew.moya.utilities.jpa.FacadeCallback;
@Stateless @Stateless
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/VipProductDeliveryFacade.java
...@@ -3,7 +3,6 @@ package fi.codecrew.moya.facade; ...@@ -3,7 +3,6 @@ package fi.codecrew.moya.facade;
import javax.ejb.LocalBean; import javax.ejb.LocalBean;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import fi.codecrew.moya.model.VipProduct;
import fi.codecrew.moya.model.VipProductDelivery; import fi.codecrew.moya.model.VipProductDelivery;
@Stateless @Stateless
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/VipProductFacade.java
package fi.codecrew.moya.facade; package fi.codecrew.moya.facade;
import java.util.List;
import javax.ejb.EJB;
import javax.ejb.LocalBean; import javax.ejb.LocalBean;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root;
import fi.codecrew.moya.beans.EventBeanLocal;
import fi.codecrew.moya.model.LanEvent;
import fi.codecrew.moya.model.Vip;
import fi.codecrew.moya.model.VipProduct; import fi.codecrew.moya.model.VipProduct;
import fi.codecrew.moya.model.Vip_;
@Stateless @Stateless
@LocalBean @LocalBean
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/callbacks/OrderCallback.java
...@@ -52,6 +52,7 @@ public class OrderCallback<T extends ModelInterface> implements FacadeCallback<T ...@@ -52,6 +52,7 @@ public class OrderCallback<T extends ModelInterface> implements FacadeCallback<T
} }
@SuppressWarnings("unchecked")
@Override @Override
public void exec(CriteriaBuilder cb, CriteriaQuery<?> cq, Path<T> root, List<Predicate> predicates, boolean isFullQuery) { public void exec(CriteriaBuilder cb, CriteriaQuery<?> cq, Path<T> root, List<Predicate> predicates, boolean isFullQuery) {
if (!isFullQuery) if (!isFullQuery)
...@@ -79,6 +80,7 @@ public class OrderCallback<T extends ModelInterface> implements FacadeCallback<T ...@@ -79,6 +80,7 @@ public class OrderCallback<T extends ModelInterface> implements FacadeCallback<T
if (path == null) { if (path == null) {
return; return;
} }
// Unchecked error comes from this line, which is actually checked...
if (path.getJavaType().equals(String.class)) { if (path.getJavaType().equals(String.class)) {
path = cb.lower((Expression<String>) path); path = cb.lower((Expression<String>) path);
} }
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/callbacks/bill/BillFilterPredicate.java
...@@ -18,7 +18,6 @@ import fi.codecrew.moya.facade.callbacks.EventUserSearchPredicate; ...@@ -18,7 +18,6 @@ import fi.codecrew.moya.facade.callbacks.EventUserSearchPredicate;
import fi.codecrew.moya.model.Bill; import fi.codecrew.moya.model.Bill;
import fi.codecrew.moya.model.Bill_; import fi.codecrew.moya.model.Bill_;
import fi.codecrew.moya.model.LanEvent; import fi.codecrew.moya.model.LanEvent;
import fi.codecrew.moya.utilities.jpa.FacadeCallback;
public class BillFilterPredicate extends GenericBillPredicate { public class BillFilterPredicate extends GenericBillPredicate {
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/callbacks/bill/BillOrderPredicate.java
...@@ -16,7 +16,6 @@ import fi.codecrew.moya.entitysearch.BillSearchQuery; ...@@ -16,7 +16,6 @@ import fi.codecrew.moya.entitysearch.BillSearchQuery;
import fi.codecrew.moya.model.Bill; import fi.codecrew.moya.model.Bill;
import fi.codecrew.moya.model.EventUser; import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.EventUser_; import fi.codecrew.moya.model.EventUser_;
import fi.codecrew.moya.model.User;
import fi.codecrew.moya.model.User_; import fi.codecrew.moya.model.User_;
import fi.codecrew.moya.utilities.SearchQuery.QuerySortOrder; import fi.codecrew.moya.utilities.SearchQuery.QuerySortOrder;
......
code/moya-database/src/main/java/fi/codecrew/moya/model/ActionLogMessageTag.java
...@@ -23,8 +23,6 @@ import javax.persistence.Entity; ...@@ -23,8 +23,6 @@ import javax.persistence.Entity;
import javax.persistence.JoinColumn; import javax.persistence.JoinColumn;
import javax.persistence.Table; import javax.persistence.Table;
import org.eclipse.persistence.annotations.PrivateOwned;
@Entity @Entity
@Table(name = "actionlog_message_tags") @Table(name = "actionlog_message_tags")
public class ActionLogMessageTag extends GenericEntity { public class ActionLogMessageTag extends GenericEntity {
......
code/moya-database/src/main/java/fi/codecrew/moya/model/DBModel.java
...@@ -22,8 +22,6 @@ import java.util.Date; ...@@ -22,8 +22,6 @@ import java.util.Date;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id; import javax.persistence.Id;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Temporal; import javax.persistence.Temporal;
......
code/moya-database/src/main/java/fi/codecrew/moya/model/FoodWave.java
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
package fi.codecrew.moya.model; package fi.codecrew.moya.model;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
......
code/moya-database/src/main/java/fi/codecrew/moya/model/GenericEntity.java
...@@ -21,7 +21,6 @@ package fi.codecrew.moya.model; ...@@ -21,7 +21,6 @@ package fi.codecrew.moya.model;
import javax.json.Json; import javax.json.Json;
import javax.json.JsonObject; import javax.json.JsonObject;
import javax.json.JsonObjectBuilder; import javax.json.JsonObjectBuilder;
import javax.json.JsonValue;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Id; import javax.persistence.Id;
import javax.persistence.MappedSuperclass; import javax.persistence.MappedSuperclass;
......
code/moya-database/src/main/java/fi/codecrew/moya/model/HelpText.java
...@@ -22,12 +22,19 @@ ...@@ -22,12 +22,19 @@
*/ */
package fi.codecrew.moya.model; package fi.codecrew.moya.model;
import fi.codecrew.moya.enums.ValidLocale;
import javax.persistence.*;
import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.Locale;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import fi.codecrew.moya.enums.ValidLocale;
/** /**
* Group for lectures, so you can set limits how many of these the user can * Group for lectures, so you can set limits how many of these the user can
......
code/moya-database/src/main/java/fi/codecrew/moya/model/LanEvent.java
...@@ -20,7 +20,6 @@ package fi.codecrew.moya.model; ...@@ -20,7 +20,6 @@ package fi.codecrew.moya.model;
import java.beans.Transient; import java.beans.Transient;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
......
code/moya-database/src/main/java/fi/codecrew/moya/model/LectureGroup.java
...@@ -27,7 +27,6 @@ import java.util.List; ...@@ -27,7 +27,6 @@ import java.util.List;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.JoinColumn; import javax.persistence.JoinColumn;
import javax.persistence.Lob; import javax.persistence.Lob;
import javax.persistence.ManyToOne; import javax.persistence.ManyToOne;
......
code/moya-database/src/main/java/fi/codecrew/moya/model/PrintedCard.java
...@@ -25,10 +25,8 @@ package fi.codecrew.moya.model; ...@@ -25,10 +25,8 @@ package fi.codecrew.moya.model;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Comparator;
import java.util.List; import java.util.List;
import javax.faces.model.ListDataModel;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
...@@ -40,7 +38,6 @@ import javax.persistence.OneToMany; ...@@ -40,7 +38,6 @@ import javax.persistence.OneToMany;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Temporal; import javax.persistence.Temporal;
import javax.persistence.TemporalType; import javax.persistence.TemporalType;
import javax.persistence.Transient;
import javax.persistence.UniqueConstraint; import javax.persistence.UniqueConstraint;
import fi.codecrew.moya.enums.CardState; import fi.codecrew.moya.enums.CardState;
......
code/moya-database/src/main/java/fi/codecrew/moya/model/Product.java
...@@ -23,12 +23,26 @@ ...@@ -23,12 +23,26 @@
package fi.codecrew.moya.model; package fi.codecrew.moya.model;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import javax.persistence.*; import javax.persistence.CascadeType;
import javax.persistence.CollectionTable;
import javax.persistence.Column;
import javax.persistence.ElementCollection;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.JoinColumn;
import javax.persistence.JoinTable;
import javax.persistence.Lob;
import javax.persistence.ManyToMany;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.UniqueConstraint;
import org.eclipse.persistence.annotations.PrivateOwned; import org.eclipse.persistence.annotations.PrivateOwned;
......
code/moya-database/src/main/java/fi/codecrew/moya/model/TournamentGame.java
...@@ -19,13 +19,17 @@ ...@@ -19,13 +19,17 @@
package fi.codecrew.moya.model; package fi.codecrew.moya.model;
import static javax.persistence.FetchType.LAZY; import static javax.persistence.FetchType.LAZY;
import fi.codecrew.moya.enums.TournamentType;
import fi.codecrew.moya.model.GenericEntity;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
import java.util.List; import java.util.List;
import javax.persistence.*; import javax.persistence.Basic;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.Lob;
import javax.persistence.OneToMany;
import javax.persistence.Table;
/** /**
......
code/moya-database/src/main/java/fi/codecrew/moya/model/TournamentRule.java
...@@ -18,14 +18,14 @@ ...@@ -18,14 +18,14 @@
*/ */
package fi.codecrew.moya.model; package fi.codecrew.moya.model;
import static javax.persistence.FetchType.LAZY;
import fi.codecrew.moya.enums.TournamentType;
import fi.codecrew.moya.model.GenericEntity;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
import java.util.List;
import javax.persistence.*; import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.Lob;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
/** /**
......
code/moya-database/src/main/java/fi/codecrew/moya/model/TournamentTeamMember.java
...@@ -25,7 +25,6 @@ import javax.persistence.Entity; ...@@ -25,7 +25,6 @@ import javax.persistence.Entity;
import javax.persistence.EnumType; import javax.persistence.EnumType;
import javax.persistence.Enumerated; import javax.persistence.Enumerated;
import javax.persistence.JoinColumn; import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table; import javax.persistence.Table;
import fi.codecrew.moya.enums.TournamentTeamMemberRole; import fi.codecrew.moya.enums.TournamentTeamMemberRole;
......
code/moya-database/src/main/java/fi/codecrew/moya/model/User.java
...@@ -24,8 +24,6 @@ import java.util.Calendar; ...@@ -24,8 +24,6 @@ import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import javax.json.Json;
import javax.json.JsonValue;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
......
code/moya-database/src/main/java/fi/codecrew/moya/model/map/MapReservationQueue.java
package fi.codecrew.moya.model.map; package fi.codecrew.moya.model.map;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.JoinColumn; import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne; import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.Temporal; import javax.persistence.Temporal;
import javax.persistence.TemporalType; import javax.persistence.TemporalType;
......
code/moya-database/src/main/java/fi/codecrew/moya/model/map/MapReservationQueueEntry.java
...@@ -3,11 +3,8 @@ package fi.codecrew.moya.model.map; ...@@ -3,11 +3,8 @@ package fi.codecrew.moya.model.map;
import java.util.Date; import java.util.Date;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.JoinColumn; import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne; import javax.persistence.ManyToOne;
import javax.persistence.OneToOne;
import javax.persistence.Table;
import javax.persistence.Temporal; import javax.persistence.Temporal;
import javax.persistence.TemporalType; import javax.persistence.TemporalType;
import javax.persistence.Transient; import javax.persistence.Transient;
...@@ -31,6 +28,7 @@ public class MapReservationQueueEntry extends GenericEntity implements Comparabl ...@@ -31,6 +28,7 @@ public class MapReservationQueueEntry extends GenericEntity implements Comparabl
* *
*/ */
private static final long serialVersionUID = -1529588850152306791L; private static final long serialVersionUID = -1529588850152306791L;
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(MapReservationQueueEntry.class); private static final Logger logger = LoggerFactory.getLogger(MapReservationQueueEntry.class);
@Column() @Column()
......
code/moya-utils/src/test/java/fi/codecrew/moya/utilities/StringUtilsTest.java
...@@ -7,6 +7,7 @@ import org.testng.annotations.Test; ...@@ -7,6 +7,7 @@ import org.testng.annotations.Test;
public class StringUtilsTest { public class StringUtilsTest {
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(StringUtilsTest.class); private static final Logger logger = LoggerFactory.getLogger(StringUtilsTest.class);
@Test @Test
......
code/moya-web/src/main/java/fi/codecrew/moya/cmdline/ICommandlineCommand.java
...@@ -18,8 +18,7 @@ ...@@ -18,8 +18,7 @@
*/ */
package fi.codecrew.moya.cmdline; package fi.codecrew.moya.cmdline;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.OutputStreamWriter; import java.io.OutputStreamWriter;
public interface ICommandlineCommand { public interface ICommandlineCommand {
......
code/moya-web/src/main/java/fi/codecrew/moya/management/ReplServlet.java
...@@ -2,7 +2,6 @@ package fi.codecrew.moya.management; ...@@ -2,7 +2,6 @@ package fi.codecrew.moya.management;
import java.io.IOException; import java.io.IOException;
import javax.servlet.Servlet;
import javax.servlet.ServletConfig; import javax.servlet.ServletConfig;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.ServletRequest; import javax.servlet.ServletRequest;
......
code/moya-web/src/main/java/fi/codecrew/moya/rest/AccountEventRestView.java
...@@ -89,7 +89,6 @@ public class AccountEventRestView { ...@@ -89,7 +89,6 @@ public class AccountEventRestView {
monthMap.put(day, dayValue += p.getQuantity().intValueExact()); monthMap.put(day, dayValue += p.getQuantity().intValueExact());
} }
boolean empty = true;
HcSeries data1 = new HcSeries("Daily"); HcSeries data1 = new HcSeries("Daily");
HcSeries data2 = new HcSeries("Stacked"); HcSeries data2 = new HcSeries("Stacked");
......
code/moya-web/src/main/java/fi/codecrew/moya/rest/JsonpRestFilter.java
package fi.codecrew.moya.rest; package fi.codecrew.moya.rest;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import javax.servlet.Filter; import javax.servlet.Filter;
......
code/moya-web/src/main/java/fi/codecrew/moya/rest/PojoUtils.java
...@@ -4,8 +4,6 @@ import java.math.BigDecimal; ...@@ -4,8 +4,6 @@ import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.xml.bind.annotation.XmlElement;
import fi.codecrew.moya.model.*; import fi.codecrew.moya.model.*;
import fi.codecrew.moya.rest.pojo.appconfig.v1.ApplicationInstancePojo; import fi.codecrew.moya.rest.pojo.appconfig.v1.ApplicationInstancePojo;
import fi.codecrew.moya.rest.pojo.appconfig.v1.EventPojo; import fi.codecrew.moya.rest.pojo.appconfig.v1.EventPojo;
......
code/moya-web/src/main/java/fi/codecrew/moya/rest/ReaderRestView.java
...@@ -36,11 +36,8 @@ import fi.codecrew.moya.beans.ReaderBeanLocal; ...@@ -36,11 +36,8 @@ import fi.codecrew.moya.beans.ReaderBeanLocal;
import fi.codecrew.moya.beans.UserBeanLocal; import fi.codecrew.moya.beans.UserBeanLocal;
import fi.codecrew.moya.model.EventUser; import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.ReaderEvent; import fi.codecrew.moya.model.ReaderEvent;
import fi.codecrew.moya.rest.pojo.reader.v1.ReaderEventRestPojo;
import fi.codecrew.moya.rest.pojo.reader.v1.ReaderEventRestRoot; import fi.codecrew.moya.rest.pojo.reader.v1.ReaderEventRestRoot;
import fi.codecrew.moya.rest.pojo.reader.v1.ReaderRestPojo;
import fi.codecrew.moya.rest.pojo.reader.v1.ReaderRestRoot; import fi.codecrew.moya.rest.pojo.reader.v1.ReaderRestRoot;
import fi.codecrew.moya.rest.pojo.userinfo.v1.EventUserRestPojo;
import fi.codecrew.moya.rest.pojo.userinfo.v1.UserPermissionRestPojo; import fi.codecrew.moya.rest.pojo.userinfo.v1.UserPermissionRestPojo;
@RequestScoped @RequestScoped
......
code/moya-web/src/main/java/fi/codecrew/moya/rest/appconfig/v1/EventInfoV1.java
package fi.codecrew.moya.rest.appconfig.v1; package fi.codecrew.moya.rest.appconfig.v1;
import com.wordnik.swagger.annotations.Api;
import com.wordnik.swagger.annotations.ApiOperation;
import com.wordnik.swagger.annotations.ApiResponse;
import fi.codecrew.moya.beans.EventBeanLocal;
import fi.codecrew.moya.beans.PermissionBeanLocal;
import fi.codecrew.moya.beans.SessionMgmtBeanLocal;
import fi.codecrew.moya.beans.UserBeanLocal;
import fi.codecrew.moya.model.LanEvent;
import fi.codecrew.moya.rest.PojoUtils;
import fi.codecrew.moya.rest.pojo.appconfig.v1.EventRoot;
import fi.codecrew.moya.rest.pojo.map.v1.MapRoot;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.ejb.SessionBean;
import javax.enterprise.context.RequestScoped; import javax.enterprise.context.RequestScoped;
import javax.ws.rs.Consumes; import javax.ws.rs.Consumes;
import javax.ws.rs.GET; import javax.ws.rs.GET;
...@@ -21,7 +8,15 @@ import javax.ws.rs.Path; ...@@ -21,7 +8,15 @@ import javax.ws.rs.Path;
import javax.ws.rs.Produces; import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
import java.util.List;
import com.wordnik.swagger.annotations.Api;
import com.wordnik.swagger.annotations.ApiOperation;
import com.wordnik.swagger.annotations.ApiResponse;
import fi.codecrew.moya.beans.EventBeanLocal;
import fi.codecrew.moya.beans.PermissionBeanLocal;
import fi.codecrew.moya.rest.PojoUtils;
import fi.codecrew.moya.rest.pojo.appconfig.v1.EventRoot;
/** /**
* Created by tuukka on 28.3.2015. * Created by tuukka on 28.3.2015.
......
code/moya-web/src/main/java/fi/codecrew/moya/rest/appconfig/v1/InstancesV1.java
package fi.codecrew.moya.rest.appconfig.v1; package fi.codecrew.moya.rest.appconfig.v1;
import com.wordnik.swagger.annotations.Api; import java.security.Principal;
import com.wordnik.swagger.annotations.ApiOperation;
import com.wordnik.swagger.annotations.ApiResponse;
import fi.codecrew.moya.beans.ApiApplicationBeanLocal;
import fi.codecrew.moya.beans.EventBeanLocal;
import fi.codecrew.moya.beans.PermissionBeanLocal;
import fi.codecrew.moya.model.ApiApplicationInstance;
import fi.codecrew.moya.rest.PojoUtils;
import fi.codecrew.moya.rest.pojo.appconfig.v1.ApplicationInstancePojo;
import fi.codecrew.moya.rest.pojo.map.v1.MapRoot;
import org.primefaces.push.PrimeAtmosphereHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.enterprise.context.RequestScoped; import javax.enterprise.context.RequestScoped;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.*; import javax.ws.rs.Consumes;
import javax.ws.rs.FormParam;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.Context; import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
import java.security.Principal;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.wordnik.swagger.annotations.Api;
import com.wordnik.swagger.annotations.ApiOperation;
import com.wordnik.swagger.annotations.ApiResponse;
import fi.codecrew.moya.beans.ApiApplicationBeanLocal;
import fi.codecrew.moya.beans.PermissionBeanLocal;
import fi.codecrew.moya.model.ApiApplicationInstance;
import fi.codecrew.moya.rest.PojoUtils;
import fi.codecrew.moya.rest.pojo.appconfig.v1.ApplicationInstancePojo;
/** /**
* Created by tuukka on 28.3.2015. * Created by tuukka on 28.3.2015.
......
code/moya-web/src/main/java/fi/codecrew/moya/rest/placemap/v1/PlacemapRestViewV1.java
...@@ -2,9 +2,7 @@ package fi.codecrew.moya.rest.placemap.v1; ...@@ -2,9 +2,7 @@ package fi.codecrew.moya.rest.placemap.v1;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.enterprise.context.RequestScoped; import javax.enterprise.context.RequestScoped;
......
code/moya-web/src/main/java/fi/codecrew/moya/rest/v2/PojoFactoryV2.java
...@@ -12,7 +12,12 @@ import java.io.Serializable; ...@@ -12,7 +12,12 @@ import java.io.Serializable;
*/ */
public class PojoFactoryV2 implements Serializable { public class PojoFactoryV2 implements Serializable {
public UserPojo createUserPojo(EventUser eventUser) { /**
*
*/
private static final long serialVersionUID = 1L;
public UserPojo createUserPojo(EventUser eventUser) {
User user = eventUser.getUser(); User user = eventUser.getUser();
UserPojo pojo = new UserPojo(); UserPojo pojo = new UserPojo();
pojo.eventuserId = eventUser.getId(); pojo.eventuserId = eventUser.getId();
......
code/moya-web/src/main/java/fi/codecrew/moya/rest/v2/UserRestViewV2.java
...@@ -16,7 +16,6 @@ import fi.codecrew.moya.rest.pojo.userinfo.v1.EventUserRestPojo; ...@@ -16,7 +16,6 @@ import fi.codecrew.moya.rest.pojo.userinfo.v1.EventUserRestPojo;
import fi.codecrew.moya.rest.v2.pojo.UserPojo; import fi.codecrew.moya.rest.v2.pojo.UserPojo;
import org.glassfish.jersey.media.multipart.FormDataBodyPart; import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import org.glassfish.jersey.media.multipart.FormDataContentDisposition; import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataMultiPart;
import org.glassfish.jersey.media.multipart.FormDataParam; import org.glassfish.jersey.media.multipart.FormDataParam;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -24,9 +23,7 @@ import org.slf4j.LoggerFactory; ...@@ -24,9 +23,7 @@ import org.slf4j.LoggerFactory;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.enterprise.context.RequestScoped; import javax.enterprise.context.RequestScoped;
import javax.inject.Inject; import javax.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.Part;
import javax.ws.rs.*; import javax.ws.rs.*;
import javax.ws.rs.core.Context; import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MediaType;
......
code/moya-web/src/main/java/fi/codecrew/moya/rest/v2/VipRestView.java
package fi.codecrew.moya.rest.v2; package fi.codecrew.moya.rest.v2;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date; import java.util.Date;
import java.util.List;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.enterprise.context.RequestScoped; import javax.enterprise.context.RequestScoped;
import javax.ws.rs.Consumes; import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE; import javax.ws.rs.DELETE;
import javax.ws.rs.FormParam;
import javax.ws.rs.GET; import javax.ws.rs.GET;
import javax.ws.rs.POST; import javax.ws.rs.POST;
import javax.ws.rs.PUT;
import javax.ws.rs.Path; import javax.ws.rs.Path;
import javax.ws.rs.PathParam; import javax.ws.rs.PathParam;
import javax.ws.rs.Produces; import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
...@@ -26,11 +21,9 @@ import fi.codecrew.moya.beans.PermissionBeanLocal; ...@@ -26,11 +21,9 @@ import fi.codecrew.moya.beans.PermissionBeanLocal;
import fi.codecrew.moya.beans.ProductBeanLocal; import fi.codecrew.moya.beans.ProductBeanLocal;
import fi.codecrew.moya.beans.UserBeanLocal; import fi.codecrew.moya.beans.UserBeanLocal;
import fi.codecrew.moya.beans.VipBeanLocal; import fi.codecrew.moya.beans.VipBeanLocal;
import fi.codecrew.moya.model.AccountEvent;
import fi.codecrew.moya.model.EventUser; import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.Vip; import fi.codecrew.moya.model.Vip;
import fi.codecrew.moya.model.VipProduct; import fi.codecrew.moya.model.VipProduct;
import fi.codecrew.moya.rest.v2.pojo.ProductPojo;
import fi.codecrew.moya.rest.v2.pojo.VipProductPojo; import fi.codecrew.moya.rest.v2.pojo.VipProductPojo;
import fi.codecrew.moya.rest.v2.pojo.VipRestPojo; import fi.codecrew.moya.rest.v2.pojo.VipRestPojo;
import fi.codecrew.moya.utilities.SearchQuery; import fi.codecrew.moya.utilities.SearchQuery;
......
code/moya-web/src/main/java/fi/codecrew/moya/servlet/BortalCommand.java
...@@ -26,9 +26,6 @@ import java.io.OutputStreamWriter; ...@@ -26,9 +26,6 @@ import java.io.OutputStreamWriter;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.util.HashMap; import java.util.HashMap;
import javax.annotation.PostConstruct;
import javax.security.auth.login.LoginException;
import org.apache.sshd.server.Command; import org.apache.sshd.server.Command;
import org.apache.sshd.server.Environment; import org.apache.sshd.server.Environment;
import org.apache.sshd.server.ExitCallback; import org.apache.sshd.server.ExitCallback;
...@@ -36,7 +33,6 @@ import org.slf4j.Logger; ...@@ -36,7 +33,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import fi.codecrew.moya.clientutils.BortalLocalContextHolder; import fi.codecrew.moya.clientutils.BortalLocalContextHolder;
import fi.codecrew.moya.cmdline.Hello;
import fi.codecrew.moya.cmdline.ICommandlineCommand; import fi.codecrew.moya.cmdline.ICommandlineCommand;
public class BortalCommand implements Command, Runnable { public class BortalCommand implements Command, Runnable {
......
code/moya-web/src/main/java/fi/codecrew/moya/servlet/PlaceMapServlet.java
...@@ -29,7 +29,6 @@ import java.awt.image.BufferedImage; ...@@ -29,7 +29,6 @@ import java.awt.image.BufferedImage;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -44,12 +43,14 @@ import javax.servlet.http.HttpServlet; ...@@ -44,12 +43,14 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import fi.codecrew.moya.beans.*;
import fi.codecrew.moya.model.User;
import org.primefaces.component.barcode.Barcode;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import fi.codecrew.moya.beans.BarcodeBeanLocal;
import fi.codecrew.moya.beans.LoggingBeanLocal;
import fi.codecrew.moya.beans.PermissionBeanLocal;
import fi.codecrew.moya.beans.PlaceBeanLocal;
import fi.codecrew.moya.beans.UserBeanLocal;
import fi.codecrew.moya.enums.apps.MapPermission; import fi.codecrew.moya.enums.apps.MapPermission;
import fi.codecrew.moya.model.EventMap; import fi.codecrew.moya.model.EventMap;
import fi.codecrew.moya.model.EventUser; import fi.codecrew.moya.model.EventUser;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/ConversationKeepaliveView.java
...@@ -38,6 +38,7 @@ public class ConversationKeepaliveView implements Serializable { ...@@ -38,6 +38,7 @@ public class ConversationKeepaliveView implements Serializable {
private int value = 0; private int value = 0;
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(ConversationKeepaliveView.class); private static final Logger logger = LoggerFactory.getLogger(ConversationKeepaliveView.class);
public int ping() { public int ping() {
......
code/moya-web/src/main/java/fi/codecrew/moya/web/ErrorPageView.java
...@@ -49,15 +49,13 @@ public class ErrorPageView implements Serializable { ...@@ -49,15 +49,13 @@ public class ErrorPageView implements Serializable {
// @Inject // @Inject
// private transient FacesContext context; // private transient FacesContext context;
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(ErrorPageView.class); private static final Logger logger = LoggerFactory.getLogger(ErrorPageView.class);
public String getStackTrace() { public String getStackTrace() {
FacesContext context = FacesContext.getCurrentInstance(); FacesContext context = FacesContext.getCurrentInstance();
Map requestMap = context.getExternalContext().getRequestMap(); Map<String, Object> requestMap = context.getExternalContext().getRequestMap();
Throwable ex = Throwable ex = (Throwable) requestMap.get("javax.servlet.error.exception");
(Throwable) requestMap.get("javax.servlet.error.exception");
StringWriter sw = new StringWriter(); StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw); PrintWriter pw = new PrintWriter(sw);
...@@ -70,7 +68,7 @@ public class ErrorPageView implements Serializable { ...@@ -70,7 +68,7 @@ public class ErrorPageView implements Serializable {
public String getMessage() { public String getMessage() {
FacesContext context = FacesContext.getCurrentInstance(); FacesContext context = FacesContext.getCurrentInstance();
Map requestMap = context.getExternalContext().getRequestMap(); Map<String, Object> requestMap = context.getExternalContext().getRequestMap();
Throwable ex = (Throwable) requestMap.get("javax.servlet.error.exception"); Throwable ex = (Throwable) requestMap.get("javax.servlet.error.exception");
return ex.getMessage(); return ex.getMessage();
} }
......
code/moya-web/src/main/java/fi/codecrew/moya/web/LocaleSelectorView.java
...@@ -32,6 +32,7 @@ import fi.codecrew.moya.handler.SessionStore; ...@@ -32,6 +32,7 @@ import fi.codecrew.moya.handler.SessionStore;
@RequestScoped @RequestScoped
public class LocaleSelectorView { public class LocaleSelectorView {
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(LocaleSelectorView.class); private static final Logger logger = LoggerFactory.getLogger(LocaleSelectorView.class);
@Inject @Inject
......
code/moya-web/src/main/java/fi/codecrew/moya/web/TestDataView.java
...@@ -30,14 +30,26 @@ import javax.enterprise.context.RequestScoped; ...@@ -30,14 +30,26 @@ import javax.enterprise.context.RequestScoped;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
import fi.codecrew.moya.beans.*; import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fi.codecrew.moya.beans.CardTemplateBeanLocal;
import fi.codecrew.moya.beans.EventBeanLocal;
import fi.codecrew.moya.beans.MenuBeanLocal;
import fi.codecrew.moya.beans.PollBeanLocal;
import fi.codecrew.moya.beans.RoleBeanLocal;
import fi.codecrew.moya.beans.TestDataBeanLocal;
import fi.codecrew.moya.beans.TicketBeanLocal;
import fi.codecrew.moya.beans.UserBeanLocal;
import fi.codecrew.moya.beans.UserUtilBeanLocal;
import fi.codecrew.moya.enums.apps.EventPermission; import fi.codecrew.moya.enums.apps.EventPermission;
import fi.codecrew.moya.enums.apps.UserPermission; import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.*; import fi.codecrew.moya.model.LanEvent;
import fi.codecrew.moya.model.Poll;
import fi.codecrew.moya.model.PollQuestion;
import fi.codecrew.moya.model.PossibleAnswer;
import fi.codecrew.moya.web.cdiview.GenericCDIView; import fi.codecrew.moya.web.cdiview.GenericCDIView;
import fi.codecrew.moya.web.cdiview.eticket.EticketView; import fi.codecrew.moya.web.cdiview.eticket.EticketView;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** /**
* *
...@@ -47,6 +59,11 @@ import org.slf4j.LoggerFactory; ...@@ -47,6 +59,11 @@ import org.slf4j.LoggerFactory;
@RequestScoped @RequestScoped
public class TestDataView extends GenericCDIView { public class TestDataView extends GenericCDIView {
/**
*
*/
private static final long serialVersionUID = 1L;
private static final Logger logger = LoggerFactory private static final Logger logger = LoggerFactory
.getLogger(TestDataView.class); .getLogger(TestDataView.class);
...@@ -287,7 +304,6 @@ public class TestDataView extends GenericCDIView { ...@@ -287,7 +304,6 @@ public class TestDataView extends GenericCDIView {
logger.info("Generating poll data!"); logger.info("Generating poll data!");
LanEvent ev = eventbean.getCurrentEvent();
Poll poll = new Poll(); Poll poll = new Poll();
poll.setName("Tapahtumakysely"); poll.setName("Tapahtumakysely");
Calendar end = Calendar.getInstance(); Calendar end = Calendar.getInstance();
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/actionlog/ActionLogCreateView.java
...@@ -18,15 +18,12 @@ ...@@ -18,15 +18,12 @@
*/ */
package fi.codecrew.moya.web.cdiview.actionlog; package fi.codecrew.moya.web.cdiview.actionlog;
import java.util.List;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.enterprise.context.RequestScoped; import javax.enterprise.context.RequestScoped;
import javax.inject.Named; import javax.inject.Named;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
import fi.codecrew.moya.beans.ActionLogBeanLocal; import fi.codecrew.moya.beans.ActionLogBeanLocal;
import fi.codecrew.moya.model.Role;
import fi.codecrew.moya.web.cdiview.GenericCDIView; import fi.codecrew.moya.web.cdiview.GenericCDIView;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/actionlog/ActionLogMessageView.java
...@@ -18,13 +18,11 @@ ...@@ -18,13 +18,11 @@
*/ */
package fi.codecrew.moya.web.cdiview.actionlog; package fi.codecrew.moya.web.cdiview.actionlog;
import java.awt.event.ActionEvent;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped; import javax.enterprise.context.ConversationScoped;
import javax.enterprise.context.RequestScoped;
import javax.inject.Named; import javax.inject.Named;
import org.primefaces.event.SelectEvent; import org.primefaces.event.SelectEvent;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/card/CardMassPrintView.java
...@@ -55,6 +55,7 @@ public class CardMassPrintView extends GenericCDIView implements Serializable { ...@@ -55,6 +55,7 @@ public class CardMassPrintView extends GenericCDIView implements Serializable {
private MassPrintResult mpr = null; private MassPrintResult mpr = null;
private boolean waitForAcceptance = true; private boolean waitForAcceptance = true;
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(CardMassPrintView.class); private static final Logger logger = LoggerFactory.getLogger(CardMassPrintView.class);
public CardMassPrintView() { public CardMassPrintView() {
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/card/CardTemplateDataEditView.java
...@@ -41,7 +41,6 @@ import fi.codecrew.moya.model.CardTemplate; ...@@ -41,7 +41,6 @@ import fi.codecrew.moya.model.CardTemplate;
import fi.codecrew.moya.model.CardTextData; import fi.codecrew.moya.model.CardTextData;
import fi.codecrew.moya.utilities.I18n; import fi.codecrew.moya.utilities.I18n;
import fi.codecrew.moya.web.cdiview.GenericCDIView; import fi.codecrew.moya.web.cdiview.GenericCDIView;
import fi.codecrew.moya.web.cdiview.user.UserView;
@Named @Named
@ConversationScoped @ConversationScoped
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/card/CardTemplateDataView.java
...@@ -18,13 +18,11 @@ ...@@ -18,13 +18,11 @@
*/ */
package fi.codecrew.moya.web.cdiview.card; package fi.codecrew.moya.web.cdiview.card;
import java.lang.reflect.Array;
import java.util.List; import java.util.List;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped; import javax.enterprise.context.ConversationScoped;
import javax.inject.Named; import javax.inject.Named;
import javax.json.Json;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/eticket/EticketView.java
...@@ -18,16 +18,7 @@ ...@@ -18,16 +18,7 @@
*/ */
package fi.codecrew.moya.web.cdiview.eticket; package fi.codecrew.moya.web.cdiview.eticket;
import fi.codecrew.moya.beans.*; import java.util.List;
import fi.codecrew.moya.enums.apps.BillPermission;
import fi.codecrew.moya.model.GroupMembership;
import fi.codecrew.moya.model.Place;
import fi.codecrew.moya.model.PlaceGroup;
import fi.codecrew.moya.web.cdiview.GenericCDIView;
import fi.codecrew.moya.web.cdiview.shop.InviteView;
import fi.codecrew.moya.web.cdiview.user.UserView;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped; import javax.enterprise.context.ConversationScoped;
...@@ -36,15 +27,26 @@ import javax.faces.context.FacesContext; ...@@ -36,15 +27,26 @@ import javax.faces.context.FacesContext;
import javax.faces.model.ListDataModel; import javax.faces.model.ListDataModel;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
import java.util.HashMap;
import java.util.List; import org.slf4j.Logger;
import java.util.Map; import org.slf4j.LoggerFactory;
import fi.codecrew.moya.beans.BarcodeBeanLocal;
import fi.codecrew.moya.beans.PlaceBeanLocal;
import fi.codecrew.moya.beans.PlaceGroupBeanLocal;
import fi.codecrew.moya.beans.TicketBeanLocal;
import fi.codecrew.moya.beans.UserBeanLocal;
import fi.codecrew.moya.enums.apps.BillPermission;
import fi.codecrew.moya.model.GroupMembership;
import fi.codecrew.moya.web.cdiview.GenericCDIView;
import fi.codecrew.moya.web.cdiview.user.UserView;
@Named @Named
@ConversationScoped @ConversationScoped
public class EticketView extends GenericCDIView { public class EticketView extends GenericCDIView {
private static final long serialVersionUID = -3934253910818396155L; private static final long serialVersionUID = -3934253910818396155L;
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(EticketView.class); private static final Logger logger = LoggerFactory.getLogger(EticketView.class);
// @Inject // @Inject
...@@ -64,23 +66,13 @@ public class EticketView extends GenericCDIView { ...@@ -64,23 +66,13 @@ public class EticketView extends GenericCDIView {
UserBeanLocal userBean; UserBeanLocal userBean;
@EJB @EJB
PlaceBeanLocal placeBean; private PlaceBeanLocal placeBean;
@EJB @EJB
TicketBeanLocal ticketBean; private TicketBeanLocal ticketBean;
@Inject
private InviteView inviteView;
private Place place;
private PlaceGroup group;
private transient ListDataModel<PlaceGroup> placegroups;
private transient ListDataModel<Place> placelist;
private transient ListDataModel<GroupMembership> memberlist; private transient ListDataModel<GroupMembership> memberlist;
private Map<Integer, String> inviteMails = new HashMap<>();
public String getUserTextCode() { public String getUserTextCode() {
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/eticket/StandaloneEticketView.java
...@@ -18,32 +18,29 @@ ...@@ -18,32 +18,29 @@
*/ */
package fi.codecrew.moya.web.cdiview.eticket; package fi.codecrew.moya.web.cdiview.eticket;
import fi.codecrew.moya.beans.*;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.GroupMembership;
import fi.codecrew.moya.model.Place;
import fi.codecrew.moya.model.PlaceGroup;
import fi.codecrew.moya.web.cdiview.GenericCDIView;
import fi.codecrew.moya.web.cdiview.shop.InviteView;
import fi.codecrew.moya.web.cdiview.user.UserView;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped; import javax.enterprise.context.ConversationScoped;
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
import javax.faces.model.ListDataModel; import javax.faces.model.ListDataModel;
import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
import java.util.HashMap;
import java.util.Map; import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fi.codecrew.moya.beans.BarcodeBeanLocal;
import fi.codecrew.moya.beans.PlaceBeanLocal;
import fi.codecrew.moya.beans.PlaceGroupBeanLocal;
import fi.codecrew.moya.beans.TicketBeanLocal;
import fi.codecrew.moya.beans.UserBeanLocal;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.GroupMembership;
import fi.codecrew.moya.web.cdiview.GenericCDIView;
@Named @Named
@ConversationScoped @ConversationScoped
public class StandaloneEticketView extends GenericCDIView { public class StandaloneEticketView extends GenericCDIView {
private static final long serialVersionUID = -3934253910818396155L; private static final long serialVersionUID = -3934253910818396155L;
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(StandaloneEticketView.class); private static final Logger logger = LoggerFactory.getLogger(StandaloneEticketView.class);
// @Inject // @Inject
...@@ -60,34 +57,19 @@ public class StandaloneEticketView extends GenericCDIView { ...@@ -60,34 +57,19 @@ public class StandaloneEticketView extends GenericCDIView {
private PlaceGroupBeanLocal placegroupBean; private PlaceGroupBeanLocal placegroupBean;
@EJB @EJB
UserBeanLocal userBean; private UserBeanLocal userBean;
@EJB @EJB
PlaceBeanLocal placeBean; private PlaceBeanLocal placeBean;
@EJB @EJB
TicketBeanLocal ticketBean; private TicketBeanLocal ticketBean;
@Inject
private InviteView inviteView;
private Place place;
private PlaceGroup group;
private transient ListDataModel<PlaceGroup> placegroups;
private transient ListDataModel<Place> placelist;
private transient ListDataModel<GroupMembership> memberlist; private transient ListDataModel<GroupMembership> memberlist;
private Map<Integer, String> inviteMails = new HashMap<>();
private boolean mapVisible = false; private boolean mapVisible = false;
public void initView() { public void initView() {
if(token == null) if(token == null)
throw new RuntimeException("todo"); throw new RuntimeException("todo");
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/help/HelpView.java
...@@ -18,21 +18,19 @@ ...@@ -18,21 +18,19 @@
*/ */
package fi.codecrew.moya.web.cdiview.help; package fi.codecrew.moya.web.cdiview.help;
import javax.ejb.EJB;
import javax.enterprise.context.RequestScoped;
import javax.inject.Inject;
import javax.inject.Named;
import fi.codecrew.moya.beans.HelpBeanLocal; import fi.codecrew.moya.beans.HelpBeanLocal;
import fi.codecrew.moya.beans.PermissionBeanLocal; import fi.codecrew.moya.beans.PermissionBeanLocal;
import fi.codecrew.moya.enums.ValidLocale; import fi.codecrew.moya.enums.ValidLocale;
import fi.codecrew.moya.enums.apps.UserPermission; import fi.codecrew.moya.enums.apps.UserPermission;
import fi.codecrew.moya.handler.SessionStore; import fi.codecrew.moya.handler.SessionStore;
import fi.codecrew.moya.model.Help;
import fi.codecrew.moya.model.HelpText; import fi.codecrew.moya.model.HelpText;
import fi.codecrew.moya.web.helper.LayoutView; import fi.codecrew.moya.web.helper.LayoutView;
import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped;
import javax.enterprise.context.RequestScoped;
import javax.inject.Inject;
import javax.inject.Named;
/** /**
* Created by tuukka on 19/12/15. * Created by tuukka on 19/12/15.
*/ */
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/map/MapManageView.java
...@@ -45,7 +45,6 @@ import fi.codecrew.moya.beans.ProductBeanLocal; ...@@ -45,7 +45,6 @@ import fi.codecrew.moya.beans.ProductBeanLocal;
import fi.codecrew.moya.beans.UserBeanLocal; import fi.codecrew.moya.beans.UserBeanLocal;
import fi.codecrew.moya.enums.apps.MapPermission; import fi.codecrew.moya.enums.apps.MapPermission;
import fi.codecrew.moya.model.EventMap; import fi.codecrew.moya.model.EventMap;
import fi.codecrew.moya.model.LanEvent;
import fi.codecrew.moya.model.Place; import fi.codecrew.moya.model.Place;
import fi.codecrew.moya.model.Product; import fi.codecrew.moya.model.Product;
import fi.codecrew.moya.web.cdiview.GenericCDIView; import fi.codecrew.moya.web.cdiview.GenericCDIView;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/map/PlacegroupView.java
...@@ -44,6 +44,7 @@ import org.slf4j.LoggerFactory; ...@@ -44,6 +44,7 @@ import org.slf4j.LoggerFactory;
public class PlacegroupView extends GenericCDIView { public class PlacegroupView extends GenericCDIView {
private static final long serialVersionUID = -3934253910818396155L; private static final long serialVersionUID = -3934253910818396155L;
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(PlacegroupView.class); private static final Logger logger = LoggerFactory.getLogger(PlacegroupView.class);
// @Inject // @Inject
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/menu/MenuView.java
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
*/ */
package fi.codecrew.moya.web.cdiview.menu; package fi.codecrew.moya.web.cdiview.menu;
import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
...@@ -45,11 +46,10 @@ import fi.codecrew.moya.web.helper.LayoutView; ...@@ -45,11 +46,10 @@ import fi.codecrew.moya.web.helper.LayoutView;
@Named @Named
@RequestScoped @RequestScoped
public class MenuView { public class MenuView implements Serializable{
private static final long serialVersionUID = -5720164797157054213L; private static final long serialVersionUID = -5720164797157054213L;
private String pagename;
@Inject @Inject
protected NavigationHandler navihandler; protected NavigationHandler navihandler;
...@@ -72,6 +72,7 @@ public class MenuView { ...@@ -72,6 +72,7 @@ public class MenuView {
private String menuChange; private String menuChange;
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(MenuView.class); private static final Logger logger = LoggerFactory.getLogger(MenuView.class);
public List<PageContent> getPagecontent(String pagekey) public List<PageContent> getPagecontent(String pagekey)
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!