directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1459833 - in /directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model: csn/ cursor/ entry/ password/ schema/registries/
Date Fri, 22 Mar 2013 15:07:59 GMT
Author: elecharny
Date: Fri Mar 22 15:07:59 2013
New Revision: 1459833

URL: http://svn.apache.org/r1459833
Log:
Removed useless imports

Modified:
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/csn/Csn.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/DefaultClosureMonitor.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/Entry.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/ImmutableEntry.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/StringValue.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/password/PasswordUtil.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/Registries.java

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/csn/Csn.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/csn/Csn.java?rev=1459833&r1=1459832&r2=1459833&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/csn/Csn.java
(original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/csn/Csn.java
Fri Mar 22 15:07:59 2013
@@ -27,7 +27,6 @@ import java.util.TimeZone;
 
 import org.apache.directory.api.i18n.I18n;
 import org.apache.directory.api.util.Chars;
-import org.apache.directory.api.util.DateUtils;
 import org.apache.directory.api.util.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -83,7 +82,7 @@ public class Csn implements Comparable<C
     private static final SimpleDateFormat SDF = new SimpleDateFormat( "yyyyMMddHHmmss" );
 
     private static final TimeZone UTC_TIME_ZONE = TimeZone.getTimeZone( "UTC" );
-    
+
     // Initialize the dateFormat with the UTC TZ
     static
     {

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/DefaultClosureMonitor.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/DefaultClosureMonitor.java?rev=1459833&r1=1459832&r2=1459833&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/DefaultClosureMonitor.java
(original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/DefaultClosureMonitor.java
Fri Mar 22 15:07:59 2013
@@ -19,8 +19,6 @@
  */
 package org.apache.directory.api.ldap.model.cursor;
 
-import java.nio.channels.ClosedChannelException;
-
 
 /**
  * A basic ClosureMonitor that simply uses a boolean for state and a cause

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/Entry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/Entry.java?rev=1459833&r1=1459832&r2=1459833&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/Entry.java
(original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/Entry.java
Fri Mar 22 15:07:59 2013
@@ -23,7 +23,6 @@ import java.io.Externalizable;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Set;
 
 import org.apache.directory.api.ldap.model.exception.LdapException;
 import org.apache.directory.api.ldap.model.exception.LdapInvalidDnException;
@@ -832,8 +831,8 @@ public interface Entry extends Cloneable
      * @return true if the Entry is schema aware
      */
     boolean isSchemaAware();
-    
-    
+
+
     /**
      * A pretty-pinter for Entries
      * 

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/ImmutableEntry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/ImmutableEntry.java?rev=1459833&r1=1459832&r2=1459833&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/ImmutableEntry.java
(original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/ImmutableEntry.java
Fri Mar 22 15:07:59 2013
@@ -25,7 +25,6 @@ import java.io.ObjectOutput;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Set;
 
 import org.apache.directory.api.ldap.model.exception.LdapException;
 import org.apache.directory.api.ldap.model.exception.LdapInvalidDnException;

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/StringValue.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/StringValue.java?rev=1459833&r1=1459832&r2=1459833&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/StringValue.java
(original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/StringValue.java
Fri Mar 22 15:07:59 2013
@@ -22,14 +22,12 @@ package org.apache.directory.api.ldap.mo
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import java.util.Arrays;
 import java.util.Comparator;
 
 import org.apache.directory.api.i18n.I18n;
 import org.apache.directory.api.ldap.model.exception.LdapException;
 import org.apache.directory.api.ldap.model.exception.LdapInvalidAttributeValueException;
 import org.apache.directory.api.ldap.model.schema.AttributeType;
-import org.apache.directory.api.ldap.model.schema.LdapComparator;
 import org.apache.directory.api.ldap.model.schema.MatchingRule;
 import org.apache.directory.api.ldap.model.schema.Normalizer;
 import org.apache.directory.api.util.Strings;
@@ -48,7 +46,7 @@ public class StringValue extends Abstrac
 {
     /** Used for serialization */
     private static final long serialVersionUID = 2L;
-    
+
     /** The UTF-8 bytes for this value */
     private byte[] bytes;
 
@@ -122,8 +120,8 @@ public class StringValue extends Abstrac
         // object without copying it.
         return wrappedValue;
     }
-    
-    
+
+
     /**
      * {@inheritDoc}
      */
@@ -270,7 +268,7 @@ public class StringValue extends Abstrac
         }
 
         StringValue other = ( StringValue ) obj;
-        
+
         // First check if we have an attrbuteType.
         if ( attributeType != null )
         {
@@ -294,11 +292,11 @@ public class StringValue extends Abstrac
                     {
                         return true;
                     }
-                    
+
                     // We have an AttributeType, we use the associated comparator
                     try
                     {
-                        Comparator<String> comparator = ( Comparator<String>
) getLdapComparator();
+                        Comparator<String> comparator = getLdapComparator();
 
                         // Compare normalized values
                         if ( comparator == null )
@@ -334,22 +332,22 @@ public class StringValue extends Abstrac
                 // We have an AttributeType on the base value, we need to use its comparator
                 try
                 {
-                    Comparator<String> comparator = ( Comparator<String> ) getLdapComparator();
+                    Comparator<String> comparator = getLdapComparator();
 
                     // Compare normalized values. We have to normalized the other value,
                     // as it has no AT
                     MatchingRule equality = getAttributeType().getEquality();
-                    
+
                     if ( equality == null )
                     {
                         // No matching rule : compare the raw values
                         return getNormReference().equals( other.getNormReference() );
                     }
-                    
+
                     Normalizer normalizer = equality.getNormalizer();
-                    
-                    StringValue otherValue = (StringValue)normalizer.normalize( other );
-                    
+
+                    StringValue otherValue = ( StringValue ) normalizer.normalize( other
);
+
                     if ( comparator == null )
                     {
                         return getNormReference().equals( otherValue.getNormReference() );
@@ -377,25 +375,25 @@ public class StringValue extends Abstrac
                 {
                     return other.isNull();
                 }
-                
+
                 try
                 {
-                    Comparator<String> comparator = ( Comparator<String> ) other.getLdapComparator();
+                    Comparator<String> comparator = other.getLdapComparator();
 
                     // Compare normalized values. We have to normalized the other value,
                     // as it has no AT
                     MatchingRule equality = other.getAttributeType().getEquality();
-                    
+
                     if ( equality == null )
                     {
                         // No matching rule : compare the raw values
                         return getNormReference().equals( other.getNormReference() );
                     }
-                    
+
                     Normalizer normalizer = equality.getNormalizer();
-                    
-                    StringValue thisValue = (StringValue)normalizer.normalize( this );
-                    
+
+                    StringValue thisValue = ( StringValue ) normalizer.normalize( this );
+
                     if ( comparator == null )
                     {
                         return thisValue.getNormReference().equals( other.getNormReference()
);
@@ -417,7 +415,7 @@ public class StringValue extends Abstrac
                 {
                     return other.isNull();
                 }
-                
+
                 // Now check the normalized values
                 return getNormReference().equals( other.getNormReference() );
             }

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/password/PasswordUtil.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/password/PasswordUtil.java?rev=1459833&r1=1459832&r2=1459833&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/password/PasswordUtil.java
(original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/password/PasswordUtil.java
Fri Mar 22 15:07:59 2013
@@ -25,14 +25,10 @@ import java.io.UnsupportedEncodingExcept
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
-import java.util.Iterator;
 
 import org.apache.directory.api.ldap.model.constants.LdapSecurityConstants;
-import org.apache.directory.api.ldap.model.entry.Attribute;
-import org.apache.directory.api.ldap.model.entry.Value;
 import org.apache.directory.api.util.Base64;
 import org.apache.directory.api.util.DateUtils;
 import org.apache.directory.api.util.Strings;

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/Registries.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/Registries.java?rev=1459833&r1=1459832&r2=1459833&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/Registries.java
(original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/Registries.java
Fri Mar 22 15:07:59 2013
@@ -50,7 +50,6 @@ import org.apache.directory.api.ldap.mod
 import org.apache.directory.api.ldap.model.schema.NameForm;
 import org.apache.directory.api.ldap.model.schema.Normalizer;
 import org.apache.directory.api.ldap.model.schema.ObjectClass;
-import org.apache.directory.api.ldap.model.schema.SchemaManager;
 import org.apache.directory.api.ldap.model.schema.SchemaObject;
 import org.apache.directory.api.ldap.model.schema.SchemaObjectWrapper;
 import org.apache.directory.api.ldap.model.schema.SyntaxChecker;
@@ -562,8 +561,8 @@ public class Registries implements Schem
             delReference( attributeType, attributeType.getSuperior() );
         }
     }
-    
-    
+
+
     /**
      * Build the AttributeType references. This has to be done recursively, as
      * an AttributeType may inherit its parent's MatchingRules. The references
@@ -662,32 +661,32 @@ public class Registries implements Schem
         {
             switch ( schemaObject.getObjectType() )
             {
-                case ATTRIBUTE_TYPE :
-                    AttributeTypeHelper.addToRegistries( (MutableAttributeType)schemaObject,
errors, this );
+                case ATTRIBUTE_TYPE:
+                    AttributeTypeHelper.addToRegistries( ( MutableAttributeType ) schemaObject,
errors, this );
+                    break;
+
+                case DIT_CONTENT_RULE:
+                    DitContentRuleHelper.addToRegistries( ( DitContentRule ) schemaObject,
errors, this );
                     break;
-                    
-                case DIT_CONTENT_RULE :
-                    DitContentRuleHelper.addToRegistries( (DitContentRule)schemaObject, errors,
this );
-                    break;
-                    
-                case LDAP_SYNTAX :
-                    LdapSyntaxHelper.addToRegistries( (LdapSyntax)schemaObject, errors, this
);
-                    break;
-                    
-                case MATCHING_RULE :
-                    MatchingRuleHelper.addToRegistries( (MutableMatchingRule)schemaObject,
errors, this );
-                    break;
-                    
-                case MATCHING_RULE_USE :
-                    MatchingRuleUseHelper.addToRegistries( (MatchingRuleUse)schemaObject,
errors, this );
-                    break;
-                    
-                case NAME_FORM :
-                    NameFormHelper.addToRegistries( (NameForm)schemaObject, errors, this
);
-                    break;
-                    
-                case OBJECT_CLASS :
-                    ObjectClassHelper.addToRegistries( (ObjectClass)schemaObject, errors,
this );
+
+                case LDAP_SYNTAX:
+                    LdapSyntaxHelper.addToRegistries( ( LdapSyntax ) schemaObject, errors,
this );
+                    break;
+
+                case MATCHING_RULE:
+                    MatchingRuleHelper.addToRegistries( ( MutableMatchingRule ) schemaObject,
errors, this );
+                    break;
+
+                case MATCHING_RULE_USE:
+                    MatchingRuleUseHelper.addToRegistries( ( MatchingRuleUse ) schemaObject,
errors, this );
+                    break;
+
+                case NAME_FORM:
+                    NameFormHelper.addToRegistries( ( NameForm ) schemaObject, errors, this
);
+                    break;
+
+                case OBJECT_CLASS:
+                    ObjectClassHelper.addToRegistries( ( ObjectClass ) schemaObject, errors,
this );
                     break;
             }
         }
@@ -712,20 +711,20 @@ public class Registries implements Schem
         {
             switch ( schemaObject.getObjectType() )
             {
-                case ATTRIBUTE_TYPE :
-                    AttributeTypeHelper.removeFromRegistries( (AttributeType)schemaObject,
errors, this );
+                case ATTRIBUTE_TYPE:
+                    AttributeTypeHelper.removeFromRegistries( ( AttributeType ) schemaObject,
errors, this );
                     break;
 
-                case LDAP_SYNTAX :
-                    LdapSyntaxHelper.removeFromRegistries( (LdapSyntax)schemaObject, errors,
this );
+                case LDAP_SYNTAX:
+                    LdapSyntaxHelper.removeFromRegistries( ( LdapSyntax ) schemaObject, errors,
this );
                     break;
 
-                case MATCHING_RULE :
-                    MatchingRuleHelper.removeFromRegistries( (MatchingRule)schemaObject,
errors, this );
+                case MATCHING_RULE:
+                    MatchingRuleHelper.removeFromRegistries( ( MatchingRule ) schemaObject,
errors, this );
                     break;
 
-                case OBJECT_CLASS :
-                    ObjectClassHelper.removeFromRegistries( (ObjectClass)schemaObject, errors,
this );
+                case OBJECT_CLASS:
+                    ObjectClassHelper.removeFromRegistries( ( ObjectClass ) schemaObject,
errors, this );
                     break;
             }
         }
@@ -930,7 +929,7 @@ public class Registries implements Schem
     {
         // This is currently doing nothing.
     }
-    
+
 
     /**
      * Attempts to resolve the SyntaxChecker
@@ -1893,10 +1892,11 @@ public class Registries implements Schem
         {
             for ( SchemaObjectWrapper wrapper : usedBy.keySet() )
             {
-                sb.append( wrapper.get().getObjectType() ).append( '[' ).append( wrapper.get().getOid()
).append( "] : {" );
-    
+                sb.append( wrapper.get().getObjectType() ).append( '[' ).append( wrapper.get().getOid()
)
+                    .append( "] : {" );
+
                 boolean isFirst = true;
-    
+
                 for ( SchemaObjectWrapper uses : usedBy.get( wrapper ) )
                 {
                     if ( isFirst )
@@ -1907,10 +1907,10 @@ public class Registries implements Schem
                     {
                         sb.append( ", " );
                     }
-    
+
                     sb.append( uses.get().getObjectType() ).append( '[' ).append( wrapper.get().getOid()
).append( "]" );
                 }
-    
+
                 sb.append( "}\n" );
             }
         }
@@ -1936,10 +1936,11 @@ public class Registries implements Schem
         {
             for ( SchemaObjectWrapper wrapper : using.keySet() )
             {
-                sb.append( wrapper.get().getObjectType() ).append( '[' ).append( wrapper.get().getOid()
).append( "] : {" );
-    
+                sb.append( wrapper.get().getObjectType() ).append( '[' ).append( wrapper.get().getOid()
)
+                    .append( "] : {" );
+
                 boolean isFirst = true;
-    
+
                 for ( SchemaObjectWrapper uses : using.get( wrapper ) )
                 {
                     if ( isFirst )
@@ -1950,10 +1951,10 @@ public class Registries implements Schem
                     {
                         sb.append( ", " );
                     }
-    
+
                     sb.append( uses.get().getObjectType() ).append( '[' ).append( wrapper.get().getOid()
).append( "]" );
                 }
-    
+
                 sb.append( "}\n" );
             }
         }
@@ -2811,8 +2812,6 @@ public class Registries implements Schem
     }
 
 
-
-
     /**
      * @see Object#toString()
      */



Mime
View raw message