Rest to jackson.

code/MoyaWeb/.settings/org.eclipse.ltk.core.refactoring.prefs

+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false

code/MoyaWeb/src/fi/codecrew/moya/rest/PrinterRestView.java

 package fi.codecrew.moya.rest;
 package fi.codecrew.moya.rest;
 
 
-import java.util.List;
-
 import javax.ejb.EJB;
 import javax.ejb.EJB;
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.context.RequestScoped;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.Consumes;
@@ -22,6 +20,7 @@ import fi.codecrew.moya.beans.CardTemplateBeanLocal;
 import fi.codecrew.moya.beans.UserBeanLocal;
 import fi.codecrew.moya.beans.UserBeanLocal;
 import fi.codecrew.moya.enums.CardState;
 import fi.codecrew.moya.enums.CardState;
 import fi.codecrew.moya.model.PrintedCard;
 import fi.codecrew.moya.model.PrintedCard;
+import fi.codecrew.moya.rest.pojo.CardRoot;
 import fi.codecrew.moya.rest.pojo.PrintedCardRestPojo;
 import fi.codecrew.moya.rest.pojo.PrintedCardRestPojo;
 
 
 @RequestScoped
 @RequestScoped
@@ -98,16 +97,16 @@ public class PrinterRestView {
 
 
 	@GET
 	@GET
 	@Path("/ListUnprinted")
 	@Path("/ListUnprinted")
-	public List<PrintedCardRestPojo> getUserCard(@QueryParam("key") String key) throws Exception {
-		List<PrintedCardRestPojo> ret = PrintedCardRestPojo.parseCards(cardbean.getCardsByState(CardState.VALIDATED));
+	public CardRoot getUserCard(@QueryParam("key") String key) throws Exception {
+		CardRoot ret = PrintedCardRestPojo.parseCards(cardbean.getCardsByState(CardState.VALIDATED));
 		logger.info("Returning card pojos: {} for key {}", ret, key);
 		logger.info("Returning card pojos: {} for key {}", ret, key);
 		return ret;
 		return ret;
 	}
 	}
 
 
 	@GET
 	@GET
 	@Path("/ListAll")
 	@Path("/ListAll")
-	public List<PrintedCardRestPojo> getAllCards(@QueryParam("key") String key) throws Exception {
-		List<PrintedCardRestPojo> ret = PrintedCardRestPojo.parseCards(cardbean.getCardsByState());
+	public CardRoot getAllCards(@QueryParam("key") String key) throws Exception {
+		CardRoot ret = PrintedCardRestPojo.parseCards(cardbean.getCardsByState());
 		logger.info("Returning card pojos: {} for key {}", ret, key);
 		logger.info("Returning card pojos: {} for key {}", ret, key);
 		return ret;
 		return ret;
 	}
 	}

code/MoyaWeb/src/fi/codecrew/moya/rest/pojo/CardRoot.java

+package fi.codecrew.moya.rest.pojo;
+
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+public class CardRoot {
+	@XmlElementWrapper(name = "cards")
+	private List<PrintedCardRestPojo> cards;
+
+	public List<PrintedCardRestPojo> getCards() {
+		return cards;
+	}
+
+	public void setCards(List<PrintedCardRestPojo> cards) {
+		this.cards = cards;
+	}
+
+}

code/MoyaWeb/src/fi/codecrew/moya/rest/pojo/PrintedCardRestPojo.java

@@ -4,12 +4,10 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlTransient;
 
 
 import fi.codecrew.moya.model.PrintedCard;
 import fi.codecrew.moya.model.PrintedCard;
 
 
-@XmlRootElement(name = "cards")
 public class PrintedCardRestPojo {
 public class PrintedCardRestPojo {
 
 
 	public PrintedCardRestPojo() {
 	public PrintedCardRestPojo() {
@@ -57,12 +55,14 @@ public class PrintedCardRestPojo {
 		return card.getCardState().toString();
 		return card.getCardState().toString();
 	}
 	}
 
 
-	public static List<PrintedCardRestPojo> parseCards(List<PrintedCard> cards)
+	public static CardRoot parseCards(List<PrintedCard> cards)
 	{
 	{
 		ArrayList<PrintedCardRestPojo> ret = new ArrayList<PrintedCardRestPojo>();
 		ArrayList<PrintedCardRestPojo> ret = new ArrayList<PrintedCardRestPojo>();
 		for (PrintedCard c : cards) {
 		for (PrintedCard c : cards) {
 			ret.add(new PrintedCardRestPojo(c));
 			ret.add(new PrintedCardRestPojo(c));
 		}
 		}
-		return ret;
+		CardRoot root = new CardRoot();
+		root.setCards(ret);
+		return root;
 	}
 	}
 }
 }