don't send the OK int constant as entity

This commit is contained in:
Athou
2013-08-13 09:25:55 +02:00
parent 95d4f725f9
commit b331626e8f
4 changed files with 13 additions and 14 deletions

View File

@@ -138,7 +138,7 @@ public class AdminREST extends AbstractREST {
} }
} }
return Response.ok(Status.OK).entity("OK").build(); return Response.ok().build();
} }

View File

@@ -234,7 +234,7 @@ public class CategoryREST extends AbstractREST {
List<FeedSubscription> subs = feedSubscriptionDAO.findByCategories(getUser(), categories); List<FeedSubscription> subs = feedSubscriptionDAO.findByCategories(getUser(), categories);
feedEntryService.markSubscriptionEntries(getUser(), subs, olderThan); feedEntryService.markSubscriptionEntries(getUser(), subs, olderThan);
} }
return Response.ok(Status.OK).build(); return Response.ok().build();
} }
@Path("/add") @Path("/add")
@@ -340,7 +340,7 @@ public class CategoryREST extends AbstractREST {
feedCategoryDAO.saveOrUpdate(category); feedCategoryDAO.saveOrUpdate(category);
cache.invalidateUserRootCategory(getUser()); cache.invalidateUserRootCategory(getUser());
return Response.ok(Status.OK).build(); return Response.ok().build();
} }
@POST @POST
@@ -357,7 +357,7 @@ public class CategoryREST extends AbstractREST {
category.setCollapsed(req.isCollapse()); category.setCollapsed(req.isCollapse());
feedCategoryDAO.saveOrUpdate(category); feedCategoryDAO.saveOrUpdate(category);
cache.invalidateUserRootCategory(getUser()); cache.invalidateUserRootCategory(getUser());
return Response.ok(Status.OK).build(); return Response.ok().build();
} }
@GET @GET

View File

@@ -4,7 +4,6 @@ import javax.inject.Inject;
import javax.ws.rs.POST; import javax.ws.rs.POST;
import javax.ws.rs.Path; import javax.ws.rs.Path;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import com.commafeed.backend.dao.FeedEntryStatusDAO; import com.commafeed.backend.dao.FeedEntryStatusDAO;
import com.commafeed.backend.dao.FeedSubscriptionDAO; import com.commafeed.backend.dao.FeedSubscriptionDAO;
@@ -42,7 +41,7 @@ public class EntryREST extends AbstractREST {
Preconditions.checkNotNull(req.getId()); Preconditions.checkNotNull(req.getId());
feedEntryService.markEntry(getUser(), Long.valueOf(req.getId()), req.isRead()); feedEntryService.markEntry(getUser(), Long.valueOf(req.getId()), req.isRead());
return Response.ok(Status.OK).build(); return Response.ok().build();
} }
@Path("/markMultiple") @Path("/markMultiple")
@@ -56,7 +55,7 @@ public class EntryREST extends AbstractREST {
markFeedEntry(r); markFeedEntry(r);
} }
return Response.ok(Status.OK).build(); return Response.ok().build();
} }
@Path("/star") @Path("/star")
@@ -69,7 +68,7 @@ public class EntryREST extends AbstractREST {
feedEntryService.starEntry(getUser(), Long.valueOf(req.getId()), req.getFeedId(), req.isStarred()); feedEntryService.starEntry(getUser(), Long.valueOf(req.getId()), req.getFeedId(), req.isStarred());
return Response.ok(Status.OK).build(); return Response.ok().build();
} }
} }

View File

@@ -270,7 +270,7 @@ public class FeedREST extends AbstractREST {
Feed feed = sub.getFeed(); Feed feed = sub.getFeed();
taskGiver.add(feed, true); taskGiver.add(feed, true);
} }
return Response.ok(Status.OK).build(); return Response.ok().build();
} }
@Path("/refresh") @Path("/refresh")
@@ -285,7 +285,7 @@ public class FeedREST extends AbstractREST {
if (sub != null) { if (sub != null) {
Feed feed = sub.getFeed(); Feed feed = sub.getFeed();
taskGiver.add(feed, true); taskGiver.add(feed, true);
return Response.ok(Status.OK).build(); return Response.ok().build();
} }
return Response.ok(Status.NOT_FOUND).build(); return Response.ok(Status.NOT_FOUND).build();
} }
@@ -303,7 +303,7 @@ public class FeedREST extends AbstractREST {
if (subscription != null) { if (subscription != null) {
feedEntryService.markSubscriptionEntries(getUser(), Arrays.asList(subscription), olderThan); feedEntryService.markSubscriptionEntries(getUser(), Arrays.asList(subscription), olderThan);
} }
return Response.ok(Status.OK).build(); return Response.ok().build();
} }
@GET @GET
@@ -376,7 +376,7 @@ public class FeedREST extends AbstractREST {
log.info("Failed to subscribe to URL {}: {}", url, e.getMessage()); log.info("Failed to subscribe to URL {}: {}", url, e.getMessage());
return Response.status(Status.SERVICE_UNAVAILABLE).entity("Failed to subscribe to URL " + url + ": " + e.getMessage()).build(); return Response.status(Status.SERVICE_UNAVAILABLE).entity("Failed to subscribe to URL " + url + ": " + e.getMessage()).build();
} }
return Response.ok(Status.OK).build(); return Response.ok().build();
} }
@GET @GET
@@ -414,7 +414,7 @@ public class FeedREST extends AbstractREST {
boolean deleted = feedSubscriptionService.unsubscribe(getUser(), req.getId()); boolean deleted = feedSubscriptionService.unsubscribe(getUser(), req.getId());
if (deleted) { if (deleted) {
return Response.ok(Status.OK).build(); return Response.ok().build();
} else { } else {
return Response.status(Status.NOT_FOUND).build(); return Response.status(Status.NOT_FOUND).build();
} }
@@ -467,7 +467,7 @@ public class FeedREST extends AbstractREST {
feedSubscriptionDAO.saveOrUpdate(subscription); feedSubscriptionDAO.saveOrUpdate(subscription);
} }
cache.invalidateUserRootCategory(getUser()); cache.invalidateUserRootCategory(getUser());
return Response.ok(Status.OK).build(); return Response.ok().build();
} }
@POST @POST