mirror of
https://github.com/Athou/commafeed.git
synced 2026-03-21 21:37:29 +00:00
display error messages
This commit is contained in:
@@ -8,6 +8,7 @@ import com.google.common.collect.Lists;
|
||||
@SuppressWarnings("serial")
|
||||
public class Entries implements Serializable {
|
||||
private String name;
|
||||
private String message;
|
||||
private List<Entry> entries = Lists.newArrayList();
|
||||
|
||||
public String getName() {
|
||||
@@ -26,4 +27,12 @@ public class Entries implements Serializable {
|
||||
this.entries = entries;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -56,6 +56,7 @@ public class EntriesREST extends AbstractREST {
|
||||
getUser(), Long.valueOf(id));
|
||||
if (subscription != null) {
|
||||
entries.setName(subscription.getTitle());
|
||||
entries.setMessage(subscription.getFeed().getMessage());
|
||||
entries.getEntries().addAll(
|
||||
buildEntries(subscription, offset, limit, unreadOnly));
|
||||
}
|
||||
|
||||
@@ -53,7 +53,15 @@ public class SubscriptionsREST extends AbstractREST {
|
||||
Preconditions.checkNotNull(req.getTitle());
|
||||
Preconditions.checkNotNull(req.getUrl());
|
||||
|
||||
Feed feed = feedService.findByUrl(req.getUrl());
|
||||
Feed fetchedFeed = null;
|
||||
try {
|
||||
fetchedFeed = feedFetcher.fetch(req.getUrl());
|
||||
} catch (FeedException e) {
|
||||
return Response.status(Status.NOT_FOUND).entity(e.getMessage())
|
||||
.build();
|
||||
}
|
||||
|
||||
Feed feed = feedService.findByUrl(fetchedFeed.getUrl());
|
||||
if (feed == null) {
|
||||
feed = new Feed();
|
||||
feed.setUrl(req.getUrl());
|
||||
|
||||
Reference in New Issue
Block a user