Fix rest pojos

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

@@ -2,12 +2,11 @@ package fi.codecrew.moya.rest.pojo;
 
 
 import java.util.List;
 import java.util.List;
 
 
-import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
 
 @XmlRootElement
 @XmlRootElement
 public class CardRoot {
 public class CardRoot {
-	@XmlElementWrapper(name = "cards")
+	//@XmlElementWrapper(name = "cards")
 	private List<PrintedCardRestPojo> cards;
 	private List<PrintedCardRestPojo> cards;
 
 
 	public List<PrintedCardRestPojo> getCards() {
 	public List<PrintedCardRestPojo> getCards() {

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

@@ -2,27 +2,26 @@ package fi.codecrew.moya.rest.pojo;
 
 
 import java.util.List;
 import java.util.List;
 
 
-import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
 
 @XmlRootElement
 @XmlRootElement
 public class ReaderEventRestRoot {
 public class ReaderEventRestRoot {
-	@XmlElementWrapper(name = "readerEvents")
-	private List<ReaderEventRestPojo> readers;
+	//	@XmlElementWrapper(name = "readerEvents")
+	private List<ReaderEventRestPojo> readerEvents;
 
 
 	public ReaderEventRestRoot() {
 	public ReaderEventRestRoot() {
 	}
 	}
 
 
 	public ReaderEventRestRoot(List<ReaderEventRestPojo> parsed) {
 	public ReaderEventRestRoot(List<ReaderEventRestPojo> parsed) {
-		readers = parsed;
+		setReaderEvents(parsed);
 	}
 	}
 
 
-	public List<ReaderEventRestPojo> getReaders() {
-		return readers;
+	public List<ReaderEventRestPojo> getReaderEvents() {
+		return readerEvents;
 	}
 	}
 
 
-	public void setReaders(List<ReaderEventRestPojo> readers) {
-		this.readers = readers;
+	public void setReaderEvents(List<ReaderEventRestPojo> readerEvents) {
+		this.readerEvents = readerEvents;
 	}
 	}
 
 
 }
 }

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

@@ -2,12 +2,11 @@ package fi.codecrew.moya.rest.pojo;
 
 
 import java.util.List;
 import java.util.List;
 
 
-import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
 
 @XmlRootElement
 @XmlRootElement
 public class ReaderRestRoot {
 public class ReaderRestRoot {
-	@XmlElementWrapper(name = "readers")
+	//@XmlElementWrapper(name = "readers")
 	private List<ReaderRestPojo> readers;
 	private List<ReaderRestPojo> readers;
 
 
 	public ReaderRestRoot() {
 	public ReaderRestRoot() {