You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2007/09/11 18:01:26 UTC
svn commit: r574634 - in /directory/apacheds/trunk:
bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/
core/src/main/java/org/apache/directory/server/core/jndi/
core/src/main/java/org/apache/directory/server/core/normaliz...
Author: elecharny
Date: Tue Sep 11 09:01:25 2007
New Revision: 574634
URL: http://svn.apache.org/viewvc?rev=574634&view=rev
Log:
Removed some warnings by using generics
Modified:
directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/DeadContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/ExpandingVisitor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/ASTNode.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java
directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java
Modified: directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java?rev=574634&r1=574633&r2=574634&view=diff
==============================================================================
--- directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java (original)
+++ directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java Tue Sep 11 09:01:25 2007
@@ -726,7 +726,7 @@
{
try
{
- urls[i++] = new File( classpathElement ).toURL();
+ urls[i++] = new File( classpathElement ).toURI().toURL();
}
catch ( MalformedURLException e )
{
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/DeadContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/DeadContext.java?rev=574634&r1=574633&r2=574634&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/DeadContext.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/DeadContext.java Tue Sep 11 09:01:25 2007
@@ -25,6 +25,7 @@
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.Name;
+import javax.naming.NameClassPair;
import javax.naming.NameParser;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
@@ -34,6 +35,7 @@
import javax.naming.directory.DirContext;
import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
import javax.naming.ldap.Control;
import javax.naming.ldap.ExtendedRequest;
import javax.naming.ldap.ExtendedResponse;
@@ -44,6 +46,8 @@
import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+import javax.naming.Binding;
+
/**
* A do nothing placeholder context whose methods throw ConfigurationExceptions.
@@ -173,13 +177,13 @@
}
- public NamingEnumeration search( String name, Attributes matchingAttributes ) throws NamingException
+ public NamingEnumeration<SearchResult> search( String name, Attributes matchingAttributes ) throws NamingException
{
throw new LdapServiceUnavailableException( EXCEPTION_MSG, ResultCodeEnum.UNAVAILABLE );
}
- public NamingEnumeration search( Name name, Attributes matchingAttributes ) throws NamingException
+ public NamingEnumeration<SearchResult> search( Name name, Attributes matchingAttributes ) throws NamingException
{
throw new LdapServiceUnavailableException( EXCEPTION_MSG, ResultCodeEnum.UNAVAILABLE );
}
@@ -233,40 +237,40 @@
}
- public NamingEnumeration search( String name, Attributes matchingAttributes, String[] attributesToReturn )
+ public NamingEnumeration<SearchResult> search( String name, Attributes matchingAttributes, String[] attributesToReturn )
throws NamingException
{
throw new LdapServiceUnavailableException( EXCEPTION_MSG, ResultCodeEnum.UNAVAILABLE );
}
- public NamingEnumeration search( Name name, Attributes matchingAttributes, String[] attributesToReturn )
+ public NamingEnumeration<SearchResult> search( Name name, Attributes matchingAttributes, String[] attributesToReturn )
throws NamingException
{
throw new LdapServiceUnavailableException( EXCEPTION_MSG, ResultCodeEnum.UNAVAILABLE );
}
- public NamingEnumeration search( String name, String filter, SearchControls cons ) throws NamingException
+ public NamingEnumeration<SearchResult> search( String name, String filter, SearchControls cons ) throws NamingException
{
throw new LdapServiceUnavailableException( EXCEPTION_MSG, ResultCodeEnum.UNAVAILABLE );
}
- public NamingEnumeration search( Name name, String filter, SearchControls cons ) throws NamingException
+ public NamingEnumeration<SearchResult> search( Name name, String filter, SearchControls cons ) throws NamingException
{
throw new LdapServiceUnavailableException( EXCEPTION_MSG, ResultCodeEnum.UNAVAILABLE );
}
- public NamingEnumeration search( String name, String filterExpr, Object[] filterArgs, SearchControls cons )
+ public NamingEnumeration<SearchResult> search( String name, String filterExpr, Object[] filterArgs, SearchControls cons )
throws NamingException
{
throw new LdapServiceUnavailableException( EXCEPTION_MSG, ResultCodeEnum.UNAVAILABLE );
}
- public NamingEnumeration search( Name name, String filterExpr, Object[] filterArgs, SearchControls cons )
+ public NamingEnumeration<SearchResult> search( Name name, String filterExpr, Object[] filterArgs, SearchControls cons )
throws NamingException
{
throw new LdapServiceUnavailableException( EXCEPTION_MSG, ResultCodeEnum.UNAVAILABLE );
@@ -297,7 +301,7 @@
}
- public Hashtable getEnvironment() throws NamingException
+ public Hashtable<String,Object> getEnvironment() throws NamingException
{
throw new LdapServiceUnavailableException( EXCEPTION_MSG, ResultCodeEnum.UNAVAILABLE );
}
@@ -405,25 +409,25 @@
}
- public NamingEnumeration list( String name ) throws NamingException
+ public NamingEnumeration<NameClassPair> list( String name ) throws NamingException
{
throw new LdapServiceUnavailableException( EXCEPTION_MSG, ResultCodeEnum.UNAVAILABLE );
}
- public NamingEnumeration listBindings( String name ) throws NamingException
+ public NamingEnumeration<Binding> listBindings( String name ) throws NamingException
{
throw new LdapServiceUnavailableException( EXCEPTION_MSG, ResultCodeEnum.UNAVAILABLE );
}
- public NamingEnumeration list( Name name ) throws NamingException
+ public NamingEnumeration<NameClassPair> list( Name name ) throws NamingException
{
throw new LdapServiceUnavailableException( EXCEPTION_MSG, ResultCodeEnum.UNAVAILABLE );
}
- public NamingEnumeration listBindings( Name name ) throws NamingException
+ public NamingEnumeration<Binding> listBindings( Name name ) throws NamingException
{
throw new LdapServiceUnavailableException( EXCEPTION_MSG, ResultCodeEnum.UNAVAILABLE );
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/ExpandingVisitor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/ExpandingVisitor.java?rev=574634&r1=574633&r2=574634&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/ExpandingVisitor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/ExpandingVisitor.java Tue Sep 11 09:01:25 2007
@@ -82,14 +82,15 @@
// children that are branch nodes are recursively visited
// --------------------------------------------------------------------
- final List children = bnode.getChildren();
- final int limit = children.size();
- for ( int ii = 0; ii < limit; ii++ )
+ final List<ExprNode> children = bnode.getChildren();
+ int childNumber = 0;
+
+ for ( ExprNode child:children )
{
- ExprNode child = ( ExprNode ) children.get( ii );
if ( child instanceof LeafNode )
{
LeafNode leaf = ( LeafNode ) child;
+
try
{
if ( attrRegistry.hasDescendants( leaf.getAttribute() ) )
@@ -99,10 +100,11 @@
// replace the old leaf with the new OR branch node
BranchNode orNode = new BranchNode( AssertionEnum.OR );
orNode.getChildren().add( leaf );
- children.set( ii, orNode );
+ children.set( childNumber++, orNode );
// iterate through descendants adding them to the orNode
Iterator descendants = attrRegistry.descendants( leaf.getAttribute() );
+
while ( descendants.hasNext() )
{
LeafNode newLeaf = null;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/ASTNode.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/ASTNode.java?rev=574634&r1=574633&r2=574634&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/ASTNode.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/ASTNode.java Tue Sep 11 09:01:25 2007
@@ -45,12 +45,12 @@
private final ASTNode parent;
private final ExprNode exprNode;
- private final ArrayList children;
+ private final List<ASTNode> children;
public ASTNode(ASTNode parent, ExprNode exprNode)
{
- this.children = new ArrayList( 2 );
+ children = new ArrayList<ASTNode>( 2 );
this.exprNode = exprNode;
if ( parent == null )
@@ -70,10 +70,9 @@
}
BranchNode branch = ( BranchNode ) exprNode;
- List<ExprNode> exprNodes = branch.getChildren();
- for ( int ii = 0; ii < exprNodes.size(); ii++ )
+
+ for ( ExprNode child:branch.getChildren() )
{
- ExprNode child = exprNodes.get( ii );
children.add( new ASTNode( this, child ) );
}
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java?rev=574634&r1=574633&r2=574634&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java Tue Sep 11 09:01:25 2007
@@ -44,9 +44,9 @@
public static final String VAL_COL = "Values";
/** list of attribute ids */
- private final transient ArrayList keyList;
+ private final transient ArrayList<Object> keyList;
/** list of attribute values */
- private final transient ArrayList valList;
+ private final transient ArrayList<Object> valList;
/** the attributes for the entry */
private final Attributes entry;
@@ -82,8 +82,8 @@
rowCount = rowCount + entry.get( attrId ).size();
}
- keyList = new ArrayList( rowCount );
- valList = new ArrayList( rowCount );
+ keyList = new ArrayList<Object>( rowCount );
+ valList = new ArrayList<Object>( rowCount );
list = this.entry.getIDs();
while ( list.hasMoreElements() )
@@ -193,7 +193,7 @@
*/
public void setValue( Object val, int row, int col )
{
- ArrayList list = null;
+ ArrayList<Object> list = null;
if ( col > 1 || col < 0 )
{
Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java?rev=574634&r1=574633&r2=574634&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java Tue Sep 11 09:01:25 2007
@@ -27,6 +27,8 @@
import java.util.List;
import java.util.Set;
+import javax.naming.directory.Attribute;
+
import junit.framework.Assert;
import junit.framework.TestCase;
@@ -34,7 +36,9 @@
import org.apache.directory.server.core.authz.support.OperationScope;
import org.apache.directory.shared.ldap.aci.ACITuple;
import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
+import org.apache.directory.shared.ldap.aci.MicroOperation;
import org.apache.directory.shared.ldap.aci.ProtectedItem;
+import org.apache.directory.shared.ldap.aci.UserClass;
import org.apache.directory.shared.ldap.filter.PresenceNode;
@@ -46,47 +50,67 @@
*/
public class MostSpecificProtectedItemFilterTest extends TestCase
{
- private static final Collection EMPTY_COLLECTION = Collections.unmodifiableCollection( new ArrayList() );
- private static final Set EMPTY_SET = Collections.unmodifiableSet( new HashSet() );
-
- private static final List TUPLES_A = new ArrayList();
- private static final List TUPLES_B = new ArrayList();
- private static final List TUPLES_C = new ArrayList();
- private static final List TUPLES_D = new ArrayList();
- private static final List TUPLES_E = new ArrayList();
+ private static final Collection<String> EMPTY_STRING_COLLECTION = Collections.unmodifiableCollection( new ArrayList<String>() );
+
+ private static final Collection<Attribute> EMPTY_ATTRIBUTE_COLLECTION =
+ Collections.unmodifiableCollection( new ArrayList<Attribute>() );
+
+ private static final Collection<UserClass> EMPTY_USER_CLASS_COLLECTION =
+ Collections.unmodifiableCollection( new ArrayList<UserClass>() );
+
+ private static final Collection<ACITuple> EMPTY_ACI_TUPLE_COLLECTION =
+ Collections.unmodifiableCollection( new ArrayList<ACITuple>() );
+
+ private static final Collection<ProtectedItem> EMPTY_PROTECTED_ITEM_COLLECTION =
+ Collections.unmodifiableCollection( new ArrayList<ProtectedItem>() );
+
+ private static final Set<MicroOperation> EMPTY_MICRO_OPERATION_SET =
+ Collections.unmodifiableSet( new HashSet<MicroOperation>() );
+
+ private static final List<ACITuple> TUPLES_A = new ArrayList<ACITuple>();
+ private static final List<ACITuple> TUPLES_B = new ArrayList<ACITuple>();
+ private static final List<ACITuple> TUPLES_C = new ArrayList<ACITuple>();
+ private static final List<ACITuple> TUPLES_D = new ArrayList<ACITuple>();
+ private static final List<ACITuple> TUPLES_E = new ArrayList<ACITuple>();
static
{
- Collection attributeType = new ArrayList();
- Collection allAttributeValues = new ArrayList();
- Collection selfValue = new ArrayList();
- Collection attributeValue = new ArrayList();
- Collection rangeOfValues = new ArrayList();
- Collection allUserAttributeTypes = new ArrayList();
- Collection allUserAttributeTypesAndValues = new ArrayList();
-
- attributeType.add( new ProtectedItem.AttributeType( EMPTY_COLLECTION ) );
- allAttributeValues.add( new ProtectedItem.AllAttributeValues( EMPTY_COLLECTION ) );
- selfValue.add( new ProtectedItem.SelfValue( EMPTY_COLLECTION ) );
- attributeValue.add( new ProtectedItem.AttributeValue( EMPTY_COLLECTION ) );
+ Collection<ProtectedItem> attributeType = new ArrayList<ProtectedItem>();
+ Collection<ProtectedItem> allAttributeValues = new ArrayList<ProtectedItem>();
+ Collection<ProtectedItem> selfValue = new ArrayList<ProtectedItem>();
+ Collection<ProtectedItem> attributeValue = new ArrayList<ProtectedItem>();
+ Collection<ProtectedItem> rangeOfValues = new ArrayList<ProtectedItem>();
+ Collection<ProtectedItem> allUserAttributeTypes = new ArrayList<ProtectedItem>();
+ Collection<ProtectedItem> allUserAttributeTypesAndValues = new ArrayList<ProtectedItem>();
+
+ attributeType.add( new ProtectedItem.AttributeType( EMPTY_STRING_COLLECTION ) );
+ allAttributeValues.add( new ProtectedItem.AllAttributeValues( EMPTY_STRING_COLLECTION ) );
+ selfValue.add( new ProtectedItem.SelfValue( EMPTY_STRING_COLLECTION ) );
+ attributeValue.add( new ProtectedItem.AttributeValue( EMPTY_ATTRIBUTE_COLLECTION ) );
rangeOfValues.add( new ProtectedItem.RangeOfValues( new PresenceNode( "objectClass" ) ) );
allUserAttributeTypes.add( ProtectedItem.ALL_USER_ATTRIBUTE_TYPES );
allUserAttributeTypesAndValues.add( ProtectedItem.ALL_USER_ATTRIBUTE_TYPES_AND_VALUES );
- ACITuple attributeTypeTuple = new ACITuple( EMPTY_COLLECTION, AuthenticationLevel.NONE, attributeType,
- EMPTY_SET, true, 0 );
- ACITuple allAttributeValuesTuple = new ACITuple( EMPTY_COLLECTION, AuthenticationLevel.NONE,
- allAttributeValues, EMPTY_SET, true, 0 );
- ACITuple selfValueTuple = new ACITuple( EMPTY_COLLECTION, AuthenticationLevel.NONE, selfValue, EMPTY_SET, true,
- 0 );
- ACITuple attributeValueTuple = new ACITuple( EMPTY_COLLECTION, AuthenticationLevel.NONE, attributeValue,
- EMPTY_SET, true, 0 );
- ACITuple rangeOfValuesTuple = new ACITuple( EMPTY_COLLECTION, AuthenticationLevel.NONE, rangeOfValues,
- EMPTY_SET, true, 0 );
- ACITuple allUserAttributeTypesTuple = new ACITuple( EMPTY_COLLECTION, AuthenticationLevel.NONE,
- allUserAttributeTypes, EMPTY_SET, true, 0 );
- ACITuple allUserAttributeTypesAndValuesTuple = new ACITuple( EMPTY_COLLECTION, AuthenticationLevel.NONE,
- allUserAttributeTypesAndValues, EMPTY_SET, true, 0 );
+ ACITuple attributeTypeTuple = new ACITuple( EMPTY_USER_CLASS_COLLECTION, AuthenticationLevel.NONE, attributeType,
+ EMPTY_MICRO_OPERATION_SET, true, 0 );
+
+ ACITuple allAttributeValuesTuple = new ACITuple( EMPTY_USER_CLASS_COLLECTION, AuthenticationLevel.NONE,
+ allAttributeValues, EMPTY_MICRO_OPERATION_SET, true, 0 );
+
+ ACITuple selfValueTuple = new ACITuple( EMPTY_USER_CLASS_COLLECTION, AuthenticationLevel.NONE, selfValue,
+ EMPTY_MICRO_OPERATION_SET, true, 0 );
+
+ ACITuple attributeValueTuple = new ACITuple( EMPTY_USER_CLASS_COLLECTION, AuthenticationLevel.NONE, attributeValue,
+ EMPTY_MICRO_OPERATION_SET, true, 0 );
+
+ ACITuple rangeOfValuesTuple = new ACITuple( EMPTY_USER_CLASS_COLLECTION, AuthenticationLevel.NONE, rangeOfValues,
+ EMPTY_MICRO_OPERATION_SET, true, 0 );
+
+ ACITuple allUserAttributeTypesTuple = new ACITuple( EMPTY_USER_CLASS_COLLECTION, AuthenticationLevel.NONE,
+ allUserAttributeTypes, EMPTY_MICRO_OPERATION_SET, true, 0 );
+
+ ACITuple allUserAttributeTypesAndValuesTuple = new ACITuple( EMPTY_USER_CLASS_COLLECTION, AuthenticationLevel.NONE,
+ allUserAttributeTypesAndValues, EMPTY_MICRO_OPERATION_SET, true, 0 );
TUPLES_A.add( attributeTypeTuple );
TUPLES_A.add( allAttributeValuesTuple );
@@ -123,11 +147,11 @@
{
MostSpecificProtectedItemFilter filter = new MostSpecificProtectedItemFilter();
- Assert.assertEquals( 0, filter.filter( EMPTY_COLLECTION, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null,
+ Assert.assertEquals( 0, filter.filter( EMPTY_ACI_TUPLE_COLLECTION, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null,
null, null, null, null, null, null, null, null ).size() );
- Collection tuples = new ArrayList();
- tuples.add( new ACITuple( EMPTY_COLLECTION, AuthenticationLevel.NONE, EMPTY_COLLECTION, EMPTY_SET, false, 0 ) );
+ Collection<ACITuple> tuples = new ArrayList<ACITuple>();
+ tuples.add( new ACITuple( EMPTY_USER_CLASS_COLLECTION, AuthenticationLevel.NONE, EMPTY_PROTECTED_ITEM_COLLECTION, EMPTY_MICRO_OPERATION_SET, false, 0 ) );
Assert.assertEquals( 1, filter.filter( tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, null, null,
null, null, null, null, null, null ).size() );
@@ -138,8 +162,8 @@
{
MostSpecificProtectedItemFilter filter = new MostSpecificProtectedItemFilter();
- List tuples = new ArrayList( TUPLES_A );
- tuples = ( List ) filter.filter( tuples, OperationScope.ENTRY, null, null, null, null, null, null, null, null,
+ List<ACITuple> tuples = new ArrayList<ACITuple>( TUPLES_A );
+ tuples = ( List<ACITuple> ) filter.filter( tuples, OperationScope.ENTRY, null, null, null, null, null, null, null, null,
null, null );
Assert.assertEquals( 4, tuples.size() );
@@ -154,8 +178,8 @@
{
MostSpecificProtectedItemFilter filter = new MostSpecificProtectedItemFilter();
- List tuples = new ArrayList( TUPLES_B );
- tuples = ( List ) filter.filter( tuples, OperationScope.ENTRY, null, null, null, null, null, null, null, null,
+ List<ACITuple> tuples = new ArrayList<ACITuple>( TUPLES_B );
+ tuples = ( List<ACITuple> ) filter.filter( tuples, OperationScope.ENTRY, null, null, null, null, null, null, null, null,
null, null );
Assert.assertEquals( 3, tuples.size() );
@@ -169,8 +193,8 @@
{
MostSpecificProtectedItemFilter filter = new MostSpecificProtectedItemFilter();
- List tuples = new ArrayList( TUPLES_C );
- tuples = ( List ) filter.filter( tuples, OperationScope.ENTRY, null, null, null, null, null, null, null, null,
+ List<ACITuple> tuples = new ArrayList<ACITuple>( TUPLES_C );
+ tuples = ( List<ACITuple> ) filter.filter( tuples, OperationScope.ENTRY, null, null, null, null, null, null, null, null,
null, null );
Assert.assertEquals( 2, tuples.size() );
@@ -183,8 +207,8 @@
{
MostSpecificProtectedItemFilter filter = new MostSpecificProtectedItemFilter();
- List tuples = new ArrayList( TUPLES_D );
- tuples = ( List ) filter.filter( tuples, OperationScope.ENTRY, null, null, null, null, null, null, null, null,
+ List<ACITuple> tuples = new ArrayList<ACITuple>( TUPLES_D );
+ tuples = ( List<ACITuple> ) filter.filter( tuples, OperationScope.ENTRY, null, null, null, null, null, null, null, null,
null, null );
Assert.assertEquals( 1, tuples.size() );
@@ -196,8 +220,8 @@
{
MostSpecificProtectedItemFilter filter = new MostSpecificProtectedItemFilter();
- List tuples = new ArrayList( TUPLES_E );
- tuples = ( List ) filter.filter( tuples, OperationScope.ENTRY, null, null, null, null, null, null, null, null,
+ List<ACITuple> tuples = new ArrayList<ACITuple>( TUPLES_E );
+ tuples = ( List<ACITuple> ) filter.filter( tuples, OperationScope.ENTRY, null, null, null, null, null, null, null, null,
null, null );
Assert.assertEquals( 2, tuples.size() );