Author: marijan
Date: Tue Apr 24 22:16:52 2012
New Revision: 1330044
URL: http://svn.apache.org/viewvc?rev=1330044&view=rev
Log:
RAVE-513 Use generics where possible, suppress compiler warnings otherwise
- patch applied
Modified:
rave/trunk/rave-components/rave-commons/src/test/java/org/apache/rave/persistence/jpa/AbstractJpaRepositoryTest.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/RaveMethodSecurityExpressionHandler.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/RavePermissionEvaluator.java
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluatorTest.java
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/RavePermissionEvaluatorTest.java
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetServiceTest.java
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewAccountValidator.java
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/UserProfileValidator.java
rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/context/RaveContextLoaderListenerTest.java
rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/PageControllerTest.java
rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/WidgetControllerTest.java
rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/interceptors/CommonModelHandlerInterceptorTest.java
rave/trunk/rave-portal/src/test/java/renderer/RenderServiceIntegrationTest.java
Modified:
rave/trunk/rave-components/rave-commons/src/test/java/org/apache/rave/persistence/jpa/AbstractJpaRepositoryTest.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-commons/src/test/java/org/apache/rave/persistence/jpa/AbstractJpaRepositoryTest.java?rev=1330044&r1=1330043&r2=1330044&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-commons/src/test/java/org/apache/rave/persistence/jpa/AbstractJpaRepositoryTest.java
(original)
+++
rave/trunk/rave-components/rave-commons/src/test/java/org/apache/rave/persistence/jpa/AbstractJpaRepositoryTest.java
Tue Apr 24 22:16:52 2012
@@ -51,6 +51,7 @@ public class AbstractJpaRepositoryTest {
repository = new TestJpaRepository(manager);
}
+ @SuppressWarnings("unchecked")
@Test
public void getType() {
assertThat((Class<TestEntity>) repository.getType(),
is(equalTo(TestEntity.class)));
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java?rev=1330044&r1=1330043&r2=1330044&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java
(original)
+++
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java
Tue Apr 24 22:16:52 2012
@@ -197,6 +197,7 @@ public class JpaWidgetRepository extends
return map;
}
+ @SuppressWarnings("unchecked")
@Override
public Map<Long, WidgetStatistics> getAllWidgetStatistics(long userId) {
HashMap<Long, WidgetStatistics> map = new HashMap<Long,
WidgetStatistics>();
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/RaveMethodSecurityExpressionHandler.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/RaveMethodSecurityExpressionHandler.java?rev=1330044&r1=1330043&r2=1330044&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/RaveMethodSecurityExpressionHandler.java
(original)
+++
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/RaveMethodSecurityExpressionHandler.java
Tue Apr 24 22:16:52 2012
@@ -42,6 +42,7 @@ public class RaveMethodSecurityExpressio
* @param ctx the EvaluationContext
* @return the filtered Collection or array
*/
+ @SuppressWarnings("unchecked")
@Override
public Object filter(Object filterTarget, Expression filterExpression,
EvaluationContext ctx) {
// certain implementations of JPA will create unmodifiable List
objects, so clone the
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/RavePermissionEvaluator.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/RavePermissionEvaluator.java?rev=1330044&r1=1330043&r2=1330044&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/RavePermissionEvaluator.java
(original)
+++
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/RavePermissionEvaluator.java
Tue Apr 24 22:16:52 2012
@@ -39,7 +39,7 @@ import java.util.*;
*/
@Component
public class RavePermissionEvaluator implements PermissionEvaluator {
- private Map<String, ModelPermissionEvaluator> modelPermissionEvaluatorMap;
+ private Map<String, ModelPermissionEvaluator<?>>
modelPermissionEvaluatorMap;
/**
* Constructor which will take in a component-scanned list of all
ModelPermissionEvaluator
@@ -53,7 +53,7 @@ public class RavePermissionEvaluator imp
* by the component scanner
*/
@Autowired
- public RavePermissionEvaluator(List<ModelPermissionEvaluator>
modelPermissionEvaluatorList) {
+ public RavePermissionEvaluator(List<ModelPermissionEvaluator<?>>
modelPermissionEvaluatorList) {
// order all of the component scanned ModelPermissionEvaluators by
their loadOrder value
// to allow overrides of the default ModelPermissionEvaluator
implementations, since
// we are storing them all in a map the higher order implementations
will replace the
@@ -66,8 +66,8 @@ public class RavePermissionEvaluator imp
});
// build the map using the model type/class as the key
- modelPermissionEvaluatorMap = new HashMap<String,
ModelPermissionEvaluator>();
- for (ModelPermissionEvaluator mpe : modelPermissionEvaluatorList) {
+ modelPermissionEvaluatorMap = new HashMap<String,
ModelPermissionEvaluator<?>>();
+ for (ModelPermissionEvaluator<?> mpe : modelPermissionEvaluatorList) {
modelPermissionEvaluatorMap.put(mpe.getType().getName(), mpe);
}
}
@@ -81,6 +81,7 @@ public class RavePermissionEvaluator imp
* @param permissionString the permission to check
* @return true if passes the permission check, false otherwise
*/
+ @SuppressWarnings("unchecked")
@Override
public boolean hasPermission(Authentication authentication, Object
targetDomainObject, Object permissionString) {
if (targetDomainObject == null) {
@@ -139,4 +140,4 @@ public class RavePermissionEvaluator imp
}
return permission;
}
-}
\ No newline at end of file
+}
Modified:
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluatorTest.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluatorTest.java?rev=1330044&r1=1330043&r2=1330044&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluatorTest.java
(original)
+++
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluatorTest.java
Tue Apr 24 22:16:52 2012
@@ -15,48 +15,50 @@
*/
package org.apache.rave.portal.security.impl;
-import org.apache.rave.portal.security.util.AuthenticationUtils;
+import org.apache.rave.portal.model.User;
import org.apache.rave.portal.model.WidgetComment;
+import org.apache.rave.portal.repository.WidgetCommentRepository;
+import org.apache.rave.portal.security.ModelPermissionEvaluator.Permission;
+import org.apache.rave.portal.security.util.AuthenticationUtils;
import org.easymock.EasyMock;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import java.util.ArrayList;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.security.core.Authentication;
import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.apache.rave.portal.model.User;
-import org.springframework.security.core.Authentication;
-import org.apache.rave.portal.repository.WidgetCommentRepository;
-import org.apache.rave.portal.security.ModelPermissionEvaluator.Permission;
-import org.junit.Test;
-import org.junit.Before;
-import static org.junit.Assert.*;
+
import static org.easymock.EasyMock.*;
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
/**
*
*/
public class DefaultWidgetCommentPermissionEvaluatorTest {
-
+
private DefaultWidgetCommentPermissionEvaluator
defaultWidgetCommentPermissionEvaluator;
private WidgetCommentRepository mockWidgetCommentRepository;
private Authentication mockAuthentication;
private WidgetComment widgetComment;
- private User user, user2;
+ private User user, user2;
private List<GrantedAuthority> grantedAuthoritiesList;
-
+
private final Long VALID_COMMENT_ID = 3L;
private final Long VALID_USER_ID = 99L;
private final Long INVALID_USER_ID = VALID_USER_ID + 1;
private final String VALID_USERNAME = "john.doe";
private final String VALID_USERNAME2 = "jane.doe";
+
@Before
- public void setUp() {
+ public void setUp() {
mockWidgetCommentRepository =
createMock(WidgetCommentRepository.class);
mockAuthentication = createMock(Authentication.class);
defaultWidgetCommentPermissionEvaluator = new
DefaultWidgetCommentPermissionEvaluator(mockWidgetCommentRepository);
-
+
user = new User();
user.setUsername(VALID_USERNAME);
user.setEntityId(VALID_USER_ID);
@@ -69,54 +71,56 @@ public class DefaultWidgetCommentPermiss
grantedAuthoritiesList = new ArrayList<GrantedAuthority>();
grantedAuthoritiesList.add(new SimpleGrantedAuthority("ROLE_USER"));
}
-
+
@Test
- public void testGetType() throws ClassNotFoundException {
+ public void testGetType() throws ClassNotFoundException {
assertThat(defaultWidgetCommentPermissionEvaluator.getType().getName(),
is(WidgetComment.class.getName()));
}
-
+
@Test
public void verifyNotAdministrator() {
EasyMock.<Collection<? extends
GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList);
replay(mockAuthentication);
-
+
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
null, Permission.ADMINISTER), is(false));
verify(mockAuthentication);
}
-
-
+
+
+ @SuppressWarnings("unchecked")
@Test
public void verifyAdministrator() {
- List myGrantedAuthoritiesList = new ArrayList();
+ List<GrantedAuthority> myGrantedAuthoritiesList = new
ArrayList<GrantedAuthority>();
myGrantedAuthoritiesList.addAll(grantedAuthoritiesList);
myGrantedAuthoritiesList.add(new
SimpleGrantedAuthority(AuthenticationUtils.ROLE_ADMIN));
-
-
expect(mockAuthentication.getAuthorities()).andReturn(myGrantedAuthoritiesList);
+
+
+ expect((List<GrantedAuthority>)
mockAuthentication.getAuthorities()).andReturn(myGrantedAuthoritiesList);
replay(mockAuthentication);
-
+
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
null, Permission.ADMINISTER), is(true));
verify(mockAuthentication);
}
-
- @Test
+
+ @Test
public void testOwnerPermissions() {
EasyMock.<Collection<? extends
GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList).anyTimes();
expect(mockAuthentication.getPrincipal()).andReturn(user).anyTimes();
replay(mockAuthentication);
expect(mockWidgetCommentRepository.get(VALID_COMMENT_ID)).andReturn(widgetComment).anyTimes();
replay(mockWidgetCommentRepository);
-
+
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
widgetComment, Permission.ADMINISTER), is(false));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
widgetComment, Permission.CREATE), is(true));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
widgetComment, Permission.READ), is(true));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
widgetComment, Permission.DELETE), is(true));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
widgetComment, Permission.UPDATE), is(true));
-
+
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
widgetComment, Permission.CREATE_OR_UPDATE), is(false));
verify(mockAuthentication);
verify(mockWidgetCommentRepository);
}
-
+
@Test
public void testNonOwnerPermissions() {
EasyMock.<Collection<? extends
GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList).anyTimes();
@@ -124,19 +128,19 @@ public class DefaultWidgetCommentPermiss
replay(mockAuthentication);
expect(mockWidgetCommentRepository.get(VALID_COMMENT_ID)).andReturn(widgetComment).anyTimes();
replay(mockWidgetCommentRepository);
-
+
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
widgetComment, Permission.ADMINISTER), is(false));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
widgetComment, Permission.CREATE), is(false));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
widgetComment, Permission.READ), is(true));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
widgetComment, Permission.DELETE), is(false));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
widgetComment, Permission.UPDATE), is(false));
-
-
+
+
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
widgetComment, Permission.CREATE_OR_UPDATE), is(false));
verify(mockAuthentication);
verify(mockWidgetCommentRepository);
}
-
+
@Test
public void testOwnerPermissionsById() {
EasyMock.<Collection<? extends
GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList).anyTimes();
@@ -144,19 +148,19 @@ public class DefaultWidgetCommentPermiss
replay(mockAuthentication);
expect(mockWidgetCommentRepository.get(VALID_COMMENT_ID)).andReturn(widgetComment).anyTimes();
replay(mockWidgetCommentRepository);
-
+
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.ADMINISTER),
is(false));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.CREATE), is(true));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.READ), is(true));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.DELETE), is(true));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.UPDATE), is(true));
-
-
+
+
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.CREATE_OR_UPDATE),
is(false));
verify(mockAuthentication);
verify(mockWidgetCommentRepository);
}
-
+
@Test
public void testNonOwnerPermissionsById() {
EasyMock.<Collection<? extends
GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList).anyTimes();
@@ -164,71 +168,71 @@ public class DefaultWidgetCommentPermiss
replay(mockAuthentication);
expect(mockWidgetCommentRepository.get(VALID_COMMENT_ID)).andReturn(widgetComment).anyTimes();
replay(mockWidgetCommentRepository);
-
+
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.ADMINISTER),
is(false));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.CREATE),
is(false));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.READ), is(true));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.DELETE),
is(false));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.UPDATE),
is(false));
-
-
+
+
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.CREATE_OR_UPDATE),
is(false));
verify(mockAuthentication);
verify(mockWidgetCommentRepository);
}
-
+
@Test
public void testOwnerPremissionBySecurityContext() {
RaveSecurityContext raveSecurityContext = new
RaveSecurityContext(VALID_USER_ID, WidgetComment.class.getName());
-
+
expect(mockAuthentication.getPrincipal()).andReturn(user).anyTimes();
replay(mockAuthentication);
-
+
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
raveSecurityContext, WidgetComment.class.getName(), Permission.ADMINISTER),
is(false));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
raveSecurityContext, WidgetComment.class.getName(), Permission.CREATE),
is(true));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
raveSecurityContext, WidgetComment.class.getName(), Permission.READ),
is(true));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
raveSecurityContext, WidgetComment.class.getName(), Permission.DELETE),
is(true));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
raveSecurityContext, WidgetComment.class.getName(), Permission.UPDATE),
is(true));
-
+
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
raveSecurityContext, WidgetComment.class.getName(),
Permission.CREATE_OR_UPDATE), is(false));
verify(mockAuthentication);
}
-
+
@Test
public void testNonOwnerPremissionBySecurityContext() {
RaveSecurityContext raveSecurityContext = new
RaveSecurityContext(INVALID_USER_ID, WidgetComment.class.getName());
-
+
expect(mockAuthentication.getPrincipal()).andReturn(user).anyTimes();
replay(mockAuthentication);
-
+
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
raveSecurityContext, WidgetComment.class.getName(), Permission.ADMINISTER),
is(false));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
raveSecurityContext, WidgetComment.class.getName(), Permission.CREATE),
is(false));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
raveSecurityContext, WidgetComment.class.getName(), Permission.READ),
is(true));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
raveSecurityContext, WidgetComment.class.getName(), Permission.DELETE),
is(false));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
raveSecurityContext, WidgetComment.class.getName(), Permission.UPDATE),
is(false));
-
+
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
raveSecurityContext, WidgetComment.class.getName(),
Permission.CREATE_OR_UPDATE), is(false));
verify(mockAuthentication);
}
-
+
@Test
- public void testCreationPremission() {
+ public void testCreationPermission() {
//Widget.entityId is not set in this case
EasyMock.<Collection<? extends
GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList).anyTimes();
expect(mockAuthentication.getPrincipal()).andReturn(user).anyTimes();
replay(mockAuthentication);
-
+
WidgetComment localWidgetComment = new WidgetComment();
User localUser = new User();
localUser.setEntityId(VALID_USER_ID);
localWidgetComment.setUser(localUser);
expect(mockWidgetCommentRepository.get(VALID_COMMENT_ID)).andReturn(localWidgetComment).anyTimes();
replay(mockWidgetCommentRepository);
-
+
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
localWidgetComment, Permission.CREATE), is(true));
-
+
verify(mockAuthentication);
verify(mockWidgetCommentRepository);
}
-}
\ No newline at end of file
+}
Modified:
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/RavePermissionEvaluatorTest.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/RavePermissionEvaluatorTest.java?rev=1330044&r1=1330043&r2=1330044&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/RavePermissionEvaluatorTest.java
(original)
+++
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/RavePermissionEvaluatorTest.java
Tue Apr 24 22:16:52 2012
@@ -48,7 +48,7 @@ public class RavePermissionEvaluatorTest
@Before
public void setUp() {
- List<ModelPermissionEvaluator> modelPermissionEvaluatorList = new
ArrayList<ModelPermissionEvaluator>();
+ List<ModelPermissionEvaluator<?>> modelPermissionEvaluatorList = new
ArrayList<ModelPermissionEvaluator<?>>();
modelPermissionEvaluatorList.add(new
BasicEntityModelPermissionEvaluator());
modelPermissionEvaluatorList.add(new
NonBasicEntityModelPermissionEvaluator());
ravePermissionEvaluator = new
RavePermissionEvaluator(modelPermissionEvaluatorList);
@@ -60,14 +60,15 @@ public class RavePermissionEvaluatorTest
@Test
public void testLoadOrderOverride() {
- ModelPermissionEvaluator<BasicEntityModel>
mockedOverriddenPermissionEvaluator =
createMock(ModelPermissionEvaluator.class);
+ @SuppressWarnings("unchecked")
+ ModelPermissionEvaluator<BasicEntityModel>
mockedOverriddenPermissionEvaluator =
createMock(ModelPermissionEvaluator.class);
expect(mockedOverriddenPermissionEvaluator.getType()).andReturn(BasicEntityModel.class);
expect(mockedOverriddenPermissionEvaluator.getLoadOrder()).andReturn(2);
expect(mockedOverriddenPermissionEvaluator.hasPermission(authentication,
basicEntityModel, Permission.fromString(READ_PERMISSION))).andReturn(true);
replay(mockedOverriddenPermissionEvaluator);
- List<ModelPermissionEvaluator> modelPermissionEvaluatorList = new
ArrayList<ModelPermissionEvaluator>();
- // note we are adding the overide instance first to verify the
Collections.sort works as expected
+ List<ModelPermissionEvaluator<?>> modelPermissionEvaluatorList = new
ArrayList<ModelPermissionEvaluator<?>>();
+ // note we are adding the override instance first to verify the
Collections.sort works as expected
modelPermissionEvaluatorList.add(mockedOverriddenPermissionEvaluator);
modelPermissionEvaluatorList.add(new
BasicEntityModelPermissionEvaluator());
ravePermissionEvaluator = new
RavePermissionEvaluator(modelPermissionEvaluatorList);
Modified:
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetServiceTest.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetServiceTest.java?rev=1330044&r1=1330043&r2=1330044&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetServiceTest.java
(original)
+++
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetServiceTest.java
Tue Apr 24 22:16:52 2012
@@ -206,7 +206,7 @@ public class DefaultWidgetServiceTest {
expect(userRepository.get(user.getEntityId())).andReturn(user);
replay(userRepository);
- final List<Widget> widgets = new ArrayList();
+ final List<Widget> widgets = new ArrayList<Widget>();
final Widget widget = new Widget(3L, "http://www.widgetsRus.com/";);
widgets.add(widget);
Modified:
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewAccountValidator.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewAccountValidator.java?rev=1330044&r1=1330043&r2=1330044&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewAccountValidator.java
(original)
+++
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewAccountValidator.java
Tue Apr 24 22:16:52 2012
@@ -19,7 +19,7 @@
package org.apache.rave.portal.web.validator;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.validator.EmailValidator;
+import org.apache.commons.validator.routines.EmailValidator;
import org.apache.rave.portal.model.NewUser;
import org.apache.rave.portal.service.UserService;
import org.slf4j.Logger;
@@ -142,4 +142,4 @@ public class NewAccountValidator impleme
public UserService getUserService() {
return userService;
}
-}
\ No newline at end of file
+}
Modified:
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/UserProfileValidator.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/UserProfileValidator.java?rev=1330044&r1=1330043&r2=1330044&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/UserProfileValidator.java
(original)
+++
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/UserProfileValidator.java
Tue Apr 24 22:16:52 2012
@@ -19,7 +19,7 @@
package org.apache.rave.portal.web.validator;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.validator.EmailValidator;
+import org.apache.commons.validator.routines.EmailValidator;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.service.UserService;
import org.slf4j.Logger;
Modified:
rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/context/RaveContextLoaderListenerTest.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/context/RaveContextLoaderListenerTest.java?rev=1330044&r1=1330043&r2=1330044&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/context/RaveContextLoaderListenerTest.java
(original)
+++
rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/context/RaveContextLoaderListenerTest.java
Tue Apr 24 22:16:52 2012
@@ -45,9 +45,10 @@ public class RaveContextLoaderListenerTe
public void contextInitialized() {
raveContextLoaderListener.contextInitialized(servletContextEvent);
+ @SuppressWarnings("unchecked")
Map<String, String> props = (Map<String, String>)
servletContextEvent.getServletContext().getAttribute("applicationProperties");
assertThat(props.size(), is(2));
assertThat(props.get("portal.testprop1"), is("hello"));
assertThat(props.get("portal.testprop2"), is("goodbye"));
}
-}
\ No newline at end of file
+}
Modified:
rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/PageControllerTest.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/PageControllerTest.java?rev=1330044&r1=1330043&r2=1330044&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/PageControllerTest.java
(original)
+++
rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/PageControllerTest.java
Tue Apr 24 22:16:52 2012
@@ -89,6 +89,7 @@ public class PageControllerTest {
validUser.setDefaultPageLayout(validPageLayout);
}
+ @SuppressWarnings("unchecked")
@Test
public void view_pageId() {
MockHttpUtil.setupRequestAsNonMobileUserAgent(request);
@@ -109,6 +110,7 @@ public class PageControllerTest {
verify(userService, pageService, pageLayoutService);
}
+ @SuppressWarnings("unchecked")
@Test
public void view_pageId_mobileClient() {
MockHttpUtil.setupRequestAsMobileUserAgent(request);
@@ -129,6 +131,7 @@ public class PageControllerTest {
verify(userService, pageService, pageLayoutService);
}
+ @SuppressWarnings("unchecked")
@Test
public void view_pageId_zeroExistingPages() {
MockHttpUtil.setupRequestAsNonMobileUserAgent(request);
@@ -152,6 +155,7 @@ public class PageControllerTest {
verify(userService, pageService, pageLayoutService);
}
+ @SuppressWarnings("unchecked")
@Test
public void viewDefault_pageId() {
MockHttpUtil.setupRequestAsNonMobileUserAgent(request);
@@ -172,6 +176,7 @@ public class PageControllerTest {
verify(userService, pageService, pageLayoutService);
}
+ @SuppressWarnings("unchecked")
@Test
public void viewDefault_pageId_zeroExistingPages() {
MockHttpUtil.setupRequestAsNonMobileUserAgent(request);
@@ -194,4 +199,4 @@ public class PageControllerTest {
verify(userService, pageService, pageLayoutService);
}
-}
\ No newline at end of file
+}
Modified:
rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/WidgetControllerTest.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/WidgetControllerTest.java?rev=1330044&r1=1330043&r2=1330044&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/WidgetControllerTest.java
(original)
+++
rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/WidgetControllerTest.java
Tue Apr 24 22:16:52 2012
@@ -132,6 +132,7 @@ public class WidgetControllerTest {
assertEquals(status, model.asMap().get("selectedWidgetStatus"));
}
+ @SuppressWarnings("unchecked")
@Test
public void viewAdminWidgetDetail() throws Exception {
Model model = new ExtendedModelMap();
Modified:
rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/interceptors/CommonModelHandlerInterceptorTest.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/interceptors/CommonModelHandlerInterceptorTest.java?rev=1330044&r1=1330043&r2=1330044&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/interceptors/CommonModelHandlerInterceptorTest.java
(original)
+++
rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/interceptors/CommonModelHandlerInterceptorTest.java
Tue Apr 24 22:16:52 2012
@@ -53,6 +53,7 @@ public class CommonModelHandlerIntercept
interceptor = new
CommonModelHandlerInterceptor(portalPreferenceService,
staticContentFetcherService);
}
+ @SuppressWarnings("unchecked")
@Test
public void testPostHandle() throws Exception {
MockHttpServletRequest request = new MockHttpServletRequest();
Modified:
rave/trunk/rave-portal/src/test/java/renderer/RenderServiceIntegrationTest.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal/src/test/java/renderer/RenderServiceIntegrationTest.java?rev=1330044&r1=1330043&r2=1330044&view=diff
==============================================================================
---
rave/trunk/rave-portal/src/test/java/renderer/RenderServiceIntegrationTest.java
(original)
+++
rave/trunk/rave-portal/src/test/java/renderer/RenderServiceIntegrationTest.java
Tue Apr 24 22:16:52 2012
@@ -74,6 +74,7 @@ public class RenderServiceIntegrationTes
private static final Long VALID_USER_ID = 1234L;
private static final String VALID_USER_NAME = "jdoe";
+ @SuppressWarnings("unchecked")
@Before
public void setup() {
restOperations = EasyMock.createNiceMock(RestOperations.class);
