Fix rebase imports

code/moya-web/src/main/java/fi/codecrew/moya/rest/UserRestView.java

@@ -20,26 +20,29 @@ package fi.codecrew.moya.rest;
 
 
 import java.io.IOException;
 import java.io.IOException;
 import java.security.Principal;
 import java.security.Principal;
-import java.util.Collection;
 import java.util.List;
 import java.util.List;
 
 
 import javax.ejb.EJB;
 import javax.ejb.EJB;
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.context.RequestScoped;
-import javax.print.attribute.standard.Media;
 import javax.servlet.ServletException;
 import javax.servlet.ServletException;
-import javax.servlet.ServletInputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.Part;
 import javax.servlet.http.Part;
-import javax.ws.rs.*;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DefaultValue;
+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.Context;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.ResponseBuilder;
 import javax.ws.rs.core.Response.ResponseBuilder;
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.core.Response.Status;
 
 
-import fi.codecrew.moya.beans.*;
-import fi.codecrew.moya.enums.apps.UserPermission;
-import fi.codecrew.moya.model.*;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 
 
@@ -47,15 +50,28 @@ import com.wordnik.swagger.annotations.Api;
 import com.wordnik.swagger.annotations.ApiOperation;
 import com.wordnik.swagger.annotations.ApiOperation;
 import com.wordnik.swagger.annotations.ApiParam;
 import com.wordnik.swagger.annotations.ApiParam;
 
 
+import fi.codecrew.moya.beans.CardTemplateBeanLocal;
+import fi.codecrew.moya.beans.PermissionBeanLocal;
+import fi.codecrew.moya.beans.PlaceBeanLocal;
+import fi.codecrew.moya.beans.PlaceGroupBeanLocal;
+import fi.codecrew.moya.beans.ReaderBeanLocal;
+import fi.codecrew.moya.beans.TicketBeanLocal;
+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.GroupMembership;
+import fi.codecrew.moya.model.Place;
+import fi.codecrew.moya.model.ReaderEvent;
+import fi.codecrew.moya.model.User;
+import fi.codecrew.moya.model.UserImage;
 import fi.codecrew.moya.rest.pojo.userinfo.v1.EventUserRestPojo;
 import fi.codecrew.moya.rest.pojo.userinfo.v1.EventUserRestPojo;
 import fi.codecrew.moya.rest.pojo.userinfo.v1.PrintedCardRestPojo;
 import fi.codecrew.moya.rest.pojo.userinfo.v1.PrintedCardRestPojo;
 import fi.codecrew.moya.rest.pojo.userinfo.v1.SimpleEventuserRoot;
 import fi.codecrew.moya.rest.pojo.userinfo.v1.SimpleEventuserRoot;
 import fi.codecrew.moya.rest.pojo.userinfo.v1.UserReservationPlacePojo;
 import fi.codecrew.moya.rest.pojo.userinfo.v1.UserReservationPlacePojo;
 import fi.codecrew.moya.rest.pojo.userinfo.v1.UserReservationRoot;
 import fi.codecrew.moya.rest.pojo.userinfo.v1.UserReservationRoot;
-import fi.codecrew.moya.util.UserSearchQuery;
 import fi.codecrew.moya.utilities.SearchQuery.QuerySortOrder;
 import fi.codecrew.moya.utilities.SearchQuery.QuerySortOrder;
 import fi.codecrew.moya.utilities.SearchResult;
 import fi.codecrew.moya.utilities.SearchResult;
-import sun.security.provider.certpath.OCSPResponse;
 
 
 @RequestScoped
 @RequestScoped
 @Path("/user")
 @Path("/user")

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/shop/BillListView.java

@@ -22,12 +22,9 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Calendar;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 
 import javax.ejb.EJB;
 import javax.ejb.EJB;
 import javax.enterprise.context.ConversationScoped;
 import javax.enterprise.context.ConversationScoped;
-import javax.faces.model.ListDataModel;
 import javax.inject.Inject;
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Named;
 
 
@@ -44,7 +41,6 @@ import fi.codecrew.moya.enums.apps.BillPermission;
 import fi.codecrew.moya.exceptions.BillException;
 import fi.codecrew.moya.exceptions.BillException;
 import fi.codecrew.moya.model.Bill;
 import fi.codecrew.moya.model.Bill;
 import fi.codecrew.moya.model.EventUser;
 import fi.codecrew.moya.model.EventUser;
-import fi.codecrew.moya.model.User;
 import fi.codecrew.moya.utilities.SearchQuery.QuerySortOrder;
 import fi.codecrew.moya.utilities.SearchQuery.QuerySortOrder;
 import fi.codecrew.moya.utilities.SearchResult;
 import fi.codecrew.moya.utilities.SearchResult;
 import fi.codecrew.moya.web.annotations.SelectedUser;
 import fi.codecrew.moya.web.annotations.SelectedUser;