Skip to content

Riina Antikainen / Moya

Go to a project
Commit 55325248 by Tuukka Kivilahti
Options

Merge branch 'importcleanup' into 'master' 

Import cleanup

Eclipse warning cleanup. No functional changes!
 - Remove unused imports
 - Remove unused variables
 - Add type variables to Map
 - add suppress unused annotation to logging variables
 - etc

See merge request !340
2 parents e42ca5ab 041f6e04
Inline Side-by-side
Showing with 335 additions and 656 deletions
code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/ActionLogBeanLocal.java
......@@ -17,15 +17,14 @@
*
*/
package fi.codecrew.moya.beans;
import java.util.ArrayList;
import java.util.List;
import javax.ejb.Local;
import fi.codecrew.moya.enums.ActionLogMessageState;
import fi.codecrew.moya.model.ActionLogMessage;
import fi.codecrew.moya.model.ActionLogMessageResponse;
import fi.codecrew.moya.model.ActionLogMessageTag;
import java.util.List;
import javax.ejb.Local;
import fi.codecrew.moya.enums.ActionLogMessageState;
import fi.codecrew.moya.model.ActionLogMessage;
import fi.codecrew.moya.model.ActionLogMessageResponse;
import fi.codecrew.moya.model.ActionLogMessageTag;
import fi.codecrew.moya.model.Role;
@Local
......
code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/DiscountBeanLocal.java
......@@ -19,7 +19,6 @@
package fi.codecrew.moya.beans;
import java.math.BigDecimal;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
......
code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/LectureBeanLocal.java
......@@ -21,7 +21,6 @@ package fi.codecrew.moya.beans;
import java.util.List;
import javax.ejb.Local;
import javax.faces.model.ListDataModel;
import fi.codecrew.moya.model.EventUser;
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;
import javax.ejb.Local;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.PrintedCard;
import fi.codecrew.moya.model.Reader;
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;
import javax.ejb.Local;
import fi.codecrew.moya.beans.StatisticsBeanLocal.ProductSlotcountMover;
import fi.codecrew.moya.model.Product;
@Local
......
code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/TicketBeanLocal.java
......@@ -18,13 +18,12 @@
*/
package fi.codecrew.moya.beans;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.GroupMembership;
import fi.codecrew.moya.model.PlaceGroup;
import java.util.List;
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
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;
import java.util.Collection;
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;
......
code/moya-beans-client/ejbModule/fi/codecrew/moya/util/CheckoutBank.java
......@@ -34,6 +34,7 @@ public class CheckoutBank {
private final String icon;
private final String name;
private final List<Valuepair> postParams = new ArrayList<Valuepair>();
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(CheckoutBank.class);
public CheckoutBank(Node bank) {
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/ApiApplicationBean.java
......@@ -18,6 +18,13 @@
*/
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.ApiApplicationInstanceFacade;
import fi.codecrew.moya.model.ApiApplication;
......@@ -25,14 +32,6 @@ import fi.codecrew.moya.model.ApiApplicationInstance;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.utilities.PasswordFunctions;
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
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/CardPrintBean.java
......@@ -18,56 +18,54 @@
*/
package fi.codecrew.moya.beans;
import java.awt.Color;
import java.awt.Font;
import java.awt.Graphics2D;
import java.awt.geom.AffineTransform;
import java.awt.image.BufferedImage;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import javax.ejb.EJB;
import javax.ejb.LocalBean;
import javax.ejb.Stateless;
import javax.imageio.IIOImage;
import javax.imageio.ImageIO;
import javax.imageio.ImageTypeSpecifier;
import javax.imageio.ImageWriteParam;
import javax.imageio.ImageWriter;
import javax.imageio.metadata.IIOInvalidTreeException;
import javax.imageio.metadata.IIOMetadata;
import javax.imageio.metadata.IIOMetadataNode;
import javax.imageio.stream.ImageOutputStream;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.pdfjet.CoreFont;
import com.pdfjet.Image;
import com.pdfjet.ImageType;
import com.pdfjet.PDF;
import com.pdfjet.Page;
import com.pdfjet.TextLine;
import fi.codecrew.moya.enums.CardObjectDataType;
import fi.codecrew.moya.enums.CardTextAlignment;
import fi.codecrew.moya.enums.CardTextDataType;
import fi.codecrew.moya.enums.CardTextStyle;
import fi.codecrew.moya.facade.CardTemplateFacade;
import fi.codecrew.moya.facade.EventUserFacade;
import fi.codecrew.moya.facade.PrintedCardFacade;
import fi.codecrew.moya.facade.UserFacade;
import fi.codecrew.moya.model.CardObjectData;
import fi.codecrew.moya.model.CardTemplate;
import fi.codecrew.moya.model.CardTextData;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.GenericEntity;
import fi.codecrew.moya.model.PrintedCard;
import java.awt.Color;
import java.awt.Font;
import java.awt.Graphics2D;
import java.awt.image.BufferedImage;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import javax.ejb.EJB;
import javax.ejb.LocalBean;
import javax.ejb.Stateless;
import javax.imageio.IIOImage;
import javax.imageio.ImageIO;
import javax.imageio.ImageTypeSpecifier;
import javax.imageio.ImageWriteParam;
import javax.imageio.ImageWriter;
import javax.imageio.metadata.IIOInvalidTreeException;
import javax.imageio.metadata.IIOMetadata;
import javax.imageio.metadata.IIOMetadataNode;
import javax.imageio.stream.ImageOutputStream;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.pdfjet.CoreFont;
import com.pdfjet.Image;
import com.pdfjet.ImageType;
import com.pdfjet.PDF;
import com.pdfjet.Page;
import com.pdfjet.TextLine;
import fi.codecrew.moya.enums.CardObjectDataType;
import fi.codecrew.moya.enums.CardTextAlignment;
import fi.codecrew.moya.enums.CardTextDataType;
import fi.codecrew.moya.enums.CardTextStyle;
import fi.codecrew.moya.facade.CardTemplateFacade;
import fi.codecrew.moya.facade.EventUserFacade;
import fi.codecrew.moya.facade.PrintedCardFacade;
import fi.codecrew.moya.model.CardObjectData;
import fi.codecrew.moya.model.CardTemplate;
import fi.codecrew.moya.model.CardTextData;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.GenericEntity;
import fi.codecrew.moya.model.PrintedCard;
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;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/EventBean.java
......@@ -50,7 +50,6 @@ import fi.codecrew.moya.model.LanEventPrivateProperty;
import fi.codecrew.moya.model.LanEventPrivatePropertyKey;
import fi.codecrew.moya.model.LanEventProperty;
import fi.codecrew.moya.model.LanEventPropertyKey;
import fi.codecrew.moya.utilities.moyamessage.MoyaEventType;
/**
* Session Bean implementation class EventBean
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/HelpBean.java
......@@ -18,8 +18,15 @@
*/
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.apps.SpecialPermission;
import fi.codecrew.moya.enums.apps.UserPermission;
import fi.codecrew.moya.facade.HelpFacade;
import fi.codecrew.moya.facade.HelpTextFacade;
......@@ -28,13 +35,6 @@ import fi.codecrew.moya.model.Help;
import fi.codecrew.moya.model.HelpText;
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
*/
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/LectureBean.java
......@@ -20,7 +20,6 @@ package fi.codecrew.moya.beans;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import javax.annotation.security.DeclareRoles;
import javax.annotation.security.RolesAllowed;
......@@ -31,7 +30,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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.LectureFacade;
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;
import fi.codecrew.moya.model.GroupMembership;
import fi.codecrew.moya.model.NetworkAssociation;
import fi.codecrew.moya.model.Place;
import fi.codecrew.moya.model.PrintedCard;
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;
import fi.codecrew.moya.model.OrgRoleRequest;
import fi.codecrew.moya.model.Role;
import fi.codecrew.moya.model.User;
import fi.codecrew.moya.utilities.jpa.GenericFacade;
/**
* Session Bean implementation class OrgRoleBean
......@@ -55,6 +54,7 @@ import fi.codecrew.moya.utilities.jpa.GenericFacade;
})
public class OrgRoleBean implements OrgRoleBeanLocal {
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(OrgRoleBean.class);
@EJB
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/PermissionBean.java
......@@ -110,6 +110,7 @@ import fi.codecrew.moya.model.User;
@LocalBean
public class PermissionBean implements PermissionBeanLocal {
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(PermissionBean.class);
@Resource
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/PlaceBean.java
......@@ -49,8 +49,6 @@ import javax.ejb.Stateless;
import javax.ejb.Timeout;
import javax.ejb.Timer;
import javax.ejb.TimerService;
import javax.xml.registry.infomodel.Slot;
import fi.codecrew.moya.facade.*;
import fi.codecrew.moya.model.*;
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/PlaceGroupBean.java
......@@ -19,7 +19,6 @@
package fi.codecrew.moya.beans;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
......@@ -29,8 +28,6 @@ import javax.ejb.EJB;
import javax.ejb.EJBAccessException;
import javax.ejb.Stateless;
import fi.codecrew.moya.model.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -48,6 +45,11 @@ import fi.codecrew.moya.enums.apps.SpecialPermission;
import fi.codecrew.moya.facade.EventUserFacade;
import fi.codecrew.moya.facade.GroupMembershipFacade;
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.moyamessage.MoyaEventType;
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/ProductBean.java
......@@ -57,7 +57,6 @@ import fi.codecrew.moya.facade.PlaceSlotFacade;
import fi.codecrew.moya.facade.ProductFacade;
import fi.codecrew.moya.facade.UserFacade;
import fi.codecrew.moya.model.AccountEvent;
import fi.codecrew.moya.model.Bill;
import fi.codecrew.moya.model.Discount;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.InventoryEvent;
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/ReaderBean.java
......@@ -19,7 +19,6 @@
package fi.codecrew.moya.beans;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.regex.Pattern;
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/SessionMgmtBean.java
......@@ -21,7 +21,6 @@ package fi.codecrew.moya.beans;
import java.util.Collections;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentSkipListMap;
import javax.annotation.security.DeclareRoles;
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;
import fi.codecrew.moya.model.PageContent;
import fi.codecrew.moya.model.Role;
import fi.codecrew.moya.model.SitePage;
import fi.codecrew.moya.utilities.jpa.GenericFacade;
/**
* Session Bean implementation class SitePageBean
......@@ -74,7 +73,6 @@ public class SitePageBean implements SitePageBeanLocal {
@EJB
private UserBean userbean;
@SuppressWarnings("unused")
private Logger logger = LoggerFactory.getLogger(SitePageBean.class);
@EJB
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/TicketBean.java
......@@ -19,36 +19,39 @@
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.SpecialPermission;
import fi.codecrew.moya.facade.EventUserFacade;
import fi.codecrew.moya.facade.GroupMembershipFacade;
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.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.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
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/VerkkomaksutFiBean.java
......@@ -18,13 +18,10 @@
*/
package fi.codecrew.moya.beans;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.StringWriter;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
......@@ -46,14 +43,11 @@ import javax.xml.parsers.ParserConfigurationException;
import org.apache.http.HttpResponse;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.auth.params.AuthPNames;
import org.apache.http.client.CredentialsProvider;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.params.AuthPolicy;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.BasicCredentialsProvider;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
import org.slf4j.Logger;
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;
import fi.codecrew.moya.facade.VipFacade;
import fi.codecrew.moya.facade.VipProductDeliveryFacade;
import fi.codecrew.moya.facade.VipProductFacade;
import fi.codecrew.moya.model.LanEvent;
import fi.codecrew.moya.model.Vip;
import fi.codecrew.moya.model.VipProduct;
import fi.codecrew.moya.model.VipProductDelivery;
......@@ -30,6 +29,7 @@ import fi.codecrew.moya.utilities.SearchResult;
@DeclareRoles({ VipPermission.S_VIEW, VipPermission.S_USAGE, VipPermission.S_EDIT })
public class VipBean implements VipBeanLocal {
@SuppressWarnings("unused")
private static final Logger log = LoggerFactory.getLogger(VipBean.class);
// @EJB
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/moyamessage/IrcBotMoyaEventTopicListener.java
......@@ -2,26 +2,13 @@ package fi.codecrew.moya.beans.moyamessage;
import javax.ejb.EJB;
import javax.ejb.MessageDriven;
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageListener;
import fi.codecrew.moya.utilities.moyamessage.MoyaEventType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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
......@@ -29,6 +16,7 @@ import java.util.List;
@MessageDriven(mappedName = MoyaEventSender.MOYA_EVENT_SENDER_TOPIC)
public class IrcBotMoyaEventTopicListener implements MessageListener {
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(IrcBotMoyaEventTopicListener.class);
@EJB
......
code/moya-beans/ejbModule/fi/codecrew/moya/beanutil/DecimalXMLAdapter.java
......@@ -20,8 +20,6 @@ package fi.codecrew.moya.beanutil;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.NumberFormat;
import java.util.Locale;
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;
import javax.persistence.criteria.CriteriaQuery;
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.EventBeanLocal;
import fi.codecrew.moya.model.CardObjectData;
import fi.codecrew.moya.model.CardObjectData_;
import fi.codecrew.moya.model.CardTemplate;
@Stateless
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/CardTextDataFacade.java
......@@ -27,12 +27,11 @@ import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
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.EventBeanLocal;
import fi.codecrew.moya.model.CardTemplate;
import fi.codecrew.moya.model.CardTextData;
import fi.codecrew.moya.model.CardTextData_;
@Stateless
@LocalBean
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/EventMapFacade.java
......@@ -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.EventOrganiser;
import fi.codecrew.moya.model.LanEvent;
import fi.codecrew.moya.model.LanEvent_;
@Stateless
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/GameIDFacade.java
......@@ -18,29 +18,16 @@
*/
package fi.codecrew.moya.facade;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import javax.ejb.LocalBean;
import javax.ejb.Stateless;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root;
import fi.codecrew.moya.enums.TournamentStatus;
import fi.codecrew.moya.model.EventUser;
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.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
@LocalBean
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/GroupMembershipFacade.java
......@@ -18,7 +18,6 @@
*/
package fi.codecrew.moya.facade;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
......@@ -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.Place_;
import fi.codecrew.moya.model.Product;
import fi.codecrew.moya.utilities.PasswordFunctions;
@Stateless
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/HelpTextFacade.java
......@@ -19,19 +19,21 @@
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.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 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.
*/
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/HelpTextHistoryFacade.java
......@@ -19,13 +19,13 @@
package fi.codecrew.moya.facade;
import fi.codecrew.moya.model.HelpText;
import fi.codecrew.moya.model.HelpTextHistory;
import javax.ejb.LocalBean;
import javax.ejb.Stateless;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.ejb.LocalBean;
import javax.ejb.Stateless;
import fi.codecrew.moya.model.HelpTextHistory;
/**
* 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;
import javax.ejb.LocalBean;
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.LanEventDomain_;
import fi.codecrew.moya.model.LanEvent_;
import fi.codecrew.moya.model.LanEventDomain;
@Stateless
@LocalBean
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/LogEntryTypeFacade.java
......@@ -22,7 +22,6 @@ import javax.ejb.LocalBean;
import javax.ejb.Stateless;
import javax.persistence.TypedQuery;
import fi.codecrew.moya.beans.SecurityLogType;
import fi.codecrew.moya.model.LogEntryType;
import fi.codecrew.moya.utilities.moyamessage.MoyaEventType;
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/OrgRoleFacade.java
......@@ -18,8 +18,6 @@
*/
package fi.codecrew.moya.facade;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import javax.ejb.EJB;
......@@ -29,7 +27,6 @@ import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.ListJoin;
import javax.persistence.criteria.Root;
import javax.persistence.criteria.Subquery;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -54,6 +51,7 @@ public class OrgRoleFacade extends IntegerPkGenericFacade<OrgRole> {
@EJB
private EventBeanLocal eventBean;
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(OrgRoleFacade.class);
public OrgRoleFacade() {
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/PlaceFacade.java
......@@ -34,7 +34,6 @@ import fi.codecrew.moya.model.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fi.codecrew.moya.beans.EventBeanLocal;
import fi.codecrew.moya.beans.LoggingBeanLocal;
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_;
@LocalBean
public class PlaceSlotFacade extends IntegerPkGenericFacade<PlaceSlot> {
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(PlaceSlotFacade.class);
@EJB
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/PrintedCardFacade.java
......@@ -38,8 +38,6 @@ import fi.codecrew.moya.model.CardCode;
import fi.codecrew.moya.model.CardCode_;
import fi.codecrew.moya.model.CardTemplate_;
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.PrintedCard;
import fi.codecrew.moya.model.PrintedCard_;
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/RoleFacade.java
......@@ -18,7 +18,6 @@
*/
package fi.codecrew.moya.facade;
import java.util.ArrayList;
import java.util.List;
import javax.ejb.EJB;
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/SitePageFacade.java
......@@ -51,6 +51,7 @@ public class SitePageFacade extends IntegerPkGenericFacade<SitePage> {
@EJB
private EventBeanLocal eventbean;
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(SitePageFacade.class);
public SitePageFacade() {
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/TournamentFacade.java
......@@ -18,8 +18,6 @@
*/
package fi.codecrew.moya.facade;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import javax.ejb.LocalBean;
......@@ -29,13 +27,9 @@ import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root;
import fi.codecrew.moya.enums.TournamentStatus;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.LanEvent;
import fi.codecrew.moya.model.Tournament;
import fi.codecrew.moya.model.TournamentParticipant;
import fi.codecrew.moya.model.Tournament_;
import fi.codecrew.moya.model.User;
import fi.codecrew.moya.model.User_;
@Stateless
@LocalBean
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/TournamentGameFacade.java
......@@ -30,8 +30,6 @@ import javax.persistence.criteria.Root;
import fi.codecrew.moya.beans.EventBean;
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
@LocalBean
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/TournamentParticipantFacade.java
......@@ -27,8 +27,6 @@ import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root;
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_;
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/TournamentRuleFacade.java
......@@ -20,16 +20,12 @@ package fi.codecrew.moya.facade;
import java.util.List;
import javax.ejb.EJB;
import javax.ejb.LocalBean;
import javax.ejb.Stateless;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root;
import fi.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.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;
import javax.ejb.LocalBean;
import javax.ejb.Stateless;
import fi.codecrew.moya.model.TournamentMatchResult;
import fi.codecrew.moya.model.TournamentTeamMember;
@Stateless
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/UserFacade.java
......@@ -30,7 +30,6 @@ import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root;
import javax.persistence.metamodel.SingularAttribute;
import fi.codecrew.moya.model.EventUser;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/VipFacade.java
......@@ -15,19 +15,12 @@ import javax.persistence.criteria.Root;
import javax.persistence.metamodel.SingularAttribute;
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.model.EventUser;
import fi.codecrew.moya.model.EventUser_;
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.utilities.SearchQuery;
import fi.codecrew.moya.utilities.SearchResult;
import fi.codecrew.moya.utilities.SearchQuery.QuerySortOrder;
import fi.codecrew.moya.utilities.jpa.FacadeCallback;
@Stateless
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/VipProductDeliveryFacade.java
......@@ -3,7 +3,6 @@ package fi.codecrew.moya.facade;
import javax.ejb.LocalBean;
import javax.ejb.Stateless;
import fi.codecrew.moya.model.VipProduct;
import fi.codecrew.moya.model.VipProductDelivery;
@Stateless
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/VipProductFacade.java
package fi.codecrew.moya.facade;
import java.util.List;
import javax.ejb.EJB;
import javax.ejb.LocalBean;
import javax.ejb.Stateless;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root;
import fi.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.Vip_;
@Stateless
@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
}
@SuppressWarnings("unchecked")
@Override
public void exec(CriteriaBuilder cb, CriteriaQuery<?> cq, Path<T> root, List<Predicate> predicates, boolean isFullQuery) {
if (!isFullQuery)
......@@ -79,6 +80,7 @@ public class OrderCallback<T extends ModelInterface> implements FacadeCallback<T
if (path == null) {
return;
}
// Unchecked error comes from this line, which is actually checked...
if (path.getJavaType().equals(String.class)) {
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;
import fi.codecrew.moya.model.Bill;
import fi.codecrew.moya.model.Bill_;
import fi.codecrew.moya.model.LanEvent;
import fi.codecrew.moya.utilities.jpa.FacadeCallback;
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;
import fi.codecrew.moya.model.Bill;
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.utilities.SearchQuery.QuerySortOrder;
......
code/moya-database/src/main/java/fi/codecrew/moya/model/ActionLogMessageTag.java
......@@ -23,8 +23,6 @@ import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.Table;
import org.eclipse.persistence.annotations.PrivateOwned;
@Entity
@Table(name = "actionlog_message_tags")
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;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Temporal;
......
code/moya-database/src/main/java/fi/codecrew/moya/model/FoodWave.java
......@@ -23,7 +23,6 @@
package fi.codecrew.moya.model;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
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;
import javax.json.Json;
import javax.json.JsonObject;
import javax.json.JsonObjectBuilder;
import javax.json.JsonValue;
import javax.persistence.Column;
import javax.persistence.Id;
import javax.persistence.MappedSuperclass;
......
code/moya-database/src/main/java/fi/codecrew/moya/model/HelpText.java
......@@ -22,12 +22,19 @@
*/
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.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
......
code/moya-database/src/main/java/fi/codecrew/moya/model/LanEvent.java
......@@ -20,7 +20,6 @@ package fi.codecrew.moya.model;
import java.beans.Transient;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.List;
......
code/moya-database/src/main/java/fi/codecrew/moya/model/LectureGroup.java
......@@ -27,7 +27,6 @@ import java.util.List;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.JoinColumn;
import javax.persistence.Lob;
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;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Comparator;
import java.util.List;
import javax.faces.model.ListDataModel;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
......@@ -40,7 +38,6 @@ import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.persistence.Transient;
import javax.persistence.UniqueConstraint;
import fi.codecrew.moya.enums.CardState;
......
code/moya-database/src/main/java/fi/codecrew/moya/model/Product.java
......@@ -23,12 +23,26 @@
package fi.codecrew.moya.model;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.HashSet;
import java.util.List;
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;
......
code/moya-database/src/main/java/fi/codecrew/moya/model/TournamentGame.java
......@@ -19,13 +19,17 @@
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.util.Date;
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 @@
*/
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.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;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
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;
import java.util.Date;
import java.util.List;
import javax.json.Json;
import javax.json.JsonValue;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
......
code/moya-database/src/main/java/fi/codecrew/moya/model/map/MapReservationQueue.java
package fi.codecrew.moya.model.map;
import java.math.BigDecimal;
import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.Temporal;
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;
import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.OneToOne;
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.persistence.Transient;
......@@ -31,6 +28,7 @@ public class MapReservationQueueEntry extends GenericEntity implements Comparabl
*
*/
private static final long serialVersionUID = -1529588850152306791L;
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(MapReservationQueueEntry.class);
@Column()
......
code/moya-parent/pom.root.xml deleted 100644 → 0
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya</artifactId>
<name>Moya Online Youth Accumulator</name>
<packaging>pom</packaging>
<version>1.2-SNAPSHOT</version>
<modules>
<module>moya-parent</module>
<module>moya-authmodule</module>
<module>moya-cardprinter</module>
</modules>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java-version>1.8</java-version>
<!-- plugin versions -->
<ejb-plugin-version>2.3</ejb-plugin-version>
<war-plugin-version>2.4</war-plugin-version>
<ear-plugin-version>2.9</ear-plugin-version>
<compiler-plugin-version>3.2</compiler-plugin-version>
<!-- dependency versions -->
<javaee-api-version>7.0</javaee-api-version>
<!-- EJB spec version -->
<ejb-spec-version>3.2</ejb-spec-version>
<swagger.version>1.3.12</swagger.version>
<slf4j.version>1.7.12</slf4j.version>
<logback.version>1.1.3</logback.version>
<testng.version>6.8.21</testng.version>
<javamelody.version>1.55.0</javamelody.version>
<primefaces.version>5.1</primefaces.version>
</properties>
<url>http://codecrew.fi</url>
<organization>
<name>Codecrew RY</name>
<url>http://codecrew.fi</url>
</organization>
<scm>
<connection>scm:git@gitlab.codecrew.fi:codecrew/moya.git</connection>
<url>http://gitlab.codecrew.fi</url>
</scm>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${compiler-plugin-version}</version>
<configuration>
<source>${java-version}</source>
<target>${java-version}</target>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
<repositories>
<repository>
<id>iudex</id>
<url>http://iudex.fi/maven/</url>
</repository>
<repository>
<id>jvnet-nexus-releases</id>
<name>jvnet-nexus-releases</name>
<url>https://maven.java.net/content/repositories/releases/</url>
</repository>
<repository>
<id>prime-repo</id>
<name>PrimeFaces Maven Repository</name>
<url>http://repository.primefaces.org</url>
</repository>
<repository>
<id>apache.snapshots</id>
<url>http://repository.apache.org/snapshots/</url>
</repository>
<repository>
<id>clojars.org</id>
<url>http://clojars.org/repo</url>
</repository>
</repositories>
</project>
code/moya-utils/src/test/java/fi/codecrew/moya/utilities/StringUtilsTest.java
......@@ -7,6 +7,7 @@ import org.testng.annotations.Test;
public class StringUtilsTest {
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(StringUtilsTest.class);
@Test
......
code/moya-web/src/main/java/fi/codecrew/moya/cmdline/ICommandlineCommand.java
......@@ -18,8 +18,7 @@
*/
package fi.codecrew.moya.cmdline;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
public interface ICommandlineCommand {
......
code/moya-web/src/main/java/fi/codecrew/moya/management/ReplServlet.java
......@@ -2,7 +2,6 @@ package fi.codecrew.moya.management;
import java.io.IOException;
import javax.servlet.Servlet;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
......
code/moya-web/src/main/java/fi/codecrew/moya/rest/AccountEventRestView.java
......@@ -89,7 +89,6 @@ public class AccountEventRestView {
monthMap.put(day, dayValue += p.getQuantity().intValueExact());
}
boolean empty = true;
HcSeries data1 = new HcSeries("Daily");
HcSeries data2 = new HcSeries("Stacked");
......
code/moya-web/src/main/java/fi/codecrew/moya/rest/JsonpRestFilter.java
package fi.codecrew.moya.rest;
import java.io.IOException;
import java.io.PrintWriter;
import java.nio.charset.Charset;
import javax.servlet.Filter;
......
code/moya-web/src/main/java/fi/codecrew/moya/rest/PojoUtils.java
......@@ -4,8 +4,6 @@ import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlElement;
import fi.codecrew.moya.model.*;
import fi.codecrew.moya.rest.pojo.appconfig.v1.ApplicationInstancePojo;
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;
import fi.codecrew.moya.beans.UserBeanLocal;
import fi.codecrew.moya.model.EventUser;
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.ReaderRestPojo;
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;
@RequestScoped
......
code/moya-web/src/main/java/fi/codecrew/moya/rest/appconfig/v1/EventInfoV1.java
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.SessionBean;
import javax.enterprise.context.RequestScoped;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
......@@ -21,7 +8,15 @@ import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
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.
......
code/moya-web/src/main/java/fi/codecrew/moya/rest/appconfig/v1/InstancesV1.java
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.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 java.security.Principal;
import javax.ejb.EJB;
import javax.enterprise.context.RequestScoped;
import javax.servlet.ServletException;
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.MediaType;
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.
......
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;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import javax.ejb.EJB;
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;
*/
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();
UserPojo pojo = new UserPojo();
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;
import fi.codecrew.moya.rest.v2.pojo.UserPojo;
import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataMultiPart;
import org.glassfish.jersey.media.multipart.FormDataParam;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -24,9 +23,7 @@ import org.slf4j.LoggerFactory;
import javax.ejb.EJB;
import javax.enterprise.context.RequestScoped;
import javax.inject.Inject;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.Part;
import javax.ws.rs.*;
import javax.ws.rs.core.Context;
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;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import javax.ejb.EJB;
import javax.enterprise.context.RequestScoped;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.FormParam;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.PUT;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
......@@ -26,11 +21,9 @@ import fi.codecrew.moya.beans.PermissionBeanLocal;
import fi.codecrew.moya.beans.ProductBeanLocal;
import fi.codecrew.moya.beans.UserBeanLocal;
import fi.codecrew.moya.beans.VipBeanLocal;
import fi.codecrew.moya.model.AccountEvent;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.Vip;
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.VipRestPojo;
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;
import java.nio.charset.Charset;
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.Environment;
import org.apache.sshd.server.ExitCallback;
......@@ -36,7 +33,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fi.codecrew.moya.clientutils.BortalLocalContextHolder;
import fi.codecrew.moya.cmdline.Hello;
import fi.codecrew.moya.cmdline.ICommandlineCommand;
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;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
......@@ -44,12 +43,14 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
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.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.model.EventMap;
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 {
private int value = 0;
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(ConversationKeepaliveView.class);
public int ping() {
......
code/moya-web/src/main/java/fi/codecrew/moya/web/ErrorPageView.java
......@@ -49,15 +49,13 @@ public class ErrorPageView implements Serializable {
// @Inject
// private transient FacesContext context;
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(ErrorPageView.class);
public String getStackTrace() {
FacesContext context = FacesContext.getCurrentInstance();
Map requestMap = context.getExternalContext().getRequestMap();
Throwable ex =
(Throwable) requestMap.get("javax.servlet.error.exception");
Map<String, Object> requestMap = context.getExternalContext().getRequestMap();
Throwable ex = (Throwable) requestMap.get("javax.servlet.error.exception");
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
......@@ -70,7 +68,7 @@ public class ErrorPageView implements Serializable {
public String getMessage() {
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");
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;
@RequestScoped
public class LocaleSelectorView {
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(LocaleSelectorView.class);
@Inject
......
code/moya-web/src/main/java/fi/codecrew/moya/web/TestDataView.java
......@@ -30,14 +30,26 @@ import javax.enterprise.context.RequestScoped;
import javax.inject.Inject;
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.UserPermission;
import fi.codecrew.moya.model.*;
import fi.codecrew.moya.model.EventUser;
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.eticket.EticketView;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
*
......@@ -47,6 +59,11 @@ import org.slf4j.LoggerFactory;
@RequestScoped
public class TestDataView extends GenericCDIView {
/**
*
*/
private static final long serialVersionUID = 1L;
private static final Logger logger = LoggerFactory
.getLogger(TestDataView.class);
......@@ -287,7 +304,6 @@ public class TestDataView extends GenericCDIView {
logger.info("Generating poll data!");
LanEvent ev = eventbean.getCurrentEvent();
Poll poll = new Poll();
poll.setName("Tapahtumakysely");
Calendar end = Calendar.getInstance();
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/actionlog/ActionLogCreateView.java
......@@ -18,15 +18,12 @@
*/
package fi.codecrew.moya.web.cdiview.actionlog;
import java.util.List;
import javax.ejb.EJB;
import javax.enterprise.context.RequestScoped;
import javax.inject.Named;
import javax.validation.constraints.Size;
import fi.codecrew.moya.beans.ActionLogBeanLocal;
import fi.codecrew.moya.model.Role;
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 @@
*/
package fi.codecrew.moya.web.cdiview.actionlog;
import java.awt.event.ActionEvent;
import java.util.ArrayList;
import java.util.List;
import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped;
import javax.enterprise.context.RequestScoped;
import javax.inject.Named;
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 {
private MassPrintResult mpr = null;
private boolean waitForAcceptance = true;
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(CardMassPrintView.class);
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;
import fi.codecrew.moya.model.CardTextData;
import fi.codecrew.moya.utilities.I18n;
import fi.codecrew.moya.web.cdiview.GenericCDIView;
import fi.codecrew.moya.web.cdiview.user.UserView;
@Named
@ConversationScoped
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/card/CardTemplateDataView.java
......@@ -18,13 +18,11 @@
*/
package fi.codecrew.moya.web.cdiview.card;
import java.lang.reflect.Array;
import java.util.List;
import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped;
import javax.inject.Named;
import javax.json.Json;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/eticket/EticketView.java
......@@ -18,16 +18,7 @@
*/
package fi.codecrew.moya.web.cdiview.eticket;
import fi.codecrew.moya.beans.*;
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 java.util.List;
import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped;
......@@ -36,15 +27,26 @@ import javax.faces.context.FacesContext;
import javax.faces.model.ListDataModel;
import javax.inject.Inject;
import javax.inject.Named;
import java.util.HashMap;
import java.util.List;
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.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
@ConversationScoped
public class EticketView extends GenericCDIView {
private static final long serialVersionUID = -3934253910818396155L;
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(EticketView.class);
// @Inject
......@@ -64,23 +66,13 @@ public class EticketView extends GenericCDIView {
UserBeanLocal userBean;
@EJB
PlaceBeanLocal placeBean;
private PlaceBeanLocal placeBean;
@EJB
TicketBeanLocal ticketBean;
@Inject
private InviteView inviteView;
private Place place;
private PlaceGroup group;
private transient ListDataModel<PlaceGroup> placegroups;
private transient ListDataModel<Place> placelist;
private TicketBeanLocal ticketBean;
private transient ListDataModel<GroupMembership> memberlist;
private Map<Integer, String> inviteMails = new HashMap<>();
public String getUserTextCode() {
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/eticket/StandaloneEticketView.java
......@@ -18,32 +18,29 @@
*/
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.enterprise.context.ConversationScoped;
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
import javax.faces.model.ListDataModel;
import javax.inject.Inject;
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
@ConversationScoped
public class StandaloneEticketView extends GenericCDIView {
private static final long serialVersionUID = -3934253910818396155L;
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(StandaloneEticketView.class);
// @Inject
......@@ -60,34 +57,19 @@ public class StandaloneEticketView extends GenericCDIView {
private PlaceGroupBeanLocal placegroupBean;
@EJB
UserBeanLocal userBean;
private UserBeanLocal userBean;
@EJB
PlaceBeanLocal placeBean;
private PlaceBeanLocal placeBean;
@EJB
TicketBeanLocal ticketBean;
@Inject
private InviteView inviteView;
private Place place;
private PlaceGroup group;
private transient ListDataModel<PlaceGroup> placegroups;
private transient ListDataModel<Place> placelist;
private TicketBeanLocal ticketBean;
private transient ListDataModel<GroupMembership> memberlist;
private Map<Integer, String> inviteMails = new HashMap<>();
private boolean mapVisible = false;
public void initView() {
if(token == null)
throw new RuntimeException("todo");
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/help/HelpView.java
......@@ -18,21 +18,19 @@
*/
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.PermissionBeanLocal;
import fi.codecrew.moya.enums.ValidLocale;
import fi.codecrew.moya.enums.apps.UserPermission;
import fi.codecrew.moya.handler.SessionStore;
import fi.codecrew.moya.model.Help;
import fi.codecrew.moya.model.HelpText;
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.
*/
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/map/MapManageView.java
......@@ -45,7 +45,6 @@ import fi.codecrew.moya.beans.ProductBeanLocal;
import fi.codecrew.moya.beans.UserBeanLocal;
import fi.codecrew.moya.enums.apps.MapPermission;
import fi.codecrew.moya.model.EventMap;
import fi.codecrew.moya.model.LanEvent;
import fi.codecrew.moya.model.Place;
import fi.codecrew.moya.model.Product;
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;
public class PlacegroupView extends GenericCDIView {
private static final long serialVersionUID = -3934253910818396155L;
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(PlacegroupView.class);
// @Inject
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/menu/MenuView.java
......@@ -18,6 +18,7 @@
*/
package fi.codecrew.moya.web.cdiview.menu;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
......@@ -45,11 +46,10 @@ import fi.codecrew.moya.web.helper.LayoutView;
@Named
@RequestScoped
public class MenuView {
public class MenuView implements Serializable{
private static final long serialVersionUID = -5720164797157054213L;
private String pagename;
@Inject
protected NavigationHandler navihandler;
......@@ -72,6 +72,7 @@ public class MenuView {
private String menuChange;
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(MenuView.class);
public List<PageContent> getPagecontent(String pagekey)
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/menu/PrimeMenuView.java
......@@ -115,7 +115,6 @@ public class PrimeMenuView extends GenericCDIView {
if (selectedTop == null) {
return null;
}
int testid = 3;
for (MenuNavigation m : selectedTop.getChildren()) {
if (m.getItem() != null && m.getChildren().isEmpty()) {
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/networkassociation/NetworkAssociationView.java
......@@ -29,19 +29,20 @@ import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.validator.ValidatorException;
import javax.inject.Named;
import javax.mail.internet.InternetAddress;
import fi.codecrew.moya.beans.NetworkAssociationBeanLocal;
import fi.codecrew.moya.enums.apps.NetworkAssociationPermission;
import fi.codecrew.moya.enums.apps.TournamentPermission;
import fi.codecrew.moya.model.NetworkAssociation;
import fi.codecrew.moya.utilities.jsf.MessageHelper;
import fi.codecrew.moya.web.cdiview.GenericCDIView;
@Named
@RequestScoped
public class NetworkAssociationView extends GenericCDIView {
/**
*
*/
private static final long serialVersionUID = -1803866295536400232L;
private String ipAddress;
private String macAddress;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/organisation/EventOrgView.java
......@@ -57,6 +57,7 @@ public class EventOrgView extends GenericCDIView {
@EJB
private SitePageBeanLocal sitepagebean;
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(EventOrgView.class);
@LoggedIn
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/reader/ReaderNameContainer.java
......@@ -41,6 +41,7 @@ public class ReaderNameContainer implements Serializable {
private boolean autopoll = false;
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(ReaderNameContainer.class);
/**
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/reader/ReaderView.java
......@@ -22,7 +22,6 @@ import java.util.ArrayList;
import java.util.List;
import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped;
import javax.enterprise.context.SessionScoped;
import javax.faces.model.ListDataModel;
import javax.inject.Inject;
......@@ -36,17 +35,12 @@ import fi.codecrew.moya.beans.ProductBeanLocal;
import fi.codecrew.moya.beans.ReaderBeanLocal;
import fi.codecrew.moya.beans.UserBeanLocal;
import fi.codecrew.moya.enums.apps.ShopPermission;
import fi.codecrew.moya.enums.apps.UserPermission;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.PrintedCard;
import fi.codecrew.moya.model.Product;
import fi.codecrew.moya.model.Reader;
import fi.codecrew.moya.model.ReaderEvent;
import fi.codecrew.moya.model.ReaderType;
import fi.codecrew.moya.model.Role;
import fi.codecrew.moya.model.User;
import fi.codecrew.moya.utilities.SearchQuery;
import fi.codecrew.moya.utilities.SearchQuery.QuerySortOrder;
import fi.codecrew.moya.web.cdiview.GenericCDIView;
import fi.codecrew.moya.web.cdiview.shop.UserCardWrapper;
import fi.codecrew.moya.web.cdiview.user.UserView;
......@@ -78,6 +72,7 @@ public class ReaderView extends GenericCDIView {
// private UserCardWrapper neighborUser;
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(ReaderView.class);
private Integer readerid;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/reader/RfidListenerView.java
......@@ -28,6 +28,10 @@ import fi.codecrew.moya.web.cdiview.GenericCDIView;
@Named
@ConversationScoped
public class RfidListenerView extends GenericCDIView {
/**
*
*/
private static final long serialVersionUID = 1L;
@EJB
private ReaderBeanLocal readerbean;
private String reader;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/shop/AddInventoryView.java
......@@ -18,12 +18,10 @@
*/
package fi.codecrew.moya.web.cdiview.shop;
import java.math.BigDecimal;
import java.util.List;
import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped;
import javax.enterprise.context.RequestScoped;
import javax.inject.Named;
import org.slf4j.Logger;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/shop/FoodWaveView.java
......@@ -30,7 +30,6 @@ import java.util.TreeSet;
import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped;
import javax.faces.model.ListDataModel;
import javax.inject.Inject;
import javax.inject.Named;
import org.slf4j.Logger;
......@@ -61,9 +60,6 @@ public class FoodWaveView extends GenericCDIView {
@EJB
private FoodWaveBeanLocal foodWaveBean;
@Inject
private FoodWaveFoodView foodWaveFoodView;
private FoodWaveTemplate template;
private Integer templateId;
@EJB
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/shop/InviteAcceptView.java
......@@ -24,7 +24,6 @@ import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
import javax.inject.Inject;
import javax.inject.Named;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import fi.codecrew.moya.web.cdiview.user.AuthView;
......@@ -62,6 +61,7 @@ public class InviteAcceptView extends GenericCDIView {
private GroupMembership membership;
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(InviteAcceptView.class);
private boolean placeGroupMembership = false;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/shop/InviteView.java
......@@ -46,6 +46,7 @@ public class InviteView extends GenericCDIView {
@EJB
private transient UserBeanLocal userbean;
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(InviteView.class);
public void initView() {
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/shop/ProductView.java
......@@ -21,7 +21,6 @@ package fi.codecrew.moya.web.cdiview.shop;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Set;
import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped;
......@@ -56,8 +55,6 @@ public class ProductView extends GenericCDIView {
private Integer productId;
private Set<ProductFlag> productFlags;
private transient ListDataModel<Discount> productDiscounts;
private ProductLimitation limit;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/tournaments/TournamentAddTeamView.java
......@@ -22,14 +22,7 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.Role;
import fi.codecrew.moya.model.User;
import fi.codecrew.moya.web.cdiview.GenericCDIView;
import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped;
import javax.faces.event.ActionEvent;
import javax.inject.Named;
@Named
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/tournaments/TournamentEditRulesView.java
......@@ -18,21 +18,14 @@
*/
package fi.codecrew.moya.web.cdiview.tournaments;
import java.io.IOException;
import java.util.List;
import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped;
import javax.enterprise.context.RequestScoped;
import javax.faces.context.FacesContext;
import javax.inject.Named;
import fi.codecrew.moya.beans.TournamentBeanLocal;
import fi.codecrew.moya.enums.TournamentType;
import fi.codecrew.moya.enums.apps.TournamentPermission;
import fi.codecrew.moya.model.Tournament;
import fi.codecrew.moya.model.TournamentRule;
import fi.codecrew.moya.utilities.I18n;
import fi.codecrew.moya.utilities.jsf.MessageHelper;
import fi.codecrew.moya.web.cdiview.GenericCDIView;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/tournaments/TournamentParticipantsView.java
......@@ -23,7 +23,6 @@ import java.util.HashMap;
import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped;
import javax.faces.event.ActionEvent;
import javax.faces.event.ActionListener;
import javax.inject.Named;
import fi.codecrew.moya.beans.TournamentBeanLocal;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/AuthView.java
......@@ -29,16 +29,14 @@ import javax.inject.Named;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import fi.codecrew.moya.beans.UserBeanLocal;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fi.codecrew.moya.beans.BootstrapBeanLocal;
import fi.codecrew.moya.beans.PermissionBeanLocal;
import fi.codecrew.moya.beans.UserBeanLocal;
import fi.codecrew.moya.enums.apps.UserPermission;
import fi.codecrew.moya.handler.NavigationHandler;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.User;
import fi.codecrew.moya.web.cdiview.GenericCDIView;
@Named
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/ImportView.java
......@@ -58,6 +58,7 @@ public class ImportView extends GenericCDIView {
private UploadedFile file;
private ArrayList<ImportWrapper> users;
private static final Charset UTF8 = Charset.forName("UTF8");
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(ImportView.class);
//
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/OrgRoleRequestView.java
......@@ -4,7 +4,6 @@ import java.util.List;
import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped;
import javax.faces.model.ListDataModel;
import javax.inject.Named;
import fi.codecrew.moya.beans.OrgRoleBeanLocal;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/OrgRoleView.java
......@@ -18,7 +18,6 @@
*/
package fi.codecrew.moya.web.cdiview.user;
import java.util.HashSet;
import java.util.List;
import javax.ejb.EJB;
......@@ -34,7 +33,6 @@ import fi.codecrew.moya.beans.RoleBeanLocal;
import fi.codecrew.moya.beans.UserBeanLocal;
import fi.codecrew.moya.entitysearch.UserSearchQuery;
import fi.codecrew.moya.enums.apps.UserPermission;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.OrgRole;
import fi.codecrew.moya.model.Role;
import fi.codecrew.moya.model.User;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/PasswordView.java
......@@ -51,6 +51,7 @@ public class PasswordView extends GenericCDIView {
private String password;
private String passwordcheck;
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(PasswordView.class);
public String changePassword() {
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/UserCartView.java
......@@ -34,7 +34,6 @@ import org.primefaces.model.StreamedContent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fi.codecrew.moya.beans.EventBeanLocal;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.GroupMembership;
import fi.codecrew.moya.model.LanEvent;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/UserGameIDView.java
......@@ -18,7 +18,6 @@
*/
package fi.codecrew.moya.web.cdiview.user;
import java.util.HashMap;
import java.util.List;
import javax.ejb.EJB;
......@@ -32,9 +31,7 @@ import fi.codecrew.moya.enums.apps.TournamentPermission;
import fi.codecrew.moya.enums.apps.UserPermission;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.GameID;
import fi.codecrew.moya.model.Tournament;
import fi.codecrew.moya.model.TournamentGame;
import fi.codecrew.moya.model.User;
import fi.codecrew.moya.utilities.jsf.MessageHelper;
import fi.codecrew.moya.web.cdiview.GenericCDIView;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/UserView.java
......@@ -20,7 +20,6 @@ package fi.codecrew.moya.web.cdiview.user;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
import javax.ejb.EJB;
......@@ -29,7 +28,6 @@ import javax.enterprise.context.ConversationScoped;
import javax.enterprise.inject.Produces;
import javax.faces.application.FacesMessage;
import javax.faces.context.FacesContext;
import javax.faces.event.ActionEvent;
import javax.faces.event.ValueChangeEvent;
import javax.inject.Inject;
import javax.inject.Named;
......@@ -305,7 +303,6 @@ public class UserView extends GenericCDIView {
super.addFaceMessage("user.imageUpload.imageNotFound");
} else {
InputStream istr = getImage().getInputstream();
UserImage userimage = userbean.uploadImage(user, getImage().getContentType(), getImage().getInputstream(),
getImage().getFileName(), "");
user = userbean.getEventUser(userimage.getUser(), false);
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/vip/VipView.java
......@@ -6,7 +6,6 @@ import java.util.List;
import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped;
import javax.faces.model.ListDataModel;
import javax.inject.Inject;
import javax.inject.Named;
import org.slf4j.Logger;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/converter/EventUserConverter.java
......@@ -25,8 +25,6 @@ import javax.inject.Named;
import fi.codecrew.moya.beans.ReaderBeanLocal;
import fi.codecrew.moya.beans.UserBeanLocal;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.ReaderEvent;
import fi.codecrew.moya.utilities.jsf.GenericEntityFinderConverter;
import fi.codecrew.moya.utilities.jsf.GenericIntegerEntityConverter;
@Named
......
code/moya-web/src/main/java/fi/codecrew/moya/web/converter/MenuNavigationConverter.java
......@@ -22,9 +22,7 @@ import javax.ejb.EJB;
import javax.enterprise.context.RequestScoped;
import javax.inject.Named;
import fi.codecrew.moya.beans.EventMapBeanLocal;
import fi.codecrew.moya.beans.MenuBeanLocal;
import fi.codecrew.moya.model.EventMap;
import fi.codecrew.moya.model.MenuNavigation;
import fi.codecrew.moya.utilities.jsf.GenericIntegerEntityConverter;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/converter/TournamentGameConverter.java
......@@ -23,8 +23,6 @@ import javax.enterprise.context.RequestScoped;
import javax.inject.Named;
import fi.codecrew.moya.beans.TournamentBeanLocal;
import fi.codecrew.moya.beans.UserBeanLocal;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.TournamentGame;
import fi.codecrew.moya.utilities.jsf.GenericIntegerEntityConverter;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/converter/TournamentRuleConverter.java
......@@ -23,9 +23,6 @@ import javax.enterprise.context.RequestScoped;
import javax.inject.Named;
import fi.codecrew.moya.beans.TournamentBeanLocal;
import fi.codecrew.moya.beans.UserBeanLocal;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.TournamentGame;
import fi.codecrew.moya.model.TournamentRule;
import fi.codecrew.moya.utilities.jsf.GenericIntegerEntityConverter;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/CardlessIncomingView.java
......@@ -52,6 +52,7 @@ public class CardlessIncomingView extends GenericCDIView {
private static final long serialVersionUID = -715517L;
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(CardlessIncomingView.class);
@Inject
......
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/FlowFoodwaveView.java
......@@ -18,6 +18,14 @@
*/
package fi.codecrew.moya.web.flow;
import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped;
import javax.inject.Inject;
import javax.inject.Named;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fi.codecrew.moya.beans.PermissionBeanLocal;
import fi.codecrew.moya.enums.apps.ShopPermission;
import fi.codecrew.moya.model.EventUser;
......@@ -27,13 +35,6 @@ import fi.codecrew.moya.web.cdiview.reader.ReaderView;
import fi.codecrew.moya.web.cdiview.shop.FoodWaveFoodView;
import fi.codecrew.moya.web.cdiview.shop.FoodWaveView;
import fi.codecrew.moya.web.cdiview.user.UserView;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped;
import javax.inject.Inject;
import javax.inject.Named;
@Named
@ConversationScoped
......@@ -61,9 +62,6 @@ public class FlowFoodwaveView extends GenericCDIView {
private UserView userView;
@Inject
private InfoView infoView;
@Inject
private ReaderView readerView;
@Inject
......
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/IncomingPlaceshopView.java
package fi.codecrew.moya.web.flow;
import java.util.ArrayList;
import java.util.List;
import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped;
import javax.faces.context.FacesContext;
import javax.inject.Inject;
import javax.inject.Named;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fi.codecrew.moya.beans.EventBeanLocal;
import fi.codecrew.moya.beans.PermissionBeanLocal;
import fi.codecrew.moya.beans.PlaceBeanLocal;
import fi.codecrew.moya.beans.map.QueueBeanLocal;
import fi.codecrew.moya.beans.map.QueueBeanLocal.MapQueueI;
import fi.codecrew.moya.enums.apps.MapPermission;
import fi.codecrew.moya.enums.apps.UserPermission;
import fi.codecrew.moya.exceptions.BortalCatchableException;
import fi.codecrew.moya.model.*;
import fi.codecrew.moya.model.map.MapReservationQueueEntry;
import fi.codecrew.moya.model.Place;
import fi.codecrew.moya.web.cdiview.GenericCDIView;
import fi.codecrew.moya.web.cdiview.user.UserView;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped;
import javax.enterprise.context.RequestScoped;
import javax.enterprise.context.SessionScoped;
import javax.faces.context.FacesContext;
import javax.inject.Inject;
import javax.inject.Named;
import java.util.*;
@Named
@ConversationScoped
......
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/IncomingView.java
......@@ -60,9 +60,6 @@ public class IncomingView extends GenericCDIView {
private ReaderView readerView;
@Inject
private InfoView infoView;
@Inject
private ReaderNameContainer namecontainer;
@Inject
......
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/InfoView.java
......@@ -53,12 +53,9 @@ public class InfoView extends GenericCDIView {
@Inject
private ReaderView readerView;
@EJB
private UserBeanLocal userbean;
private String currentPage;
public void initView() {
super.beginConversation();
}
......
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/UserMapSearchView.java
......@@ -18,33 +18,15 @@
*/
package fi.codecrew.moya.web.flow;
import fi.codecrew.moya.beans.PlaceBeanLocal;
import fi.codecrew.moya.beans.PlaceGroupBeanLocal;
import fi.codecrew.moya.beans.ProductBeanLocal;
import fi.codecrew.moya.beans.TicketBeanLocal;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.GroupMembership;
import fi.codecrew.moya.model.Product;
import fi.codecrew.moya.model.ReaderEvent;
import fi.codecrew.moya.utilities.I18n;
import fi.codecrew.moya.web.cdiview.GenericCDIView;
import fi.codecrew.moya.web.cdiview.map.AjaxMapView;
import fi.codecrew.moya.web.cdiview.reader.ReaderView;
import fi.codecrew.moya.web.cdiview.user.UserView;
import fi.codecrew.moya.web.helpers.ProductSummaryWrapper;
import org.primefaces.event.SelectEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped;
import javax.faces.application.FacesMessage;
import javax.faces.context.FacesContext;
import javax.faces.model.ListDataModel;
import javax.inject.Inject;
import javax.inject.Named;
import java.util.ArrayList;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fi.codecrew.moya.web.cdiview.GenericCDIView;
import fi.codecrew.moya.web.cdiview.map.AjaxMapView;
@Named
@ConversationScoped
......@@ -52,21 +34,16 @@ public class UserMapSearchView extends GenericCDIView {
private static final long serialVersionUID = -715517L;
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(UserMapSearchView.class);
@Inject
private UserView userview;
@Inject
private InfoView infoView;
@Inject
private AjaxMapView ajaxMapView;
boolean initialized = false;
public void initView() {
if(!initialized) {
if (!initialized) {
super.beginConversation();
initialized = true;
}
......@@ -74,7 +51,4 @@ public class UserMapSearchView extends GenericCDIView {
ajaxMapView.initViewMap();
}
}
code/moya-web/src/main/java/fi/codecrew/moya/web/helper/LayoutView.java
......@@ -18,7 +18,6 @@
*/
package fi.codecrew.moya.web.helper;
import java.io.ByteArrayInputStream;
import java.io.Serializable;
import java.util.Collections;
import java.util.HashSet;
......@@ -34,8 +33,6 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.servlet.http.HttpServletRequest;
import org.primefaces.model.DefaultStreamedContent;
import org.primefaces.model.StreamedContent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/helper/ProductShopItemHelper.java
......@@ -19,7 +19,6 @@
package fi.codecrew.moya.web.helper;
import java.math.BigDecimal;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/helpers/BortalApplicationWrapper.java
......@@ -38,6 +38,7 @@ public class BortalApplicationWrapper implements Serializable {
private final ArrayList<IAppPermission> permissions;
private Set<String> selected = new HashSet<String>();
private final BortalApplication app;
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(BortalApplicationWrapper.class);
public BortalApplicationWrapper(BortalApplication bApp, Set<IAppPermission> set) {
......
code/moya-web/src/main/java/fi/codecrew/moya/web/helpers/ProductShopItem.java
......@@ -19,19 +19,17 @@
package fi.codecrew.moya.web.helpers;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import fi.codecrew.moya.model.ProductFlag;
import fi.codecrew.moya.web.helper.ProductShopItemHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fi.codecrew.moya.model.Discount;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.Product;
import fi.codecrew.moya.model.ProductFlag;
public class ProductShopItem {
......
code/moya-web/src/main/java/fi/codecrew/moya/web/lecture/LectureGroupView.java
......@@ -28,7 +28,6 @@ import javax.inject.Named;
import fi.codecrew.moya.beans.EventBeanLocal;
import fi.codecrew.moya.beans.LectureBeanLocal;
import fi.codecrew.moya.enums.apps.LecturePermission;
import fi.codecrew.moya.enums.apps.UserPermission;
import fi.codecrew.moya.model.LectureGroup;
import fi.codecrew.moya.utilities.I18n;
import fi.codecrew.moya.web.cdiview.GenericCDIView;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/reports/BasicStatisticsView.java
......@@ -21,21 +21,11 @@ package fi.codecrew.moya.web.reports;
import java.util.List;
import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped;
import javax.enterprise.context.RequestScoped;
import javax.faces.application.FacesMessage;
import javax.faces.context.FacesContext;
import javax.faces.model.ListDataModel;
import javax.inject.Named;
import fi.codecrew.moya.beans.EventBeanLocal;
import fi.codecrew.moya.beans.LectureBeanLocal;
import fi.codecrew.moya.beans.StatisticsBeanLocal;
import fi.codecrew.moya.beans.StatisticsBeanLocal.ProductSlotcountMover;
import fi.codecrew.moya.enums.apps.LecturePermission;
import fi.codecrew.moya.model.Lecture;
import fi.codecrew.moya.model.LectureGroup;
import fi.codecrew.moya.utilities.I18n;
import fi.codecrew.moya.web.cdiview.GenericCDIView;
@Named
......
code/pom.xml
......@@ -34,7 +34,7 @@
<javamelody.version>1.58.0</javamelody.version>
<primefaces.version>6.0</primefaces.version>
<primefaces.themeversion>1.0.10</primefaces.themeversion>
<primefaces.extensions>4.0.0</primefaces.extensions>
<primefaces.extensions>6.0.0</primefaces.extensions>
</properties>
<url>http://codecrew.fi</url>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!