You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by tv...@apache.org on 2018/08/16 08:10:40 UTC
svn commit: r1838157 - in /turbine/core/trunk/src:
java/org/apache/turbine/om/security/
java/org/apache/turbine/services/rundata/
java/org/apache/turbine/services/velocity/
test/org/apache/turbine/annotation/
Author: tv
Date: Thu Aug 16 08:10:40 2018
New Revision: 1838157
URL: http://svn.apache.org/viewvc?rev=1838157&view=rev
Log:
Handle some warnings
Modified:
turbine/core/trunk/src/java/org/apache/turbine/om/security/User.java
turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java
turbine/core/trunk/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java
turbine/core/trunk/src/test/org/apache/turbine/annotation/AnnotationProcessorTest.java
Modified: turbine/core/trunk/src/java/org/apache/turbine/om/security/User.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/om/security/User.java?rev=1838157&r1=1838156&r2=1838157&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/om/security/User.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/om/security/User.java Thu Aug 16 08:10:40 2018
@@ -19,7 +19,6 @@ package org.apache.turbine.om.security;
* under the License.
*/
-import java.io.Serializable;
import java.util.Map;
import javax.servlet.http.HttpSessionBindingListener;
@@ -38,7 +37,7 @@ import org.apache.fulcrum.security.model
* @version $Id$
*/
public interface User
- extends HttpSessionBindingListener, Serializable, TurbineUserDelegate, TurbineUser
+ extends HttpSessionBindingListener, TurbineUserDelegate, TurbineUser
{
/** The 'perm storage' key name for the create_date field. */
String CREATE_DATE = "CREATE_DATE";
@@ -282,7 +281,7 @@ public interface User
*
* @throws Exception A generic exception.
*/
-
+
void updateLastLogin()
throws Exception;
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java?rev=1838157&r1=1838156&r2=1838157&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java Thu Aug 16 08:10:40 2018
@@ -39,7 +39,6 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.fulcrum.parser.CookieParser;
import org.apache.fulcrum.parser.ParameterParser;
-import org.apache.fulcrum.pool.Recyclable;
import org.apache.fulcrum.security.acl.AccessControlList;
import org.apache.fulcrum.security.model.turbine.TurbineAccessControlList;
import org.apache.turbine.Turbine;
@@ -79,7 +78,7 @@ import org.apache.turbine.util.template.
*/
public class DefaultTurbineRunData
extends DefaultPipelineData
- implements TurbineRunData, Recyclable
+ implements TurbineRunData
{
/**
* The disposed flag.
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java?rev=1838157&r1=1838156&r2=1838157&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java Thu Aug 16 08:10:40 2018
@@ -209,7 +209,7 @@ public class TurbineVelocityService
* @return A valid value to be used as Return value
*/
@Override
- public Object methodException(Context context, Class clazz, String method, Exception e, Info info)
+ public Object methodException(Context context, @SuppressWarnings("rawtypes") Class clazz, String method, Exception e, Info info)
{
log.error("Class " + clazz.getName() + "." + method + " threw Exception", e);
Modified: turbine/core/trunk/src/test/org/apache/turbine/annotation/AnnotationProcessorTest.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/annotation/AnnotationProcessorTest.java?rev=1838157&r1=1838156&r2=1838157&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/annotation/AnnotationProcessorTest.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/annotation/AnnotationProcessorTest.java Thu Aug 16 08:10:40 2018
@@ -18,7 +18,7 @@ package org.apache.turbine.annotation;
* specific language governing permissions and limitations
* under the License.
*/
-import static org.hamcrest.CoreMatchers.any;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -31,7 +31,6 @@ import java.util.List;
import org.apache.commons.configuration2.Configuration;
import org.apache.fulcrum.factory.FactoryService;
-import org.apache.fulcrum.security.entity.Group;
import org.apache.fulcrum.security.entity.Role;
import org.apache.fulcrum.security.model.turbine.TurbineAccessControlList;
import org.apache.turbine.annotation.AnnotationProcessor.ConditionType;
@@ -99,10 +98,11 @@ public class AnnotationProcessorTest
{
tc.dispose();
}
-
+
@Before
public void setUpBefore() throws Exception
{
+ // do nothing
}
@Test
@@ -127,14 +127,14 @@ public class AnnotationProcessorTest
assertNotNull(screenLoader);
assertNotNull(asb);
assertNotNull(factory);
-
+
}
-
+
@TurbineRequiredRole({"user","admin"})
public void guardedMethoded() {
-
+ // do nothing
}
-
+
@Test
public void testRequiredRoleMethodProcess() throws Exception
{
@@ -142,10 +142,10 @@ public class AnnotationProcessorTest
TurbineAccessControlList acl = mock(TurbineAccessControlList.class);
Role role = mock(Role.class);
when(role.getName()).thenReturn( "user" );
- Group group = mock(Group.class);
- when(acl.hasRole( role.getName() )).thenReturn( true );
+ // Group group = mock(Group.class);
+ when(acl.hasRole( role.getName() )).thenReturn( Boolean.TRUE );
when(data.getACL()).thenReturn(acl );
-
+
Method[] methods = getClass().getMethods();
for (Method m : methods) {
if (m.getName().equals( "guardedMethoded" )) {
@@ -154,12 +154,12 @@ public class AnnotationProcessorTest
}
}
}
-
+
@TurbineRequiredRole({"admin"})
public void guardedMethodedAdmin() {
-
+ // do nothing
}
-
+
@Test
public void testRequiredRoleAdminMethodProcess() throws Exception
{
@@ -167,10 +167,10 @@ public class AnnotationProcessorTest
TurbineAccessControlList acl = mock(TurbineAccessControlList.class);
Role role = mock(Role.class);
when(role.getName()).thenReturn( "user" );
- Group group = mock(Group.class);
- when(acl.hasRole( role.getName() )).thenReturn( true );
+ // Group group = mock(Group.class);
+ when(acl.hasRole( role.getName() )).thenReturn( Boolean.TRUE );
when(data.getACL()).thenReturn(acl );
-
+
Method[] methods = getClass().getMethods();
for (Method m : methods) {
if (m.getName().equals( "guardedMethodedAdmin" )) {
@@ -178,11 +178,11 @@ public class AnnotationProcessorTest
}
}
}
-
+
public void unguardedMethoded() {
-
+ // do nothing
}
-
+
@Test
public void testUnguardedMethodWProcessDefault() throws Exception
{
@@ -190,10 +190,10 @@ public class AnnotationProcessorTest
TurbineAccessControlList acl = mock(TurbineAccessControlList.class);
Role role = mock(Role.class);
when(role.getName()).thenReturn( "user" );
- Group group = mock(Group.class);
- when(acl.hasRole( role.getName() )).thenReturn( false );
+ // Group group = mock(Group.class);
+ when(acl.hasRole( role.getName() )).thenReturn( Boolean.FALSE );
when(data.getACL()).thenReturn(acl );
-
+
Method[] methods = getClass().getMethods();
for (Method m : methods) {
if (m.getName().equals( "unguardedMethoded" )) {