Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 4674 invoked from network); 1 Oct 2007 15:16:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 1 Oct 2007 15:16:58 -0000 Received: (qmail 68907 invoked by uid 500); 1 Oct 2007 15:16:48 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 68865 invoked by uid 500); 1 Oct 2007 15:16:48 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 68854 invoked by uid 99); 1 Oct 2007 15:16:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Oct 2007 08:16:48 -0700 X-ASF-Spam-Status: No, hits=-98.8 required=10.0 tests=ALL_TRUSTED,DNS_FROM_DOB,RCVD_IN_DOB X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Oct 2007 15:16:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 424D31A9832; Mon, 1 Oct 2007 08:16:37 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r580988 - in /directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap: name/LdapDN.java schema/Normalizer.java schema/OidNormalizer.java Date: Mon, 01 Oct 2007 15:16:35 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071001151637.424D31A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Mon Oct 1 08:16:35 2007 New Revision: 580988 URL: http://svn.apache.org/viewvc?rev=580988&view=rev Log: Using generics for Normalizer Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDN.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/Normalizer.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/OidNormalizer.java Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDN.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDN.java?rev=580988&r1=580987&r2=580988&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDN.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDN.java Mon Oct 1 08:16:35 2007 @@ -34,6 +34,7 @@ import javax.naming.NamingException; import org.apache.directory.shared.ldap.name.DefaultStringNormalizer; +import org.apache.directory.shared.ldap.schema.Normalizer; import org.apache.directory.shared.ldap.schema.OidNormalizer; import org.apache.directory.shared.ldap.util.StringTools; import org.slf4j.Logger; @@ -1422,7 +1423,7 @@ { return new AttributeTypeAndValue( atav.getUpType(), oidNormalizer.getAttributeTypeOid(), atav.getUpValue(), - oidNormalizer.getNormalizer().normalize( atav.getValue() ) ); + ((Normalizer)oidNormalizer.getNormalizer()).normalize( atav.getValue() ) ); } else @@ -1457,7 +1458,7 @@ Object normValue = DefaultStringNormalizer.normalizeString( ( String ) upValue ); rdn.addAttributeTypeAndValue( upType, oidNormalizer.getAttributeTypeOid(), upValue, - oidNormalizer.getNormalizer().normalize( normValue ) ); + ((Normalizer)oidNormalizer.getNormalizer()).normalize( normValue ) ); } Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/Normalizer.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/Normalizer.java?rev=580988&r1=580987&r2=580988&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/Normalizer.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/Normalizer.java Mon Oct 1 08:16:35 2007 @@ -31,16 +31,15 @@ * @author Apache Directory Project * @version $Rev$ */ -public interface Normalizer extends Serializable +public interface Normalizer extends Serializable { /** * Gets the normalized value. * - * @param value - * the value to normalize. It must *not* be null ! + * @param value the value to normalize. It must *not* be null ! * @return the normalized form for a value * @throws NamingException * if an error results during normalization */ - Object normalize( Object value ) throws NamingException; + T normalize( T value ) throws NamingException; } Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/OidNormalizer.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/OidNormalizer.java?rev=580988&r1=580987&r2=580988&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/OidNormalizer.java (original) +++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/OidNormalizer.java Mon Oct 1 08:16:35 2007 @@ -33,7 +33,7 @@ private String attributeTypeOid; /** The normalizer to be used with this OID */ - private Normalizer normalizer; + private Normalizer normalizer; /** @@ -42,7 +42,7 @@ * @param attributeTypeOid the oid of the attributeType mapped to the normalizer * @param normalizer the associated equality match based normalizer */ - public OidNormalizer( String attributeTypeOid, Normalizer normalizer ) + public OidNormalizer( String attributeTypeOid, Normalizer normalizer ) { this.attributeTypeOid = attributeTypeOid; this.normalizer = normalizer; @@ -66,7 +66,7 @@ * * @return The normalizer associated to the current OID */ - public Normalizer getNormalizer() + public Normalizer getNormalizer() { return normalizer; }