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/11/19 09:28:12 UTC
svn commit: r596222 - in /directory:
apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/
apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/
apacheds/branches/bigbang/server-tools/src...
Author: elecharny
Date: Mon Nov 19 00:28:08 2007
New Revision: 596222
URL: http://svn.apache.org/viewvc?rev=596222&view=rev
Log:
Removed a bunch of warning (generic)
Removed LdapUrl and LdapUrlParser classes, they are a duplication of LdapURL classes
Removed:
directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/url/
Modified:
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogStore.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
directory/apacheds/branches/bigbang/server-tools/src/test/java/org/apache/directory/server/tools/commands/AbstractTestCase.java
directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/AddingEntriesWithSpecialCharactersInRDNTest.java
directory/shared/branches/bigbang/ldap/src/main/antlr/ACIItem.g
directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/exception/LdapReferralException.java
directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifComposerImpl.java
directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractMessage.java
directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/AttributeImpl.java
directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/AttributesImpl.java
directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/MessageDecoder.java
directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequestImpl.java
directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequestImpl.java
directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulDisconnect.java
directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/StoredProcedureRequest.java
directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/spi/Provider.java
directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/sp/JavaStoredProcUtils.java
directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationModifier.java
directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeSerializerUtils.java
directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributesSerializerUtils.java
directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogStore.java?rev=596222&r1=596221&r2=596222&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogStore.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogStore.java Mon Nov 19 00:28:08 2007
@@ -24,7 +24,6 @@
import org.apache.directory.server.core.cursor.Cursor;
import org.apache.directory.shared.ldap.ldif.Entry;
-import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=596222&r1=596221&r2=596222&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Mon Nov 19 00:28:08 2007
@@ -236,14 +236,14 @@
/**
* Used to encapsulate [de]marshalling of controls before and after list operations.
*/
- protected NamingEnumeration doListOperation( LdapDN target ) throws NamingException
+ protected NamingEnumeration<SearchResult> doListOperation( LdapDN target ) throws NamingException
{
// setup the op context and populate with request controls
ListOperationContext opCtx = new ListOperationContext( target );
opCtx.addRequestControls( requestControls );
// execute list operation
- NamingEnumeration results = nexusProxy.list( opCtx );
+ NamingEnumeration<SearchResult> results = nexusProxy.list( opCtx );
// clear the request controls and set the response controls
requestControls = EMPTY_CONTROLS;
@@ -633,7 +633,7 @@
}
else
{
- for ( Iterator ii = rdn.iterator(); ii.hasNext(); /**/ )
+ for ( Iterator<AttributeTypeAndValue> ii = rdn.iterator(); ii.hasNext(); /**/ )
{
AttributeTypeAndValue atav = ( AttributeTypeAndValue ) ii.next();
attributes.put( atav.getUpType(), atav.getValue() );
@@ -685,11 +685,11 @@
if ( outAttrs != null && outAttrs.size() > 0 )
{
- NamingEnumeration list = outAttrs.getAll();
+ NamingEnumeration<? extends Attribute> list = outAttrs.getAll();
while ( list.hasMore() )
{
- attributes.put( ( Attribute ) list.next() );
+ attributes.put( list.next() );
}
}
@@ -707,10 +707,11 @@
Attributes attributes = ( ( DirContext ) obj ).getAttributes( "" );
if ( outAttrs != null && outAttrs.size() > 0 )
{
- NamingEnumeration list = outAttrs.getAll();
+ NamingEnumeration<? extends Attribute> list = outAttrs.getAll();
+
while ( list.hasMore() )
{
- attributes.put( ( Attribute ) list.next() );
+ attributes.put( list.next() );
}
}
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java?rev=596222&r1=596221&r2=596222&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java Mon Nov 19 00:28:08 2007
@@ -150,11 +150,11 @@
if ( attrs != null )
{
modItems = new ArrayList<ModificationItemImpl>( attrs.size() );
- NamingEnumeration<Attribute> e = (NamingEnumeration<Attribute>)attrs.getAll();
+ NamingEnumeration<? extends Attribute> e = (NamingEnumeration<? extends Attribute>)attrs.getAll();
while ( e.hasMore() )
{
- modItems.add( new ModificationItemImpl( modOp, ( Attribute ) e.next() ) );
+ modItems.add( new ModificationItemImpl( modOp, e.next() ) );
}
}
@@ -272,7 +272,7 @@
Attributes attributes = ( Attributes ) attrs.clone();
if ( outAttrs != null && outAttrs.size() > 0 )
{
- NamingEnumeration list = outAttrs.getAll();
+ NamingEnumeration<? extends Attribute> list = outAttrs.getAll();
while ( list.hasMore() )
{
attributes.put( ( Attribute ) list.next() );
@@ -300,7 +300,8 @@
Attributes attributes = ( Attributes ) attrs.clone();
if ( outAttrs != null && outAttrs.size() > 0 )
{
- NamingEnumeration list = outAttrs.getAll();
+ NamingEnumeration<? extends Attribute> list = outAttrs.getAll();
+
while ( list.hasMore() )
{
attributes.put( ( Attribute ) list.next() );
@@ -318,12 +319,14 @@
Attributes attributes = ( ( DirContext ) obj ).getAttributes( "" );
if ( outAttrs != null && outAttrs.size() > 0 )
{
- NamingEnumeration list = outAttrs.getAll();
+ NamingEnumeration<? extends Attribute> list = outAttrs.getAll();
+
while ( list.hasMore() )
{
attributes.put( ( Attribute ) list.next() );
}
}
+
LdapDN target = buildTarget( name );
doAddOperation( target, attributes );
}
@@ -533,8 +536,8 @@
// Handle simple filter expressions without multiple terms
if ( matchingAttributes.size() == 1 )
{
- NamingEnumeration list = matchingAttributes.getAll();
- Attribute attr = ( Attribute ) list.next();
+ NamingEnumeration<? extends Attribute> list = matchingAttributes.getAll();
+ Attribute attr = list.next();
list.close();
if ( attr.size() == 1 )
@@ -563,12 +566,12 @@
Attribute attr;
SimpleNode node;
BranchNode filter = new AndNode();
- NamingEnumeration list = matchingAttributes.getAll();
+ NamingEnumeration<? extends Attribute> list = matchingAttributes.getAll();
// Loop through each attribute value pair
while ( list.hasMore() )
{
- attr = ( Attribute ) list.next();
+ attr = list.next();
/*
* According to JNDI if an attribute in the matchingAttributes
Modified: directory/apacheds/branches/bigbang/server-tools/src/test/java/org/apache/directory/server/tools/commands/AbstractTestCase.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/server-tools/src/test/java/org/apache/directory/server/tools/commands/AbstractTestCase.java?rev=596222&r1=596221&r2=596222&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/server-tools/src/test/java/org/apache/directory/server/tools/commands/AbstractTestCase.java (original)
+++ directory/apacheds/branches/bigbang/server-tools/src/test/java/org/apache/directory/server/tools/commands/AbstractTestCase.java Mon Nov 19 00:28:08 2007
@@ -115,7 +115,8 @@
SearchControls ctls = new SearchControls();
ctls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
- NamingEnumeration entries = null;
+ NamingEnumeration<SearchResult> entries = null;
+
try
{
entries = ctx.search( dn, "(objectClass=*)", ctls );
@@ -132,6 +133,7 @@
SearchResult sr = ( SearchResult ) entries.nextElement();
deleteLDAPSubtree( sr.getNameInNamespace() );
}
+
ctx.destroySubcontext( dn );
}
}
Modified: directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/AddingEntriesWithSpecialCharactersInRDNTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/AddingEntriesWithSpecialCharactersInRDNTest.java?rev=596222&r1=596221&r2=596222&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/AddingEntriesWithSpecialCharactersInRDNTest.java (original)
+++ directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/AddingEntriesWithSpecialCharactersInRDNTest.java Mon Nov 19 00:28:08 2007
@@ -110,15 +110,18 @@
SearchControls sctls = new SearchControls();
sctls.setSearchScope(SearchControls.SUBTREE_SCOPE);
- NamingEnumeration enm = ctx.search("", "(cn=Kate\\#Bush)", sctls);
+ NamingEnumeration<SearchResult> enm = ctx.search("", "(cn=Kate\\#Bush)", sctls);
assertEquals("entry found", true, enm.hasMore());
- while (enm.hasMore()) {
- SearchResult sr = (SearchResult) enm.next();
+
+ while (enm.hasMore())
+ {
+ SearchResult sr = enm.next();
attrs = sr.getAttributes();
Attribute cn = sr.getAttributes().get("cn");
assertNotNull(cn);
assertTrue(cn.contains("Kate#Bush"));
}
+
ctx.destroySubcontext(rdn);
}
@@ -136,10 +139,12 @@
SearchControls sctls = new SearchControls();
sctls.setSearchScope(SearchControls.SUBTREE_SCOPE);
- NamingEnumeration enm = ctx.search("", "(cn=Bush, Kate)", sctls);
+ NamingEnumeration<SearchResult> enm = ctx.search("", "(cn=Bush, Kate)", sctls);
assertEquals("entry found", true, enm.hasMore());
- while (enm.hasMore()) {
- SearchResult sr = (SearchResult) enm.next();
+
+ while (enm.hasMore())
+ {
+ SearchResult sr = enm.next();
attrs = sr.getAttributes();
Attribute cn = sr.getAttributes().get("cn");
assertNotNull(cn);
@@ -216,10 +221,12 @@
SearchControls sctls = new SearchControls();
sctls.setSearchScope(SearchControls.SUBTREE_SCOPE);
- NamingEnumeration enm = ctx.search("", "(ou=East -> West)", sctls);
+ NamingEnumeration<SearchResult> enm = ctx.search("", "(ou=East -> West)", sctls);
assertEquals("entry found", true, enm.hasMore());
- while (enm.hasMore()) {
- SearchResult sr = (SearchResult) enm.next();
+
+ while (enm.hasMore())
+ {
+ SearchResult sr = enm.next();
attrs = sr.getAttributes();
Attribute ou = sr.getAttributes().get("ou");
assertNotNull(ou);
@@ -243,10 +250,12 @@
SearchControls sctls = new SearchControls();
sctls.setSearchScope(SearchControls.SUBTREE_SCOPE);
- NamingEnumeration enm = ctx.search("", "(ou=Scissors 8<)", sctls);
+ NamingEnumeration<SearchResult> enm = ctx.search("", "(ou=Scissors 8<)", sctls);
assertEquals("entry found", true, enm.hasMore());
- while (enm.hasMore()) {
- SearchResult sr = (SearchResult) enm.next();
+
+ while (enm.hasMore())
+ {
+ SearchResult sr = enm.next();
attrs = sr.getAttributes();
Attribute ou = sr.getAttributes().get("ou");
assertNotNull(ou);
@@ -270,10 +279,12 @@
SearchControls sctls = new SearchControls();
sctls.setSearchScope(SearchControls.SUBTREE_SCOPE);
- NamingEnumeration enm = ctx.search("", "(ou=semicolon group;)", sctls);
+ NamingEnumeration<SearchResult> enm = ctx.search("", "(ou=semicolon group;)", sctls);
assertEquals("entry found", true, enm.hasMore());
- while (enm.hasMore()) {
- SearchResult sr = (SearchResult) enm.next();
+
+ while (enm.hasMore())
+ {
+ SearchResult sr = enm.next();
attrs = sr.getAttributes();
Attribute ou = sr.getAttributes().get("ou");
assertNotNull(ou);
@@ -297,10 +308,12 @@
SearchControls sctls = new SearchControls();
sctls.setSearchScope(SearchControls.SUBTREE_SCOPE);
- NamingEnumeration enm = ctx.search("", "(ou=nomen=omen)", sctls);
+ NamingEnumeration<SearchResult> enm = ctx.search("", "(ou=nomen=omen)", sctls);
assertEquals("entry found", true, enm.hasMore());
- while (enm.hasMore()) {
- SearchResult sr = (SearchResult) enm.next();
+
+ while (enm.hasMore())
+ {
+ SearchResult sr = enm.next();
attrs = sr.getAttributes();
Attribute ou = sr.getAttributes().get("ou");
assertNotNull(ou);
Modified: directory/shared/branches/bigbang/ldap/src/main/antlr/ACIItem.g
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/antlr/ACIItem.g?rev=596222&r1=596221&r2=596222&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/antlr/ACIItem.g (original)
+++ directory/shared/branches/bigbang/ldap/src/main/antlr/ACIItem.g Mon Nov 19 00:28:08 2007
@@ -126,8 +126,8 @@
private Set<UserPermission> userPermissions;
private Map<String, OidNormalizer> oidsMap;
- private Set<Name> chopBeforeExclusions;
- private Set<Name> chopAfterExclusions;
+ private Set<LdapDN> chopBeforeExclusions;
+ private Set<LdapDN> chopAfterExclusions;
private SubtreeSpecificationModifier ssModifier = null;
private ComponentsMonitor mainACIItemComponentsMonitor;
@@ -1022,8 +1022,8 @@
// in case something is left from the last parse
ss = null;
ssModifier = new SubtreeSpecificationModifier();
- chopBeforeExclusions = new HashSet<Name>();
- chopAfterExclusions = new HashSet<Name>();
+ chopBeforeExclusions = new HashSet<LdapDN>();
+ chopAfterExclusions = new HashSet<LdapDN>();
subtreeSpecificationComponentsMonitor = new OptionalComponentsMonitor(
new String [] { "base", "specificExclusions", "minimum", "maximum" } );
}
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/exception/LdapReferralException.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/exception/LdapReferralException.java?rev=596222&r1=596221&r2=596222&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/exception/LdapReferralException.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/exception/LdapReferralException.java Mon Nov 19 00:28:08 2007
@@ -96,7 +96,7 @@
}
- public Context getReferralContext( Hashtable arg ) throws NamingException
+ public Context getReferralContext( Hashtable<?, ?> arg ) throws NamingException
{
throw new NotImplementedException();
}
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifComposerImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifComposerImpl.java?rev=596222&r1=596221&r2=596222&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifComposerImpl.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifComposerImpl.java Mon Nov 19 00:28:08 2007
@@ -50,7 +50,7 @@
{
Object val = null;
String key = null;
- Iterator keys = attrHash.keySet().iterator();
+ Iterator<String> keys = attrHash.keySet().iterator();
Iterator values = null;
Collection valueCol = null;
StringWriter sw = new StringWriter();
@@ -58,7 +58,7 @@
while ( keys.hasNext() )
{
- key = ( String ) keys.next();
+ key = keys.next();
valueCol = ( Collection ) attrHash.get( key );
values = valueCol.iterator();
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractMessage.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractMessage.java?rev=596222&r1=596221&r2=596222&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractMessage.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractMessage.java Mon Nov 19 00:28:08 2007
@@ -207,13 +207,15 @@
return false;
}
- Map controls = msg.getControls();
+ Map<String, Control> controls = msg.getControls();
+
if ( controls.size() != this.controls.size() )
{
return false;
}
- Iterator list = this.controls.keySet().iterator();
+ Iterator<String> list = this.controls.keySet().iterator();
+
while ( list.hasNext() )
{
if ( !controls.containsKey( list.next() ) )
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/AttributeImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/AttributeImpl.java?rev=596222&r1=596221&r2=596222&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/AttributeImpl.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/AttributeImpl.java Mon Nov 19 00:28:08 2007
@@ -143,7 +143,7 @@
{
upId = attribute.getID();
- NamingEnumeration values = attribute.getAll();
+ NamingEnumeration<?> values = attribute.getAll();
while ( values.hasMoreElements() )
{
@@ -257,7 +257,7 @@
return AttributeUtils.equals( value, attrVal );
default :
- Iterator values = list.iterator();
+ Iterator<Object> values = list.iterator();
while ( values.hasNext() )
{
@@ -732,7 +732,7 @@
try
{
- NamingEnumeration attrValues = attr.getAll();
+ NamingEnumeration<?> attrValues = attr.getAll();
while ( attrValues.hasMoreElements() )
{
@@ -829,7 +829,7 @@
default :
boolean isFirst = true;
- Iterator values = list.iterator();
+ Iterator<Object> values = list.iterator();
while ( values.hasNext() )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/AttributesImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/AttributesImpl.java?rev=596222&r1=596221&r2=596222&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/AttributesImpl.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/AttributesImpl.java Mon Nov 19 00:28:08 2007
@@ -159,7 +159,7 @@
}
else if ( attributes instanceof BasicAttributes )
{
- NamingEnumeration attrs = attributes.getAll();
+ NamingEnumeration<? extends Attribute> attrs = attributes.getAll();
keyMap = new HashMap<String, AttributeImpl>();
while ( attrs.hasMoreElements() )
@@ -175,11 +175,11 @@
keyMap = new HashMap<String, AttributeImpl>( clone.keyMap.size() );
- Iterator keys = clone.keyMap.keySet().iterator();
+ Iterator<String> keys = clone.keyMap.keySet().iterator();
while ( keys.hasNext() )
{
- String key = (String)keys.next();
+ String key = keys.next();
AttributeImpl attribute = clone.keyMap.get( key );
keyMap.put( key, (AttributeImpl)attribute.clone() );
}
@@ -358,12 +358,12 @@
{
String[] ids = new String[keyMap.size()];
- Iterator values = keyMap.values().iterator();
+ Iterator<AttributeImpl> values = keyMap.values().iterator();
int i = 0;
while ( values.hasNext() )
{
- ids[i++] = ((AttributeImpl)values.next()).getID();
+ ids[i++] = values.next().getID();
}
return new ArrayNamingEnumeration<String>( ids );
@@ -435,7 +435,7 @@
try
{
- NamingEnumeration values = attr.getAll();
+ NamingEnumeration<?> values = attr.getAll();
while ( values.hasMore() )
{
@@ -492,11 +492,11 @@
clone.keyMap = new HashMap<String, AttributeImpl>( keyMap.size() );
- Iterator keys = keyMap.keySet().iterator();
+ Iterator<String> keys = keyMap.keySet().iterator();
while ( keys.hasNext() )
{
- String key = (String)keys.next();
+ String key = keys.next();
clone.keyMap.put( key, (AttributeImpl)keyMap.get( key ).clone() );
}
@@ -518,11 +518,11 @@
{
StringBuffer buf = new StringBuffer();
- Iterator attrs = keyMap.values().iterator();
+ Iterator<AttributeImpl> attrs = keyMap.values().iterator();
while ( attrs.hasNext() )
{
- Attribute attr = (AttributeImpl)attrs.next();
+ Attribute attr = attrs.next();
buf.append( attr );
}
@@ -565,11 +565,11 @@
return false;
}
- NamingEnumeration list = attrs.getAll();
+ NamingEnumeration<? extends Attribute> list = attrs.getAll();
while ( list.hasMoreElements() )
{
- Attribute attr = ( Attribute )list.nextElement();
+ Attribute attr = list.nextElement();
Attribute myAttr = get( attr.getID() );
if ( myAttr == null )
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/MessageDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/MessageDecoder.java?rev=596222&r1=596221&r2=596222&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/MessageDecoder.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/MessageDecoder.java Mon Nov 19 00:28:08 2007
@@ -67,7 +67,7 @@
public MessageDecoder( BinaryAttributeDetector binaryAttributeDetector ) throws MessageException
{
// We need to get the encoder class name
- Hashtable providerEnv = Provider.getEnvironment();
+ Hashtable<Object, Object> providerEnv = Provider.getEnvironment();
this.provider = Provider.getProvider( providerEnv );
this.decoder = this.provider.getDecoder( binaryAttributeDetector );
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequestImpl.java?rev=596222&r1=596221&r2=596222&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequestImpl.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequestImpl.java Mon Nov 19 00:28:08 2007
@@ -275,14 +275,14 @@
Set<Object> attrHash0 = new HashSet<Object>();
- NamingEnumeration iter0 = attr0.getAll();
+ NamingEnumeration<?> iter0 = attr0.getAll();
while ( iter0.hasMoreElements() )
{
attrHash0.add( iter0.next() );
}
- NamingEnumeration iter1 = attr1.getAll();
+ NamingEnumeration<?> iter1 = attr1.getAll();
while ( iter1.hasMoreElements() )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequestImpl.java?rev=596222&r1=596221&r2=596222&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequestImpl.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequestImpl.java Mon Nov 19 00:28:08 2007
@@ -429,7 +429,8 @@
return false;
}
- Iterator list = attributes.iterator();
+ Iterator<String> list = attributes.iterator();
+
while ( list.hasNext() )
{
if ( !req.getAttributes().contains( list.next() ) )
@@ -539,7 +540,7 @@
if ( attributes != null )
{
- Iterator it = attributes.iterator();
+ Iterator<String> it = attributes.iterator();
while ( it.hasNext() )
{
@@ -552,7 +553,7 @@
sb.append( ", " );
}
- sb.append( '\'' ).append( (String)it.next() ).append( '\'' );
+ sb.append( '\'' ).append( it.next() ).append( '\'' );
}
}
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulDisconnect.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulDisconnect.java?rev=596222&r1=596221&r2=596222&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulDisconnect.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulDisconnect.java Mon Nov 19 00:28:08 2007
@@ -107,7 +107,8 @@
this.timeOffline = codec.getTimeOffline();
this.delay = codec.getDelay();
super.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
- List contexts = codec.getReplicatedContexts();
+ List<LdapURL> contexts = codec.getReplicatedContexts();
+
for ( int ii = 0; ii < contexts.size(); ii++ )
{
replicatedContexts.addLdapUrl( contexts.get( ii ).toString() );
@@ -126,7 +127,8 @@
org.apache.directory.shared.ldap.codec.extended.operations.GracefulDisconnect codec = new org.apache.directory.shared.ldap.codec.extended.operations.GracefulDisconnect();
codec.setTimeOffline( this.timeOffline );
codec.setDelay( this.delay );
- Iterator contexts = this.replicatedContexts.getLdapUrls().iterator();
+ Iterator<String> contexts = this.replicatedContexts.getLdapUrls().iterator();
+
while ( contexts.hasNext() )
{
String urlstr = ( String ) contexts.next();
@@ -198,10 +200,11 @@
.getGracefulDisconnect();
this.delay = codec.getDelay();
this.timeOffline = codec.getTimeOffline();
- List contexts = codec.getReplicatedContexts();
+ List<LdapURL> contexts = codec.getReplicatedContexts();
+
for ( int ii = 0; ii < contexts.size(); ii++ )
{
- LdapURL url = ( LdapURL ) contexts.get( ii );
+ LdapURL url = contexts.get( ii );
replicatedContexts.addLdapUrl( url.toString() );
}
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/StoredProcedureRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/StoredProcedureRequest.java?rev=596222&r1=596221&r2=596222&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/StoredProcedureRequest.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/StoredProcedureRequest.java Mon Nov 19 00:28:08 2007
@@ -189,7 +189,7 @@
}
- public Class getJavaParameterType( int index )
+ public Class<?> getJavaParameterType( int index )
{
throw new NotImplementedException( "class loading of procedure type not implemented" );
}
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/spi/Provider.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/spi/Provider.java?rev=596222&r1=596221&r2=596222&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/spi/Provider.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/message/spi/Provider.java Mon Nov 19 00:28:08 2007
@@ -74,7 +74,7 @@
if ( fqcn != null )
{
- Class mc;
+ Class<?> mc;
try
{
@@ -226,7 +226,7 @@
* @throws ProviderException
* if the provider cannot be found
*/
- public static Provider getProvider( Hashtable env ) throws ProviderException
+ public static Provider getProvider( Hashtable<Object, Object> env ) throws ProviderException
{
Provider provider;
String className = ( String ) env.get( BERLIB_PROVIDER );
@@ -242,7 +242,7 @@
try
{
- Class clazz = Class.forName( className );
+ Class<?> clazz = Class.forName( className );
Method method = clazz.getMethod( "getProvider", (Class[])null );
provider = ( Provider ) method.invoke( null, (Object[])null );
}
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/sp/JavaStoredProcUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/sp/JavaStoredProcUtils.java?rev=596222&r1=596221&r2=596222&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/sp/JavaStoredProcUtils.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/sp/JavaStoredProcUtils.java Mon Nov 19 00:28:08 2007
@@ -57,7 +57,7 @@
* @throws NamingException
* If an IO error occurs during reading the class file.
*/
- public static byte[] getClassFileAsStream( Class clazz ) throws NamingException
+ public static byte[] getClassFileAsStream( Class<?> clazz ) throws NamingException
{
String fullClassName = clazz.getName();
int lastDot = fullClassName.lastIndexOf( '.' );
@@ -93,7 +93,7 @@
* @throws NamingException
* If an error occurs during creating the subcontext.
*/
- public static void loadStoredProcedureClass( LdapContext ctx, Class clazz ) throws NamingException
+ public static void loadStoredProcedureClass( LdapContext ctx, Class<?> clazz ) throws NamingException
{
byte[] buf = getClassFileAsStream( clazz );
String fullClassName = clazz.getName();
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationModifier.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationModifier.java?rev=596222&r1=596221&r2=596222&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationModifier.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationModifier.java Mon Nov 19 00:28:08 2007
@@ -41,10 +41,10 @@
private LdapDN base = new LdapDN();
/** the set of subordinates entries and their subordinates to exclude */
- private Set chopBefore = Collections.EMPTY_SET;
+ private Set<LdapDN> chopBefore = Collections.EMPTY_SET;
/** the set of subordinates entries whose subordinates are to be excluded */
- private Set chopAfter = Collections.EMPTY_SET;
+ private Set<LdapDN> chopAfter = Collections.EMPTY_SET;
/** the minimum distance below base to start including entries */
private int minBaseDistance = 0;
@@ -100,7 +100,7 @@
* the set of subordinates entries and their subordinates to
* exclude
*/
- public void setChopBeforeExclusions( Set chopBefore )
+ public void setChopBeforeExclusions( Set<LdapDN> chopBefore )
{
this.chopBefore = chopBefore;
}
@@ -114,7 +114,7 @@
* the set of subordinates entries whose subordinates are to be
* excluded
*/
- public void setChopAfterExclusions( Set chopAfter )
+ public void setChopAfterExclusions( Set<LdapDN> chopAfter )
{
this.chopAfter = chopAfter;
}
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeSerializerUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeSerializerUtils.java?rev=596222&r1=596221&r2=596222&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeSerializerUtils.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeSerializerUtils.java Mon Nov 19 00:28:08 2007
@@ -309,13 +309,14 @@
{
// write the type or is-binary field
Object first = attr.get();
+
if ( first instanceof String )
{
buf[pos] = STRING_TYPE;
pos++;
// write out each value to the buffer whatever type it may be
- for ( NamingEnumeration ii = attr.getAll(); ii.hasMore(); /**/ )
+ for ( NamingEnumeration<?> ii = attr.getAll(); ii.hasMore(); /**/ )
{
String value = ( String ) ii.next();
pos = write( buf, value, pos );
@@ -327,7 +328,7 @@
pos++;
// write out each value to the buffer whatever type it may be
- for ( NamingEnumeration ii = attr.getAll(); ii.hasMore(); /**/ )
+ for ( NamingEnumeration<?> ii = attr.getAll(); ii.hasMore(); /**/ )
{
byte[] value = ( byte[] ) ii.next();
pos = write( buf, value, pos );
@@ -354,9 +355,10 @@
try
{
- for ( NamingEnumeration ii = attr.getAll(); ii.hasMore(); /**/ )
+ for ( NamingEnumeration<?> ii = attr.getAll(); ii.hasMore(); /**/ )
{
Object value = ii.next();
+
if ( value instanceof String )
{
size += ( ( String ) value ).length() << 1; // length of sting * 2
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributesSerializerUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributesSerializerUtils.java?rev=596222&r1=596221&r2=596222&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributesSerializerUtils.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributesSerializerUtils.java Mon Nov 19 00:28:08 2007
@@ -103,10 +103,10 @@
try
{
- for ( NamingEnumeration ii = attrs.getAll(); ii.hasMore(); /**/)
+ for ( NamingEnumeration<? extends Attribute> ii = attrs.getAll(); ii.hasMore(); /**/)
{
// get an attribute at a time
- Attribute attr = ( Attribute ) ii.next();
+ Attribute attr = ii.next();
// write the length of the id and it's value
pos = AttributeSerializerUtils.write( buf, attr.getID(), pos );
@@ -119,7 +119,7 @@
pos++;
// write out each value to the buffer whatever type it may be
- for ( NamingEnumeration jj = attr.getAll(); jj.hasMore(); /**/)
+ for ( NamingEnumeration<?> jj = attr.getAll(); jj.hasMore(); /**/)
{
String value = ( String ) jj.next();
pos = AttributeSerializerUtils.write( buf, value, pos );
@@ -131,7 +131,7 @@
pos++;
// write out each value to the buffer whatever type it may be
- for ( NamingEnumeration jj = attr.getAll(); jj.hasMore(); /**/)
+ for ( NamingEnumeration<?> jj = attr.getAll(); jj.hasMore(); /**/)
{
byte[] value = ( byte[] ) jj.next();
pos = AttributeSerializerUtils.write( buf, value, pos );
@@ -162,7 +162,7 @@
try
{
- for ( NamingEnumeration ii = attrs.getAll(); ii.hasMore(); /**/)
+ for ( NamingEnumeration<? extends Attribute> ii = attrs.getAll(); ii.hasMore(); /**/)
{
Attribute attr = ( Attribute ) ii.next();
Modified: directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java?rev=596222&r1=596221&r2=596222&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java (original)
+++ directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java Mon Nov 19 00:28:08 2007
@@ -143,7 +143,7 @@
assertTrue( expectedTypes.contains( attributeValue.getID().toLowerCase() ) );
- NamingEnumeration values = attributeValue.getAll();
+ NamingEnumeration<?> values = attributeValue.getAll();
HashSet vals = ( HashSet ) typesVals.get( attributeValue.getID().toLowerCase() );
while ( values.hasMore() )
@@ -615,7 +615,7 @@
assertEquals( "l", attributeValue.getID().toLowerCase() );
- NamingEnumeration values = attributeValue.getAll();
+ NamingEnumeration<?> values = attributeValue.getAll();
while ( values.hasMore() )
{
@@ -707,7 +707,7 @@
assertEquals( "l", attributeValue.getID().toLowerCase() );
- NamingEnumeration values = attributeValue.getAll();
+ NamingEnumeration<?> values = attributeValue.getAll();
while ( values.hasMore() )
{