Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

methods refactoring

Browse Source
This commit is contained in:
Athou
2013-05-21 12:57:32 +02:00
parent 6cfa275aa1
commit 5569fcca40
1 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java
View File

@@ -139,13 +139,7 @@ public class FeedREST extends AbstractResourceREST {
return Response.ok(writer.toString()).build(); return Response.ok(writer.toString()).build();
} }
@GET private FeedInfo fetchFeedInternal(String url) {
@Path("/fetch")
@ApiOperation(value = "Fetch a feed", notes = "Fetch a feed by its url", responseClass = "com.commafeed.frontend.model.FeedInfo")
public Response fetchFeed(
@ApiParam(value = "the feed's url", required = true) @QueryParam("url") String url) {
Preconditions.checkNotNull(url);
FeedInfo info = null; FeedInfo info = null;
url = StringUtils.trimToEmpty(url); url = StringUtils.trimToEmpty(url);
url = prependHttp(url); url = prependHttp(url);
@@ -160,6 +154,23 @@ public class FeedREST extends AbstractResourceREST {
.status(Status.INTERNAL_SERVER_ERROR) .status(Status.INTERNAL_SERVER_ERROR)
.entity(e.getMessage()).build()); .entity(e.getMessage()).build());
} }
return info;
}
@GET
@Path("/fetch")
@ApiOperation(value = "Fetch a feed", notes = "Fetch a feed by its url", responseClass = "com.commafeed.frontend.model.FeedInfo")
public Response fetchFeed(
@ApiParam(value = "the feed's url", required = true) @QueryParam("url") String url) {
Preconditions.checkNotNull(url);
FeedInfo info = null;
try {
info = fetchFeedInternal(url);
} catch (Exception e) {
return Response.status(Status.INTERNAL_SERVER_ERROR)
.entity(e.getMessage()).build();
}
return Response.ok(info).build(); return Response.ok(info).build();
} }
@@ -219,12 +230,13 @@ public class FeedREST extends AbstractResourceREST {
Preconditions.checkNotNull(req.getUrl()); Preconditions.checkNotNull(req.getUrl());
String url = prependHttp(req.getUrl()); String url = prependHttp(req.getUrl());
url = ((FeedInfo) fetchFeed(url).getEntity()).getUrl();
FeedCategory category = CategoryREST.ALL.equals(req.getCategoryId()) ? null
: feedCategoryDAO.findById(Long.valueOf(req.getCategoryId()));
FeedInfo info = (FeedInfo) fetchFeed(url).getEntity();
try { try {
url = fetchFeedInternal(url).getUrl();
FeedCategory category = CategoryREST.ALL
.equals(req.getCategoryId()) ? null : feedCategoryDAO
.findById(Long.valueOf(req.getCategoryId()));
FeedInfo info = fetchFeedInternal(url);
feedSubscriptionService.subscribe(getUser(), info.getUrl(), feedSubscriptionService.subscribe(getUser(), info.getUrl(),
req.getTitle(), category); req.getTitle(), category);
} catch (Exception e) { } catch (Exception e) {
@@ -247,9 +259,9 @@ public class FeedREST extends AbstractResourceREST {
Preconditions.checkNotNull(url); Preconditions.checkNotNull(url);
url = prependHttp(url); url = prependHttp(url);
url = ((FeedInfo) fetchFeed(url).getEntity()).getUrl(); url = fetchFeedInternal(url).getUrl();
FeedInfo info = (FeedInfo) fetchFeed(url).getEntity(); FeedInfo info = fetchFeedInternal(url);
feedSubscriptionService.subscribe(getUser(), info.getUrl(), feedSubscriptionService.subscribe(getUser(), info.getUrl(),
info.getTitle(), null); info.getTitle(), null);
} catch (Exception e) { } catch (Exception e) {