From 7943c8e1e606b0697d0d624cf9cba8345cfcce5b Mon Sep 17 00:00:00 2001 From: Athou Date: Wed, 5 Jun 2013 20:51:29 +0200 Subject: [PATCH] allow empty names for modification requests, not modifying the name (fix #263) --- .../model/request/CategoryModificationRequest.java | 2 +- .../model/request/FeedModificationRequest.java | 2 +- .../frontend/rest/resources/CategoryREST.java | 11 +++++++---- .../commafeed/frontend/rest/resources/FeedREST.java | 11 +++++++---- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/commafeed/frontend/model/request/CategoryModificationRequest.java b/src/main/java/com/commafeed/frontend/model/request/CategoryModificationRequest.java index 7768f9dd..ace4cf84 100644 --- a/src/main/java/com/commafeed/frontend/model/request/CategoryModificationRequest.java +++ b/src/main/java/com/commafeed/frontend/model/request/CategoryModificationRequest.java @@ -18,7 +18,7 @@ public class CategoryModificationRequest implements Serializable { @ApiProperty(value = "id", required = true) private Long id; - @ApiProperty(value = "new name") + @ApiProperty(value = "new name, null if not changed") private String name; @ApiProperty(value = "new parent category id") diff --git a/src/main/java/com/commafeed/frontend/model/request/FeedModificationRequest.java b/src/main/java/com/commafeed/frontend/model/request/FeedModificationRequest.java index b3025db7..a6407fa7 100644 --- a/src/main/java/com/commafeed/frontend/model/request/FeedModificationRequest.java +++ b/src/main/java/com/commafeed/frontend/model/request/FeedModificationRequest.java @@ -18,7 +18,7 @@ public class FeedModificationRequest implements Serializable { @ApiProperty(value = "id", required = true) private Long id; - @ApiProperty(value = "new name") + @ApiProperty(value = "new name, null if not changed") private String name; @ApiProperty(value = "new parent category id") diff --git a/src/main/java/com/commafeed/frontend/rest/resources/CategoryREST.java b/src/main/java/com/commafeed/frontend/rest/resources/CategoryREST.java index 03645588..1c4df8c1 100644 --- a/src/main/java/com/commafeed/frontend/rest/resources/CategoryREST.java +++ b/src/main/java/com/commafeed/frontend/rest/resources/CategoryREST.java @@ -252,11 +252,13 @@ public class CategoryREST extends AbstractResourceREST { @ApiParam(required = true) CategoryModificationRequest req) { Preconditions.checkNotNull(req); Preconditions.checkNotNull(req.getId()); - Preconditions.checkArgument(StringUtils.isNotBlank(req.getName())); FeedCategory category = feedCategoryDAO .findById(getUser(), req.getId()); - category.setName(req.getName()); + + if (StringUtils.isNotBlank(req.getName())) { + category.setName(req.getName()); + } FeedCategory parent = null; if (req.getParentId() != null @@ -274,10 +276,11 @@ public class CategoryREST extends AbstractResourceREST { Collections.sort(categories, new Comparator() { @Override public int compare(FeedCategory o1, FeedCategory o2) { - return ObjectUtils.compare(o1.getPosition(), o2.getPosition()); + return ObjectUtils.compare(o1.getPosition(), + o2.getPosition()); } }); - + int existingIndex = -1; for (int i = 0; i < categories.size(); i++) { if (ObjectUtils.equals(categories.get(i).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 cd0ea348..52bdd36f 100644 --- a/src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java +++ b/src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java @@ -317,11 +317,13 @@ public class FeedREST extends AbstractResourceREST { @ApiParam(value = "subscription id", required = true) FeedModificationRequest req) { Preconditions.checkNotNull(req); Preconditions.checkNotNull(req.getId()); - Preconditions.checkNotNull(req.getName()); FeedSubscription subscription = feedSubscriptionDAO.findById(getUser(), req.getId()); - subscription.setTitle(req.getName()); + + if (StringUtils.isNotBlank(req.getName())) { + subscription.setTitle(req.getName()); + } FeedCategory parent = null; if (req.getCategoryId() != null @@ -337,10 +339,11 @@ public class FeedREST extends AbstractResourceREST { Collections.sort(subs, new Comparator() { @Override public int compare(FeedSubscription o1, FeedSubscription o2) { - return ObjectUtils.compare(o1.getPosition(), o2.getPosition()); + return ObjectUtils.compare(o1.getPosition(), + o2.getPosition()); } }); - + int existingIndex = -1; for (int i = 0; i < subs.size(); i++) { if (ObjectUtils.equals(subs.get(i).getId(),