You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by cg...@apache.org on 2012/09/23 22:02:05 UTC
svn commit: r1389136 - in /rave/trunk/rave-components:
rave-core/src/main/java/org/apache/rave/portal/security/impl/
rave-core/src/main/java/org/apache/rave/portal/service/
rave-core/src/main/java/org/apache/rave/portal/service/impl/
rave-core/src/test...
Author: cgeer
Date: Sun Sep 23 20:02:05 2012
New Revision: 1389136
URL: http://svn.apache.org/viewvc?rev=1389136&view=rev
Log:
RAVE-781 Changed the saveWidgetTag method to be createWidgetTag and changed the permission check to create. Right now updates/deletes are not allowed for widget tags.
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetTagPermissionEvaluator.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetTagService.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetTagService.java
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetTagServiceTest.java
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rest/WidgetApi.java
rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetTagPermissionEvaluator.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetTagPermissionEvaluator.java?rev=1389136&r1=1389135&r2=1389136&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetTagPermissionEvaluator.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetTagPermissionEvaluator.java Sun Sep 23 20:02:05 2012
@@ -145,6 +145,8 @@ public class DefaultWidgetTagPermissionE
hasPermission = true;
break;
case CREATE:
+ hasPermission = true;
+ break;
case DELETE:
case UPDATE:
// anyone can create, delete, read, or update a WidgetTag that they own
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetTagService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetTagService.java?rev=1389136&r1=1389135&r2=1389136&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetTagService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetTagService.java Sun Sep 23 20:02:05 2012
@@ -25,8 +25,6 @@ public interface WidgetTagService {
WidgetTag getWidgetTagByWidgetIdAndKeyword(Long widgetId, String keyword);
- @PreAuthorize("hasPermission(#widgetTag, 'create_or_update')")
- void saveWidgetTag(WidgetTag widgetTag);
-
-
+ @PreAuthorize("hasPermission(#widgetTag, 'create')")
+ void createWidgetTag(WidgetTag widgetTag);
}
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetTagService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetTagService.java?rev=1389136&r1=1389135&r2=1389136&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetTagService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetTagService.java Sun Sep 23 20:02:05 2012
@@ -42,7 +42,7 @@ public class DefaultWidgetTagService imp
@Override
@Transactional
- public void saveWidgetTag(WidgetTag widgetTag) {
+ public void createWidgetTag(WidgetTag widgetTag) {
widgetTagRepository.save(widgetTag);
}
Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetTagServiceTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetTagServiceTest.java?rev=1389136&r1=1389135&r2=1389136&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetTagServiceTest.java (original)
+++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetTagServiceTest.java Sun Sep 23 20:02:05 2012
@@ -57,7 +57,7 @@ public class DefaultWidgetTagServiceTest
expect(widgetTagRepository.save(wtag)).andReturn(wtag);
replay(widgetTagRepository);
- widgetTagService.saveWidgetTag(wtag);
+ widgetTagService.createWidgetTag(wtag);
verify(widgetTagRepository);
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rest/WidgetApi.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rest/WidgetApi.java?rev=1389136&r1=1389135&r2=1389136&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rest/WidgetApi.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rest/WidgetApi.java Sun Sep 23 20:02:05 2012
@@ -165,7 +165,7 @@ public class WidgetApi extends AbstractR
widgetTag.setUser(userService.getAuthenticatedUser());
widgetTag.setCreatedDate(new Date());
widgetTag.setTag(getTag(tagText));
- widgetTagService.saveWidgetTag(widgetTag);
+ widgetTagService.createWidgetTag(widgetTag);
logger.debug("widget tag is saved.");
}
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java?rev=1389136&r1=1389135&r2=1389136&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java Sun Sep 23 20:02:05 2012
@@ -237,7 +237,7 @@ public class WidgetApiTest {
expect(widgetTagService.getWidgetTagByWidgetIdAndKeyword(VALID_WIDGET_ID, TAG_TEXT)).andReturn(null);
expect(userService.getAuthenticatedUser()).andReturn(user);
expect(tagService.getTagByKeyword(TAG_TEXT)).andReturn(null);
- widgetTagService.saveWidgetTag(isA(WidgetTag.class));
+ widgetTagService.createWidgetTag(isA(WidgetTag.class));
expectLastCall();
replay(widgetTagService, userService, tagService);
widgetApi.createWidgetTag(VALID_WIDGET_ID, TAG_TEXT, response);
@@ -255,7 +255,7 @@ public class WidgetApiTest {
expect(widgetTagService.getWidgetTagByWidgetIdAndKeyword(VALID_WIDGET_ID, TAG_TEXT)).andReturn(null);
expect(userService.getAuthenticatedUser()).andReturn(user);
expect(tagService.getTagByKeyword(TAG_TEXT)).andReturn(tag);
- widgetTagService.saveWidgetTag(isA(WidgetTag.class));
+ widgetTagService.createWidgetTag(isA(WidgetTag.class));
expectLastCall();
replay(widgetTagService, userService, tagService);
widgetApi.createWidgetTag(VALID_WIDGET_ID, TAG_TEXT, response);