Skip to content

Antti Väyrynen / Moya

Go to a project
Commit 30568e17 by Tuukka Kivilahti
Options

Merge branch 'serializable-fix' into 'master' 

Findbugs-fixes

See merge request !375
2 parents 4bde9b5e 734f9f72
Inline Side-by-side
Showing with 518 additions and 445 deletions
code/findbugs-exclude.xml 0 → 100644
<FindBugsFilter>
<!--
@EJB annotated fields should not be transient, but they are detected as
non-serializable instance fields in serializable class (SE_BAD_FIELD)
See https://stackoverflow.com/questions/13700306/best-practice-for-serialization-for-ejb-and-cdi-beans
-->
<Match>
<Class name="~fi\.codecrew\.moya\.web\..*"/>
<!-- We assume that most field names contain the string 'Bean'-->
<Field name="~.*[Bb]ean.*"/>
<Bug pattern="SE_BAD_FIELD"/>
</Match>
<Match>
<Class name="fi.codecrew.moya.handler.SessionStore" />
<Field name="~.*[Bb]ean.*"/>
<Bug pattern="SE_BAD_FIELD"/>
</Match>
<Match>
<Class name="fi.codecrew.moyamgmt.handler.SessionStore" />
<Field name="~.*[Bb]ean.*"/>
<Bug pattern="SE_BAD_FIELD"/>
</Match>
<!--Do not try to check the autogenerated model files ending in: '_' -->
<Match>
<Class name="~fi\.codecrew\.moya\.model\..*_"/>
</Match>
</FindBugsFilter>
code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/map/QueueBeanLocal.java
package fi.codecrew.moya.beans.map;
import java.io.Serializable;
import java.util.Collection;
import java.util.Date;
......@@ -31,7 +32,7 @@ public interface QueueBeanLocal {
MapQueueRules findRules(EventMap map);
public interface MapQueueI {
public interface MapQueueI extends Serializable {
Collection<MapReservationQueueEntry> getQueue();
......
code/moya-beans-client/ejbModule/fi/codecrew/moya/bortal/views/BillSummary.java
......@@ -18,11 +18,12 @@
*/
package fi.codecrew.moya.bortal.views;
import java.io.Serializable;
import java.math.BigDecimal;
import fi.codecrew.moya.model.BillLine;
public class BillSummary {
public class BillSummary implements Serializable{
public BillSummary(String name) {
this.name = name;
......
code/moya-beans-client/ejbModule/fi/codecrew/moya/util/CheckoutBank.java
......@@ -18,6 +18,7 @@
*/
package fi.codecrew.moya.util;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
......@@ -27,7 +28,7 @@ import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
public class CheckoutBank {
public class CheckoutBank implements Serializable {
private final String key;
private final String url;
......
code/moya-beans-client/ejbModule/fi/codecrew/moya/util/MassPrintResult.java
......@@ -18,11 +18,14 @@
*/
package fi.codecrew.moya.util;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import fi.codecrew.moya.model.EventUser;
public class MassPrintResult {
public class MassPrintResult implements Serializable {
private static final long serialVersionUID = -7489122040594726017L;
private byte[] pdf;
private List<EventUser> affectedUsers = new ArrayList<EventUser>();
public byte[] getPdf() {
......
code/moya-beans-client/ejbModule/fi/codecrew/moya/util/Valuepair.java
......@@ -18,7 +18,9 @@
*/
package fi.codecrew.moya.util;
public class Valuepair {
import java.io.Serializable;
public class Valuepair implements Serializable {
private String key;
private String value;
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/RestBean.java
......@@ -23,6 +23,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Random;
import java.util.concurrent.ConcurrentHashMap;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
......@@ -92,25 +93,17 @@ public class RestBean implements RestBeanLocal {
}
// Username -> Nonce -> expiration
private Map<String, Map<String, Long>> userRestAuths = Collections.synchronizedMap(new HashMap<String, Map<String, Long>>());
private ConcurrentHashMap<String, ConcurrentHashMap<String, Long>> userRestAuths = new ConcurrentHashMap<>();
@Override
public String getLoggedinUserRestNonce()
{
public String getLoggedinUserRestNonce() {
String username = context.getCallerPrincipal().getName();
if (username == null) {
return null;
}
Map<String, Long> userAuthMap = userRestAuths.get(username);
ConcurrentHashMap<String, Long> userAuthMap = userRestAuths.get(username);
if (userAuthMap == null) {
synchronized (userRestAuths) {
if (!userRestAuths.containsKey(username)) {
userAuthMap = Collections.synchronizedMap(new HashMap<String, Long>());
userRestAuths.put(username, userAuthMap);
} else {
userRestAuths.get(username);
}
}
userAuthMap = userRestAuths.putIfAbsent(username, new ConcurrentHashMap<>());
}
Random random = new Random();
......
code/moya-parent/pom.xml
<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
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
......@@ -179,8 +179,41 @@
<version>2.17</version>
<scope>provided</scope>
</dependency>
<!-- These are required for findbugs annotations-->
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>annotations</artifactId>
<version>${findbugs.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>${findbugs.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
<reporting>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>${findbugs-maven.version}</version>
<configuration>
<excludeFilterFile>findbugs-exclude.xml</excludeFilterFile>
<includeFilterFile>findbugs-include.xml</includeFilterFile>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<configuration>
<excludeFilterFile>findbugs-exclude.xml</excludeFilterFile>
<includeFilterFile>findbugs-include.xml</includeFilterFile>
</configuration>
</plugin>
</plugins>
</reporting>
<parent>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya</artifactId>
......
code/moya-utils/src/main/java/fi/codecrew/moya/utilities/NumericStringComparator.java
package fi.codecrew.moya.utilities;
import java.io.Serializable;
import java.math.BigInteger;
import java.util.Comparator;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class NumericStringComparator implements Comparator<String> {
public class NumericStringComparator implements Comparator<String>, Serializable {
// \D non numeric
// \d numeric
......
code/moya-web/src/main/java/fi/codecrew/moya/handler/NavigationHandler.java
......@@ -38,7 +38,7 @@ public class NavigationHandler implements Serializable {
private String destNavi;
@Inject
private transient Conversation conversation;
private Conversation conversation;
public void saveNavigation(String navigation)
{
......
code/moya-web/src/main/java/fi/codecrew/moya/rest/MapAdminView.java
......@@ -75,7 +75,7 @@ public class MapAdminView {
@EJB
private UserBeanLocal eventuserbean;
@EJB
private transient PlaceBeanLocal placebean;
private PlaceBeanLocal placebean;
private static final Logger logger = LoggerFactory.getLogger(MapAdminView.class);
......
code/moya-web/src/main/java/fi/codecrew/moya/rest/PojoUtils.java
......@@ -156,11 +156,11 @@ public class PojoUtils {
public static ReaderEventRestPojo initReaderEventRestPojo(ReaderEvent event) {
ReaderEventRestPojo ret = new ReaderEventRestPojo();
if (event != null && event.getPrintedCard() != null) {
if ( event.getPrintedCard() != null) {
if (event.getPrintedCard().getUser() != null) {
ret.setEventUser(PojoUtils.initEventUserRestPojo(event.getPrintedCard().getUser()));
}
} else if (event != null && event.getUser() != null) {
} else if (event.getUser() != null) {
ret.setEventUser(PojoUtils.initEventUserRestPojo(event.getUser()));
}
......@@ -168,10 +168,10 @@ public class PojoUtils {
ret.setReaderEventTime(event.getUpdatetime());
ret.setReaderId(event.getReader().getId());
if (event != null && event.getPrintedCard() != null) {
if (event.getPrintedCard() != null) {
ret.setPrintedCardId(event.getPrintedCard().getId());
}
if (event != null && event.getPrintedCard() != null) {
if (event.getPrintedCard() != null) {
ret.setPrintedCardState(event.getPrintedCard().getCardState().name());
}
return ret;
......
code/moya-web/src/main/java/fi/codecrew/moya/servlet/FileDownloadServlet.java
......@@ -65,22 +65,22 @@ public class FileDownloadServlet extends GenericImageServlet {
*/
private static final long serialVersionUID = -3359999630873773508L;
@EJB
private transient CardTemplateBeanLocal ctbean;
private CardTemplateBeanLocal ctbean;
@EJB
private transient UserBeanLocal userbean;
private UserBeanLocal userbean;
@EJB
private transient CardTemplateBeanLocal cardbean;
private CardTemplateBeanLocal cardbean;
@EJB
private transient CardPrintBeanLocal cardprint;
private CardPrintBeanLocal cardprint;
@EJB
private transient PermissionBeanLocal permbean;
private PermissionBeanLocal permbean;
@EJB
private transient EventBeanLocal orgbean;
private EventBeanLocal orgbean;
private static final Logger logger = LoggerFactory.getLogger(FileDownloadServlet.class);
......
code/moya-web/src/main/java/fi/codecrew/moya/servlet/GenericImageServlet.java
......@@ -112,7 +112,7 @@ public abstract class GenericImageServlet extends HttpServlet {
} else {
response.setStatus(HttpServletResponse.SC_NOT_FOUND);
}
response.getWriter().append("Error " + data.getResponse() + " while fetching data");
response.getWriter().append("Error " + (data == null ? "null-data" : data.getResponse()) + " while fetching data");
} else {
response.setContentLength(data.getData().length);
if (request.getParameter("download") != null)
......
code/moya-web/src/main/java/fi/codecrew/moya/servlet/PlaceGroupPdf.java
......@@ -45,12 +45,12 @@ public class PlaceGroupPdf extends HttpServlet {
private static final long serialVersionUID = 1L;
@EJB
private transient PlaceGroupBeanLocal pgbean;
private PlaceGroupBeanLocal pgbean;
@EJB
private transient PermissionBeanLocal permbean;
private PermissionBeanLocal permbean;
@EJB
private transient UserBeanLocal userbean;
private UserBeanLocal userbean;
private static final Logger logger = LoggerFactory.getLogger(PlaceGroupPdf.class);
/**
......
code/moya-web/src/main/java/fi/codecrew/moya/servlet/PlaceMapServlet.java
......@@ -69,13 +69,13 @@ public class PlaceMapServlet extends HttpServlet {
private static final long serialVersionUID = 8769688627918936258L;
@EJB
private transient PlaceBeanLocal placeBean;
private PlaceBeanLocal placeBean;
@EJB
private transient PermissionBeanLocal permbean;
private PermissionBeanLocal permbean;
@EJB
private transient LoggingBeanLocal loggerbean;
private LoggingBeanLocal loggerbean;
@EJB
private UserBeanLocal userBean;
......
code/moya-web/src/main/java/fi/codecrew/moya/servlet/PrintBill.java
......@@ -45,9 +45,9 @@ public class PrintBill extends HttpServlet {
private static final String BILL_ID = "billid";
@EJB
private transient BillBeanLocal billentity;
private BillBeanLocal billentity;
@EJB
private transient EventBeanLocal eventbean;
private EventBeanLocal eventbean;
/**
* @see HttpServlet#HttpServlet()
......
code/moya-web/src/main/java/fi/codecrew/moya/servlet/UserCardPngServlet.java
......@@ -48,10 +48,10 @@ public class UserCardPngServlet extends GenericImageServlet {
private static final long serialVersionUID = -3359999630873773508L;
@EJB
private transient UserBeanLocal userbean;
private UserBeanLocal userbean;
@EJB
private transient PermissionBeanLocal permbean;
private PermissionBeanLocal permbean;
/**
* @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse
......
code/moya-web/src/main/java/fi/codecrew/moya/servlet/UserCardServlet.java
......@@ -61,10 +61,10 @@ public class UserCardServlet extends GenericImageServlet {
private static final long serialVersionUID = -3359999630873773508L;
@EJB
private transient UserBeanLocal userbean;
private UserBeanLocal userbean;
@EJB
private transient PermissionBeanLocal permbean;
private PermissionBeanLocal permbean;
/**
* @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse
......@@ -74,7 +74,7 @@ public class UserCardServlet extends GenericImageServlet {
private final Pattern lhMatcher = Pattern.compile("^127.[0-9.]*|(0:)*1%0");
@EJB
private transient CardTemplateBeanLocal cardbean;
private CardTemplateBeanLocal cardbean;
private static final Logger logger = LoggerFactory
.getLogger(UserCardServlet.class);
......
code/moya-web/src/main/java/fi/codecrew/moya/web/ErrorPageView.java
......@@ -22,6 +22,7 @@ import java.io.PrintWriter;
import java.io.Serializable;
import java.io.StringWriter;
import java.nio.ByteBuffer;
import java.nio.charset.Charset;
import java.util.Arrays;
import java.util.Base64;
import java.util.Map;
......@@ -81,7 +82,7 @@ public class ErrorPageView implements Serializable {
Map<?, ?> requestMap = context.getExternalContext().getRequestMap();
Throwable ex = (Throwable) requestMap.get("javax.servlet.error.exception");
CRC32 stackHash = new CRC32();
stackHash.update(Arrays.toString(ex.getStackTrace()).getBytes());
stackHash.update(Arrays.toString(ex.getStackTrace()).getBytes(Charset.forName("UTF-8")));
return "0x" + Long.toHexString(stackHash.getValue());
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/actionlog/ActionLogMessageView.java
......@@ -16,95 +16,95 @@
* future versions of the Software.
*
*/
package fi.codecrew.moya.web.cdiview.actionlog;
import java.util.ArrayList;
import java.util.List;
import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped;
import javax.inject.Named;
import org.primefaces.event.SelectEvent;
import org.primefaces.model.tagcloud.DefaultTagCloudItem;
import org.primefaces.model.tagcloud.DefaultTagCloudModel;
import org.primefaces.model.tagcloud.TagCloudItem;
import org.primefaces.model.tagcloud.TagCloudModel;
import fi.codecrew.moya.beans.ActionLogBeanLocal;
import fi.codecrew.moya.enums.apps.ContentPermission;
import fi.codecrew.moya.model.ActionLogMessage;
import fi.codecrew.moya.model.ActionLogMessageTag;
import fi.codecrew.moya.web.cdiview.GenericCDIView;
@Named
@ConversationScoped
public class ActionLogMessageView extends GenericCDIView {
private static final long serialVersionUID = 1L;
private boolean updateEnabled = true;
private TagCloudModel tagCloud = null;
private List<ActionLogMessageTag> activeTags = null;
@EJB
private transient ActionLogBeanLocal actionLogBean;
public void initView() {
if(super.requirePermissions(ContentPermission.MANAGE_ACTIONLOG)) {
this.beginConversation();
refreshTagCloud();
if(activeTags == null) {
activeTags = new ArrayList<>();
}
}
}
public void refreshTagCloud() {
tagCloud = new DefaultTagCloudModel();
for(ActionLogMessageTag almt : actionLogBean.getAllTags()) {
tagCloud.addTag(new DefaultTagCloudItem(almt.getTag(), 1));
}
}
public boolean getUpdateEnabled() {
return updateEnabled;
}
public void setUpdateEnabled(boolean updateEnabled) {
this.updateEnabled = updateEnabled;
}
public List<ActionLogMessage> getMessages() {
return actionLogBean.getAllActionLogEventsByFilter(activeTags);
}
public TagCloudModel getTagCloud() {
return tagCloud;
}
public void onTagSelect(SelectEvent event) {
TagCloudItem item = (TagCloudItem)event.getObject();
ActionLogMessageTag almt = actionLogBean.getActionLogMessageTagByString(item.getLabel());
if(!activeTags.contains(almt))
activeTags.add(almt);
}
public void selectFilterTag(String tag) {
for(ActionLogMessageTag almt : this.activeTags) {
if(tag.equals(almt.getTag())) {
this.activeTags.remove(almt);
break;
}
}
}
public List<ActionLogMessageTag> getActiveTags() {
return this.activeTags;
}
}
package fi.codecrew.moya.web.cdiview.actionlog;
import java.util.ArrayList;
import java.util.List;
import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped;
import javax.inject.Named;
import org.primefaces.event.SelectEvent;
import org.primefaces.model.tagcloud.DefaultTagCloudItem;
import org.primefaces.model.tagcloud.DefaultTagCloudModel;
import org.primefaces.model.tagcloud.TagCloudItem;
import org.primefaces.model.tagcloud.TagCloudModel;
import fi.codecrew.moya.beans.ActionLogBeanLocal;
import fi.codecrew.moya.enums.apps.ContentPermission;
import fi.codecrew.moya.model.ActionLogMessage;
import fi.codecrew.moya.model.ActionLogMessageTag;
import fi.codecrew.moya.web.cdiview.GenericCDIView;
@Named
@ConversationScoped
public class ActionLogMessageView extends GenericCDIView {
private static final long serialVersionUID = 1L;
private boolean updateEnabled = true;
private TagCloudModel tagCloud = null;
private List<ActionLogMessageTag> activeTags = null;
@EJB
private ActionLogBeanLocal actionLogBean;
public void initView() {
if (super.requirePermissions(ContentPermission.MANAGE_ACTIONLOG)) {
this.beginConversation();
refreshTagCloud();
if (activeTags == null) {
activeTags = new ArrayList<>();
}
}
}
public void refreshTagCloud() {
tagCloud = new DefaultTagCloudModel();
for (ActionLogMessageTag almt : actionLogBean.getAllTags()) {
tagCloud.addTag(new DefaultTagCloudItem(almt.getTag(), 1));
}
}
public boolean getUpdateEnabled() {
return updateEnabled;
}
public void setUpdateEnabled(boolean updateEnabled) {
this.updateEnabled = updateEnabled;
}
public List<ActionLogMessage> getMessages() {
return actionLogBean.getAllActionLogEventsByFilter(activeTags);
}
public TagCloudModel getTagCloud() {
return tagCloud;
}
public void onTagSelect(SelectEvent event) {
TagCloudItem item = (TagCloudItem) event.getObject();
ActionLogMessageTag almt = actionLogBean.getActionLogMessageTagByString(item.getLabel());
if (!activeTags.contains(almt))
activeTags.add(almt);
}
public void selectFilterTag(String tag) {
for (ActionLogMessageTag almt : this.activeTags) {
if (tag.equals(almt.getTag())) {
this.activeTags.remove(almt);
break;
}
}
}
public List<ActionLogMessageTag> getActiveTags() {
return this.activeTags;
}
}
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/actionlog/TaskModificationView.java
......@@ -16,89 +16,89 @@
* future versions of the Software.
*
*/
package fi.codecrew.moya.web.cdiview.actionlog;
import java.util.List;
import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped;
import javax.inject.Named;
import fi.codecrew.moya.beans.ActionLogBeanLocal;
import fi.codecrew.moya.enums.ActionLogMessageState;
import fi.codecrew.moya.enums.apps.ContentPermission;
import fi.codecrew.moya.model.ActionLogMessage;
import fi.codecrew.moya.model.ActionLogMessageResponse;
import fi.codecrew.moya.web.cdiview.GenericCDIView;
@Named
@ConversationScoped
public class TaskModificationView extends GenericCDIView {
/**
*
*/
private static final long serialVersionUID = 938879097893244897L;
private Integer id;
private ActionLogMessage message;
private List<ActionLogMessageResponse> responses;
private String responseMessage;
private ActionLogMessageState responseStateChange;
@EJB
private transient ActionLogBeanLocal logbean;
public void initView() {
if (super.requirePermissions(ContentPermission.MANAGE_ACTIONLOG) && message == null) {
super.beginConversation();
message = logbean.find(id);
}
}
public String createResponse() {
if (responseStateChange == null || responseStateChange == message.getState())
logbean.addActionLogMessageResponse(message, responseMessage, null);
else {
logbean.addActionLogMessageResponse(message, responseMessage, responseStateChange);
if (responseStateChange != message.getState()) {
this.message = logbean.find(id);
}
}
responseMessage = "";
responseStateChange = null;
return null;
}
public List<ActionLogMessageResponse> getResponses() {
responses = logbean.getActionLogMessageResponses(message);
return responses;
}
public ActionLogMessage getMessage() {
return message;
}
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getResponseMessage() {
return responseMessage;
}
public void setResponseMessage(String responseMessage) {
this.responseMessage = responseMessage;
}
public ActionLogMessageState getResponseStateChange() {
return responseStateChange;
}
public void setResponseStateChange(ActionLogMessageState responseStateChange) {
this.responseStateChange = responseStateChange;
}
}
package fi.codecrew.moya.web.cdiview.actionlog;
import java.util.List;
import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped;
import javax.inject.Named;
import fi.codecrew.moya.beans.ActionLogBeanLocal;
import fi.codecrew.moya.enums.ActionLogMessageState;
import fi.codecrew.moya.enums.apps.ContentPermission;
import fi.codecrew.moya.model.ActionLogMessage;
import fi.codecrew.moya.model.ActionLogMessageResponse;
import fi.codecrew.moya.web.cdiview.GenericCDIView;
@Named
@ConversationScoped
public class TaskModificationView extends GenericCDIView {
/**
*
*/
private static final long serialVersionUID = 938879097893244897L;
private Integer id;
private ActionLogMessage message;
private List<ActionLogMessageResponse> responses;
private String responseMessage;
private ActionLogMessageState responseStateChange;
@EJB
private ActionLogBeanLocal logbean;
public void initView() {
if (super.requirePermissions(ContentPermission.MANAGE_ACTIONLOG) && message == null) {
super.beginConversation();
message = logbean.find(id);
}
}
public String createResponse() {
if (responseStateChange == null || responseStateChange == message.getState())
logbean.addActionLogMessageResponse(message, responseMessage, null);
else {
logbean.addActionLogMessageResponse(message, responseMessage, responseStateChange);
if (responseStateChange != message.getState()) {
this.message = logbean.find(id);
}
}
responseMessage = "";
responseStateChange = null;
return null;
}
public List<ActionLogMessageResponse> getResponses() {
responses = logbean.getActionLogMessageResponses(message);
return responses;
}
public ActionLogMessage getMessage() {
return message;
}
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getResponseMessage() {
return responseMessage;
}
public void setResponseMessage(String responseMessage) {
this.responseMessage = responseMessage;
}
public ActionLogMessageState getResponseStateChange() {
return responseStateChange;
}
public void setResponseStateChange(ActionLogMessageState responseStateChange) {
this.responseStateChange = responseStateChange;
}
}
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/content/NewsListView.java
......@@ -39,7 +39,7 @@ public class NewsListView extends GenericCDIView {
private static final long serialVersionUID = 1720809638296537794L;
@EJB
private transient NewsBeanLocal newsbean;
private NewsBeanLocal newsbean;
private List<NewsGroup> newsgroups;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/content/NewsView.java
......@@ -31,7 +31,7 @@ public class NewsView extends GenericCDIView {
private static final long serialVersionUID = 4141547312297765524L;
@EJB
private transient NewsBeanLocal newsbean;
private NewsBeanLocal newsbean;
private NewsGroup group;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/content/NewsgroupView.java
......@@ -45,7 +45,7 @@ public class NewsgroupView extends GenericCDIView {
private News news;
@EJB
private transient NewsBeanLocal newsbean;
private NewsBeanLocal newsbean;
public void initView() {
if (super.requirePermissions(permbean.hasPermission(ContentPermission.MANAGE_NEWS)) && newsgroup == null) {
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/content/PageOutputView.java
......@@ -37,7 +37,7 @@ public class PageOutputView extends GenericCDIView {
private static final long serialVersionUID = 1384298744925823293L;
@EJB
private transient SitePageBeanLocal pagebean;
private SitePageBeanLocal pagebean;
@Inject
private SessionStore store;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/content/SiteNewsListView.java
......@@ -39,7 +39,7 @@ public class SiteNewsListView extends GenericCDIView {
private static final long serialVersionUID = 1720809638296537794L;
@EJB
private transient SitePageBeanLocal sitepagebean;
private SitePageBeanLocal sitepagebean;
private List<SitePage> pages;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/content/SitePageView.java
......@@ -40,7 +40,7 @@ public class SitePageView extends GenericCDIView {
private static final long serialVersionUID = -513285802858190970L;
@EJB
private transient SitePageBeanLocal sitepagebean;
private SitePageBeanLocal sitepagebean;
private Integer id;
private SitePage sitepage;
private List<SitePage> pages;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/eticket/EticketView.java
......@@ -71,7 +71,7 @@ public class EticketView extends GenericCDIView {
@EJB
private TicketBeanLocal ticketBean;
private transient ListDataModel<GroupMembership> memberlist;
private ListDataModel<GroupMembership> memberlist;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/eticket/StandaloneEticketView.java
......@@ -65,7 +65,7 @@ public class StandaloneEticketView extends GenericCDIView {
@EJB
private TicketBeanLocal ticketBean;
private transient ListDataModel<GroupMembership> memberlist;
private ListDataModel<GroupMembership> memberlist;
private boolean mapVisible = false;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/help/HelpView.java
......@@ -55,7 +55,7 @@ public class HelpView {
@Inject
private transient SessionStore sessionstore;
private SessionStore sessionstore;
public void populateHelpText() {
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/map/AjaxMapView.java
package fi.codecrew.moya.web.cdiview.map;
import java.awt.*;
import java.io.Serializable;
import java.util.*;
import java.util.List;
......@@ -43,14 +44,14 @@ public class AjaxMapView extends GenericCDIView {
private String testVal = "Testval1";
@EJB
private transient EventBeanLocal eventbean;
private EventBeanLocal eventbean;
@EJB
private PlaceBeanLocal placebean;
@EJB
private PermissionBeanLocal permbean;
@Inject
private transient FacesContext context;
private FacesContext context;
private EventMap map;
private Place place;
......@@ -65,7 +66,7 @@ public class AjaxMapView extends GenericCDIView {
private Boolean reserving;
private Integer placeId;
public static class Slotcounter {
public static class Slotcounter implements Serializable {
private final Product product;
private Integer count = 0;
private Integer unused = 0;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/map/MapPlacechangeView.java
package fi.codecrew.moya.web.cdiview.map;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
......@@ -40,7 +41,7 @@ public class MapPlacechangeView extends GenericCDIView {
private List<MoveContainer> moveContainers;
private boolean toggleSuccess;
public static class MoveContainer {
public static class MoveContainer implements Serializable {
private boolean moving = false;
private final PlaceSlot src;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/map/MapView.java
......@@ -50,9 +50,9 @@ public class MapView extends GenericCDIView {
private EventMap activeMap;
@EJB
private transient PlaceBeanLocal placeBean;
private PlaceBeanLocal placeBean;
@EJB
private transient EventBeanLocal eventBean;
private EventBeanLocal eventBean;
private BigDecimal balance;
private static final Logger logger = LoggerFactory.getLogger(MapView.class);
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/map/PlaceView.java
......@@ -63,10 +63,10 @@ public class PlaceView extends GenericCDIView {
private Place place;
@EJB
private transient UserBeanLocal userbean;
private UserBeanLocal userbean;
@EJB
private transient PlaceBeanLocal placebean;
private PlaceBeanLocal placebean;
@Inject
@SelectedUser
......@@ -76,7 +76,7 @@ public class PlaceView extends GenericCDIView {
private EventMap currentMap;
private String searchuser;
private transient ListDataModel<User> userlist;
private ListDataModel<User> userlist;
public boolean canEdit() {
return permbean.hasPermission(MapPermission.MANAGE_MAPS);
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/map/TimelapseMapView.java
......@@ -38,8 +38,9 @@ import java.util.Date;
public class TimelapseMapView extends GenericCDIView {
public static final String JSON_DATETIME = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
private static final long serialVersionUID = 8454455874174728343L;
@EJB
private transient PlaceBeanLocal placebean;
private PlaceBeanLocal placebean;
@EJB
private PermissionBeanLocal permbean;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/menu/JsfMenuitem.java
......@@ -20,7 +20,9 @@ package fi.codecrew.moya.web.cdiview.menu;
import fi.codecrew.moya.model.MenuNavigation;
public class JsfMenuitem {
import java.io.Serializable;
public class JsfMenuitem implements Serializable {
private boolean selected;
private final MenuNavigation navigation;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/menu/MenuView.java
......@@ -54,21 +54,21 @@ public class MenuView implements Serializable{
protected NavigationHandler navihandler;
@Inject
private transient LayoutView layoutview;
private LayoutView layoutview;
@Inject
private transient SessionStore sessionstore;
private SessionStore sessionstore;
@EJB
private transient MenuBeanLocal menubean;
private MenuBeanLocal menubean;
private transient LinkedList<List<JsfMenuitem>> menus;
private LinkedList<List<JsfMenuitem>> menus;
private HashSet<MenuNavigation> navis;
private Map<String, List<PageContent>> contents = new HashMap<String, List<PageContent>>();
@EJB
private transient SitePageBeanLocal pagebean;
private SitePageBeanLocal pagebean;
private String menuChange;
......@@ -117,7 +117,7 @@ public class MenuView implements Serializable{
return getViewChangeTopmenu().size() > 1;
}
private transient List<JsfMenuitem> viewchangeTopmenu;
private List<JsfMenuitem> viewchangeTopmenu;
@EJB
private PermissionBeanLocal permbean;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/organisation/EventOrgView.java
......@@ -50,9 +50,9 @@ public class EventOrgView extends GenericCDIView {
private static final long serialVersionUID = -1351272199807699797L;
@EJB
private transient EventOrganiserBeanLocal eventorgbean;
private EventOrganiserBeanLocal eventorgbean;
@EJB
private transient EventBeanLocal eventbean;
private EventBeanLocal eventbean;
@EJB
private SitePageBeanLocal sitepagebean;
......@@ -83,7 +83,7 @@ public class EventOrgView extends GenericCDIView {
@EJB
private UserBeanLocal userBean;
private transient ListDataModel<LanEventDomain> eventdomains;
private ListDataModel<LanEventDomain> eventdomains;
ScheduleModel eventsCalendar = null;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/organisation/EventPropertyView.java
......@@ -52,15 +52,15 @@ public class EventPropertyView extends GenericCDIView {
private LanEventProperty property;
@Inject
private transient EventOrgView eventorgview;
private EventOrgView eventorgview;
@EJB
private transient EventBeanLocal eventbean;
private EventBeanLocal eventbean;
private UploadedFile file;
private static final Logger logger = LoggerFactory.getLogger(EventPropertyView.class);
private transient ListDataModel<LanEventProperty> properties;
private transient ListDataModel<LanEventPrivateProperty> privateProperties;
private ListDataModel<LanEventProperty> properties;
private ListDataModel<LanEventPrivateProperty> privateProperties;
private LanEventPrivateProperty privateProperty;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/poll/PollView.java
......@@ -18,6 +18,7 @@
*/
package fi.codecrew.moya.web.cdiview.poll;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedList;
......@@ -192,7 +193,7 @@ public class PollView extends GenericCDIView {
this.canManage = canManage;
}
public static class QuestionWrapper {
public static class QuestionWrapper implements Serializable {
private PollQuestion question;
private ArrayList<PollAnswer> answers;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/reader/ReaderView.java
......@@ -62,13 +62,13 @@ public class ReaderView extends GenericCDIView {
private ReaderNameContainer namecontainer;
@EJB
private transient ReaderBeanLocal readerbean;
private ReaderBeanLocal readerbean;
@EJB
private transient UserBeanLocal userbean;
private UserBeanLocal userbean;
@EJB
private transient BarcodeBeanLocal barcodebean;
private BarcodeBeanLocal barcodebean;
// private UserCardWrapper neighborUser;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/shop/AddInventoryView.java
......@@ -41,7 +41,7 @@ public class AddInventoryView extends GenericCDIView {
private static final long serialVersionUID = 1L;
@EJB
private ProductBeanLocal pblocal;
private ProductBeanLocal productBean;
@EJB
private PermissionBeanLocal permBeanLocal;
......@@ -58,13 +58,13 @@ public class AddInventoryView extends GenericCDIView {
{
inventoryEvent = new InventoryEvent();
super.beginConversation();
setProducts(pblocal.findProductsForEvent());
setProducts(productBean.findProductsForEvent());
logger.debug("Initialized {} products for inventoryview", products.size());
}
}
public String save() {
pblocal.saveInventoryEvent(inventoryEvent);
productBean.saveInventoryEvent(inventoryEvent);
return null;
}
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/shop/BillReviewView.java
......@@ -40,9 +40,9 @@ public class BillReviewView extends GenericCDIView {
*/
private static final long serialVersionUID = -4665348757236295800L;
@EJB
private transient VerkkomaksutFiBeanLocal vmbean;
private VerkkomaksutFiBeanLocal vmbean;
@EJB
private transient BillBeanLocal billbean;
private BillBeanLocal billbean;
private Bill bill;
private VerkkomaksutReturnEntry vmreturn;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/shop/DiscountView.java
......@@ -42,7 +42,7 @@ public class DiscountView extends GenericCDIView {
private Discount discount;
@EJB
private transient ProductBeanLocal prodbean;
private ProductBeanLocal prodbean;
public void initEditView() {
if (super.requirePermissions(ShopPermission.MANAGE_PRODUCTS) && discount == null) {
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/shop/FoodWaveFoodView.java
......@@ -70,7 +70,7 @@ public class FoodWaveFoodView extends GenericCDIView {
private FoodWave foodWave = null;
@EJB
private transient ProductBeanLocal productBean;
private ProductBeanLocal productBean;
@Inject
private UserView userview;
......@@ -81,7 +81,7 @@ public class FoodWaveFoodView extends GenericCDIView {
private Integer foodwaveid = 0;
private ListDataModel<Product> products;
private transient ListDataModel<ProductShopItem> shoppingcart;
private ListDataModel<ProductShopItem> shoppingcart;
private static final Logger logger = LoggerFactory.getLogger(FoodWaveFoodView.class);
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/shop/ProductListView.java
......@@ -37,7 +37,7 @@ public class ProductListView extends PaginationView<Product> {
private static final long serialVersionUID = -5621674984772482156L;
@EJB
private transient ProductBeanLocal productBean;
private ProductBeanLocal productBean;
public void initView() {
if (super.requirePermissions(ShopPermission.LIST_ALL_PRODUCTS)) {
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/shop/ProductShopView.java
......@@ -66,15 +66,15 @@ public class ProductShopView extends GenericCDIView {
*/
private static final long serialVersionUID = 1288114954999406683L;
@EJB
private transient ProductBeanLocal productBean;
private ProductBeanLocal productBean;
@EJB
private transient BillBeanLocal billbean;
private BillBeanLocal billbean;
@EJB
private transient UserBeanLocal userbean;
private UserBeanLocal userbean;
@EJB
private transient EventBeanLocal eventbean;
private EventBeanLocal eventbean;
public void cashChanged() {
payInstant = false;
......@@ -84,7 +84,7 @@ public class ProductShopView extends GenericCDIView {
private BigDecimal cash = BigDecimal.ZERO;
private transient ListDataModel<ProductShopItem> shoppingcart;
private ListDataModel<ProductShopItem> shoppingcart;
@Inject
private BillListView billListView;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/shop/UserCardWrapper.java
......@@ -34,7 +34,7 @@ public class UserCardWrapper implements Serializable {
private static final long serialVersionUID = -2755200540851855878L;
private final EventUser user;
private transient final ListDataModel<PrintedCard> printedCards;
private final ListDataModel<PrintedCard> printedCards;
public UserCardWrapper(User u, UserBeanLocal userbean) {
user = userbean.getEventUser(u, false);
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/CardView.java
......@@ -52,19 +52,19 @@ public class CardView extends GenericCDIView {
private Integer templateId;
private CardTemplate cardTemplate;
@EJB
private transient CardTemplateBeanLocal cfbean;
private CardTemplateBeanLocal cfbean;
@EJB
private transient EventBeanLocal eventBean;
private EventBeanLocal eventBean;
@Inject
@SelectedUser
private transient EventUser user;
private EventUser user;
private Integer cardid;
private List<CardTemplate> cardTemplates;
private transient UploadedFile templateImage;
private UploadedFile templateImage;
private static final Logger logger = LoggerFactory.getLogger(CardView.class);
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/CreditTransferView.java
......@@ -18,6 +18,7 @@
*/
package fi.codecrew.moya.web.cdiview.user;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
......@@ -142,7 +143,7 @@ public class CreditTransferView extends GenericCDIView {
this.totalTransferred = totalTransferred;
}
public static class EventUserWrapper {
public static class EventUserWrapper implements Serializable {
private final EventUser user;
private BigDecimal credits = BigDecimal.ZERO;
private EventUser sourceEventuser;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/ImportView.java
......@@ -19,6 +19,7 @@
package fi.codecrew.moya.web.cdiview.user;
import java.io.IOException;
import java.io.Serializable;
import java.nio.charset.Charset;
import java.util.ArrayList;
......@@ -93,6 +94,10 @@ public class ImportView extends GenericCDIView {
}
}
if (bytes == null) {
return null;
}
String content = new String(bytes, UTF8);
String[] splittedIds = content.split(";");
for (String idstr : splittedIds) {
......@@ -120,7 +125,7 @@ public class ImportView extends GenericCDIView {
return "/useradmin/list?faces-redirect=true";
}
public static class ImportWrapper
public static class ImportWrapper implements Serializable
{
private final EventUser eventuser;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/OrgRoleDataView.java
......@@ -33,10 +33,10 @@ public class OrgRoleDataView extends GenericCDIView {
private static final long serialVersionUID = -607046631885684171L;
private transient ListDataModel<OrgRole> orgRoles;
private ListDataModel<OrgRole> orgRoles;
@EJB
private transient OrgRoleBeanLocal orgRolesBean;
private OrgRoleBeanLocal orgRolesBean;
public ListDataModel<OrgRole> getOrgRoles() {
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/OrgRoleView.java
......@@ -49,14 +49,14 @@ public class OrgRoleView extends GenericCDIView {
private Integer id;
@EJB
private transient OrgRoleBeanLocal orgRoleBean;
private OrgRoleBeanLocal orgRoleBean;
@EJB
private transient EventBeanLocal eventBean;
private EventBeanLocal eventBean;
@EJB
private transient UserBeanLocal userbean;
private UserBeanLocal userbean;
@EJB
private transient RoleBeanLocal rolebean;
private RoleBeanLocal rolebean;
private User addableUser;
private Role eventRole;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/PasswordResetView.java
......@@ -47,7 +47,7 @@ public class PasswordResetView extends GenericCDIView {
private String emailaddr;
@EJB
private transient UserBeanLocal userbean;
private UserBeanLocal userbean;
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(PasswordResetView.class);
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/RoleDataView.java
......@@ -40,9 +40,9 @@ public class RoleDataView extends GenericCDIView {
private static final long serialVersionUID = -5165373936500592099L;
@EJB
private transient RoleBeanLocal rolebean;
private RoleBeanLocal rolebean;
private transient ListDataModel<Role> roles;
private ListDataModel<Role> roles;
private static final Logger logger = LoggerFactory.getLogger(RoleDataView.class);
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/UserCardView.java
......@@ -36,13 +36,13 @@ public class UserCardView extends GenericCDIView {
private static final long serialVersionUID = -7316229268164228981L;
@EJB
private transient CardTemplateBeanLocal cardBean;
private CardTemplateBeanLocal cardBean;
@Inject
@SelectedUser
private transient EventUser user;
private EventUser user;
private transient ListDataModel<PrintedCard> printedCards;
private ListDataModel<PrintedCard> printedCards;
public EventUser getUser() {
return user;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/UserCartView.java
......@@ -99,7 +99,7 @@ public class UserCartView extends GenericCDIView {
sb.append("Added to event").append(CSV_SEPARATOR);
LanEvent event = null;
if (usercart != null && !usercart.isEmpty()) {
if (!usercart.isEmpty()) {
event = usercart.get(0).getEvent();
}
sb.append("\n");
......@@ -132,12 +132,12 @@ public class UserCartView extends GenericCDIView {
if (uc.getCreated() != null) {
ul.append(createtimeFormat.format(uc.getCreated().getTime()));
}
ul.append(CSV_SEPARATOR);
if (uc.getEventuserCreated() != null) {
ul.append(createtimeFormat.format(uc.getEventuserCreated()));
}
ul.append(CSV_SEPARATOR);
sb.append(ul.toString()
......@@ -146,9 +146,6 @@ public class UserCartView extends GenericCDIView {
.replaceAll(" ", " ")
);
sb.append("\n");
}
DefaultStreamedContent ret = new DefaultStreamedContent(new ByteArrayInputStream(sb.toString().getBytes(UTF8)));
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/UserSessionView.java
......@@ -38,10 +38,10 @@ public class UserSessionView extends GenericCDIView {
private static final long serialVersionUID = -5305969666679378884L;
@EJB
private transient SessionMgmtBeanLocal sessionMgmt;
private transient ListDataModel<HttpSessionWrapper> sessions;
private SessionMgmtBeanLocal sessionMgmtBean;
private ListDataModel<HttpSessionWrapper> sessions;
private transient HttpSession session;
private HttpSession session;
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(UserSessionView.class);
......@@ -49,7 +49,7 @@ public class UserSessionView extends GenericCDIView {
public void initView()
{
if (super.requirePermissions(UserPermission.MANAGE_HTTP_SESSION) && sessions == null) {
sessions = new ListDataModel<>(HttpSessionWrapper.wrap(sessionMgmt.getSessions(),sessionMgmt));
sessions = new ListDataModel<>(HttpSessionWrapper.wrap(sessionMgmtBean.getSessions(),sessionMgmtBean));
super.beginConversation();
}
}
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/vip/VipDeliverView.java
package fi.codecrew.moya.web.cdiview.vip;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
......@@ -76,7 +77,7 @@ public class VipDeliverView extends GenericCDIView {
this.notes = notes;
}
public static class VipProductWrapper
public static class VipProductWrapper implements Serializable
{
private final VipProduct product;
private BigDecimal deliver;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/voting/CompoFileDownloadView.java
......@@ -41,11 +41,11 @@ public class CompoFileDownloadView extends GenericCDIView {
private static final long serialVersionUID = -262883747402530562L;
@EJB
private transient VotingBeanLocal votebean;
private VotingBeanLocal votebean;
@Inject
private CompoEntry entry;
private transient ListDataModel<CompoEntryFile> files;
private ListDataModel<CompoEntryFile> files;
private CompoEntryFile file;
private DefaultStreamedContent dlfile;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/voting/CompoMgmtView.java
......@@ -16,120 +16,120 @@
* future versions of the Software.
*
*/
package fi.codecrew.moya.web.cdiview.voting;
import java.util.Date;
import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped;
import javax.faces.model.ListDataModel;
import javax.inject.Named;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fi.codecrew.moya.beans.VotingBeanLocal;
import fi.codecrew.moya.enums.apps.CompoPermission;
import fi.codecrew.moya.model.Compo;
import fi.codecrew.moya.model.CompoEntry;
import fi.codecrew.moya.web.cdiview.GenericCDIView;
@Named
@ConversationScoped
public class CompoMgmtView extends GenericCDIView {
/**
*
*/
private static final long serialVersionUID = -8373473936336396427L;
@EJB
private transient VotingBeanLocal votingBean;
private Integer compoId;
private String compoName;
private Compo compo;
private transient ListDataModel<CompoEntry> entries;
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(CompoMgmtView.class);
public Integer getCompoId() {
return compoId;
}
public void initCreate()
{
if (super.requirePermissions(fi.codecrew.moya.enums.apps.CompoPermission.MANAGE) && compo == null)
{
compo = new Compo();
Date now = new Date();
compo.setStartTime(now);
compo.setEndTime(now);
compo.setSubmitStart(now);
compo.setSubmitEnd(now);
compo.setVoteStart(now);
compo.setVoteEnd(now);
super.beginConversation();
}
}
public String createCompo() {
votingBean.createCompo(compo);
return "details";
}
public String saveCompo()
{
compo = votingBean.saveCompo(compo);
return null;
}
public String saveSort()
{
for (CompoEntry e : entries)
{
setCompo(votingBean.saveSort(e).getCompo());
}
entries = new ListDataModel<CompoEntry>(getCompo().getCompoEntries());
return null;
}
public void setCompoId(Integer compoId) {
this.compoId = compoId;
}
public ListDataModel<CompoEntry> getEntries() {
return entries;
}
public void initView() {
if (super.requirePermissions(CompoPermission.MANAGE) && entries == null)
{
setCompo(votingBean.getCompoById(compoId));
entries = new ListDataModel<CompoEntry>(getCompo().getCompoEntries());
super.beginConversation();
}
}
public String getCompoName() {
return compoName;
}
public void setCompoName(String compoName) {
this.compoName = compoName;
}
public Compo getCompo() {
return compo;
}
public void setCompo(Compo compo) {
this.compo = compo;
}
}
package fi.codecrew.moya.web.cdiview.voting;
import java.util.Date;
import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped;
import javax.faces.model.ListDataModel;
import javax.inject.Named;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fi.codecrew.moya.beans.VotingBeanLocal;
import fi.codecrew.moya.enums.apps.CompoPermission;
import fi.codecrew.moya.model.Compo;
import fi.codecrew.moya.model.CompoEntry;
import fi.codecrew.moya.web.cdiview.GenericCDIView;
@Named
@ConversationScoped
public class CompoMgmtView extends GenericCDIView {
/**
*
*/
private static final long serialVersionUID = -8373473936336396427L;
@EJB
private VotingBeanLocal votingBean;
private Integer compoId;
private String compoName;
private Compo compo;
private ListDataModel<CompoEntry> entries;
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(CompoMgmtView.class);
public Integer getCompoId() {
return compoId;
}
public void initCreate()
{
if (super.requirePermissions(fi.codecrew.moya.enums.apps.CompoPermission.MANAGE) && compo == null)
{
compo = new Compo();
Date now = new Date();
compo.setStartTime(now);
compo.setEndTime(now);
compo.setSubmitStart(now);
compo.setSubmitEnd(now);
compo.setVoteStart(now);
compo.setVoteEnd(now);
super.beginConversation();
}
}
public String createCompo() {
votingBean.createCompo(compo);
return "details";
}
public String saveCompo()
{
compo = votingBean.saveCompo(compo);
return null;
}
public String saveSort()
{
for (CompoEntry e : entries)
{
setCompo(votingBean.saveSort(e).getCompo());
}
entries = new ListDataModel<CompoEntry>(getCompo().getCompoEntries());
return null;
}
public void setCompoId(Integer compoId) {
this.compoId = compoId;
}
public ListDataModel<CompoEntry> getEntries() {
return entries;
}
public void initView() {
if (super.requirePermissions(CompoPermission.MANAGE) && entries == null)
{
setCompo(votingBean.getCompoById(compoId));
entries = new ListDataModel<CompoEntry>(getCompo().getCompoEntries());
super.beginConversation();
}
}
public String getCompoName() {
return compoName;
}
public void setCompoName(String compoName) {
this.compoName = compoName;
}
public Compo getCompo() {
return compo;
}
public void setCompo(Compo compo) {
this.compo = compo;
}
}
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/voting/CompoView.java
......@@ -49,25 +49,25 @@ public class CompoView extends GenericCDIView {
private VotingBeanLocal votbean;
@EJB
private transient PermissionBeanLocal permbean;
private PermissionBeanLocal permbean;
private boolean manage;
private transient ListDataModel<Compo> compolist;
private ListDataModel<Compo> compolist;
@Produces
private CompoEntry entry;
private static final Logger logger = LoggerFactory.getLogger(CompoView.class);
private transient UploadedFile uploadedFile;
private UploadedFile uploadedFile;
private Compo compo;
private Integer entryId;
private Integer compoId;
private transient ListDataModel<EntryWrapper> voteEntries;
private ListDataModel<EntryWrapper> voteEntries;
public ListDataModel<Compo> getCompos() {
return compolist;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/flowShopView.java → code/moya-web/src/main/java/fi/codecrew/moya/web/flow/FlowShopView.java
......@@ -36,7 +36,7 @@ import javax.inject.Named;
@Named
@ConversationScoped
public class flowShopView extends GenericCDIView {
public class FlowShopView extends GenericCDIView {
private static final long serialVersionUID = 802344850073689859L;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/helper/LayoutView.java
......@@ -53,7 +53,7 @@ public class LayoutView implements Serializable {
*
*/
private static final long serialVersionUID = 4468645109141859301L;
private ResourceBundle rb;
private transient ResourceBundle rb;
private String pagename;
@EJB
private transient EventBeanLocal eventbean;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/helpers/ProductShopItem.java
......@@ -18,6 +18,7 @@
*/
package fi.codecrew.moya.web.helpers;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
......@@ -30,7 +31,7 @@ import org.slf4j.LoggerFactory;
import javax.faces.model.ListDataModel;
public class ProductShopItem {
public class ProductShopItem implements Serializable {
private static final Logger logger = LoggerFactory.getLogger(ProductShopItem.class);
private final Product product;
......@@ -46,13 +47,9 @@ public class ProductShopItem {
private Map<ProductOptionGroup, ProductOption> selectedOptions = new HashMap<>();
private BigDecimal overriddenUnitPrice = BigDecimal.ZERO;
private boolean overrideUnitPrice = false;
public BigDecimal getCreditPrice()
{
if (BigDecimal.ZERO.compareTo(price) < 0)
......@@ -299,19 +296,19 @@ public class ProductShopItem {
public String getSelectedProductOptionString() {
String retString = "";
StringBuilder retString = new StringBuilder();
for(ProductOption option : this.selectedOptions.values()) {
if(option == null)
continue;
if(!retString.isEmpty()) {
retString += ", ";
if(retString.length() == 0) {
retString.append(", ");
}
retString += option.getName();
retString.append(option.getName());
}
return retString;
return retString.toString();
}
......
code/moya-web/src/main/java/fi/codecrew/moya/web/helpers/UserOverviewItem.java
......@@ -60,11 +60,11 @@ public class UserOverviewItem {
this.rejectionMsgBody = mailBody;
else
this.rejectionMsgBody = "";
if(this.rejectionMsgSubject.contains("{0}") && eventUser != null && eventUser.getEvent() != null)
if(this.rejectionMsgSubject.contains("{0}") && eventUser.getEvent() != null)
this.rejectionMsgSubject = this.rejectionMsgSubject.replace("{0}", eventUser.getEvent().getName());
if(this.rejectionMsgBody.contains("{0}") && eventUser != null && eventUser.getEvent() != null)
if(this.rejectionMsgBody.contains("{0}") && eventUser.getEvent() != null)
this.rejectionMsgBody = this.rejectionMsgBody.replace("{0}", eventUser.getEvent().getName());
this.rejectionMsgToAddr = eventUser.getEmail();
......
code/pom.xml
......@@ -32,7 +32,8 @@
<slf4j.version>1.7.25</slf4j.version>
<logback.version>1.2.3</logback.version>
<testng.version>6.11</testng.version>
<findbugs.version>3.0.1</findbugs.version>
<findbugs-maven.version>3.0.5</findbugs-maven.version>
<javamelody.version>1.65.0</javamelody.version>
<primefaces.version>6.0</primefaces.version>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!