fix for admin api

src/main/java/com/commafeed/frontend/model/Entry.java

@@ -7,6 +7,8 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 
+import com.commafeed.backend.model.FeedEntry;
+import com.commafeed.backend.model.FeedEntryStatus;
 import com.wordnik.swagger.annotations.ApiClass;
 import com.wordnik.swagger.annotations.ApiProperty;
 
@@ -16,39 +18,61 @@ import com.wordnik.swagger.annotations.ApiProperty;
 @ApiClass("Entry details")
 public class Entry implements Serializable {
 
+	public static Entry build(FeedEntryStatus status) {
+		Entry entry = new Entry();
+
+		FeedEntry feedEntry = status.getEntry();
+		entry.setId(String.valueOf(status.getId()));
+		entry.setTitle(feedEntry.getContent().getTitle());
+		entry.setContent(feedEntry.getContent().getContent());
+		entry.setEnclosureUrl(status.getEntry().getContent().getEnclosureUrl());
+		entry.setEnclosureType(status.getEntry().getContent()
+				.getEnclosureType());
+		entry.setDate(feedEntry.getUpdated());
+		entry.setUrl(feedEntry.getUrl());
+
+		entry.setRead(status.isRead());
+
+		entry.setFeedName(status.getSubscription().getTitle());
+		entry.setFeedId(String.valueOf(status.getSubscription().getId()));
+		entry.setFeedUrl(status.getSubscription().getFeed().getLink());
+
+		return entry;
+	}
+
 	@ApiProperty("entry id")
 	private String id;
-	
+
 	@ApiProperty("entry title")
 	private String title;
-	
+
 	@ApiProperty("entry content")
 	private String content;
-	
+
 	@ApiProperty("entry enclosure url, if any")
 	private String enclosureUrl;
-	
+
 	@ApiProperty("entry enclosure mime type, if any")
 	private String enclosureType;
-	
+
 	@ApiProperty("entry publication date")
 	private Date date;
-	
+
 	@ApiProperty("feed id")
 	private String feedId;
-	
+
 	@ApiProperty("feed name")
 	private String feedName;
-	
+
 	@ApiProperty("feed url")
 	private String feedUrl;
-	
+
 	@ApiProperty("entry url")
 	private String url;
-	
+
 	@ApiProperty("read sttaus")
 	private boolean read;
-	
+
 	@ApiProperty("starred status")
 	private boolean starred;
 

src/main/java/com/commafeed/frontend/model/MarkRequest.java

@@ -1,41 +0,0 @@
-package com.commafeed.frontend.model;
-
-import java.io.Serializable;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@SuppressWarnings("serial")
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
-public class MarkRequest implements Serializable {
-	private String type;
-	private String id;
-	private boolean read;
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public boolean isRead() {
-		return read;
-	}
-
-	public void setRead(boolean read) {
-		this.read = read;
-	}
-
-}

src/main/java/com/commafeed/frontend/model/request/CollapseRequest.java

@@ -0,0 +1,40 @@
+package com.commafeed.frontend.model.request;
+
+import java.io.Serializable;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import com.wordnik.swagger.annotations.ApiClass;
+import com.wordnik.swagger.annotations.ApiProperty;
+
+@SuppressWarnings("serial")
+@XmlRootElement
+@XmlAccessorType(XmlAccessType.FIELD)
+@ApiClass("Mark Request")
+public class CollapseRequest implements Serializable {
+
+	@ApiProperty(value = "category id", required = true)
+	private Long id;
+
+	@ApiProperty(value = "collapse", required = true)
+	private boolean collapse;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public boolean isCollapse() {
+		return collapse;
+	}
+
+	public void setCollapse(boolean collapse) {
+		this.collapse = collapse;
+	}
+
+}

src/main/java/com/commafeed/frontend/model/request/IDRequest.java

@@ -0,0 +1,29 @@
+package com.commafeed.frontend.model.request;
+
+import java.io.Serializable;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import com.wordnik.swagger.annotations.ApiClass;
+import com.wordnik.swagger.annotations.ApiProperty;
+
+@SuppressWarnings("serial")
+@XmlRootElement
+@XmlAccessorType(XmlAccessType.FIELD)
+@ApiClass
+public class IDRequest implements Serializable {
+
+	@ApiProperty
+	private Long id;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+}

src/main/java/com/commafeed/frontend/model/request/MarkRequest.java

@@ -0,0 +1,51 @@
+package com.commafeed.frontend.model.request;
+
+import java.io.Serializable;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import com.wordnik.swagger.annotations.ApiClass;
+import com.wordnik.swagger.annotations.ApiProperty;
+
+@SuppressWarnings("serial")
+@XmlRootElement
+@XmlAccessorType(XmlAccessType.FIELD)
+@ApiClass("Mark Request")
+public class MarkRequest implements Serializable {
+
+	@ApiProperty(value = "id", required = true)
+	private String id;
+
+	@ApiProperty(value = "mark as read or unread")
+	private boolean read;
+
+	@ApiProperty(value = "only entries older than this, prevent marking an entry that was not retrieved", required = false)
+	private Long olderThan;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public boolean isRead() {
+		return read;
+	}
+
+	public void setRead(boolean read) {
+		this.read = read;
+	}
+
+	public Long getOlderThan() {
+		return olderThan;
+	}
+
+	public void setOlderThan(Long olderThan) {
+		this.olderThan = olderThan;
+	}
+
+}

src/main/java/com/commafeed/frontend/model/request/ProfileModificationRequest.java

@@ -1,4 +1,4 @@
-package com.commafeed.frontend.model;
+package com.commafeed.frontend.model.request;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

src/main/java/com/commafeed/frontend/model/request/RegistrationRequest.java

@@ -1,4 +1,4 @@
-package com.commafeed.frontend.model;
+package com.commafeed.frontend.model.request;
 
 import java.io.Serializable;
 

src/main/java/com/commafeed/frontend/model/request/RenameRequest.java

@@ -0,0 +1,40 @@
+package com.commafeed.frontend.model.request;
+
+import java.io.Serializable;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import com.wordnik.swagger.annotations.ApiClass;
+import com.wordnik.swagger.annotations.ApiProperty;
+
+@SuppressWarnings("serial")
+@XmlRootElement
+@XmlAccessorType(XmlAccessType.FIELD)
+@ApiClass("Rename Request")
+public class RenameRequest implements Serializable {
+
+	@ApiProperty(value = "id", required = true)
+	private Long id;
+
+	@ApiProperty(value = "mark as read or unread")
+	private String name;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+}

src/main/java/com/commafeed/frontend/model/request/SubscribeRequest.java

@@ -1,4 +1,4 @@
-package com.commafeed.frontend.model;
+package com.commafeed.frontend.model.request;
 
 import java.io.Serializable;
 
@@ -13,7 +13,7 @@ import com.wordnik.swagger.annotations.ApiProperty;
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)
 @ApiClass("Subscription request")
-public class SubscriptionRequest implements Serializable {
+public class SubscribeRequest implements Serializable {
 
 	@ApiProperty(value = "url of the feed", required = true)
 	private String url;