Some minor fixes to account for api changes

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

@@ -3,7 +3,6 @@ package fi.codecrew.moya.beans;
 import java.io.IOException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStream;
 import java.math.BigInteger;
 import java.math.BigInteger;
-import java.util.BitSet;
 
 
 import javax.ejb.EJB;
 import javax.ejb.EJB;
 import javax.ejb.LocalBean;
 import javax.ejb.LocalBean;
@@ -12,8 +11,6 @@ import javax.ejb.Stateless;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 
 
-import com.google.common.primitives.UnsignedBytes;
-
 import fi.codecrew.moya.facade.PlaceFacade;
 import fi.codecrew.moya.facade.PlaceFacade;
 import fi.codecrew.moya.facade.PrintedCardFacade;
 import fi.codecrew.moya.facade.PrintedCardFacade;
 import fi.codecrew.moya.model.EventUser;
 import fi.codecrew.moya.model.EventUser;

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

@@ -237,7 +237,7 @@ public class JaasBean implements MoyaRealmBeanRemote {
 	public String authenticateApp(String pathInfo, String appId, String userId, String appStamp, String mac) {
 	public String authenticateApp(String pathInfo, String appId, String userId, String appStamp, String mac) {
 
 
 		logger.info("Authenticat app with pathinfo {}, appid {}, userid {}, appstamp {}, mac {}",
 		logger.info("Authenticat app with pathinfo {}, appid {}, userid {}, appstamp {}, mac {}",
-				pathInfo, appId, userId, appStamp, mac
+				new Object[]{pathInfo, appId, userId, appStamp, mac}
 				);
 				);
 		if (mac == null) {
 		if (mac == null) {
 			logger.warn("Rest auth failed: Mac is null");
 			logger.warn("Rest auth failed: Mac is null");

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

@@ -846,7 +846,7 @@ public class UserBean implements UserBeanLocal {
 	@Override
 	@Override
 	public boolean isUserInRole(EventUser user, Integer roleId) {
 	public boolean isUserInRole(EventUser user, Integer roleId) {
 		Set<Role> roles = localFindUsersRoles(user);
 		Set<Role> roles = localFindUsersRoles(user);
-		logger.info("CHecking user {} roleid {} from roles {}, roles size{}", user, roleId, roles, roles.size());
+		logger.info("CHecking user {} roleid {} from roles {}, roles size{}", new Object[] { user, roleId, roles, roles.size() });
 		addRecursive(roles, eventBean.getCurrentEvent().getDefaultRole());
 		addRecursive(roles, eventBean.getCurrentEvent().getDefaultRole());
 
 
 		for (Role r : roles) {
 		for (Role r : roles) {
@@ -926,7 +926,8 @@ public class UserBean implements UserBeanLocal {
 			dstacc.setSeller(seller);
 			dstacc.setSeller(seller);
 			dstUser.addAccountevent(dstacc);
 			dstUser.addAccountevent(dstacc);
 			accountEventFacade.create(dstacc);
 			accountEventFacade.create(dstacc);
-			logger.info("Transferred {} credits with price {} for user {} from {} to {}", count, creditPrice, srcUser.getUser(), srcUser, dstUser);
+			logger.info("Transferred {} credits with price {} for user {} from {} to {}",
+					new Object[] { count, creditPrice, srcUser.getUser(), srcUser, dstUser });
 
 
 			dstTotal = dstTotal.add(dstacc.getTotal());
 			dstTotal = dstTotal.add(dstacc.getTotal());
 		}
 		}

code/moya-beans/ejbModule/fi/codecrew/moya/beanutil/LdapUserHandler.java

@@ -149,7 +149,7 @@ public class LdapUserHandler {
 
 
 				while (searchAttrs.hasMore()) {
 				while (searchAttrs.hasMore()) {
 					Attribute next = searchAttrs.next();
 					Attribute next = searchAttrs.next();
-					logger.info("Got {}, {}, {}", next.getID(), next.get(), searchAttrs.hasMore());
+					logger.info("Got {}, {}, {}", new Object[] { next.getID(), next.get(), searchAttrs.hasMore() });
 					if (next == null || next.get() == null)
 					if (next == null || next.get() == null)
 						continue;
 						continue;
 
 

code/moya-utils/src/test/java/fi/codecrew/moya/utilities/JsonUtilsTest.java

@@ -8,9 +8,8 @@ import javax.json.JsonObject;
 import javax.json.JsonReader;
 import javax.json.JsonReader;
 import javax.json.JsonValue;
 import javax.json.JsonValue;
 
 
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.testng.Assert;
+import org.testng.annotations.Test;
 
 
 import fi.codecrew.moya.utilities.JsonUtils;
 import fi.codecrew.moya.utilities.JsonUtils;
 
 
@@ -23,9 +22,6 @@ public class JsonUtilsTest {
 		return jsonObject;
 		return jsonObject;
 	}
 	}
 
 
-	@Before
-	public void setUp() throws Exception {
-	}
 
 
 	@Test
 	@Test
 	public final void testGetSubObject() {
 	public final void testGetSubObject() {

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/UserSearchView.java

@@ -112,7 +112,7 @@ public class UserSearchView extends PaginationView<UserWrapper> {
 					sq.setSort(sortField);
 					sq.setSort(sortField);
 					sq.setSortDirection(SortOrder.ASCENDING.equals(sortOrder) ? QuerySortOrder.ASCENDING : (SortOrder.DESCENDING.equals(sortOrder) ? QuerySortOrder.DESCENDING : QuerySortOrder.UNSORTED));
 					sq.setSortDirection(SortOrder.ASCENDING.equals(sortOrder) ? QuerySortOrder.ASCENDING : (SortOrder.DESCENDING.equals(sortOrder) ? QuerySortOrder.DESCENDING : QuerySortOrder.UNSORTED));
 					SearchResult<EventUser> sr = userbean.getThisEventsUsers(sq);
 					SearchResult<EventUser> sr = userbean.getThisEventsUsers(sq);
-					logger.info("sortfield {}, order {}, querysort: {}", sortField, sortOrder, sq.getSortDirection());
+					logger.info("sortfield {}, order {}, querysort: {}", new Object[] { sortField, sortOrder, sq.getSortDirection() });
 
 
 					this.setRowCount(new Long(sr.getResultcount()).intValue());
 					this.setRowCount(new Long(sr.getResultcount()).intValue());
 					this.setWrappedData(sr.getResults());
 					this.setWrappedData(sr.getResults());

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/UserView.java

@@ -96,9 +96,9 @@ public class UserView extends GenericCDIView {
 	private transient CardTemplateBeanLocal cardBean;
 	private transient CardTemplateBeanLocal cardBean;
 
 
 	private List<Role> usersRoles;
 	private List<Role> usersRoles;
-	
+
 	private List<Role> userSelectableRoles = null;
 	private List<Role> userSelectableRoles = null;
-	
+
 	@EJB
 	@EJB
 	private transient RoleBeanLocal rolebean;
 	private transient RoleBeanLocal rolebean;
 	@EJB
 	@EJB
@@ -144,7 +144,7 @@ public class UserView extends GenericCDIView {
 		FacesContext.getCurrentInstance().addMessage(null, msg);
 		FacesContext.getCurrentInstance().addMessage(null, msg);
 		UploadedFile f = event.getFile();
 		UploadedFile f = event.getFile();
 		if (f != null)
 		if (f != null)
-			logger.info("Received file {}, {}, {}", f.getContentType(), f.getFileName(), f.getSize());
+			logger.info("Received file {}, {}, {}", new Object[] { f.getContentType(), f.getFileName(), f.getSize() });
 
 
 	}
 	}
 
 
@@ -159,12 +159,6 @@ public class UserView extends GenericCDIView {
 
 
 	}
 	}
 
 
-
-	
-	
-	
-	
-	
 	/**
 	/**
 	 * This is the user we are currently editing, if that is not found we use
 	 * This is the user we are currently editing, if that is not found we use
 	 * current user
 	 * current user
@@ -188,13 +182,11 @@ public class UserView extends GenericCDIView {
 
 
 	public String saveRoles()
 	public String saveRoles()
 	{
 	{
-		rolebean.saveRoles(user, usersRoles);	
+		rolebean.saveRoles(user, usersRoles);
 		usersRoles = null;
 		usersRoles = null;
 		return null;
 		return null;
 	}
 	}
 
 
-	
-	
 	public List<Role> getUserSelectableRoles() {
 	public List<Role> getUserSelectableRoles() {
 		if (userSelectableRoles == null && user != null)
 		if (userSelectableRoles == null && user != null)
 		{
 		{
@@ -203,7 +195,7 @@ public class UserView extends GenericCDIView {
 		return userSelectableRoles;
 		return userSelectableRoles;
 
 
 	}
 	}
-	
+
 	public List<Role> getUsersRoles() {
 	public List<Role> getUsersRoles() {
 		if (usersRoles == null && user != null)
 		if (usersRoles == null && user != null)
 		{
 		{
@@ -212,8 +204,6 @@ public class UserView extends GenericCDIView {
 		return usersRoles;
 		return usersRoles;
 
 
 	}
 	}
-	
-	
 
 
 	public String crop()
 	public String crop()
 	{
 	{
@@ -343,12 +333,11 @@ public class UserView extends GenericCDIView {
 	}
 	}
 
 
 	public String saveUser() {
 	public String saveUser() {
-		
-		
-		if(userSelectableRoles != null) {
+
+		if (userSelectableRoles != null) {
 			saveUserSelectableRoles();
 			saveUserSelectableRoles();
 		}
 		}
-		
+
 		logger.info("Saving user");
 		logger.info("Saving user");
 		if (permbean.getCurrentUser().equals(user) || permbean.hasPermission(UserPermission.MODIFY)) {
 		if (permbean.getCurrentUser().equals(user) || permbean.hasPermission(UserPermission.MODIFY)) {
 
 
@@ -432,11 +421,11 @@ public class UserView extends GenericCDIView {
 		canSave = permbean.hasPermission(UserPermission.MODIFY);
 		canSave = permbean.hasPermission(UserPermission.MODIFY);
 		return "/useradmin/edit";
 		return "/useradmin/edit";
 	}
 	}
-	
-	 //  /admin/adduser/index
+
+	//  /admin/adduser/index
 	public String incomingPhotoReady() {
 	public String incomingPhotoReady() {
 		authView.executeLogoutNoRedirect();
 		authView.executeLogoutNoRedirect();
-		
+
 		navihandler.forward("/admin/adduser/index?faces-redirect=true");
 		navihandler.forward("/admin/adduser/index?faces-redirect=true");
 		return "/admin/adduser/index";
 		return "/admin/adduser/index";
 	}
 	}
@@ -503,7 +492,7 @@ public class UserView extends GenericCDIView {
 	public void setUsersRoles(List<Role> usersRoles) {
 	public void setUsersRoles(List<Role> usersRoles) {
 		this.usersRoles = usersRoles;
 		this.usersRoles = usersRoles;
 	}
 	}
-	
+
 	public void setUserSelectableRoles(List<Role> usersRoles) {
 	public void setUserSelectableRoles(List<Role> usersRoles) {
 		this.userSelectableRoles = usersRoles;
 		this.userSelectableRoles = usersRoles;
 	}
 	}
@@ -558,24 +547,18 @@ public class UserView extends GenericCDIView {
 	public void setLayoutview(LayoutView layoutview) {
 	public void setLayoutview(LayoutView layoutview) {
 		this.layoutview = layoutview;
 		this.layoutview = layoutview;
 	}
 	}
-	
-	
-	
-	
-	
+
 	public String saveUserSelectableRoles()
 	public String saveUserSelectableRoles()
 	{
 	{
-		rolebean.saveUserSelectableRoles(user, userSelectableRoles);	
+		rolebean.saveUserSelectableRoles(user, userSelectableRoles);
 		userSelectableRoles = null;
 		userSelectableRoles = null;
 		return null;
 		return null;
 	}
 	}
 
 
-	
 	public boolean isShowUserSelectableRoles() {
 	public boolean isShowUserSelectableRoles() {
 		return (rolebean.listUserSelectableRoles().size() >= 1);
 		return (rolebean.listUserSelectableRoles().size() >= 1);
 	}
 	}
-	
-	
+
 	private Boolean shirtEnabled;
 	private Boolean shirtEnabled;
 
 
 	public boolean isShirtEnabled()
 	public boolean isShirtEnabled()
@@ -591,8 +574,5 @@ public class UserView extends GenericCDIView {
 		}
 		}
 		return shirtEnabled;
 		return shirtEnabled;
 	}
 	}
-	
-	
-	
-	
+
 }
 }