From 7bb660986ea0bf65356180c9d4e917a0e910b4e9 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Tue, 11 Jun 2013 14:42:17 +0200
Subject: [PATCH] use pathparam for id

---
 src/main/java/com/commafeed/backend/feeds/FeedUtils.java | 2 +-
 .../com/commafeed/frontend/rest/resources/FeedREST.java  | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/commafeed/backend/feeds/FeedUtils.java b/src/main/java/com/commafeed/backend/feeds/FeedUtils.java
index 841f565a..4cd295c2 100644
--- a/src/main/java/com/commafeed/backend/feeds/FeedUtils.java
+++ b/src/main/java/com/commafeed/backend/feeds/FeedUtils.java
@@ -264,7 +264,7 @@ public class FeedUtils {
 
 	public static String getFaviconUrl(FeedSubscription subscription,
 			String publicUrl) {
-		return removeTrailingSlash(publicUrl) + "/rest/feed/favicon?id="
+		return removeTrailingSlash(publicUrl) + "/rest/feed/favicon/"
 				+ subscription.getId();
 	}
 }
diff --git a/src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java b/src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java
index e7d56b70..2493e625 100644
--- a/src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java
+++ b/src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java
@@ -250,9 +250,10 @@ public class FeedREST extends AbstractResourceREST {
 	}
 
 	@GET
-	@Path("/favicon")
-	@ApiOperation(value = "Fetch a feed's icon", notes = "Fetch icon of a feed")
-	public Response getFavicon(@QueryParam("id") Long id) {
+	@Path("/favicon/{id}")
+	@ApiOperation(value = "Fetch a feed's icon", notes = "Fetch a feed's icon")
+	public Response getFavicon(
+			@ApiParam(value = "subscription id") @PathParam("id") Long id) {
 
 		Preconditions.checkNotNull(id);
 		FeedSubscription subscription = feedSubscriptionDAO.findById(getUser(),
@@ -277,7 +278,7 @@ public class FeedREST extends AbstractResourceREST {
 
 		CacheControl cacheControl = new CacheControl();
 		cacheControl.setMaxAge(2592000);
-		cacheControl.setPrivate(false);
+		cacheControl.setPrivate(true);
 		// trying to replicate "public, max-age=2592000"
 		builder.cacheControl(cacheControl);