Merge branch 'minorcleanups' into 'master'

Minor cleanups

See commit messages.

See merge request !283

code/moya-beans/ejbModule/fi/codecrew/moya/beans/SessionMgmtBean.java

@@ -28,6 +28,8 @@ import javax.annotation.security.RolesAllowed;
 import javax.ejb.ConcurrencyManagement;
 import javax.ejb.ConcurrencyManagement;
 import javax.ejb.ConcurrencyManagementType;
 import javax.ejb.ConcurrencyManagementType;
 import javax.ejb.LocalBean;
 import javax.ejb.LocalBean;
+import javax.ejb.Lock;
+import javax.ejb.LockType;
 import javax.ejb.Singleton;
 import javax.ejb.Singleton;
 import javax.ejb.TransactionAttribute;
 import javax.ejb.TransactionAttribute;
 import javax.ejb.TransactionAttributeType;
 import javax.ejb.TransactionAttributeType;
@@ -47,26 +49,26 @@ import fi.codecrew.moya.enums.apps.UserPermission;
 @ConcurrencyManagement(ConcurrencyManagementType.BEAN)
 @ConcurrencyManagement(ConcurrencyManagementType.BEAN)
 @TransactionAttribute(TransactionAttributeType.SUPPORTS)
 @TransactionAttribute(TransactionAttributeType.SUPPORTS)
 @DeclareRoles({ UserPermission.S_MANAGE_HTTP_SESSION })
 @DeclareRoles({ UserPermission.S_MANAGE_HTTP_SESSION })
+@Lock(LockType.READ)
 public class SessionMgmtBean implements SessionMgmtBeanLocal {
 public class SessionMgmtBean implements SessionMgmtBeanLocal {
 
 
-	/**
-	 * Default constructor.
-	 */
-	public SessionMgmtBean() {
-		// TODO Auto-generated constructor stub
-	}
-
 	private final ConcurrentHashMap<String, UserContainer> sessionUsers = new ConcurrentHashMap<>();
 	private final ConcurrentHashMap<String, UserContainer> sessionUsers = new ConcurrentHashMap<>();
 	private final Set<HttpSession> sessions = Collections.newSetFromMap(new ConcurrentHashMap<HttpSession, Boolean>());
 	private final Set<HttpSession> sessions = Collections.newSetFromMap(new ConcurrentHashMap<HttpSession, Boolean>());
 
 
 	@SuppressWarnings("unused")
 	@SuppressWarnings("unused")
 	private static final Logger logger = LoggerFactory.getLogger(SessionMgmtBean.class);
 	private static final Logger logger = LoggerFactory.getLogger(SessionMgmtBean.class);
 
 
+	/**
+	 * Default constructor.
+	 */
+	public SessionMgmtBean() {
+	}
+
 	@Override
 	@Override
 	public void updateSessionUser(String sessionId, String user) {
 	public void updateSessionUser(String sessionId, String user) {
 
 
 		if (!sessionUsers.containsKey(sessionId)) {
 		if (!sessionUsers.containsKey(sessionId)) {
-			sessionUsers.put(sessionId, new UserContainer(BortalLocalContextHolder.getHostname(), user));
+			sessionUsers.putIfAbsent(sessionId, new UserContainer(BortalLocalContextHolder.getHostname(), user));
 		}
 		}
 	}
 	}
 
 

code/moya-beans/src/test/java/fi/codecrew/moya/beans/CheckoutFiBeanTest.java

@@ -80,7 +80,7 @@ public class CheckoutFiBeanTest {
 			bill.setSentDateTime(d);
 			bill.setSentDateTime(d);
 			Product prod = new Product();
 			Product prod = new Product();
 			prod.setName("Hurr");
 			prod.setName("Hurr");
-			prod.setPrice(new BigDecimal(111.11).setScale(4, RoundingMode.HALF_UP));
+			prod.setPrice(BigDecimal.valueOf(111.11).setScale(4, RoundingMode.HALF_UP));
 			bill.getBillLines().add(new BillLine(bill, prod, new BigDecimal(5)));
 			bill.getBillLines().add(new BillLine(bill, prod, new BigDecimal(5)));
 
 
 			final String priceInCents = Integer.valueOf(bill.totalPrice().multiply(TO_CENTS).intValue()).toString();
 			final String priceInCents = Integer.valueOf(bill.totalPrice().multiply(TO_CENTS).intValue()).toString();

code/moya-database/src/main/java/fi/codecrew/moya/model/LanEventPropertyKey.java

@@ -57,7 +57,10 @@ public enum LanEventPropertyKey {
 	 * unexpired bill
 	 * unexpired bill
 	 */
 	 */
 	RESERVE_UNPAID_SLOT_PERCENT(Type.LONG, 10l),
 	RESERVE_UNPAID_SLOT_PERCENT(Type.LONG, 10l),
-
+	/**
+	 * ISO 4217 code of currency.
+	 */
+	EVENT_CURRENCY_CODE(Type.TEXT, "EUR");
 	;
 	;
 
 
 	private enum Type {
 	private enum Type {

code/moya-web/WebContent/neomap/quemgmt.xhtml

@@ -48,7 +48,7 @@
 			<h2>Currently reserving</h2>
 			<h2>Currently reserving</h2>
 			<p:dataTable var="u" value="#{queueManageView.userReserving}">
 			<p:dataTable var="u" value="#{queueManageView.userReserving}">
 				<p:column>
 				<p:column>
-					<p:link outcome="/user/edit" value="#{u.user.user.login}">
+					<p:link outcome="/useradmin/edit" value="#{u.user.user.login}">
 						<f:param name="userid" value="#{u.user.user.id}" />
 						<f:param name="userid" value="#{u.user.user.id}" />
 					</p:link>
 					</p:link>
 				</p:column>
 				</p:column>
@@ -70,7 +70,7 @@
 			Queue size: #{queueManageView.userQueue.rowCount}<br />
 			Queue size: #{queueManageView.userQueue.rowCount}<br />
 			<p:dataTable var="u" value="#{queueManageView.userQueue}">
 			<p:dataTable var="u" value="#{queueManageView.userQueue}">
 				<p:column>
 				<p:column>
-					<p:link outcome="/user/edit" value="#{u.user.user.login}">
+					<p:link outcome="/useradmin/edit" value="#{u.user.user.login}">
 						<f:param name="userid" value="#{u.user.user.id}" />
 						<f:param name="userid" value="#{u.user.user.id}" />
 					</p:link>
 					</p:link>
 				</p:column>
 				</p:column>