Deprekoitu findAll genericFacadesta ja luotu tarvittaviin paikkoihin omiin facadeihin.

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/ReaderBean.java

@@ -45,7 +45,6 @@ public class ReaderBean implements ReaderBeanLocal {
 	@Override
 	public ReaderEvent checkTag(String ident, String tag, String hash) {
 
-		LanEvent ev = eventbean.getCurrentEvent();
 		PrintedCard card = cardfacade.findByRfid(tag);
 		ReaderEvent ret = null;
 		logger.debug("Found card by rfid: {}", card);

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/TestDataBean.java

@@ -5,7 +5,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.URISyntaxException;
 import java.util.Calendar;
-import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -272,16 +271,17 @@ public class TestDataBean implements TestDataBeanLocal {
 		}
 	}
 
-	@Override
-	public void printPlacesInfo() {
-		logger.debug("Fetching places");
-		List<Place> places = placeFacade.findAll();
-		logger.debug("Got places: {}", places);
-		logger.info("Printing info from places");
-		for (Place place : places) {
-			logger.info("Place id: {}. Event Map id: {}.", place.getId(), place.getMap().getId());
-		}
-	}
+	// @Override
+	// public void printPlacesInfo() {
+	// logger.debug("Fetching places");
+	// List<Place> places = placeFacade.findAll();
+	// logger.debug("Got places: {}", places);
+	// logger.info("Printing info from places");
+	// for (Place place : places) {
+	// logger.info("Place id: {}. Event Map id: {}.", place.getId(),
+	// place.getMap().getId());
+	// }
+	// }
 
 	@Override
 	public void generateTestCompos() {

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/UserUtilBean.java

@@ -39,7 +39,6 @@ public class UserUtilBean implements UserUtilBeanLocal {
 				logger.warn("User {} has empty login...");
 				continue;
 			}
-
 			User testU = userfacade.findByLogin(u.getLogin().toLowerCase());
 			if (testU == null || testU.equals(u)) {
 				u.setLogin(u.getLogin().toLowerCase());

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/CardTemplateFacade.java

 package fi.insomnia.bortal.facade;
 
+import java.util.List;
+
+import javax.ejb.EJB;
 import javax.ejb.LocalBean;
 import javax.ejb.Stateless;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Root;
 
+import fi.insomnia.bortal.beans.EventBeanLocal;
 import fi.insomnia.bortal.model.CardTemplate;
+import fi.insomnia.bortal.model.CardTemplate_;
 
 @Stateless
 @LocalBean
@@ -13,6 +21,8 @@ public class CardTemplateFacade extends GenericFacade<Integer, CardTemplate> {
 
 	@PersistenceContext
 	private EntityManager em;
+	@EJB
+	private EventBeanLocal eventbean;
 
 	public CardTemplateFacade() {
 		super(CardTemplate.class);
@@ -23,4 +33,14 @@ public class CardTemplateFacade extends GenericFacade<Integer, CardTemplate> {
 		return em;
 	}
 
+	public List<CardTemplate> findAll()
+	{
+		CriteriaBuilder cb = em.getCriteriaBuilder();
+		CriteriaQuery<CardTemplate> cq = cb.createQuery(CardTemplate.class);
+		Root<CardTemplate> root = cq.from(CardTemplate.class);
+		cq.where(cb.equal(root.get(CardTemplate_.event), eventbean.getCurrentEvent()));
+		return em.createQuery(cq).getResultList();
+
+	}
+
 }

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/EventOrganiserFacade.java

 package fi.insomnia.bortal.facade;
 
+import java.util.List;
+
 import javax.ejb.LocalBean;
 import javax.ejb.Stateless;
 import javax.persistence.EntityManager;
@@ -37,4 +39,11 @@ public class EventOrganiserFacade extends GenericFacade<Integer, EventOrganiser>
 
 		return getSingleNullableResult(em.createQuery(cq));
 	}
+
+	public List<EventOrganiser> findAll()
+	{
+		CriteriaBuilder cb = em.getCriteriaBuilder();
+		CriteriaQuery<EventOrganiser> cq = cb.createQuery(EventOrganiser.class);
+		return em.createQuery(cq).getResultList();
+	}
 }

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/GenericFacade.java

@@ -74,34 +74,40 @@ public abstract class GenericFacade<I extends Serializable, C extends ModelInter
 		return ret;
 	}
 
-	@Deprecated
-	public List<C> findAll() {
-		return findAll(null);
-	}
-
-	@Deprecated
-	public List<C> findAll(String sort) {
-		return findAll(0, 0, sort);
-	}
-
-	@Deprecated
-	public List<C> findRange(int[] range) {
-		CriteriaQuery<C> cq = getEm().getCriteriaBuilder().createQuery(getEntityClass());
-		cq.select(cq.from(getEntityClass()));
-		TypedQuery<C> q = getEm().createQuery(cq);
-		q.setMaxResults(range[1] - range[0]);
-		q.setFirstResult(range[0]);
-		return q.getResultList();
-	}
-
-	@Deprecated
-	public long count() {
-		CriteriaQuery<Long> cq = getEm().getCriteriaBuilder().createQuery(Long.class);
-		Root<C> rt = cq.from(getEntityClass());
-		cq.select(getEm().getCriteriaBuilder().count(rt));
-		TypedQuery<Long> q = getEm().createQuery(cq);
-		return q.getSingleResult();
-	}
+	/**
+	 * Deprekoitu! Yleensä ei haluta palauttaa kaikkia entryjä kannasta, vaan
+	 * vain ko. tapahtumaan / käyttäjään / muuhun olioon liittyvät Jos oikeasti
+	 * tarpeellinen luo funktio facadeen!
+	 */
+	// @Deprecated
+	// public List<C> findAll() {
+	// return findAll(null);
+	// }
+	//
+	// @Deprecated
+	// public List<C> findAll(String sort) {
+	// return findAll(0, 0, sort);
+	// }
+	//
+	// @Deprecated
+	// public List<C> findRange(int[] range) {
+	// CriteriaQuery<C> cq =
+	// getEm().getCriteriaBuilder().createQuery(getEntityClass());
+	// cq.select(cq.from(getEntityClass()));
+	// TypedQuery<C> q = getEm().createQuery(cq);
+	// q.setMaxResults(range[1] - range[0]);
+	// q.setFirstResult(range[0]);
+	// return q.getResultList();
+	// }
+	// @Deprecated
+	// public long count() {
+	// CriteriaQuery<Long> cq =
+	// getEm().getCriteriaBuilder().createQuery(Long.class);
+	// Root<C> rt = cq.from(getEntityClass());
+	// cq.select(getEm().getCriteriaBuilder().count(rt));
+	// TypedQuery<Long> q = getEm().createQuery(cq);
+	// return q.getSingleResult();
+	// }
 
 	protected static <K> K getSingleNullableResult(TypedQuery<K> q) {
 		K ret = null;
@@ -247,26 +253,26 @@ public abstract class GenericFacade<I extends Serializable, C extends ModelInter
 		return q.getSingleResult();
 	}
 
-	@Deprecated
-	public List<C> findAll(int page, int pagesize, String sort) {
-		CriteriaBuilder cb = getEm().getCriteriaBuilder();
-		CriteriaQuery<C> cq = cb.createQuery(getEntityClass());
-		Root<C> root = cq.from(getEntityClass());
-
-		if (sort != null) {
-			cq.orderBy(cb.asc(root.get(sort)));
-		}
-
-		cq.select(cq.from(getEntityClass()));
-		TypedQuery<C> q = getEm().createQuery(cq);
-
-		if (pagesize > 0) {
-			q.setFirstResult(page * pagesize);
-			q.setMaxResults(pagesize);
-		}
-
-		return q.getResultList();
-	}
+	// @Deprecated
+	// public List<C> findAll(int page, int pagesize, String sort) {
+	// CriteriaBuilder cb = getEm().getCriteriaBuilder();
+	// CriteriaQuery<C> cq = cb.createQuery(getEntityClass());
+	// Root<C> root = cq.from(getEntityClass());
+	//
+	// if (sort != null) {
+	// cq.orderBy(cb.asc(root.get(sort)));
+	// }
+	//
+	// cq.select(cq.from(getEntityClass()));
+	// TypedQuery<C> q = getEm().createQuery(cq);
+	//
+	// if (pagesize > 0) {
+	// q.setFirstResult(page * pagesize);
+	// q.setMaxResults(pagesize);
+	// }
+	//
+	// return q.getResultList();
+	// }
 
 	public void flush() {
 		getEm().flush();

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/ProductFacade.java

@@ -31,6 +31,16 @@ public class ProductFacade extends IntegerPkGenericFacade<Product> {
 		super(Product.class);
 	}
 
+	public List<Product> findAll()
+	{
+		CriteriaBuilder cb = em.getCriteriaBuilder();
+		CriteriaQuery<Product> cq = cb.createQuery(Product.class);
+		Root<Product> root = cq.from(Product.class);
+		cq.where(cb.equal(root.get(Product_.event), eventbean.getCurrentEvent()));
+		return em.createQuery(cq).getResultList();
+
+	}
+
 	@Override
 	protected EntityManager getEm() {
 		return em;

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/SitePageFacade.java

@@ -79,7 +79,6 @@ public class SitePageFacade extends GenericFacade<Integer, SitePage> {
 
 	}
 
-	@Override
 	public List<SitePage> findAll()
 	{
 		CriteriaBuilder cb = em.getCriteriaBuilder();

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/UserFacade.java

@@ -166,4 +166,12 @@ public class UserFacade extends GenericFacade<Integer, User> {
 		em.getEntityManagerFactory().getCache().evictAll();
 	}
 
+	public List<User> findAll()
+	{
+		CriteriaBuilder cb = em.getCriteriaBuilder();
+		CriteriaQuery<User> cq = cb.createQuery(User.class);
+		return em.createQuery(cq).getResultList();
+
+	}
+
 }

code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/TestDataBeanLocal.java

@@ -17,7 +17,7 @@ public interface TestDataBeanLocal {
 
 	User createUser();
 
-	public void printPlacesInfo();
+	// public void printPlacesInfo();
 
 	void generateTestCompos();
 

code/LanBortalDatabase/src/fi/insomnia/bortal/model/NewsGroup.java

@@ -54,6 +54,7 @@ public class NewsGroup extends GenericEntity {
 
     @OrderBy("priority")
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "group")
+    @PrivateOwned
     private List<News> news;
 
     @ManyToMany()
@@ -92,9 +93,6 @@ public class NewsGroup extends GenericEntity {
         this.priority = priority;
     }
 
-    @OrderBy("priority")
-    @OneToMany(mappedBy = "group", cascade = CascadeType.ALL)
-    @PrivateOwned
     public List<News> getNews() {
         return news;
     }

code/LanBortalWeb/src/fi/insomnia/bortal/web/TestDataView.java

@@ -51,6 +51,7 @@ public class TestDataView {
 	private PollBeanLocal pollbean;
 
 	public void convertUsernames() {
+
 		utilbean.convertUsernames();
 	}
 

code/LanBortalWeb/src/fi/insomnia/bortal/web/converter/PollAnswerConverter.java

@@ -23,6 +23,7 @@ public class PollAnswerConverter implements Converter {
 
 	@Override
 	public Object getAsObject(FacesContext context, UIComponent component, String value) {
+
 		PossibleAnswer possibleAnswer = pollbean.findPossibleAnwerById(Integer.parseInt(value));
 		PollAnswer ret = new PollAnswer();
 		ret.setChoice(possibleAnswer);